Skip to content

Commit

Permalink
feat: Enable gpu-next and update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jmir1 committed Jan 23, 2024
1 parent a7bac1b commit 92ffe4e
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 14 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {
minSdkVersion 21
targetSdkVersion 33
versionCode 33
versionName "1.11.n"
versionName "1.12.n"
vectorDrawables.useSupportLibrary = true
}

Expand Down Expand Up @@ -75,7 +75,7 @@ dependencies {
}

def getVersionName = { ->
return "1.11.n"
return "1.12.n"
}

def getGroupId = { ->
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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>
5 changes: 1 addition & 4 deletions app/src/main/java/is/xyz/mpv/MPVView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion buildscripts/include/depinfo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ v_fribidi=1.0.13
v_freetype=2-13-2
v_mbedtls=3.5.1
v_libxml2=2.11.5
v_ffmpeg=n6.1
v_ffmpeg=n6.1.1
v_mpv=7f595aabf45fd60d080ab80ccdc8def26cfbd2ec


## Dependency tree
Expand Down
18 changes: 13 additions & 5 deletions buildscripts/include/download-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 ..
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 92ffe4e

Please sign in to comment.