chore: update dependencies and upstream changes

ndk 25.2.9519653 -> 26.1.10909125 harfbuzz 8.2.1 -> 8.3.0 mbedtls 3.4.1 -> 3.5.1 libplacebo 5.264.1 -> temporary removed, will be added again when new version of mpv released dav1d 1.2.1 -> 1.3.0 ffmpeg 6.0 -> 6.1
jarnedemeulemeester · Nov 17, 2023 · 2f67b0d · 2f67b0d
1 parent 522916d
commit 2f67b0d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 41 deletions.
diff --git a/buildscripts/build.sh b/buildscripts/build.sh
@@ -15,6 +15,7 @@ getdeps () {
 
 loadarch () {
 	unset CC CXX CPATH LIBRARY_PATH C_INCLUDE_PATH CPLUS_INCLUDE_PATH
+  unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 
 	local apilvl=26
 	# ndk_triple: what the toolchain actually is
@@ -76,8 +77,9 @@ wrap_mode = 'nodownload'
 [binaries]
 c = '$CC'
 cpp = '$CXX'
-ar = '$AR'
-strip = '$ndk_triple-strip'
+ar = 'llvm-ar'
+nm = 'llvm-nm'
+strip = 'llvm-strip'
 pkgconfig = 'pkg-config'
 [host_machine]
 system = 'android'

diff --git a/buildscripts/include/depinfo.sh b/buildscripts/include/depinfo.sh
@@ -3,18 +3,17 @@
 ## Dependency versions
 
 v_sdk=10406996_latest
-v_ndk=25.2.9519653
+v_ndk=26.1.10909125
 v_sdk_build_tools=34.0.0
 
 v_lua=5.2.4
 v_libass=0.17.1
-v_harfbuzz=8.2.1
+v_harfbuzz=8.3.0
 v_fribidi=1.0.13
 v_freetype=2-13-2
-v_mbedtls=3.4.1
-v_libplacebo=5.264.1
-v_dav1d=1.2.1
-v_ffmpeg=6.0
+v_mbedtls=3.5.1
+v_dav1d=1.3.0
+v_ffmpeg=6.1
 v_mpv=0.36.0
 
 
@@ -30,6 +29,6 @@ dep_harfbuzz=()
 dep_libass=(freetype fribidi harfbuzz)
 dep_lua=()
 dep_libplacebo=()
-dep_mpv=(ffmpeg libass lua libplacebo)
+dep_mpv=(ffmpeg libass lua)
 dep_mpv_android=(mpv)
 
diff --git a/buildscripts/include/download-deps.sh b/buildscripts/include/download-deps.sh
@@ -34,9 +34,6 @@ if [ ! -d lua ]; then
 		tar -xz -C lua --strip-components=1
 fi
 
-# libplacebo
-[ ! -d libplacebo ] && git clone --depth 1 --branch v$v_libplacebo --recursive https://code.videolan.org/videolan/libplacebo.git libplacebo
-
 # mpv
 [ ! -d mpv ] && git clone --depth 1 --branch v$v_mpv https://github.com/mpv-player/mpv.git mpv
 

diff --git a/buildscripts/include/download-sdk.sh b/buildscripts/include/download-sdk.sh
@@ -12,12 +12,12 @@ if [ "$os" == "linux" ]; then
 		hash yum &>/dev/null && {
 			sudo yum install autoconf pkgconfig libtool ninja-build \
 			python3-pip python3-setuptools unzip wget;
-			sudo pip3 install meson jsonschema jinja2; }
+			python3 -m pip install meson jsonschema jinja2; }
 		apt-get -v &>/dev/null && {
 		    sudo apt-get update;
 			sudo apt-get install -y autoconf pkg-config libtool ninja-build nasm \
 			python3-pip python3-setuptools unzip;
-			sudo pip3 install meson jsonschema jinja2; }
+			python3 -m pip install meson jsonschema jinja2; }
 	fi
 
 	if ! javac -version &>/dev/null; then

diff --git a/buildscripts/scripts/ffmpeg.sh b/buildscripts/scripts/ffmpeg.sh
@@ -25,7 +25,7 @@ cpuflags=
 
 ../configure \
 	--target-os=android --enable-cross-compile --cross-prefix=$ndk_triple- --cc=$CC \
-	--arch=${ndk_triple%%-*} --cpu=$cpu --pkg-config=pkg-config \
+	--arch=${ndk_triple%%-*} --cpu=$cpu --pkg-config=pkg-config --nm=llvm-nm \
 	--extra-cflags="-I$prefix_dir/include $cpuflags" --extra-ldflags="-L$prefix_dir/lib" \
 	--enable-{jni,mediacodec,mbedtls,libdav1d} --disable-vulkan \
 	--disable-static --enable-shared --enable-{gpl,version3} \

diff --git a/buildscripts/scripts/libplacebo.sh b/buildscripts/scripts/libplacebo.sh
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-android-plugin = "8.1.0"
-androidx-annotation = "1.6.0"
+android-plugin = "8.1.4"
+androidx-annotation = "1.7.0"
 publish-plugin = "1.3.0"
 
 [libraries]

diff --git a/libmpv/build.gradle.kts b/libmpv/build.gradle.kts
@@ -8,7 +8,7 @@ android {
     namespace = "dev.jdtech.mpv"
     compileSdk = 34
     buildToolsVersion = "34.0.0"
-    ndkVersion = "25.2.9519653"
+    ndkVersion = "26.1.10909125"
 
     defaultConfig {
         minSdk = 26
@@ -88,4 +88,4 @@ signing {
         rootProject.ext["signing.password"]?.toString(),
     )
     sign(publishing.publications)
-}
+}