diff --git a/.travis.yml b/.travis.yml index 219c4d6..384365e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,10 @@ before_install: - sudo rm -rf /var/cache/apt/archives - sudo ln -s $HOME/.cache/apt /var/cache/apt/archives - sudo add-apt-repository ppa:beineri/opt-qt-5.11.1-xenial -y - - sudo add-apt-repository ppa:djcj/vapoursynth -y - sudo apt-get update install: - - sudo apt-get -y install python3-pip libvapoursynth* libxpm-dev libcurl3 libcurl4-openssl-dev automake libtool desktop-file-utils python3-setuptools libjack0 libjack-dev nasm ccache qt511-meta-minimal qt511graphicaleffect* qt511quickcontrols python3-setuptools qt511quickcontrols2 qt511imageformats qt511svg libgl1-mesa-dev checkinstall + - sudo apt-get -y install python3-pip libxpm-dev libcurl3 libcurl4-openssl-dev automake libtool desktop-file-utils python3-setuptools libjack0 libjack-dev nasm ccache qt511-meta-minimal qt511graphicaleffect* qt511quickcontrols python3-setuptools qt511quickcontrols2 qt511imageformats qt511svg libgl1-mesa-dev checkinstall - sudo apt-get build-dep libmpv1 - source /opt/qt*/bin/qt*-env.sh diff --git a/scripts/build-mpv.sh b/scripts/build-mpv.sh index b38ce6c..4e6fec5 100755 --- a/scripts/build-mpv.sh +++ b/scripts/build-mpv.sh @@ -15,9 +15,8 @@ export MPVDIR=`pwd` rm -rf ffmpeg mpv libass -echo ' ' > ffmpeg_options -echo "--disable-programs --disable-runtime-cpudetect --enable-small" >> ffmpeg_options -echo "--enable-libmpv-shared --prefix=/usr --enable-vapoursynth --enable-lgpl" > mpv_options +echo "--disable-programs --enable-runtime-cpudetect --enable-small" > ffmpeg_options +echo "--enable-libmpv-shared --prefix=/usr --disable-vapoursynth --enable-lgpl" > mpv_options echo "--disable-caca --disable-wayland --disable-gl-wayland --disable-libarchive --disable-zlib --disable-tv --disable-debug-build --disable-manpage-build --disable-libsmbclient --disable-wayland" >> mpv_options ./rebuild -j`nproc` diff --git a/scripts/makeappimage.sh b/scripts/makeappimage.sh index e36ac92..4778ca8 100755 --- a/scripts/makeappimage.sh +++ b/scripts/makeappimage.sh @@ -7,13 +7,11 @@ export PATH="/usr/lib/ccache:/usr/lib/ccache/bin:$PATH" export QML_SOURCES_PATHS=src/qml export V=0 VERBOSE=0 -qmake CONFIG+=release PREFIX=/usr +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr . make -j$(nproc) -make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/ -#wget "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" +make DESTDIR=appdir -j$(nproc) install ; find appdir/ wget -nc "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" wget -nc "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" -#wget -nc "https://raw.githubusercontent.com/TheAssassin/linuxdeploy-plugin-conda/master/linuxdeploy-plugin-conda.sh" chmod +x linux* mkdir -p appdir/usr/lib