diff --git a/.travis.yml b/.travis.yml index b6bc53c..0697b0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_install: - sudo apt-get update install: - - sudo apt-get -y install libjack0 libjack-dev nasm ccache qt511-meta-minimal qt511quickcontrols qt511quickcontrols2 qt511imageformats qt511svg libgl1-mesa-dev + - sudo apt-get -y install libjack0 libjack-dev nasm ccache qt511-meta-minimal qt511quickcontrols 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 eda18ef..ce6d9d8 100755 --- a/scripts/build-mpv.sh +++ b/scripts/build-mpv.sh @@ -12,23 +12,21 @@ rm -rf mpv-build git clone --depth 1 https://github.com/mpv-player/mpv-build mpv-build cd mpv-build -#git clone --depth 1 http://aomedia.googlesource.com/aom aom || true -#mkdir aom-build || true -#cd aom-build -# cmake ../aom \ -# -DCMAKE_INSTALL_PREFIX=/usr \ -# -DBUILD_SHARED_LIBS=1 \ -# -DENABLE_TESTS=0 -G "Unix Makefiles" -#make -j`nproc` -#sudo make install -#cd .. +export MPVDIR=`pwd` +mkdir aom -p +cd aom +git clone --depth 1 https://aomedia.googlesource.com/aom +cmake aom/ +make +sudo checkinstall -y --deldoc=yes +cd $MPVDIR rm -rf ffmpeg mpv libass 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 -#echo "--enable-libaom" > ffmpeg_options +echo "--enable-libaom" > 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" >> mpv_options