Skip to content

Commit 9490fdf

Browse files
author
Your Name
committed
add ffmpeg
1 parent 83d42b3 commit 9490fdf

File tree

3 files changed

+18
-0
lines changed

3 files changed

+18
-0
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ linuxdeploy*.AppImage
1010
Miniconda3-latest*.sh
1111
__pycache__
1212
funscript-editor*.AppImage
13+
ffmpeg
14+
ffmpeg-git*.tar.xz

build_appimage.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,21 @@ if [ ! -f ./linuxdeploy-x86_64.AppImage ]; then
44
wget -c "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
55
fi
66

7+
if [ ! -f ffmpeg-git-amd64-static.tar.xz ]; then
8+
wget -c "https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz"
9+
fi
10+
711
rm -f ./funscript-editor-*.AppImage
812

913
chmod +x linuxdeploy-x86_64.AppImage
1014
chmod +x linuxdeploy-plugin-conda.sh
1115

16+
echo "extract ffmpeg..."
17+
mkdir -p tmp
18+
tar -xf ffmpeg-git-amd64-static.tar.xz -C tmp
19+
mv -f tmp/ffmpeg-git*/ffmpeg .
20+
rm -rf tmp
21+
1222
ARCH=x86_64 \
1323
./linuxdeploy-x86_64.AppImage \
1424
--appdir AppDir \

linuxdeploy-plugin-conda.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ if [ -d dist ]; then
115115
find dist -iname "*.whl" | sort | tail -n 1 | xargs -I {} pip3 install --force-reinstall {}
116116
fi
117117

118+
if [ -f ffmpeg ]; then
119+
cp -fv ffmpeg $APPDIR/usr/conda/lib/python3*/site-packages/funscript_editor/data
120+
chmod +x $APPDIR/usr/conda/lib/python3*/site-packages/funscript_editor/data/ffmpeg
121+
fi
122+
118123
# create missing symlinks
119124
mkdir -p "$APPDIR"/usr/bin/
120125
mkdir -p "$APPDIR"/usr/lib/
@@ -178,4 +183,5 @@ export FONTCONFIG_PATH="$APPDIR"/usr/conda/etc/fonts
178183
export FONTCONFIG_FILE="$APPDIR"/usr/conda/etc/fonts/fonts.conf
179184
EOF
180185

186+
181187
exit 0

0 commit comments

Comments
 (0)