[Android] Bump VLC 4 Ci image and libvlcjni hash

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Wed May 15 10:10:43 2024 +0200| [1669b693c07409826868677c966863c821726d82] | committer: Duncan McNamara

Bump VLC 4 Ci image and libvlcjni hash

> https://code.videolan.org/videolan/vlc-android/commit/1669b693c07409826868677c966863c821726d82
---

 buildsystem/compile-medialibrary.sh                |  1 +
 buildsystem/compile.sh                             |  4 +--
 ...a-ndk25.crossfile => arm64-v8a-ndk26.crossfile} |  0
 ...ndk25.crossfile => armeabi-v7a-ndk26.crossfile} |  0
 .../{x86-ndk25.crossfile => x86-ndk26.crossfile}   |  0
 ...6_64-ndk25.crossfile => x86_64-ndk26.crossfile} |  0
 buildsystem/gitlab/.gitlab-ci.yml                  |  2 +-
 .../e0a9935be1c506646566f6b7845eb381bb219e16.patch | 32 ++++++++++++++++++++++
 8 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index e55eade7aa..6342380173 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -61,6 +61,7 @@ if [ ! -d "${MEDIALIBRARY_MODULE_DIR}/${SQLITE_RELEASE}" ]; then
   rm -f ${SQLITE_RELEASE}.tar.gz
   cd ${SQLITE_RELEASE}
   patch -p1 < ${SRC_DIR}/buildsystem/patches/sqlite/sqlite-no-shell.patch
+  patch -p1 < ${SRC_DIR}/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
   autoreconf -vif
 fi
 cd ${MEDIALIBRARY_MODULE_DIR}/${SQLITE_RELEASE}
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index 76af63069f..9403ab79c4 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -266,9 +266,9 @@ fi
 
 
 if [ "$FORCE_VLC_4" = 1 ]; then
-    LIBVLCJNI_TESTED_HASH=6337b790b501a9c132fdc7ec1a0c04313738cd96
+    LIBVLCJNI_TESTED_HASH=d12898a97f7fb7ee5a7882cdfb901496ed54ea08
 else
-    LIBVLCJNI_TESTED_HASH=24c0047f5697cc96e89ac86e2557ce319fc43c86
+    LIBVLCJNI_TESTED_HASH=fef5039810febe5a76d7766c2e748b25736a5106
 fi
 LIBVLCJNI_REPOSITORY=https://code.videolan.org/videolan/libvlcjni
 
diff --git a/buildsystem/crossfiles/arm64-v8a-ndk25.crossfile b/buildsystem/crossfiles/arm64-v8a-ndk26.crossfile
similarity index 100%
rename from buildsystem/crossfiles/arm64-v8a-ndk25.crossfile
rename to buildsystem/crossfiles/arm64-v8a-ndk26.crossfile
diff --git a/buildsystem/crossfiles/armeabi-v7a-ndk25.crossfile b/buildsystem/crossfiles/armeabi-v7a-ndk26.crossfile
similarity index 100%
rename from buildsystem/crossfiles/armeabi-v7a-ndk25.crossfile
rename to buildsystem/crossfiles/armeabi-v7a-ndk26.crossfile
diff --git a/buildsystem/crossfiles/x86-ndk25.crossfile b/buildsystem/crossfiles/x86-ndk26.crossfile
similarity index 100%
rename from buildsystem/crossfiles/x86-ndk25.crossfile
rename to buildsystem/crossfiles/x86-ndk26.crossfile
diff --git a/buildsystem/crossfiles/x86_64-ndk25.crossfile b/buildsystem/crossfiles/x86_64-ndk26.crossfile
similarity index 100%
rename from buildsystem/crossfiles/x86_64-ndk25.crossfile
rename to buildsystem/crossfiles/x86_64-ndk26.crossfile
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index 4ad42411b3..4e12d0b886 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -7,7 +7,7 @@ cache:
 
 variables:
   VLC_ANDROID_IMAGE_30: registry.videolan.org/vlc-debian-android-3.0:20230621085943
-  VLC_ANDROID_IMAGE_40: registry.videolan.org/vlc-debian-android:20230614051113
+  VLC_ANDROID_IMAGE_40: registry.videolan.org/vlc-debian-android:20240514145422
   VLC_WEB_BUILD_IMAGE: registry.videolan.org/videolan-alpine-node:20230523124511
   WEBSERVER_DIR: "./remoteaccess"
 
diff --git a/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch b/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
new file mode 100644
index 0000000000..5e69b1e02e
--- /dev/null
+++ b/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
@@ -0,0 +1,32 @@
+From e0a9935be1c506646566f6b7845eb381bb219e16 Mon Sep 17 00:00:00 2001
+From: stephan <stephan at noemail.net>
+Date: Mon, 19 Feb 2024 12:20:46 +0000
+Subject: [PATCH] Extend the strerror_r() result type discrepancy check in
+ os_unix.c to include the Android NDK, as reported in [forum post
+ 3f13857fa4062301|forum:3f13857fa4062301]. The NDK's strerror_r() signature is
+ version-dependent, whereas this change assumes int return (POSIX semantic)
+ across all versions.
+
+FossilOrigin-Name: f18b2524da6bbbcf372b292df52fbe6efa49fd6e1f1f13ef2447279d559f7a08
+---
+ sqlite3.c |  6 +++++-
+ 3 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/sqlite3.c b/sqlite3.c
+index 4b3d63c2c1..4663c22d94 100644
+--- a/sqlite3.c
++++ b/sqlite3.c
+@@ -1295,8 +1295,12 @@ static int unixLogErrorAtLine(
+   ** available, the error message will often be an empty string. Not a
+   ** huge problem. Incorrectly concluding that the GNU version is available
+   ** could lead to a segfault though.
++  **
++  ** Forum post 3f13857fa4062301 reports that the Android SDK may use
++  ** int-type return, depending on its version.
+   */
+-#if defined(STRERROR_R_CHAR_P) || defined(__USE_GNU)
++#if (defined(STRERROR_R_CHAR_P) || defined(__USE_GNU)) \
++  && !defined(ANDROID) && !defined(__ANDROID__)
+   zErr =
+ # endif
+   strerror_r(iErrno, aErr, sizeof(aErr)-1);