Accepting request 607673 from GNOME:Next

New stable branch, please keep all subs in a "group" when acking/forwarding. Particulary important this time as there is a few plugins moving from one package to an other. OBS-URL: https://build.opensuse.org/request/show/607673 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-base?expand=0&rev=112
2018-05-16 08:15:46 +00:00 · 2018-05-16 08:15:46 +00:00 · 7f83027b02
commit 7f83027b02
parent f1a38032d2
7 changed files with 247 additions and 26 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -4,6 +4,7 @@ gstreamer-plugins-base-devel
    requires "libgstapp-1_0-0-<targettype> = <version>"
    requires "libgstaudio-1_0-0-<targettype> = <version>"
    requires "libgstfft-1_0-0-<targettype> = <version>"
+    requires "libgstgl-1_0-0-<targettype> = <version>"
    requires "libgstpbutils-1_0-0-<targettype> = <version>"
    requires "libgstriff-1_0-0-<targettype> = <version>"
    requires "libgstrtp-1_0-0-<targettype> = <version>"
@ -15,6 +16,7 @@ libgstallocators-1_0-0
 libgstapp-1_0-0
 libgstaudio-1_0-0
 libgstfft-1_0-0
+libgstgl-1_0-0
 libgstpbutils-1_0-0
 libgstriff-1_0-0
 libgstrtp-1_0-0
--- a/gst-pb-base-fix-unresolvable.patch
+++ b/gst-pb-base-fix-unresolvable.patch
@ -0,0 +1,84 @@
+From c0c76a8788ae810de9fcaca225b5a2e879e382f6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Sun, 25 Mar 2018 12:48:12 +0300
+Subject: gl: Disable glmixerbin for the time being too
+
+Otherwise we have one copy in gst-plugins-bad and one (unused) here,
+which makes static linking unhappy.
+---
+ ext/gl/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am
+index abbb49b..cf93f1d 100644
+--- a/ext/gl/Makefile.am
+++ b/ext/gl/Makefile.am
+@@ -5,6 +5,8 @@ plugin_LTLIBRARIES = libgstopengl.la
+ #	gstglbasemixer.h
+ #	gstglmixer.c
+ #	gstglmixer.h
+#	gstglmixerbin.h
+#	gstglmixerbin.c
+ #	gstglstereomix.c
+ #	gstglstereomix.h
+ #	gstglvideomixer.c
+@@ -16,7 +18,6 @@ libgstopengl_la_SOURCES = \
+ 	gstgldownloadelement.c \
+ 	gstglcolorconvertelement.c \
+ 	gstglfilterbin.c \
+-	gstglmixerbin.c \
+ 	gstglsinkbin.c \
+ 	gstglsrcbin.c \
+ 	gstglimagesink.c \
+@@ -57,7 +58,6 @@ noinst_HEADERS = \
+ 	gstgldownloadelement.h \
+ 	gstglcolorconvertelement.h \
+ 	gstglfilterbin.h \
+-	gstglmixerbin.h \
+ 	gstglsinkbin.h \
+ 	gstglsrcbin.h \
+ 	gstglimagesink.h \
+-- 
+cgit v1.1
+
+
+From 9261296858cb149767ceac44fd6bd13cc0de0d21 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
+Date: Tue, 27 Mar 2018 10:43:16 +0100
+Subject: gl: pick up GstVideo-1.0.gir from local build dir
+
+https://bugzilla.gnome.org/show_bug.cgi?id=794708
+---
+ gst-libs/gst/gl/Makefile.am | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
+index a3bbc94..2df0385 100644
+--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
+@@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
+ 		-I$(top_builddir)/gst-libs \
+ 		$(GST_PLUGINS_BASE_CFLAGS) \
+ 		$(GL_CFLAGS) \
+		--add-include-path="$(top_builddir)/gst-libs/gst/video/" \
+ 		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+ 		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
+-		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
+		--library-path="$(top_builddir)/gst-libs/gst/video/" \
+ 		--library=libgstgl-@GST_API_VERSION@.la \
+ 		--include=Gst-@GST_API_VERSION@ \
+ 		--include=GstBase-@GST_API_VERSION@ \
+@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+ 		$(INTROSPECTION_COMPILER) \
+ 		--includedir=$(srcdir) \
+ 		--includedir=$(builddir) \
+		--includedir="$(top_builddir)/gst-libs/gst/video/" \
+ 		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+ 		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
+-		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
+ 		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+ 
+ CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
+-- 
+cgit v1.1
+
--- a/gst-plugins-base-1.12.5.tar.xz
+++ b/gst-plugins-base-1.12.5.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8fd9f25b65f3286f43530868b501a4e7cdc3f1568be78c75da716cd2559b712e
-size 3093500
--- a/gst-plugins-base-1.14.0.tar.xz
+++ b/gst-plugins-base-1.14.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940
+size 3687296
--- a/gstreamer-plugins-base.appdata.xml
+++ b/gstreamer-plugins-base.appdata.xml
@ -10,7 +10,7 @@
      This addon includes system codecs that are essential for the running system.
    </p>
    <p>
-      A codec decodes audio and video for for playback or editing and is also
+      A codec decodes audio and video for playback or editing and is also
      used for transmission or storage.
      Different codecs are used in video-conferencing, streaming media and
      video editing applications.
--- a/gstreamer-plugins-base.changes
+++ b/gstreamer-plugins-base.changes
@ -1,3 +1,64 @@
+-------------------------------------------------------------------
+Fri Mar 30 00:29:01 UTC 2018 - luc14n0@linuxmail.org
+
+- Update to version 1.14.0:
+  + Highlights:
+    - WebRTC support: real-time audio/video streaming to and from
+      web browsers;
+    - Experimental support for the next-gen royalty-free AV1 video
+      codec;
+    - Video4Linux: encoding support, stable element names and
+      faster device probing;
+    - Support for the Secure Reliable Transport (SRT) video
+      streaming protocol;
+    - RTP Forward Error Correction (FEC) support (ULPFEC);
+    - RTSP 2.0 support in rtspsrc and gst-rtsp-server;
+    - ONVIF audio backchannel support in gst-rtsp-server and
+      rtspsrc;
+    - playbin3 gapless playback and pre-buffering support;
+    - Tee, our stream splitter/duplication element, now does
+      allocation query aggregation which is important for efficient
+      data handling and zero-copy;
+    - QuickTime muxer has a new prefill recording mode that allows
+      file import in Adobe Premiere and FinalCut Pro while the file
+      is still being written;
+    - rtpjitterbuffer fast-start mode and timestamp offset
+      adjustment smoothing;
+    - souphttpsrc connection sharing, which allows for connection
+      reuse, cookie sharing, etc;
+    - nvdec: new plugin for hardware-accelerated video decoding
+      using the NVIDIA NVDEC API;
+    - Adaptive DASH trick play support;
+    - ipcpipeline: new plugin that allows splitting a pipeline
+      across multiple processes;
+    - Major gobject-introspection annotation improvements for large
+      parts of the library API;
+    - GStreamer C# bindings have been revived and seen many updates
+      and fixes;
+    - The externally maintained GStreamer Rust bindings had many
+      usability improvements and cover most of the API now.
+      Coinciding with the 1.14 release, a new release with the 1.14
+      API additions is happening.
+  + Updated translations.
+- Add:
+  + gcc-c++, libjpeg-devel, libpng-devel and Mesa-libGLESv3-devel,
+    and egl, gbm, gl, glesv1_cm, glesv2, graphene-1.0, gudev-1.0,
+    gdk-pixbuf-2.0, gmodule-no-export-2.0, libdrm, wayland-client,
+    wayland-cursor, wayland-egl and x11-xcb pkgconfig modules as
+    build time dependencies.
+  + gio-unix-2.0, glib-2.0, xext, xv and x11 BuildRequires to avoid
+    implicit dependencies.
+  + OpenGL shared library and its GI bindings and plugin plus
+    audiomixer plugin from gstreamer-plugins-bad/good, following
+    upstream changes.
+- Add new sub-package libgstgl-1_0-0 to baselibs.conf.
+- Add versioned gstreamer-plugins-bad Conflicts: Several
+  sub-packages moved here, conflict on older versions.
+- Add gst-pb-base-fix-unresolvable.patch: Fix unresolvable problem
+  due to moved plugins, take 2 commits from upstream stable branch.
+- Following the above patch: Add libtool BuildRequires and pass
+  autogen.sh
+
 -------------------------------------------------------------------
 Thu Mar 29 12:09:13 UTC 2018 - bjorn.lie@gmail.com

--- a/gstreamer-plugins-base.spec
+++ b/gstreamer-plugins-base.spec
@ -20,17 +20,23 @@
 %define gst_branch 1.0
 %define gstreamer_plugins_base_req %(xzgrep --text "^GST[_A-Z]*_REQ" %{SOURCE0} | sort -u | sed 's/GST_REQ=/gstreamer >= /')
 Name:           gstreamer-plugins-base
-Version:        1.12.5
+Version:        1.14.0
 Release:        0
 Summary:        GStreamer Streaming-Media Framework Plug-Ins
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later
 Group:          Productivity/Multimedia/Other
-URL:            http://gstreamer.freedesktop.org/
+URL:            https://gstreamer.freedesktop.org/
 Source0:        https://gstreamer.freedesktop.org/src/gst-plugins-base/%{_name}-%{version}.tar.xz
 Source1:        gstreamer-plugins-base.appdata.xml
 Source2:        baselibs.conf
+
+# PATCH-FIX-UPSTREAM gst-pb-base-fix-unresolvable.patch bjorn.lie@gmail.com -- Fix unresolvable problem due to moved plugins
+Patch0:         gst-pb-base-fix-unresolvable.patch
+
+BuildRequires:  Mesa-libGLESv3-devel
 BuildRequires:  cdparanoia-devel
 BuildRequires:  fdupes
+BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel >= 2.40.0
 BuildRequires:  gobject-introspection-devel >= 1.31.1
 BuildRequires:  gtk-doc >= 1.12
@ -38,6 +44,10 @@ BuildRequires:  libICE-devel
 BuildRequires:  libSM-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXv-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+# Needed for patch0
+BuildRequires:  libtool
 BuildRequires:  orc >= 0.4.24
 BuildRequires:  pkgconfig
 BuildRequires:  python3-base
@ -45,12 +55,23 @@ BuildRequires:  python3-xml
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(alsa) >= 0.9.1
+BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(freetype2) >= 2.0.9
+BuildRequires:  pkgconfig(gbm)
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.24
-BuildRequires:  pkgconfig(gstreamer-1.0) >= 1.12.0
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glesv1_cm)
+BuildRequires:  pkgconfig(glesv2)
+BuildRequires:  pkgconfig(glib-2.0) >= 2.24
+BuildRequires:  pkgconfig(gmodule-no-export-2.0)
+BuildRequires:  pkgconfig(graphene-1.0)
+BuildRequires:  pkgconfig(gstreamer-1.0) >= 1.14.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
 BuildRequires:  pkgconfig(gtk+-x11-3.0) >= 3.0.0
+BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(iso-codes)
+BuildRequires:  pkgconfig(libdrm) >= 2.4.55
 BuildRequires:  pkgconfig(libvisual-0.4) >= 0.4.0
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(ogg) >= 1.0
@ -61,6 +82,13 @@ BuildRequires:  pkgconfig(theoradec) >= 1.1
 BuildRequires:  pkgconfig(theoraenc) >= 1.1
 BuildRequires:  pkgconfig(vorbis) >= 1.0
 BuildRequires:  pkgconfig(vorbisenc) >= 1.0
+BuildRequires:  pkgconfig(wayland-client) >= 1.0
+BuildRequires:  pkgconfig(wayland-cursor) >= 1.0
+BuildRequires:  pkgconfig(wayland-egl) >= 1.0
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(x11-xcb)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xv)
 BuildRequires:  pkgconfig(zlib)
 Requires:       %{gstreamer_plugins_base_req}
 Recommends:     %{name}-lang
@ -68,6 +96,8 @@ Recommends:     PackageKit-gstreamer-plugin
 Supplements:    gstreamer
 # Generic name, never used in SuSE:
 Provides:       gst-plugins-base = %{version}
+Obsoletes:      typelib-1_0-GstFft-1_0 < 1.14.0
+Conflicts:      gstreamer-plugins-bad < 1.13.92

 %description
 GStreamer is a streaming media framework based on graphs of filters
@ -181,6 +211,28 @@ anything media-related, from real-time sound processing to playing
 videos. Its plug-in-based architecture means that new data types or
 processing capabilities can be added simply by installing new plug-ins.

+%package -n libgstgl-1_0-0
+Summary:        GStreamer Streaming-Media Framework Plug-Ins
+Group:          System/Libraries
+
+%description -n libgstgl-1_0-0
+GStreamer is a streaming media framework based on graphs of filters
+that operate on media data. Applications using this library can do
+anything media-related,from real-time sound processing to playing
+videos. Its plug-in-based architecture means that new data types or
+processing capabilities can be added simply by installing new plug-ins.
+
+%package -n typelib-1_0-GstGL-1_0
+Summary:        GStreamer Streaming-Media Framework Plug-Ins -- Introspection bindings
+Group:          System/Libraries
+
+%description -n typelib-1_0-GstGL-1_0
+GStreamer is a streaming media framework based on graphs of filters
+that operate on media data. Applications using this library can do
+anything media-related, from real-time sound processing to playing
+videos. Its plug-in-based architecture means that new data types or
+processing capabilities can be added simply by installing new plug-ins.
+
 This package provides the GObject Introspection bindings for GStreamer
 plug-ins.

@ -366,6 +418,7 @@ Requires:       libgstallocators-1_0-0 = %{version}
 Requires:       libgstapp-1_0-0 = %{version}
 Requires:       libgstaudio-1_0-0 = %{version}
 Requires:       libgstfft-1_0-0 = %{version}
+Requires:       libgstgl-1_0-0 = %{version}
 Requires:       libgstpbutils-1_0-0 = %{version}
 Requires:       libgstriff-1_0-0 = %{version}
 Requires:       libgstrtp-1_0-0 = %{version}
@ -376,7 +429,7 @@ Requires:       libgstvideo-1_0-0 = %{version}
 Requires:       typelib-1_0-GstAllocators-1_0 = %{version}
 Requires:       typelib-1_0-GstApp-1_0 = %{version}
 Requires:       typelib-1_0-GstAudio-1_0 = %{version}
-Requires:       typelib-1_0-GstFft-1_0 = %{version}
+Requires:       typelib-1_0-GstGL-1_0 = %{version}
 Requires:       typelib-1_0-GstPbutils-1_0 = %{version}
 Requires:       typelib-1_0-GstRtp-1_0 = %{version}
 Requires:       typelib-1_0-GstRtsp-1_0 = %{version}
@ -408,10 +461,9 @@ package.
 translation-update-upstream po gst-plugins-base-%{gst_branch}

 %build
-# FIXME: GTKDOC_CFLAGS, GST_OBJ_CFLAGS:
-# Silently ignored compilation of uninstalled gtk-doc scanners without RPM_OPT_FLAGS.
-export CFLAGS="%{optflags} -fno-strict-aliasing"
 export PYTHON=%{_bindir}/python3
+# Needed for patch0
+NOCONFIGURE=1 ./autogen.sh
 %configure\
 	--with-package-name='openSUSE GStreamer-plugins-base package'\
 	--with-package-origin='http://download.opensuse.org'\
@ -438,24 +490,37 @@ find %{buildroot} -type f -name "*.la" -delete -print

 %post -n libgstallocators-1_0-0 -p /sbin/ldconfig
 %postun -n libgstallocators-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstapp-1_0-0 -p /sbin/ldconfig
 %postun -n libgstapp-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstaudio-1_0-0 -p /sbin/ldconfig
 %postun -n libgstaudio-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstfft-1_0-0 -p /sbin/ldconfig
 %postun -n libgstfft-1_0-0 -p /sbin/ldconfig
+
+%post -n libgstgl-1_0-0 -p /sbin/ldconfig
+%postun -n libgstgl-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstpbutils-1_0-0 -p /sbin/ldconfig
 %postun -n libgstpbutils-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstriff-1_0-0 -p /sbin/ldconfig
 %postun -n libgstriff-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstrtp-1_0-0 -p /sbin/ldconfig
 %postun -n libgstrtp-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstrtsp-1_0-0 -p /sbin/ldconfig
 %postun -n libgstrtsp-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstsdp-1_0-0 -p /sbin/ldconfig
 %postun -n libgstsdp-1_0-0 -p /sbin/ldconfig
+
 %post -n libgsttag-1_0-0 -p /sbin/ldconfig
 %postun -n libgsttag-1_0-0 -p /sbin/ldconfig
+
 %post -n libgstvideo-1_0-0 -p /sbin/ldconfig
 %postun -n libgstvideo-1_0-0 -p /sbin/ldconfig

@ -473,6 +538,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/gstreamer-%{gst_branch}/libgstalsa.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstapp.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstaudioconvert.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstaudiomixer.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstaudioresample.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstaudiotestsrc.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstaudiorate.so
@ -481,6 +547,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/gstreamer-%{gst_branch}/libgstgio.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstlibvisual.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstogg.so
+%{_libdir}/gstreamer-%{gst_branch}/libgstopengl.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstopus.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstpango.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstpbtypes.so
@ -499,8 +566,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/gstreamer-%{gst_branch}/libgstximagesink.so
 %{_libdir}/gstreamer-%{gst_branch}/libgstxvimagesink.so

-%files lang -f %{_name}-%{gst_branch}.lang
-
 %files -n libgstallocators-1_0-0
 %{_libdir}/libgstallocators*.so.*

@ -522,8 +587,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %files -n libgstfft-1_0-0
 %{_libdir}/libgstfft*.so.*

-%files -n typelib-1_0-GstFft-1_0
-%{_libdir}/girepository-1.0/GstFft-*.typelib
+%files -n libgstgl-1_0-0
+%{_libdir}/libgstgl-%{gst_branch}.so.0*
+
+%files -n typelib-1_0-GstGL-1_0
+%{_libdir}/girepository-1.0/GstGL-*.typelib

 %files -n libgstpbutils-1_0-0
 %{_libdir}/libgstpbutils*.so.*
@ -572,10 +640,16 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %dir %{_datadir}/gst-plugins-base/
 %dir %{_datadir}/gst-plugins-base/%{gst_branch}/
 %{_datadir}/gst-plugins-base/%{gst_branch}/license-translations.dict
+%dir %{_libdir}/gstreamer-%{gst_branch}/include
+%dir %{_libdir}/gstreamer-%{gst_branch}/include/gst
+%dir %{_libdir}/gstreamer-%{gst_branch}/include/gst/gl
+%{_libdir}/gstreamer-%{gst_branch}/include/gst/gl/gstglconfig.h

 %files doc
 %doc AUTHORS NEWS README RELEASE REQUIREMENTS
 %{_datadir}/gtk-doc/html/gst-plugins-base-libs-%{gst_branch}
 %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{gst_branch}

+%files lang -f %{_name}-%{gst_branch}.lang
+
 %changelog