pool/gstreamer-plugins-base
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 906797 from multimedia:libs

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/906797
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gstreamer-plugins-base?expand=0&rev=78
This commit is contained in:
Dominique Leuenberger 2021-07-18 21:44:45 +00:00 committed by Git OBS Bridge
commit 1935f8165f
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
90903917.patch Normal file
View File

@ -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

7
gstreamer-plugins-base.changes
View File

@ -1,7 +1,12 @@
-------------------------------------------------------------------
Sat Jul 17 09:57:52 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Add 90903917.patch: Fix build with meson >= 0.58.0rc1
-------------------------------------------------------------------
Sat May 8 17:56:30 UTC 2021 - Dirk Müller <dmueller@suse.com>
- don't own appdata dir - comes from filesystem rpm
- don't own appdata dir - comes from filesystem rpm
-------------------------------------------------------------------
Tue Mar 30 08:59:41 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>

2
gstreamer-plugins-base.spec
View File

@ -31,6 +31,8 @@ URL: https://gstreamer.freedesktop.org
Source0: %{_name}-%{version}.tar.xz
Source1: gstreamer-plugins-base.appdata.xml
Source2: baselibs.conf
# PATCH-FIX-UPSTREAM 90903917.patch dimstar@opensuse.org -- Fix build when Meson >= 0.58.0rc1
Patch0: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/commit/90903917.patch
# PATCH-FIX-OPENSUSE gstreamer-plugins-base-gl-deps.patch dimstar@opensuse.org -- Local workaround for https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/735
Patch3: gstreamer-plugins-base-gl-deps.patch
Patch4: add_wayland_dep_to_tests.patch