[Android] buildsystem: use the same sqlite3 as in VLC

[Steve Lhomme]

vlc-android | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Oct 30 08:49:21 2024 +0100| [0f771afdf2020f2413a4cf041f7e2d108f7f36a3] | committer: Nicolas Pomepuy

buildsystem: use the same sqlite3 as in VLC

With the same SHA512SUM check.

> https://code.videolan.org/videolan/vlc-android/commit/0f771afdf2020f2413a4cf041f7e2d108f7f36a3
---

 buildsystem/compile-medialibrary.sh                |  7 ++---
 .../e0a9935be1c506646566f6b7845eb381bb219e16.patch | 32 ----------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/buildsystem/compile-medialibrary.sh b/buildsystem/compile-medialibrary.sh
index b599b41643..b9ed059671 100755
--- a/buildsystem/compile-medialibrary.sh
+++ b/buildsystem/compile-medialibrary.sh
@@ -43,8 +43,8 @@ fi
 
 MEDIALIBRARY_MODULE_DIR=${SRC_DIR}/medialibrary
 MEDIALIBRARY_BUILD_DIR=${MEDIALIBRARY_MODULE_DIR}/medialibrary
-SQLITE_RELEASE="sqlite-autoconf-3340100"
-SQLITE_SHA1="c20286e11fe5c2e3712ce74890e1692417de6890"
+SQLITE_RELEASE="sqlite-autoconf-3460100"
+SQLITE_SHA512SUM="a5ba5af9c8d6440d39ba67e3d5903c165df3f1d111e299efbe7c1cca4876d4d5aecd722e0133670daa6eb5cbf8a85c6a3d9852ab507a393615fb5245a3e1a743"
 
 if [ ! -d "${MEDIALIBRARY_MODULE_DIR}/${SQLITE_RELEASE}" ]; then
   echo -e "\e[1m\e[32msqlite source not found, downloading\e[0m"
@@ -53,14 +53,13 @@ if [ ! -d "${MEDIALIBRARY_MODULE_DIR}/${SQLITE_RELEASE}" ]; then
   rm -rf ${MEDIALIBRARY_MODULE_DIR}/jni/libs
   rm -rf ${MEDIALIBRARY_MODULE_DIR}/jni/obj
   wget https://download.videolan.org/pub/contrib/sqlite/${SQLITE_RELEASE}.tar.gz
-    if [ ! "`sha1sum ${SQLITE_RELEASE}.tar.gz`" = "${SQLITE_SHA1}  ${SQLITE_RELEASE}.tar.gz" ]; then
+    if [ ! "$(sha512sum ${SQLITE_RELEASE}.tar.gz)" = "${SQLITE_SHA512SUM}  ${SQLITE_RELEASE}.tar.gz" ]; then
     echo "Wrong sha1 for ${SQLITE_RELEASE}.tar.gz"
     exit 1
   fi
   tar -xozf ${SQLITE_RELEASE}.tar.gz
   rm -f ${SQLITE_RELEASE}.tar.gz
   cd ${SQLITE_RELEASE}
-  patch -p1 < ${SRC_DIR}/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
 fi
 cd ${MEDIALIBRARY_MODULE_DIR}/${SQLITE_RELEASE}
 if [ ! -d "build-$ANDROID_ABI" ]; then
diff --git a/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch b/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
deleted file mode 100644
index 5e69b1e02e..0000000000
--- a/buildsystem/patches/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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);