diff --git a/.gitignore b/.gitignore index e474d24..35ed284 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ moc_* qrc_qml.cpp appdir AppDir -Makefile \ No newline at end of file +Makefile +linuxdeploy* diff --git a/.travis.yml b/.travis.yml index 936427d..91d2935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ install: - source /opt/qt*/bin/qt*-env.sh script: + - bash scripts/build-mpv.sh - bash scripts/makeappimage.sh after_success: diff --git a/scripts/build-mpv.sh b/scripts/build-mpv.sh index 8cebc24..b59876b 100755 --- a/scripts/build-mpv.sh +++ b/scripts/build-mpv.sh @@ -2,6 +2,7 @@ set -x export OLDDIR=`pwd` +export PATH="/usr/lib/ccache:/usr/lib/ccache/bin:$PATH" export CFLAGS="-fPIC -Os" diff --git a/scripts/makeappimage.sh b/scripts/makeappimage.sh index fa71ff3..017293c 100755 --- a/scripts/makeappimage.sh +++ b/scripts/makeappimage.sh @@ -4,8 +4,6 @@ set -ex export PATH="/usr/lib/ccache:/usr/lib/ccache/bin:$PATH" -bash scripts/build-mpv.sh - export QML_SOURCES_PATHS=src/qml export V=0 VERBOSE=0 @@ -18,8 +16,14 @@ wget -nc "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download wget -nc "https://raw.githubusercontent.com/TheAssassin/linuxdeploy-plugin-conda/master/linuxdeploy-plugin-conda.sh" chmod +x linux* mkdir -p appdir/usr/lib -cp /usr/lib/x86_64-linux-gnu/libjack.so.0 appdir/usr/lib -export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file + +if [ "$ARCH" == "" ]; then + ARCH="x86_64" +fi + +cp -f /usr/lib/*/libjack.so.0 appdir/usr/lib +export UPD_INFO="gh-releases-zsync|NamedKitten|KittehPlayer|continuous|KittehPlayer-$ARCH.AppImage" + #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 @@ -28,4 +32,4 @@ export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for namin 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 qt --plugin conda --output appimage -v 3 +./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage -v 3