diff options
| author | Seungha Yang <seungha@centricular.com> | 2024-07-09 22:59:23 +0900 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2024-07-25 02:46:11 +0000 |
| commit | b3a36ada9457b1c58d5bb87208117a681420eea3 (patch) | |
| tree | f8335571461dd08106f30aeae8a9fbe03c9657ca | |
| parent | 96f95b739481c46bbeb57876e7d07ffaf5306077 (diff) | |
libsoup: Workaround build error with GCC 14
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1526>
| -rw-r--r-- | recipes/libsoup.recipe | 4 | ||||
| -rw-r--r-- | recipes/libsoup/0001-Workaround-MinGW-build-werror.patch | 30 |
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes/libsoup.recipe b/recipes/libsoup.recipe index bb5df6b2..c5672f55 100644 --- a/recipes/libsoup.recipe +++ b/recipes/libsoup.recipe @@ -13,6 +13,10 @@ class Recipe(recipe.Recipe): meson_options = {'gnome': 'false', 'vapi': 'disabled', 'tls_check': 'false', 'tests' : 'false'} deps = ['libxml2', 'glib', 'glib-networking', 'libpsl'] + patches = [ + 'libsoup/0001-Workaround-MinGW-build-werror.patch', + ] + # sqlite ships with the system on macOS and iOS. Android also ships with # sqlite3, but it's not available from the NDK; only from Java. # We also build it on Linux to avoid the potential for bugs with diff --git a/recipes/libsoup/0001-Workaround-MinGW-build-werror.patch b/recipes/libsoup/0001-Workaround-MinGW-build-werror.patch new file mode 100644 index 00000000..c19aa713 --- /dev/null +++ b/recipes/libsoup/0001-Workaround-MinGW-build-werror.patch @@ -0,0 +1,30 @@ +From 2aeb31086b665eac6dc70c5259056d9c1eb819ea Mon Sep 17 00:00:00 2001 +From: Seungha Yang <seungha@centricular.com> +Date: Tue, 9 Jul 2024 22:53:11 +0900 +Subject: [PATCH] Workaround MinGW build werror + +../libsoup/soup-socket.c:1325:29: error: +passing argument 4 of 'setsockopt' from incompatible pointer type [-Wincompatible-pointer-types] +--- + meson.build | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/meson.build b/meson.build +index 130f813..b00f3e8 100644 +--- a/meson.build ++++ b/meson.build +@@ -70,6 +70,11 @@ else + '-Wno-format-zero-length', + ] + ++ if host_system == 'windows' ++ # setsockopt() argument type mismatch ++ test_cflags += ['-Wno-incompatible-pointer-types'] ++ endif ++ + common_flags += cc.get_supported_arguments(test_cflags) + endif + +-- +2.44.0.windows.1 + |