midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable ffmpeg support on Linux FlatPak (#4731)

Browse Source 
* linux-flatpak: enable ffmpeg support

* linux-flatpak: fix caching for ccache
This commit is contained in:
liushuyu 2019-04-23 15:17:37 -06:00 committed by Ben
parent 624271696e
commit d6d8c52c96
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis/linux-flatpak/docker.sh
View File

@ -30,6 +30,12 @@ gpg2 --import "$GPG_KEY"
mkdir -p "$REPO_DIR" mkdir -p "$REPO_DIR"
sshfs "$FLATPAK_SSH_USER@$FLATPAK_SSH_HOSTNAME:$SSH_DIR" "$REPO_DIR" -C -p "$FLATPAK_SSH_PORT" -o IdentityFile="$SSH_KEY" 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 # 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-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" flatpak build-update-repo "$REPO_DIR" -v --generate-static-deltas --gpg-sign="$FLATPAK_GPG_PUBLIC_KEY"

3
.travis/linux-flatpak/generate-data.sh
View File

@ -86,7 +86,8 @@ cat > /tmp/org.citra.$REPO_NAME.json <<EOF
"-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_BUILD_TYPE=Release",
"-DENABLE_QT_TRANSLATION=ON", "-DENABLE_QT_TRANSLATION=ON",
"-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON", "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON",
"-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON" "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON",
"-DENABLE_FFMPEG=ON"
], ],
"cleanup": [ "cleanup": [
"/bin/citra", "/bin/citra",