From f2ec85aac02e5dab10f28ab295c270e6c143cab7 Mon Sep 17 00:00:00 2001
From: Kitteh <kitteh@namedkitten.pw>
Date: Tue, 23 Oct 2018 13:36:01 +0100
Subject: [PATCH] Don't build normal libs.

---
 .gitignore           |  1 +
 KittehPlayer.pro     |  4 ---
 scripts/build-mpv.sh | 63 ++------------------------------------------
 3 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/.gitignore b/.gitignore
index 35ed284..d4adf5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ appdir
 AppDir
 Makefile
 linuxdeploy*
+other_libs
\ No newline at end of file
diff --git a/KittehPlayer.pro b/KittehPlayer.pro
index 2404b10..202bb30 100644
--- a/KittehPlayer.pro
+++ b/KittehPlayer.pro
@@ -6,13 +6,9 @@ QT += qml quickcontrols2 widgets
 SOURCES += src/main.cpp src/mpvobject.cpp
 
 CONFIG += release
-exists("/usr/lib/libmpv.a") {
-LIBS += -L/usr/lib /usr/lib/libmpv.a
-} else {
 QT_CONFIG -= no-pkg-config
 CONFIG += link_pkgconfig
 PKGCONFIG += mpv
-}
 RESOURCES += src/qml/qml.qrc
 
 unix {
diff --git a/scripts/build-mpv.sh b/scripts/build-mpv.sh
index a9ba939..e52e37d 100755
--- a/scripts/build-mpv.sh
+++ b/scripts/build-mpv.sh
@@ -15,65 +15,6 @@ cd mpv-build
 
 export MPVDIR=`pwd`
 
-mkdir other_libs
-cd other_libs
-export OTHER_LIBS=`pwd`
-
-
-wget -nc "https://github.com/webmproject/libvpx/archive/v1.7.0.tar.gz" && tar xvf "v1.7.0.tar.gz"
-cd libvpx*
-./configure --prefix=/usr --disable-unit-tests --disable-shared
-make -j`nproc`
-sudo make install
-cd $OTHER_LIBS
-
-wget "http://kent.dl.sourceforge.net/project/lame/lame/3.100/lame-3.100.tar.gz"  && tar xvf "lame-3.100.tar.gz"
-cd lame-3.100 || exit
-./configure --prefix=/usr --disable-shared --enable-static
-make -j`nproc`
-sudo make install
-cd $OTHER_LIBS
-
-wget "http://downloads.xvid.org/downloads/xvidcore-1.3.4.tar.gz" && tar xvf "xvidcore-1.3.4.tar.gz"
-cd xvidcore
-cd build/generic
-./configure --prefix=/usr --disable-shared --enable-static
-make -j`nproc`
-sudo make install
-cd $OTHER_LIBS
-
-
-wget "http://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20180531-2245.tar.bz2" && tar xvf "x264-snapshot-20180531-2245.tar.bz2"
-cd x264-snapshot-*
-./configure --prefix=/usr --enable-static --enable-pic CXXFLAGS="-fPIC"
-make -j`nproc`
-sudo make install
-sudo make install-lib-static
-cd $OTHER_LIBS
-
-
-wget "http://downloads.xiph.org/releases/ogg/libogg-1.3.3.tar.gz" && tar xvf "libogg-1.3.3.tar.gz"
-cd libogg-1.3.3 || exit
-./configure --prefix=/usr --disable-shared --enable-static
-make -j`nproc`
-sudo make install
-cd $OTHER_LIBS
-
-wget "http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.6.tar.gz" && tar xvf "libvorbis-1.3.6.tar.gz"
-cd libvorbis-1.3.6
-./configure --prefix=/usr --enable-static --disable-shared --disable-oggtest
-make -j`nproc`
-sudo make install
-cd $OTHER_LIBS
-
-
-wget "http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.gz" && tar xvf "libtheora-1.1.1.tar.bz"
-cd libtheora-1.1.1
-sed "s/-fforce-addr//g" -i configure
-./configure --prefix=/usr --enable-static --disable-shared --disable-oggtest --disable-vorbistest --disable-examples --disable-asm
-make -j`nproc`
-sudo make install
-cd $OTHER_LIBS
 
 
 cd $MPVDIR
@@ -83,12 +24,12 @@ 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
 #--enable-libaom
-echo "--pkg-config-flags=\"--static\" --extra-libs=\"-lpthread -lm\" --enable-static --disable-debug --disable-shared --disable-ffplay --disable-doc --enable-gpl --enable-version3 --enable-nonfree --enable-pthreads --enable-libvpx --enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264 --enable-avfilter --enable-filters" > ffmpeg_options
+echo '--disable-debug --disable-shared --disable-ffplay --disable-doc --enable-gpl --enable-version3 --enable-nonfree --enable-pthreads --enable-libvpx --enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264 --enable-avfilter --enable-filters' > 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 --disable-wayland" >> mpv_options
 
-./rebuild -j`nproc`
+sudo ./build -j`nproc`
 sudo ./install
 ccache -s