From e39534a65eb8b5de0d2a921c90a7635d8dc54825 Mon Sep 17 00:00:00 2001 From: NamedKitten Date: Sun, 14 Oct 2018 21:50:14 +0100 Subject: [PATCH] fix? --- scripts/build-mpv.sh | 14 ++++++++------ scripts/makeappimage.sh | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/build-mpv.sh b/scripts/build-mpv.sh index 9d588f7..841e890 100755 --- a/scripts/build-mpv.sh +++ b/scripts/build-mpv.sh @@ -1,18 +1,20 @@ #!/bin/bash -set -e +set -ex + + CFLAGS="-fPIC -Os" -git clone --depth 1 https://github.com/mpv-player/mpv-build mpv-build || true +rm -rf mpv-build && git clone --depth 1 https://github.com/mpv-player/mpv-build mpv-build cd mpv-build -git clone --depth 1 https://github.com/FFmpeg/FFmpeg.git ffmpeg || true -git clone --depth 1 https://github.com/mpv-player/mpv.git mpv || true -git clone --depth 1 https://github.com/libass/libass.git libass || true +rm -rf ffmpeg && git clone --depth 1 https://github.com/FFmpeg/FFmpeg.git ffmpeg +rm -rf mpv && git clone --depth 1 https://github.com/mpv-player/mpv.git mpv +rm -rf libass && git clone --depth 1 https://github.com/libass/libass.git libass 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 -./build -j`nproc` +./rebuild -j`nproc` sudo ./install cd .. diff --git a/scripts/makeappimage.sh b/scripts/makeappimage.sh index 0c536c3..f5dd516 100755 --- a/scripts/makeappimage.sh +++ b/scripts/makeappimage.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -ex + export PATH="/usr/lib/ccache:/usr/lib/ccache/bin:$PATH" bash scripts/build-mpv.sh