From 8266e55f06460cf4eac21c8d955b1419829eb04b Mon Sep 17 00:00:00 2001
From: jmir1 <jhmiramon@gmail.com>
Date: Tue, 23 Jan 2024 22:13:40 +0100
Subject: [PATCH] feat: Enable gpu-next and ping mpv commit

---
 app/build.gradle                        |  4 ++--
 app/src/main/AndroidManifest.xml        |  2 +-
 app/src/main/java/is/xyz/mpv/MPVView.kt |  5 +----
 buildscripts/include/depinfo.sh         |  1 +
 buildscripts/include/download-deps.sh   | 18 +++++++++++++-----
 jitpack.yml                             |  2 +-
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9c119ef78..fc73a7214 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 33
         versionCode 33
-        versionName "1.11.n"
+        versionName "1.12.n"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -75,7 +75,7 @@ dependencies {
 }
 
 def getVersionName = { ->
-    return "1.11.n"
+    return "1.12.n"
 }
 
 def getGroupId = { ->
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d13c28efd..6dbdc9173 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     android:versionCode="33"
-    android:versionName="1.11.n" >
+    android:versionName="1.12.n" >
     <application/>
 </manifest>
diff --git a/app/src/main/java/is/xyz/mpv/MPVView.kt b/app/src/main/java/is/xyz/mpv/MPVView.kt
index 5e1c0815b..4bea16226 100644
--- a/app/src/main/java/is/xyz/mpv/MPVView.kt
+++ b/app/src/main/java/is/xyz/mpv/MPVView.kt
@@ -42,10 +42,7 @@ class MPVView(context: Context, attrs: AttributeSet) : SurfaceView(context, attr
         MPVLib.setOptionString("profile", "fast")
 
         // vo
-        val vo = if (sharedPreferences.getBoolean("gpu_next", false))
-            "gpu-next"
-        else
-            "gpu"
+        val vo = "gpu-next"
         voInUse = vo
 
         // hwdec
diff --git a/buildscripts/include/depinfo.sh b/buildscripts/include/depinfo.sh
index bc76663f6..340d77956 100755
--- a/buildscripts/include/depinfo.sh
+++ b/buildscripts/include/depinfo.sh
@@ -18,6 +18,7 @@ v_freetype=2-13-2
 v_mbedtls=3.5.1
 v_libxml2=2.11.5
 v_ffmpeg=n6.1
+v_mpv=7f595aabf45fd60d080ab80ccdc8def26cfbd2ec
 
 
 ## Dependency tree
diff --git a/buildscripts/include/download-deps.sh b/buildscripts/include/download-deps.sh
index d5eb0b807..3c5ddf79c 100755
--- a/buildscripts/include/download-deps.sh
+++ b/buildscripts/include/download-deps.sh
@@ -22,10 +22,10 @@ if [ ! -d libxml2 ]; then
 fi
 
 # dav1d
-[ ! -d dav1d ] && git clone https://github.com/videolan/dav1d --depth 1
+[ ! -d dav1d ] && git clone https://github.com/videolan/dav1d.git --depth 1
 
 # ffmpeg
-[ ! -d ffmpeg ] && git clone https://github.com/FFmpeg/FFmpeg -b $v_ffmpeg ffmpeg --depth 1
+[ ! -d ffmpeg ] && git clone https://github.com/FFmpeg/FFmpeg.git -b $v_ffmpeg ffmpeg --depth 1
 
 # freetype2
 [ ! -d freetype2 ] && git clone --recurse-submodules git://git.sv.nongnu.org/freetype/freetype2.git -b VER-$v_freetype --depth 1 --shallow-submodules
@@ -52,7 +52,7 @@ if [ ! -d unibreak ]; then
 fi
 
 # libass
-[ ! -d libass ] && git clone https://github.com/libass/libass --depth 1
+[ ! -d libass ] && git clone https://github.com/libass/libass.git --depth 1
 
 # lua
 if [ ! -d lua ]; then
@@ -62,9 +62,17 @@ if [ ! -d lua ]; then
 fi
 
 # libplacebo
-[ ! -d libplacebo ] && git clone --recursive https://github.com/haasn/libplacebo --depth 1 --shallow-submodules
+[ ! -d libplacebo ] && git clone --recursive https://github.com/haasn/libplacebo.git --depth 1 --shallow-submodules
 
 # mpv
-[ ! -d mpv ] && git clone https://github.com/mpv-player/mpv --depth 1
+if [ ! -d mpv ]; then
+	mkdir mpv
+	cd mpv
+	git init
+	git remote add origin https://github.com/mpv-player/mpv.git
+	git fetch --depth 1 origin $v_mpv
+	git checkout FETCH_HEAD
+	cd ..
+fi
 
 cd ..
diff --git a/jitpack.yml b/jitpack.yml
index 1cddc52cc..ecee46f7f 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,7 +1,7 @@
 jdk:
   - openjdk17
 env:
-  RELEASE_VERSION: "1.11.n"
+  RELEASE_VERSION: "1.12.n"
 before_install:
   - mkdir -p app/build/outputs/aar
   - wget -O app/build/outputs/aar/aniyomi-mpv-lib-release.aar https://github.com/jmir1/mpv-android/releases/download/$RELEASE_VERSION/aniyomi-mpv-lib-$RELEASE_VERSION.aar