Hello community,
here is the log from the commit of package gstreamer-plugins-bad for
openSUSE:Factory checked in at 2020-03-06 21:24:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-bad"
Fri Mar 6 21:24:03 2020 rev:102 rq:781233 version:1.16.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes
2020-02-06 13:05:26.544245300 +0100
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new.26092/gstreamer-plugins-bad.changes
2020-03-06 21:24:11.389445857 +0100
@@ -1,0 +2,15 @@
+Thu Feb 27 18:08:58 UTC 2020 - Bjørn Lie <[email protected]>
+
+- Switch to meson buildsystem for tumbleweed.
+- Following the above, add pkgconfig(vulkan) BuildRequires and
+ tweak options passed to meson, as well as a cleanup in some
+ conditionals.
+
+-------------------------------------------------------------------
+Thu Feb 27 13:57:58 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Add gst-plugins-bad-wayland-headers.patch: Fix build when using
+ meson and having wayland-headers in non-default location
+https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1076.
+
+-------------------------------------------------------------------
New:
----
gst-plugins-bad-wayland-headers.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-bad.spec ++++++
--- /var/tmp/diff_new_pack.YUdTtp/_old 2020-03-06 21:24:12.945446717 +0100
+++ /var/tmp/diff_new_pack.YUdTtp/_new 2020-03-06 21:24:12.949446719 +0100
@@ -25,8 +25,12 @@
%bcond_with faac
%bcond_with faad
-# TODO: fix build failure and enable this for Tumbleweed
+# Enable for tumbleweed only for now
+%if 0%{?suse_version} >= 1550
+%define use_meson 1
+%else
%define use_meson 0
+%endif
Name: gstreamer-plugins-bad
Version: 1.16.2
@@ -42,6 +46,8 @@
Patch0: gst-bad-interlace-fixes.patch
# PATCH-FIX-UPSTREAM gst-bad-autoconvert-fix-lock-less.patch -- autoconvert:
Fix lock-less exchange or free condition.
Patch1: gst-bad-autoconvert-fix-lock-less.patch
+# PATCH-FIX-UPSTREAM gst-plugins-bad-wayland-headers.patch -- Fix wayland
headers discovery
+Patch2: gst-plugins-bad-wayland-headers.patch
BuildRequires: Mesa-libGLESv3-devel
BuildRequires: fdupes
@@ -108,6 +114,7 @@
BuildRequires: pkgconfig(soundtouch)
BuildRequires: pkgconfig(spandsp) >= 0.0.6
BuildRequires: pkgconfig(srt)
+BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(webrtc-audio-processing) >= 0.2
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb) >= 1.10
@@ -146,12 +153,10 @@
BuildRequires: pkgconfig(graphene-1.0) >= 1.4.0
%endif
%endif
-%if 0%{?suse_version} >= 1550
%ifarch x86_64
BuildRequires: pkgconfig(libmfx)
BuildRequires: pkgconfig(libva-drm)
%endif
-%endif
%if 0%{?BUILD_ORIG}
%if %{with faac}
BuildRequires: faac-devel
@@ -466,15 +471,7 @@
%if ! 0%{?BUILD_ORIG}
-Dpackage-name='openSUSE GStreamer-plugins-bad package' \
-Dpackage-origin='http://download.opensuse.org' \
- -Dresindvd=disabled \
- -Dsiren=disabled \
-Ddts=disabled \
- -Dlibde265=disabled \
- -Dmodplug=disabled \
- -Dvoaacenc=disabled \
- -Dvoamrwbenc=disabled \
- -Dopenh264=disabled \
-%endif
%if %{without faac}
-Dfaac=disabled \
%endif
@@ -483,29 +480,39 @@
%endif
%if %{without fdk_aac}
-Dfdkaac=disabled \
- -Dopensles=disabled \
%endif
+ -Dlibde265=disabled \
+ -Dmodplug=disabled \
+ -Dopenh264=disabled \
+ -Dresindvd=disabled \
+ -Drtmp=disabled \
+ -Dsiren=disabled \
+ -Dvoamrwbenc=disabled \
+ -Dvoaacenc=disabled \
+ -Dx265=disabled \
+%endif
+ -Ddirectfb=disabled \
-Dexamples=disabled \
-Dfestival=disabled \
-Dflite=disabled \
- -Dwayland=enabled \
- -Dintrospection=enabled \
- -Dmsdk=disabled \
- -Dopencv=disabled \
- -Dtinyalsa=disabled \
- -Dwasapi=disabled \
+ -Dhls-crypto=openssl \
+ -Diqa=disabled \
-Dnvdec=disabled \
-Dnvenc=disabled \
- -Ddirectfb=disabled \
- -Diqa=disabled \
+ -Dopencv=disabled \
-Dopenni2=disabled \
- -Drtmp=disabled \
+ -Dopensles=disabled \
-Dsctp=disabled \
- -Dvulkan=disabled \
+ -Dtinyalsa=disabled \
+ -Dvdpau=disabled \
+ -Dwasapi=disabled \
-Dwildmidi=disabled \
-Dwpe=disabled \
- -Dx265=disabled \
- -Dhls-crypto=openssl \
+%ifarch x86_64
+ -Dmsdk=enabled \
+%else
+ -Dmsdk=disabled \
+%endif
%{nil}
%{meson_build}
%else
@@ -663,11 +670,9 @@
%{_libdir}/gstreamer-%{gst_branch}/libgstmpegpsmux.so
%{_libdir}/gstreamer-%{gst_branch}/libgstmpegtsmux.so
%{_libdir}/gstreamer-%{gst_branch}/libgstmplex.so
-%if 0%{?suse_version} >= 1550
%ifarch x86_64
%{_libdir}/gstreamer-%{gst_branch}/libgstmsdk.so
%endif
-%endif
%{_libdir}/gstreamer-%{gst_branch}/libgstmusepack.so
%{_libdir}/gstreamer-%{gst_branch}/libgstmxf.so
%{_libdir}/gstreamer-%{gst_branch}/libgstnetsim.so
@@ -702,6 +707,7 @@
%{_libdir}/gstreamer-%{gst_branch}/libgstvideoparsersbad.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvideosignal.so
%{_libdir}/gstreamer-%{gst_branch}/libgstvmnc.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstvulkan.so
%if 0%{?suse_version} >= 1500
%{_libdir}/gstreamer-%{gst_branch}/libgstlv2.so
%{_libdir}/gstreamer-%{gst_branch}/libgstopenmpt.so
@@ -800,8 +806,8 @@
%files doc
%doc AUTHORS NEWS README RELEASE REQUIREMENTS
-%{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%{gst_branch}/
-%{_datadir}/gtk-doc/html/gst-plugins-bad-libs-%{gst_branch}/
+#%%{_datadir}/gtk-doc/html/gst-plugins-bad-plugins-%%{gst_branch}/
+#%%{_datadir}/gtk-doc/html/gst-plugins-bad-libs-%%{gst_branch}/
%if 0%{?BUILD_ORIG}
%if 0%{?BUILD_ORIG_ADDON}
++++++ gst-plugins-bad-wayland-headers.patch ++++++
commit 7020e84ab9a6cc44e8167bdb144822d7dfc97a38
Author: Dominique Leuenberger <[email protected]>
Date: Thu Feb 27 14:54:13 2020 +0100
build: Fix build on systems with wayland-client headers in non-default
location
Add a missing dependency to wl_client_dep for the wayland build. Some
distros
have the wayland-client headers not installed in /usr/include (which is
perfectly
valid, the pkg-config .pc file gives the right feedback).
diff --git a/gst-libs/gst/wayland/meson.build b/gst-libs/gst/wayland/meson.build
index b1ede41f1..89bc6ab57 100644
--- a/gst-libs/gst/wayland/meson.build
+++ b/gst-libs/gst/wayland/meson.build
@@ -15,7 +15,7 @@ if use_wayland
soversion : soversion,
darwin_versions : osxversion,
install : true,
- dependencies : [gst_dep, gstvideo_dep]
+ dependencies : [gst_dep, gstvideo_dep, wl_client_dep]
)
gstwayland_dep = declare_dependency(link_with : gstwayland,
