mirror of
https://github.com/vcmi/vcmi.git
synced 2025-04-15 11:46:56 +02:00
use ffmpeg ppa
This commit is contained in:
parent
9d2b87ba4d
commit
2f9bc5fc9a
16
.travis.yml
16
.travis.yml
@ -11,6 +11,8 @@ before_install:
|
||||
- sudo add-apt-repository --yes ppa:zoogie/sdl2-snapshots
|
||||
#new Qt
|
||||
- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
|
||||
#new FFmpeg
|
||||
- sudo add-apt-repository --yes ppa:djcj/vlc-stable
|
||||
|
||||
- sudo apt-get update -qq
|
||||
|
||||
@ -18,24 +20,13 @@ before_install:
|
||||
- sudo apt-get install -qq $PACKAGE
|
||||
- sudo apt-get install -qq cmake yasm libboost1.55-all-dev zlib1g-dev
|
||||
- sudo apt-get install -qq libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
|
||||
- sudo apt-get install -qq libavformat-dev libswscale-dev
|
||||
- sudo apt-get install -qq qtdeclarative5-dev
|
||||
|
||||
#setup compiler
|
||||
- export CC=${REAL_CC} CXX=${REAL_CXX}
|
||||
|
||||
before_script:
|
||||
#install new ffmpeg
|
||||
- mkdir ffmpeg
|
||||
- cd ffmpeg
|
||||
- wget https://www.ffmpeg.org/releases/ffmpeg-2.2.4.tar.gz
|
||||
- tar -xzf ffmpeg-2.2.4.tar.gz
|
||||
- cd ffmpeg-2.2.4
|
||||
- ./configure --disable-doc --enable-shared --prefix=/usr
|
||||
- make
|
||||
- sudo make install
|
||||
- cd ..
|
||||
- cd ..
|
||||
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake ..
|
||||
@ -43,7 +34,6 @@ before_script:
|
||||
script:
|
||||
- make
|
||||
|
||||
|
||||
env:
|
||||
- ignore=this
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user