From afde1bb385848c6743b1294399fafb2fd0b8ff29 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Mon, 14 Nov 2022 12:23:02 +0900
Subject: [PATCH] mpv-x: Bump to 0.35.0

---
 x11-packages/mpv-x/build.sh        | 42 ++++++++++++------------------
 x11-packages/mpv-x/sles_rate.patch | 13 ---------
 x11-packages/mpv-x/wscript.patch   | 22 ----------------
 3 files changed, 17 insertions(+), 60 deletions(-)
 delete mode 100644 x11-packages/mpv-x/sles_rate.patch
 delete mode 100644 x11-packages/mpv-x/wscript.patch

diff --git a/x11-packages/mpv-x/build.sh b/x11-packages/mpv-x/build.sh
index 9fe8a7b344..cd3f142302 100644
--- a/x11-packages/mpv-x/build.sh
+++ b/x11-packages/mpv-x/build.sh
@@ -3,41 +3,33 @@ TERMUX_PKG_DESCRIPTION="Command-line media player"
 # License: GPL-2.0-or-later
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.34.1
+TERMUX_PKG_VERSION=0.35.0
 TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=32ded8c13b6398310fa27767378193dc1db6d78b006b70dbcbd3123a1445e746
-TERMUX_PKG_DEPENDS="ffmpeg, fftw, libandroid-glob, libandroid-shmem, libarchive, libass, libbluray, libcaca, libdrm, libdvdnav, libdvdread, libiconv, libjpeg-turbo, liblua52, libsamplerate, libsixel, libuchardet, libx11, libxext, libxinerama, libxrandr, libxss, libzimg, littlecms, openal-soft, pulseaudio, rubberband, zlib"
+TERMUX_PKG_SHA256=dc411c899a64548250c142bf1fa1aa7528f1b4398a24c86b816093999049ec00
+TERMUX_PKG_DEPENDS="ffmpeg, libandroid-glob, libandroid-shmem, libarchive, libass, libbluray, libcaca, libdrm, libdvdnav, libiconv, libjpeg-turbo, liblua52, libsixel, libuchardet, libx11, libxext, libxinerama, libxpresent, libxrandr, libxss, libzimg, littlecms, openal-soft, pulseaudio, rubberband, zlib"
 TERMUX_PKG_CONFLICTS="mpv"
 TERMUX_PKG_REPLACES="mpv"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
---enable-libmpv-shared
---enable-lua
---enable-dvdnav
---disable-vapoursynth
---enable-openal
---disable-gbm
---disable-wayland
---disable-xv
---disable-vdpau
---disable-vaapi
---disable-gl
---disable-vulkan
+-Dlibmpv=true
+-Dlua=lua52
+-Ddvdnav=enabled
+-Dvapoursynth=disabled
+-Dopenal=enabled
+-Dgbm=disabled
+-Dgl=disabled
+-Dvdpau=disabled
+-Dvaapi=disabled
+-Dvulkan=disabled
+-Dwayland=disabled
+-Dxv=disabled
+-Dandroid-media-ndk=disabled
 "
 
 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob -landroid-shmem"
 }
 
-termux_step_make_install() {
-	cd $TERMUX_PKG_SRCDIR
-
-	./bootstrap.py
-
-	./waf configure \
-		--prefix=$TERMUX_PREFIX \
-		$TERMUX_PKG_EXTRA_CONFIGURE_ARGS
-
-	./waf -v install
+termux_step_post_make_install() {
 	install -Dm600 -t $TERMUX_PREFIX/etc/mpv/ $TERMUX_PKG_BUILDER_DIR/mpv.conf
 	install -Dm600 -t $TERMUX_PREFIX/share/mpv/scripts/ $TERMUX_PKG_SRCDIR/TOOLS/lua/*
 }
diff --git a/x11-packages/mpv-x/sles_rate.patch b/x11-packages/mpv-x/sles_rate.patch
deleted file mode 100644
index 9632ff29c9..0000000000
--- a/x11-packages/mpv-x/sles_rate.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/audio/out/ao_opensles.c b/audio/out/ao_opensles.c
-index 40ab5324b5..aef78c2dec 100644
---- a/audio/out/ao_opensles.c
-+++ b/audio/out/ao_opensles.c
-@@ -111,6 +111,8 @@ static int init(struct ao *ao)
- 
-     // This AO only supports two channels at the moment
-     mp_chmap_from_channels(&ao->channels, 2);
-+    // Upstream "Wilhelm" supports only 8000 <= rate <= 192000
-+    ao->samplerate = MPMIN(MPMAX(ao->samplerate, 8000), 192000);
- 
-     CHK(slCreateEngine(&p->sl, 0, NULL, 0, NULL, NULL));
-     CHK((*p->sl)->Realize(p->sl, SL_BOOLEAN_FALSE));
diff --git a/x11-packages/mpv-x/wscript.patch b/x11-packages/mpv-x/wscript.patch
deleted file mode 100644
index 4d95e33e27..0000000000
--- a/x11-packages/mpv-x/wscript.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/wscript b/wscript
-index 830201a6bd..543a30feea 100644
---- a/wscript
-+++ b/wscript
-@@ -154,7 +154,7 @@ main_dependencies = [
-     }, {
-         'name': '--android',
-         'desc': 'Android environment',
--        'func': check_statement('android/api-level.h', '(void)__ANDROID__'),  # arbitrary android-specific header
-+        'func': check_cc(lib=['android']),
-     }, {
-         'name': '--tvos',
-         'desc': 'tvOS environment',
-@@ -167,7 +167,7 @@ main_dependencies = [
-         'desc': 'Android EGL support',
-         'deps': 'android',
-         'groups': [ 'gl' ],
--        'func': check_cc(lib=['android', 'EGL']),
-+        'func': check_cc(lib=['EGL']),
-     }, {
-         'name': 'posix-or-mingw',
-         'desc': 'development environment',