Experiment: build FFmpeg on Travis for Linux.

Let's see how workable / problematic this is. Can improve our scripts more to make this easier / more automatic.
hrydgard · Jul 1, 2016 · aa9a26f · aa9a26f
1 parent 4d8c769
commit aa9a26f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.travis.sh b/.travis.sh
@@ -114,6 +114,10 @@ travis_install() {
 travis_script() {
 	# Compile PPSSPP
 	if [ "$PPSSPP_BUILD_TYPE" = "Linux" ]; then
+		pushd ffmpeg
+		./linux_x86-64.sh
+		popd
+
 		if [ "$QT" = "TRUE" ]; then
 			./b.sh --qt
 		else

diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,8 @@ addons:
       - lib32z1
       - lib32z1-dev
       - lib32bz2-1.0
+      - yasm
+      - diffutils
 
 cache:
   - apt

diff --git a/ffmpeg b/ffmpeg
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,8 @@ addons: @@
           - lib32z1
           - lib32z1-dev
           - lib32bz2-1.0
+          - yasm
+          - diffutils
     cache:
       - apt
@@ Expand Down @@