diff options
Diffstat (limited to 'media-libs/gst-plugins-base')
4 files changed, 112 insertions, 1 deletions
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest index 784a28ea7fca..ea97edd479d7 100644 --- a/media-libs/gst-plugins-base/Manifest +++ b/media-libs/gst-plugins-base/Manifest @@ -1,5 +1,7 @@ +AUX gst-plugins-base-1.18.4_meson-0.58.0.patch 2198 BLAKE2B 3a6e661f37c94c6c2e013a9addf17c3ce5af25d29d7141ffbdc25df4b75c79952c8c6b60204ca1b9cb652e665a82c66a62b5a16617104b24dd095b776b17b4e9 SHA512 4f3ad40b8d0690cb893207d686d12623d9b7e238f9b7fc7278b567f43e4f36390e4c66bf76fb2dc619c66f2a192e9567d2bfc6688f952355f8a47c3bb9622e86 +AUX gst-plugins-base-1.18.4_wayland_registry_remove.patch 2041 BLAKE2B 88830f067aee3ef0bbe89cce2c88c32a12626ef9c84d64b53fd6a119709aa22f827a3ff30a7ae5064e8e2e2c0f9c3999c740c7712ddc53d058b4a2baec286097 SHA512 0cf14673d77a4071dac220c620db21fd1a82e8d2445ac554ae2d27c9e429729af11eded8b5dacdaac444566676dae68f4bfd2bedd3c186b5eb1e39fc5c694de0 DIST gst-plugins-base-1.16.3.tar.xz 3953616 BLAKE2B c78713d0aa77a7e8c8043377a7b7959e8159baa3c3b81751b6dc825137c26fe8e52d3ff2c9c734bdda1d01a087b67d1bce4da66de390aad8169c74001c8f620c SHA512 d44d4da9cb27a6b8e59cb3f0714cc71809c0f14b42ef8d4a2dddbb940efbcb9634a40596d3cdc7391016f6e758005c14aabe1f8f30bb597a57d85c2d94045e75 DIST gst-plugins-base-1.18.4.tar.xz 3169512 BLAKE2B 8b5a7a08641532631842e2ec02379b116ae0f08cda7654d123dbb2d56f97667b94ffc716b389a14ad034d0edb36587d8edc2c4f53782135c53def248fa60d0a3 SHA512 c750d68404462807ff03f441e232c4d98752a9bceeec3038fb37a105942f25499bde0660ca688b6f3204c58eb6a2e3f33671e979018c8bd829e7591455961a6a EBUILD gst-plugins-base-1.16.3.ebuild 5954 BLAKE2B 744b3bec6a4d7b6c1ad44276a6641ae960b21d3ee3b5be92a739f0798ff468564a2e776f135e16c67be42d325d6ce2806ffbce6a24b477f27bfbd50b24127006 SHA512 9ec447c3176369f521829a3b2882f73f579f1b608c4bb3c54eb9d290f9200b39f0679ab4ec5ec8d2180821f55efe7c4d89132fe7c968a51b6f1457051a3cd2ca -EBUILD gst-plugins-base-1.18.4.ebuild 5524 BLAKE2B bb5274444be74b79b3753f562e20c82523cab2a16590b58cd1ee5526709fed07d0ca9bb0dc0719fc7a1a7f85cf74bfcd6967308187ec85722e067a6c9307fb6c SHA512 6209d47015f5be1528804a81657f7a249da00f9a61a4fb041f63165f7df1c9c017418e6a8d824f3b26dc94a25c9e8769b0f5bd14e13c662f07727087c9a6b5f3 +EBUILD gst-plugins-base-1.18.4.ebuild 5718 BLAKE2B a70a9b46e6471263455c049bdf7c8a887c66ed0d50f23fc1e3faa8a4abfc32ab98df4f8484362d696c2041c92c0f95430a05476d526635709914e99dc5072521 SHA512 f42a746757febf46af978caa95ae51eb10ee2b3379f294cc5f48d086ea85408777c56b18cf4768472658fc674f3c17e07e08f368723b8fe6c79e4c823adf9186 MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2 diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch new file mode 100644 index 000000000000..9cb2dafb3d7d --- /dev/null +++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_meson-0.58.0.patch @@ -0,0 +1,48 @@ +From 90903917a8185e0f9add7af8153ae2fc9875fdcb Mon Sep 17 00:00:00 2001 +From: Xavier Claessens <xavier.claessens@collabora.com> +Date: Mon, 26 Apr 2021 14:25:03 -0400 +Subject: [PATCH] gstgl: Fix build when Meson >= 0.58.0rc1 + +"implicit_include_directories: false" now also means that current build +directory is not added to include paths by default any more. We have to +add it manually because we have some custom_target() that generate +headers in current build directory. + +See https://github.com/mesonbuild/meson/issues/8700. + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1127> +--- + gst-libs/gst/gl/meson.build | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build +index db11c5e89..731ee9f5e 100644 +--- a/gst-libs/gst/gl/meson.build ++++ b/gst-libs/gst/gl/meson.build +@@ -989,11 +989,20 @@ if build_gstgl + command : [mkenums, glib_mkenums, '@OUTPUT@', '@INPUT@']) + gen_sources = [gl_enumtypes_h] + ++ common_args = gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'] ++ ++ # We have custom_target() that generate headers in the current build dir, ++ # but with implicit_include_directories: false, meson >= 0.58.0 won't include ++ # it by default. We cannot use include_directories('.') here because it would ++ # also include current source dir which is what we want to avoid because ++ # case-insensitive FS would include gst-libs/gl/egl/egl.h as EGL/egl.h. ++ common_args += '-I@0@'.format(meson.current_build_dir()) ++ + gstgl = library('gstgl-' + api_version, + gl_sources, gl_egl_sources, gl_x11_sources, gl_wayland_sources, gl_priv_sources, gl_enumtypes_c, gl_enumtypes_h, +- c_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], +- cpp_args : gst_plugins_base_args + gl_cpp_args + ['-DBUILDING_GST_GL'], +- objc_args : gst_plugins_base_args + gl_cpp_args + gl_objc_args + ['-DBUILDING_GST_GL'], ++ c_args : common_args, ++ cpp_args : common_args, ++ objc_args : common_args + gl_objc_args, + include_directories : [configinc, libsinc, gl_includes], + version : libversion, + soversion : soversion, +-- +GitLab + diff --git a/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch new file mode 100644 index 000000000000..0bf004350f02 --- /dev/null +++ b/media-libs/gst-plugins-base/files/gst-plugins-base-1.18.4_wayland_registry_remove.patch @@ -0,0 +1,55 @@ +From dc1fe07687747f11be6bb0eb944d53efa82ef86c Mon Sep 17 00:00:00 2001 +From: Matthew Waters <matthew@centricular.com> +Date: Mon, 22 Mar 2021 13:59:39 +1100 +Subject: [PATCH] gl/wayland: provide a dummy global_remove function + +Even if we don't care about any global objects being removed, wayland +will still error if globals are removed without a corresponding listener +set up for them. e.g. wl_output hotplugging + +Discovered by: Matthias Clasen + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1085> +--- + .../gst/gl/wayland/gstglwindow_wayland_egl.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c +index 6b06632a7..bb8be2756 100644 +--- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c ++++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.c +@@ -494,7 +494,8 @@ registry_handle_global (void *data, struct wl_registry *registry, + GstGLWindowWaylandEGL *window_wayland = data; + + GST_TRACE_OBJECT (window_wayland, "registry_handle_global with registry %p, " +- "interface %s, version %u", registry, interface, version); ++ "name %" G_GUINT32_FORMAT ", interface %s, version %u", registry, name, ++ interface, version); + + if (g_strcmp0 (interface, "wl_compositor") == 0) { + window_wayland->display.compositor = +@@ -518,8 +519,20 @@ registry_handle_global (void *data, struct wl_registry *registry, + } + } + ++static void ++registry_handle_global_remove (void *data, struct wl_registry *registry, ++ uint32_t name) ++{ ++ GstGLWindowWaylandEGL *window_wayland = data; ++ ++ /* TODO: deal with any registry objects that may be removed */ ++ GST_TRACE_OBJECT (window_wayland, "wl_registry %p global_remove %" ++ G_GUINT32_FORMAT, registry, name); ++} ++ + static const struct wl_registry_listener registry_listener = { +- registry_handle_global ++ registry_handle_global, ++ registry_handle_global_remove, + }; + + static gboolean +-- +GitLab + diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild index 0f426cd99d04..a158631adf0a 100644 --- a/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild +++ b/media-libs/gst-plugins-base/gst-plugins-base-1.18.4.ebuild @@ -92,6 +92,12 @@ DEPEND="${RDEPEND} DOCS="AUTHORS NEWS README RELEASE" +# Fixes backported to 1.18.x, to be removed in 1.18.5 +PATCHES=( + "${FILESDIR}/gst-plugins-base-1.18.4_meson-0.58.0.patch" + "${FILESDIR}/gst-plugins-base-1.18.4_wayland_registry_remove.patch" +) + multilib_src_configure() { filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340 |