From ae77dbf0e43096bc07dd8d24831e66ec4a34e9e2ddf568dddbb14396b58f63a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 28 Feb 2020 07:57:44 +0000 Subject: [PATCH 1/2] Accepting request 779923 from home:iznogood:branches:multimedia:libs - Enable meson build conditionally for Tumbleweed. Possibly a solution to buildissues with new upcomming make OBS-URL: https://build.opensuse.org/request/show/779923 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-base?expand=0&rev=150 --- gstreamer-plugins-base.changes | 5 +++++ gstreamer-plugins-base.spec | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gstreamer-plugins-base.changes b/gstreamer-plugins-base.changes index 3296c2e..6631202 100644 --- a/gstreamer-plugins-base.changes +++ b/gstreamer-plugins-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 26 22:42:38 UTC 2020 - Bjørn Lie + +- Enable meson build conditionally for Tumbleweed. + ------------------------------------------------------------------- Fri Jan 31 23:03:20 UTC 2020 - Bjørn Lie diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 679e8c6..67733f0 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -20,8 +20,12 @@ %define gst_branch 1.0 %define gstreamer_plugins_base_req %(xzgrep --text "^GST[_A-Z]*_REQ.*=" %{SOURCE0} | sort -u | sed 's/GST_REQ=/gstreamer >= /') -# Disable for now. Plugin docs aren't being generated +# Enable for tumbleweed only for now +%if 0%{?suse_version} >= 1550 +%define use_meson 1 +%else %define use_meson 0 +%endif Name: gstreamer-plugins-base Version: 1.16.2 From 55152c397df1d31916b860794e4f72b53214df83e2c1c2d16d4a5f235b2f6dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 6 Mar 2020 09:13:12 +0000 Subject: [PATCH 2/2] Accepting request 782030 from home:dimstar:Factory - Add gstreamer-plugins-base-gl-deps.patch: Workaround incomplete OBS-URL: https://build.opensuse.org/request/show/782030 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-base?expand=0&rev=151 --- gstreamer-plugins-base-gl-deps.patch | 20 ++++++++++++++++++++ gstreamer-plugins-base.changes | 9 ++++++++- gstreamer-plugins-base.spec | 2 ++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gstreamer-plugins-base-gl-deps.patch diff --git a/gstreamer-plugins-base-gl-deps.patch b/gstreamer-plugins-base-gl-deps.patch new file mode 100644 index 0000000..250a4dd --- /dev/null +++ b/gstreamer-plugins-base-gl-deps.patch @@ -0,0 +1,20 @@ +Workaround incomplete gstreamer-gl.pc, missing dependency on wayland-client. +This patch is not suitable for upstream, as it does not cater for the possible +alternative implementations being built (e.g. without wayland support) + +https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/735 + + +Index: gst-plugins-base-1.16.2/pkgconfig/gstreamer-gl.pc.in +=================================================================== +--- gst-plugins-base-1.16.2.orig/pkgconfig/gstreamer-gl.pc.in ++++ gst-plugins-base-1.16.2/pkgconfig/gstreamer-gl.pc.in +@@ -10,7 +10,7 @@ gl_apis=@GL_APIS@ + Name: GStreamer OpenGL Plugins Libraries + Description: Streaming media framework, OpenGL plugins libraries + Version: @VERSION@ +-Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ ++Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@ wayland-client + + Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ + Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@ diff --git a/gstreamer-plugins-base.changes b/gstreamer-plugins-base.changes index 6631202..01f1a5a 100644 --- a/gstreamer-plugins-base.changes +++ b/gstreamer-plugins-base.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 6 08:42:07 UTC 2020 - Dominique Leuenberger + +- Add gstreamer-plugins-base-gl-deps.patch: Workaround incomplete + gstreamer-gl.pc file, which is missing the (dynamic) dependency + on wayland. + ------------------------------------------------------------------- Wed Feb 26 22:42:38 UTC 2020 - Bjørn Lie @@ -6,7 +13,7 @@ Wed Feb 26 22:42:38 UTC 2020 - Bjørn Lie ------------------------------------------------------------------- Fri Jan 31 23:03:20 UTC 2020 - Bjørn Lie -- No longer recommend -lang: supplements are in use. +- No longer recommend -lang: supplements are in use. ------------------------------------------------------------------- Mon Jan 6 10:17:50 UTC 2020 - Bjørn Lie diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 67733f0..99c17bf 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -43,6 +43,8 @@ Patch0: gst-base-playbin-handle-error.patch Patch1: gst-base-audioencoder-fix-leak.patch # PATCH-FIX-UPSTREAM gst-base-fft-update-kiss-version.patch -- fft: Update our kiss fft version Patch2: gst-base-fft-update-kiss-version.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 BuildRequires: Mesa-libGLESv3-devel BuildRequires: cdparanoia-devel