From 3790946082a5d31699f7a1538491f70acac2b9d8 Mon Sep 17 00:00:00 2001 From: Kitteh Date: Sun, 21 Oct 2018 17:51:37 +0100 Subject: [PATCH] [Scripts] Re-enable ffmpeg ASM. --- scripts/build-mpv.sh | 2 +- scripts/makeappimage.sh | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/build-mpv.sh b/scripts/build-mpv.sh index 5b59f70..b59876b 100755 --- a/scripts/build-mpv.sh +++ b/scripts/build-mpv.sh @@ -28,7 +28,7 @@ git clone --depth 1 https://github.com/FFmpeg/FFmpeg.git ffmpeg git clone --depth 1 https://github.com/mpv-player/mpv.git mpv git clone --depth 1 https://github.com/libass/libass.git libass #--enable-libaom -echo "--disable-asm" > ffmpeg_options +echo " " > ffmpeg_options echo "--disable-programs --disable-runtime-cpudetect --enable-small" >> ffmpeg_options echo "--enable-libmpv-shared --prefix=/usr" > mpv_options echo "--disable-caca --disable-wayland --disable-gl-wayland --disable-libarchive --disable-zlib --disable-tv --disable-debug-build --disable-manpage-build --disable-vapoursynth --disable-libsmbclient --disable-wayland" >> mpv_options diff --git a/scripts/makeappimage.sh b/scripts/makeappimage.sh index 4164c37..747ac8b 100755 --- a/scripts/makeappimage.sh +++ b/scripts/makeappimage.sh @@ -22,14 +22,7 @@ if [ "$ARCH" == "" ]; then fi cp -f /usr/lib/*/libjack.so.0 appdir/usr/lib -export UPD_INFO="gh-releases-zsync|NamedKitten|KittehPlayer|continuous|KittehPlayer-$ARCH.AppImage.zsync" -#mkdir -p appdir/usr/plugins/imageformats -#cp /opt/qt*/plugins/imageformats/libqsvg.so appdir/usr/plugins/imageformats/ -#./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -qmldir=./src/qml/ -bundle-non-qt-libs -#./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -qmldir=./src/qml/ -appimage -#export PIP_REQUIREMENTS=youtube-dl +export UPD_INFO="gh-releases-zsync|NamedKitten|KittehPlayer|continuous|KittehPlayer-$ARCH.AppImage.zsync" export CONDA_PACKAGES=youtube-dl -#ln -s ../conda/bin/youtube-dl appdir/usr/bin/youtube-dl -#sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O appdir/usr/bin/youtube-dl ./linuxdeploy-x86_64.AppImage --appdir appdir --plugin conda --plugin qt --output appimage -v 3