From cb0c6053149e11205e28de98cc1a6b84a20108ac Mon Sep 17 00:00:00 2001 From: NamedKitten Date: Sun, 14 Oct 2018 19:35:07 +0100 Subject: [PATCH] Please? --- .travis.yml | 5 +++-- scripts/build-mpv.sh | 19 ++++++------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16aef46..b8c0bb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,12 @@ cache: before_install: - sudo add-apt-repository ppa:beineri/opt-qt-5.11.1-xenial -y + - sudo add-apt-repository ppa:mc3man/xerus-media -y - sudo apt-get update install: - - sudo apt-get -y install ccache libmpv1 libmpv-dev qt511-meta-minimal qt511quickcontrols qt511quickcontrols2 qt511imageformats qt511svg libgl1-mesa-dev - - sudo apt-get build-dep libmpv1 libmpv-dev + - sudo apt-get -y install ccache libmpv-dev libmpv1 qt511-meta-minimal qt511quickcontrols qt511quickcontrols2 qt511imageformats qt511svg libavcodec-dev libavcodec-extra libgl1-mesa-dev + - sudo apt-get dist-upgrade - source /opt/qt*/bin/qt*-env.sh script: diff --git a/scripts/build-mpv.sh b/scripts/build-mpv.sh index 8a90f0d..eec5f24 100644 --- a/scripts/build-mpv.sh +++ b/scripts/build-mpv.sh @@ -1,17 +1,10 @@ #!/bin/bash -#git clone --depth 1 https://github.com/mpv-player/mpv-build -#cd mpv-build -export PATH="/usr/lib/ccache:$PATH" -git clone --depth 1 https://github.com/mpv-player/mpv -cd mpv +git clone --depth 1 https://github.com/mpv-player/mpv-build +cd mpv-build -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 - - -./bootstrap.py -./waf configure `cat mpv_options` -./waf -j`nproc` -sudo ./waf install +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 +./rebuild -j`nproc` +sudo ./install cd ..