sqlite3.patch: Bump to latest wrapdb: 3.46.1

(cherry picked from commit df3144cf9f58a9d934f292c34ac314f542289d2b)

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1591>

2 files changed, 54 insertions, 33 deletions

diff --git a/recipes/sqlite3.recipe b/recipes/sqlite3.recipe
index 5fc6003c..65b971c3 100644
--- a/recipes/sqlite3.recipe
+++ b/recipes/sqlite3.recipe
@@ -4,18 +4,15 @@ from cerbero.tools.libtool import LibtoolLibrary
 
 class Recipe(recipe.Recipe):
     name = 'sqlite3'
-    version = '3320300'
+    version = '3460100'
     stype = SourceType.TARBALL
     btype = BuildType.MESON
-    url = 'https://sqlite.org/2020/sqlite-amalgamation-%(version)s.zip'
+    url = 'https://sqlite.org/2024/sqlite-amalgamation-%(version)s.zip'
     tarball_dirname = 'sqlite-amalgamation-%(version)s'
-    tarball_checksum = 'e9cec01d4519e2d49b3810615237325263fe1feaceae390ee12b4a29bd73dbe2'
+    tarball_checksum = '77823cb110929c2bcb0f5d48e4833b5c59a8a6e40cdea3936b99e199dbbe5784'
     licenses = [License.PublicDomain]
 
-    patches = [
-        # https://github.com/mesonbuild/sqlite/pull/16
-        'sqlite3/0001-Add-meson-build-file-from-wrapdb.patch',
-    ]
+    patches = ['sqlite3/0001-Add-meson-build-file-from-wrapdb.patch']
 
     files_libs = ['libsqlite3']
     files_devel = ['include/sqlite3.h', '%(libdir)s/pkgconfig/sqlite3.pc']
diff --git a/recipes/sqlite3/0001-Add-meson-build-file-from-wrapdb.patch b/recipes/sqlite3/0001-Add-meson-build-file-from-wrapdb.patch
index 11211235..67733ba2 100644
--- a/recipes/sqlite3/0001-Add-meson-build-file-from-wrapdb.patch
+++ b/recipes/sqlite3/0001-Add-meson-build-file-from-wrapdb.patch
@@ -1,9 +1,9 @@
 From 4e02230540f1448c2d57a8ee77fd5c46c5b3e98c Mon Sep 17 00:00:00 2001
 From: Nirbheek Chauhan <nirbheek@centricular.com>
-Date: Mon, 13 Jul 2020 17:47:29 +0530
+Date: Mon, 14 Oct 2024 17:47:29 +0530
 Subject: [PATCH] Add meson build file from wrapdb
 
-https://wrapdb.mesonbuild.com/v1/projects/sqlite/3310100/1/get_wrap
+https://wrapdb.mesonbuild.com/v2/sqlite3_3.46.1-2/get_patch
 ---
  meson.build | 32 ++++++++++++++++++++++++++++++++
  1 file changed, 32 insertions(+)
@@ -14,39 +14,63 @@ new file mode 100644
 index 0000000..061fc1d
 --- /dev/null
 +++ b/meson.build
-@@ -0,0 +1,32 @@
-+project('sqlite', 'c', version : '3320300', license : 'pd')
+@@ -0,0 +1,56 @@
++project(
++  'sqlite3',
++  'c',
++  license: 'pd',
++  version: '3.46.1',
++  meson_version: '>=0.48.0',
++)
 +
++cc = meson.get_compiler('c')
++if meson.version().version_compare('>= 0.62.0')
++  libdl = dependency('dl', required: false)
++else
++  libdl = cc.find_library('dl', required: false)
++endif
++libm = cc.find_library('m', required: false)
 +
-+thread_dep = dependency('threads')
++sources = files('sqlite3.c')
++if host_machine.system() == 'windows'
++  sqlite_args = get_option('default_library') != 'static' ? '-DSQLITE_API=__declspec(dllexport)' : []
++  libthreads = dependency('', required: false)
++else
++  sqlite_args = '-DSQLITE_API=__attribute__((visibility("default")))'
++  libthreads = dependency('threads')
++endif
 +
-+cc = meson.get_compiler('c')
-+dl_dep = cc.find_library('dl', required : false)
-+m_dep = cc.find_library('m', required: false)
++libsqlite3 = library(
++  'sqlite3',
++  sources,
++  c_args: sqlite_args,
++  dependencies: [libdl, libm, libthreads],
++  install: true,
++  gnu_symbol_visibility: 'hidden',
++  # ABI compatibility with autotools/libtool
++  version: '0.8.6',
++)
 +
-+sqlite_args = []
-+if cc.get_id() == 'msvc' and get_option('default_library') != 'static'
-+  sqlite_args += ['-DSQLITE_API=__declspec(dllexport)']
++sqlite_args = ['-D_GNU_SOURCE']
++if host_machine.system() == 'windows' and get_option('default_library') != 'static'
++  sqlite_args += '-DSQLITE_API=__declspec(dllimport)'
 +endif
 +
-+sqinc = include_directories('.')
-+sqlib = library('sqlite3', 'sqlite3.c', include_directories: sqinc,
-+    c_args : sqlite_args,
-+    dependencies : [thread_dep, dl_dep, m_dep],
-+    # ABI compatibility with autotools/libtool
-+    version: '0.8.6',
-+    install: true)
++depinc = include_directories('.')
++sqlite3_dep = declare_dependency(
++  compile_args: sqlite_args,
++  include_directories: depinc,
++  link_with: libsqlite3,
++)
 +
 +install_headers('sqlite3.h')
 +
-+sqlite_dep = declare_dependency(link_with : sqlib,
-+    include_directories : sqinc)
-+
-+pkg = import('pkgconfig')
-+pkg.generate(name: 'sqlite3',
-+             description: 'An embedded SQL database engine',
-+             version: meson.project_version(),
-+             libraries: sqlib)
++pkgconfig = import('pkgconfig')
++pkgconfig.generate(
++  libsqlite3,
++  description: 'An embedded SQL database engine',
++  version: meson.project_version(),
++)
 -- 
 2.26.2