subprojects: update glib wrap to 2.78.0

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5315>
This commit is contained in:
Tim-Philipp Müller 2023-09-11 17:02:18 +01:00
parent 516073f9d0
commit 07cea96579
3 changed files with 6 additions and 88 deletions

View file

@ -1,11 +1,10 @@
[wrap-file]
directory = glib-2.76.4
source_url = https://download.gnome.org/sources/glib/2.76/glib-2.76.4.tar.xz
source_fallback_url = https://ftp.acc.umu.se/pub/gnome/sources/glib/2.76/glib-2.76.4.tar.xz
source_filename = glib-2.76.4.tar.xz
source_hash = 5a5a191c96836e166a7771f7ea6ca2b0069c603c7da3cba1cd38d1694a395dda
wrapdb_version = 2.76.4
diff_files = glib-2.76.4/0001-meson-help-gobject-introspection-locate-source-and-b.patch, glib-2.76.4/0001-meson-Allow-fallback-static-build-of-pcre-subproject.patch
directory = glib-2.78.0
source_url = https://download.gnome.org/sources/glib/2.78/glib-2.78.0.tar.xz
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/glib_2.78.0-1/glib-2.78.0.tar.xz
source_filename = glib-2.78.0.tar.xz
source_hash = 44eaab8b720877ce303c5540b657b126f12dc94972d9880b52959f43fb537b30
wrapdb_version = 2.78.0-1
[provide]
dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-windows-2.0, gio-unix-2.0

View file

@ -1,48 +0,0 @@
From dd5683ce6495ee3e39968043f9b1a2a4dec5cde6 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Wed, 28 Jun 2023 14:38:36 +0000
Subject: [PATCH] meson: Allow fallback & static build of pcre subproject
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Using `allow_fallback: false` on the first check for libpcre
was unnecessary, as `required: false` already disables using
fallbacks. `allow_fallback: false` meant that
`--force-fallback-for` couldnt work. This commit fixes that.
Also allow the fallback libpcre to be built statically so it
can be linked into GLib.
Helps: #3025
---
meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 1c62ea352..9e7448386 100644
--- a/meson.build
+++ b/meson.build
@@ -2050,7 +2050,9 @@ else
endif
pcre2_req = '>=10.32'
-pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, allow_fallback: false)
+
+# Pick up pcre from the system, or if "--force-fallback-for libpcre2-8" was specified
+pcre2 = dependency('libpcre2-8', version: pcre2_req, required: false, default_options: ['default_library=static'])
if not pcre2.found()
if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl'
# MSVC: Search for the PCRE2 library by the configuration, which corresponds
@@ -2066,7 +2068,7 @@ endif
# Try again with the fallback
if not pcre2.found()
- pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true)
+ pcre2 = dependency('libpcre2-8', version: pcre2_req, allow_fallback: true, default_options: ['default_library=static'])
assert(pcre2.type_name() == 'internal')
# static flags are automatically enabled by the subproject if it's built
# with default_library=static
--
2.37.1 (Apple Git-137.1)

View file

@ -1,33 +0,0 @@
From 783bf28650ec581c3d225821d13dad5ec3cf6c24 Mon Sep 17 00:00:00 2001
From: Andoni Morales Alastruey <amorales@fluendo.com>
Date: Wed, 19 Jul 2023 17:14:02 +0200
Subject: [PATCH] meson: help gobject-introspection locate source and build
dirs
gobject-introspection is currently assuming glib subproject
is in unversioned, but gstreamer uses a versioned directory, eg:
subprojects/glib-2.74.1 instead of subprojects/glib
---
meson.build | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/meson.build b/meson.build
index 43bb468..3e4dd96 100644
--- a/meson.build
+++ b/meson.build
@@ -54,6 +54,12 @@ if host_system == 'darwin'
endif
endif
+# When building glib and gobject-introspection with subprojects, gobject-introspection
+# requires to know to lnow the path of the sources and the build directory.
+# We provide it here with a variable.
+glib_source_dir = meson.current_source_dir()
+glib_build_dir = meson.current_build_dir()
+
glib_version = meson.project_version()
glib_api_version = '2.0'
version_arr = glib_version.split('.')
--
2.40.0.windows.1