mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-11 01:08:39 +12:00
Fix Travis by using a PPA to install QT. (#4269)
This commit is contained in:
parent
7bbadfd08b
commit
c1f32aa570
1 changed files with 3 additions and 8 deletions
11
.travis.yml
11
.travis.yml
|
@ -34,12 +34,6 @@ before_install:
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
|
|
||||||
wget http://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run ;
|
|
||||||
chmod a+x ./qt-unified-linux-x64-online.run ;
|
|
||||||
QT_QPA_PLATFORM=minimal QTVER="${QTVER//.}" travis_wait 60 ./qt-unified-linux-x64-online.run --script qt-installer-noninteractive.qs --no-force-installations --verbose ;
|
|
||||||
fi;
|
|
||||||
|
|
||||||
# Install updated libglew-dev since the version provided by trusty is outdated
|
# Install updated libglew-dev since the version provided by trusty is outdated
|
||||||
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
|
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
|
||||||
wget https://mirrors.kernel.org/ubuntu/pool/universe/g/glew/libglew-dev_2.0.0-5_amd64.deb;
|
wget https://mirrors.kernel.org/ubuntu/pool/universe/g/glew/libglew-dev_2.0.0-5_amd64.deb;
|
||||||
|
@ -99,6 +93,7 @@ addons:
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
- llvm-toolchain-trusty-4.0
|
- llvm-toolchain-trusty-4.0
|
||||||
- sourceline: 'ppa:jonathonf/binutils' # We need to update binutils to a newer version to link against the ffmpeg libs on.
|
- sourceline: 'ppa:jonathonf/binutils' # We need to update binutils to a newer version to link against the ffmpeg libs on.
|
||||||
|
- sourceline: 'ppa:beineri/opt-qt-5.10.1-trusty' # <<WARNING>>: This needs to be updated manually whenever the QT Version changes. Add QT PPA since the installer is quite bad.
|
||||||
packages:
|
packages:
|
||||||
- binutils
|
- binutils
|
||||||
- cmake
|
- cmake
|
||||||
|
@ -120,8 +115,8 @@ addons:
|
||||||
- libstdc++-5-dev
|
- libstdc++-5-dev
|
||||||
- lib32stdc++6
|
- lib32stdc++6
|
||||||
- zlib1g-dev
|
- zlib1g-dev
|
||||||
# We need to install qt 5.10.1 manually because the version trusty provides is too old.
|
# From the beineri PPA
|
||||||
#- qtbase5-dev
|
- qt510-meta-minimal # <<WARNING>>: This needs to be updated manually whenever the QT Version changes.
|
||||||
- libudev-dev
|
- libudev-dev
|
||||||
- libevdev-dev
|
- libevdev-dev
|
||||||
- libpulse-dev
|
- libpulse-dev
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue