From d6d8c52c96adfbb29db833d2b3e8a0beaa7288ef Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Tue, 23 Apr 2019 15:17:37 -0600
Subject: [PATCH] Enable ffmpeg support on Linux FlatPak (#4731)

* linux-flatpak: enable ffmpeg support

* linux-flatpak: fix caching for ccache
---
 .travis/linux-flatpak/docker.sh        | 6 ++++++
 .travis/linux-flatpak/generate-data.sh | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.travis/linux-flatpak/docker.sh b/.travis/linux-flatpak/docker.sh
index 31e2bb777..b5652a7b8 100755
--- a/.travis/linux-flatpak/docker.sh
+++ b/.travis/linux-flatpak/docker.sh
@@ -30,6 +30,12 @@ gpg2 --import "$GPG_KEY"
 mkdir -p "$REPO_DIR"
 sshfs "$FLATPAK_SSH_USER@$FLATPAK_SSH_HOSTNAME:$SSH_DIR" "$REPO_DIR" -C -p "$FLATPAK_SSH_PORT" -o IdentityFile="$SSH_KEY"
 
+# setup ccache location
+wget 'https://liushuyu.b-cdn.net/citra-ccache-flatpak.tar.xz'
+tar xf citra-ccache-flatpak.tar.xz -C /root/.ccache --strip-components=1
+mkdir -p "$STATE_DIR"
+ln -sv /root/.ccache "$STATE_DIR/ccache"
+
 # Build the citra flatpak
 flatpak-builder -v --jobs=4 --ccache --force-clean --state-dir="$STATE_DIR" --gpg-sign="$FLATPAK_GPG_PUBLIC_KEY" --repo="$REPO_DIR" "$BUILD_DIR" "/tmp/org.citra.$REPO_NAME.json"
 flatpak build-update-repo "$REPO_DIR" -v --generate-static-deltas --gpg-sign="$FLATPAK_GPG_PUBLIC_KEY"
diff --git a/.travis/linux-flatpak/generate-data.sh b/.travis/linux-flatpak/generate-data.sh
index 47f999705..066534016 100644
--- a/.travis/linux-flatpak/generate-data.sh
+++ b/.travis/linux-flatpak/generate-data.sh
@@ -86,7 +86,8 @@ cat > /tmp/org.citra.$REPO_NAME.json <<EOF
                 "-DCMAKE_BUILD_TYPE=Release",
                 "-DENABLE_QT_TRANSLATION=ON",
                 "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON",
-                "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON"
+                "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON",
+                "-DENABLE_FFMPEG=ON"
             ],
             "cleanup": [
               "/bin/citra",