[vlc-commits] [Git][videolan/vlc][master] contrib: sqlite: update to 3.46.1

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
37e2147d by Steve Lhomme at 2024-09-07T16:05:14+00:00
contrib: sqlite: update to 3.46.1

We don't have to patch it for Android anymore.

- - - - -


3 changed files:

- contrib/src/sqlite/SHA512SUMS
- − contrib/src/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
- contrib/src/sqlite/rules.mak


Changes:

=====================================
contrib/src/sqlite/SHA512SUMS
=====================================
@@ -1 +1 @@
-adaa306ebacfbeeea6efe71aa964b1dee4a05ade794c55c7afad8693ed291354e9daa2449226c4dc50fbfa5919dfc9a17dea946f01171ff63d472af78cbed987  sqlite-autoconf-3340100.tar.gz
+a5ba5af9c8d6440d39ba67e3d5903c165df3f1d111e299efbe7c1cca4876d4d5aecd722e0133670daa6eb5cbf8a85c6a3d9852ab507a393615fb5245a3e1a743  sqlite-autoconf-3460100.tar.gz


=====================================
contrib/src/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch deleted
=====================================
@@ -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);


=====================================
contrib/src/sqlite/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # sqlite
 
-SQLITE_VERSION := 3340100
-SQLITE_URL := https://www.sqlite.org/2021/sqlite-autoconf-$(SQLITE_VERSION).tar.gz
+SQLITE_VERSION := 3460100
+SQLITE_URL := https://www.sqlite.org/2024/sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 
 PKGS += sqlite
 
@@ -23,7 +23,6 @@ $(TARBALLS)/sqlite-autoconf-$(SQLITE_VERSION).tar.gz:
 sqlite: sqlite-autoconf-$(SQLITE_VERSION).tar.gz .sum-sqlite
 	$(UNPACK)
 	$(call update_autoconfig,.)
-	$(APPLY) $(SRC)/sqlite/e0a9935be1c506646566f6b7845eb381bb219e16.patch
 	$(call pkg_static, "sqlite3.pc.in")
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/37e2147d96eb58f4129c340f36e451852feab395

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/37e2147d96eb58f4129c340f36e451852feab395
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance