Skip to content

Commit 4a14b67

Browse files
committed
OTX: Revert Linux builds to QT 597 to fix pressure loss
1 parent 1df273d commit 4a14b67

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ci-scripts/linux/travis-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pushd thirdparty/tiff-4.0.3
33
CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --disable-jbig && make
44
popd
55
cd toonz && mkdir build && cd build
6-
source /opt/qt514/bin/qt514-env.sh
6+
source /opt/qt59/bin/qt59-env.sh
77
cmake ../sources \
88
-DWITH_SYSTEM_SUPERLU:BOOL=OFF
99
# according to https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments

ci-scripts/linux/travis-buildpkg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
source /opt/qt514/bin/qt514-env.sh
2+
source /opt/qt59/bin/qt59-env.sh
33

44
echo ">>> Temporary install of OpenToonz"
55
export BUILDDIR=$(pwd)/toonz/build

ci-scripts/linux/travis-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
sudo add-apt-repository --yes ppa:beineri/opt-qt-5.14.1-xenial
1+
sudo add-apt-repository --yes ppa:beineri/opt-qt597-xenial
22
sudo add-apt-repository --yes ppa:achadwick/mypaint-testing
33
sudo add-apt-repository --yes ppa:litenstein/opencv3-xenial
44
sudo apt-get update
5-
sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt514script libsuperlu-dev qt514svg qt514tools qt514multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libopencv-dev libglib2.0-dev qt514serialport
5+
sudo apt-get install -y cmake liblzo2-dev liblz4-dev libfreetype6-dev libpng-dev libegl1-mesa-dev libgles2-mesa-dev libglew-dev freeglut3-dev qt59script libsuperlu-dev qt59svg qt59tools qt59multimedia wget libusb-1.0-0-dev libboost-all-dev liblzma-dev libjson-c-dev libmypaint-dev libjpeg-turbo8-dev libopencv-dev libglib2.0-dev qt59serialport
66

77
# someone forgot to include liblz4.pc with the package, use the version from xenial, as it only depends on libc
88
wget http://mirrors.kernel.org/ubuntu/pool/main/l/lz4/liblz4-1_0.0~r131-2ubuntu2_amd64.deb -O liblz4.deb

0 commit comments

Comments
 (0)