[packages/gstreamer-plugins-bad] - updated to 1.16.2 - removed obsolete openh264 patch - added neon patch (allow neon 0.31.x) - added

qboosh qboosh at pld-linux.org
Sun Mar 29 21:12:29 CEST 2020 

commit 16b9405a556db94d976847abe4aebb554c08fa47
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 29 21:12:21 2020 +0200

    - updated to 1.16.2
    - removed obsolete openh264 patch
    - added neon patch (allow neon 0.31.x)
    - added make patch (make 4.3 compatibility)
    - build wpe element

 gstreamer-make.patch                 | 13 +++++++++++
 gstreamer-plugins-bad-neon.patch     | 11 +++++++++
 gstreamer-plugins-bad-openh264.patch | 32 --------------------------
 gstreamer-plugins-bad.spec           | 44 +++++++++++++++++++++++++++++-------
 4 files changed, 60 insertions(+), 40 deletions(-)
---
diff --git a/gstreamer-plugins-bad.spec b/gstreamer-plugins-bad.spec
index bd1adda..4ad85a6 100644
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -2,7 +2,6 @@
 # - nvenc (BR: cuda >= 6.5, nvEncodeAPI.h >= 5.0, -lnvidia-encode)
 # - nvdec (BR: libnvcuvid)
 # - OpenSLES (when available on pure Linux, not Android)
-# - wpe-webkit, wpebackend-fdo? https://wpewebkit.org/
 #
 # Conditional build:
 %bcond_without	amr		# amrwbenc output plugin
@@ -13,7 +12,7 @@
 %bcond_without	dc1394		# dc1394 input plugin
 %bcond_without	directfb	# DirectFB videosink plugin
 %bcond_without	dts		# DTS audio decoder plugin
-%bcond_without	egl		# EGL support in GL output
+%bcond_without	egl		# EGL support in GL output + wayland and wpe elements
 %bcond_without	faad		# faad audio decoder plugin
 %bcond_without	gles		# GLESv2 support in GL output
 %bcond_with	gnustep		# Cocoa support using GNUstep [unsupported since 1.4.5]
@@ -47,6 +46,7 @@
 %bcond_without	vdpau		# VDPAU decoder/videopostprocess/videosink plugin
 %bcond_without	vulkan		# Vulkan videosink/upload plugin
 %bcond_without	wayland		# Wayland videosink plugin, Wayland EGL support, Wayland support in Vulkan plugin
+%bcond_without	wpe		# WebKit based web browser plugin
 %bcond_without	wildmidi	# wildmidi MIDI files decoder plugin
 %bcond_without	x265		# x265 H.265 encoder plugin
 %bcond_with	xvid		# XviD plugin [not ported to 1.0, removed]
@@ -56,24 +56,26 @@
 
 %if %{without egl}
 %undefine with_wayland
+%undefine with_wpe
 %endif
 
 %define		gstname		gst-plugins-bad
 %define		gstmver		1.0
-%define		gst_ver		1.16.0
-%define		gstpb_ver	1.16.0
+%define		gst_ver		1.16.2
+%define		gstpb_ver	1.16.2
 Summary:	Bad GStreamer Streaming-media framework plugins
 Summary(pl.UTF-8):	Złe wtyczki do środowiska obróbki strumieni GStreamer
 Name:		gstreamer-plugins-bad
-Version:	1.16.0
-Release:	6
+Version:	1.16.2
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
 Source0:	https://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.xz
-# Source0-md5:	e9e562d86c1527c44d904500dd35e326
+# Source0-md5:	ccc7404230afddec723bbdb63c89feec
 Patch0:		%{name}-libdts.patch
 Patch1:		%{name}-mfx.patch
-Patch2:		%{name}-openh264.patch
+Patch2:		%{name}-neon.patch
+Patch3:		gstreamer-make.patch
 URL:		https://gstreamer.freedesktop.org/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake >= 1:1.14
@@ -208,7 +210,10 @@ BuildRequires:	vo-aacenc-devel >= 0.1.0
 BuildRequires:	webrtc-audio-processing-devel < 0.4
 BuildRequires:	webrtc-audio-processing-devel >= 0.2
 %{?with_wildmidi:BuildRequires:	wildmidi-devel >= 0.4}
+%{?with_wpe:BuildRequires:	wpe-webkit-devel >= 2.24}
+%{?with_wpe:BuildRequires:	wpebackend-fdo-devel >= 1.0}
 BuildRequires:	xorg-lib-libX11-devel
+%{?with_wpe:BuildRequires:	xorg-lib-libxkbcommon-devel}
 %{?with_xvid:BuildRequires:	xvid-devel >= 1.3.0}
 BuildRequires:	zbar-devel >= 0.9
 %{?with_zvbi:BuildRequires:	zvbi-devel >= 0.2}
@@ -1261,6 +1266,22 @@ wildmidi plugin for GStreamer.
 %description -n gstreamer-wildmidi -l pl.UTF-8
 Wtyczka wildmidi dla GStreamera.
 
+%package -n gstreamer-wpe
+Summary:	GStreamer WPE (WebKit web browser) source plugin
+Summary(pl.UTF-8):	Wtyczka GStreamera ze źródłem WPE (przeglądarki WWW opartej na WebKicie)
+Group:		Libraries
+Requires:	gstreamer >= %{gst_ver}
+Requires:	gstreamer-plugins-base >= %{gstpb_ver}
+Requires:	wpe-webkit >= 2.24
+Requires:	wpebackend-fdo >= 1.0
+
+%description -n gstreamer-wpe
+GStreamer WPE (WebKit web browser) source plugin.
+
+%description -n gstreamer-wpe -l pl.UTF-8
+Wtyczka GStreamera ze źródłem WPE (przeglądarki WWW opartej na
+WebKicie).
+
 %package -n gstreamer-x265
 Summary:	GStreamer x265 encoder plugin
 Summary(pl.UTF-8):	Wtyczka GStreamera kodująca przy użyciu biblioteki x265
@@ -1307,6 +1328,7 @@ Wtyczka GStreamera skanująca kody kreskowe.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -1909,6 +1931,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{gstlibdir}/libgstwildmidi.so
 %endif
 
+%if %{with wpe}
+%files -n gstreamer-wpe
+%defattr(644,root,root,755)
+%attr(755,root,root) %{gstlibdir}/libgstwpe.so
+%endif
+
 %if %{with x265}
 %files -n gstreamer-x265
 %defattr(644,root,root,755)
diff --git a/gstreamer-make.patch b/gstreamer-make.patch
new file mode 100644
index 0000000..75ddfa9
--- /dev/null
+++ b/gstreamer-make.patch
@@ -0,0 +1,13 @@
+make 4.3 no longer recognizes '#' in macros as comment; use workaround to be compatible with old and current make
+--- gstreamer-1.16.2/common/gst-glib-gen.mak.orig	2019-04-19 11:16:18.000000000 +0200
++++ gstreamer-1.16.2/common/gst-glib-gen.mak	2020-03-28 20:29:17.924914360 +0100
+@@ -8,7 +8,8 @@
+ #glib_gen_decl_banner=GST_EXPORT
+ #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
+ 
+-enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
++gst_hash=\#
++enum_headers=$(foreach h,$(glib_enum_headers),\n$(gst_hash)include \"$(h)\")
+ 
+ # these are all the rules generating the relevant files
+ $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list
diff --git a/gstreamer-plugins-bad-neon.patch b/gstreamer-plugins-bad-neon.patch
new file mode 100644
index 0000000..e7eda80
--- /dev/null
+++ b/gstreamer-plugins-bad-neon.patch
@@ -0,0 +1,11 @@
+--- gst-plugins-bad-1.16.2/configure.ac.orig	2020-03-29 19:32:56.064354609 +0200
++++ gst-plugins-bad-1.16.2/configure.ac	2020-03-29 20:00:33.358709608 +0200
+@@ -1784,7 +1784,7 @@
+ dnl *** neon ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_NEON, true)
+ AG_GST_CHECK_FEATURE(NEON, [neon http client plugins], neonhttpsrc, [
+-  PKG_CHECK_MODULES(NEON, neon >= 0.27.0  neon <= 0.30.99, HAVE_NEON="yes", [
++  PKG_CHECK_MODULES(NEON, neon >= 0.27.0  neon <= 0.31.99, HAVE_NEON="yes", [
+     HAVE_NEON="no"
+   ])
+   AC_SUBST(NEON_CFLAGS)
diff --git a/gstreamer-plugins-bad-openh264.patch b/gstreamer-plugins-bad-openh264.patch
deleted file mode 100644
index 7b09477..0000000
--- a/gstreamer-plugins-bad-openh264.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d2f6facbfb89f13a891e710b44e1561570de006a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
- <vjaquez at igalia.com>
-Date: Wed, 8 May 2019 13:35:25 +0200
-Subject: openh264enc: Fix compilation with openh264 v2.0
-
-As OpenH264 increased its version to 2.0 the guard for structure
-member is not valid.
-
-This patch will fix the compilation with gst-build and openh264.
----
- ext/openh264/gstopenh264enc.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-(limited to 'ext/openh264/gstopenh264enc.cpp')
-
-diff --git a/ext/openh264/gstopenh264enc.cpp b/ext/openh264/gstopenh264enc.cpp
-index aa8138d..11be2a5 100644
---- a/ext/openh264/gstopenh264enc.cpp
-+++ b/ext/openh264/gstopenh264enc.cpp
-@@ -739,7 +739,7 @@ gst_openh264enc_set_format (GstVideoEncoder * encoder,
-   enc_params.bEnableSceneChangeDetect = openh264enc->scene_change_detection;
-   enc_params.bEnableFrameSkip = openh264enc->enable_frame_skip;
-   enc_params.bEnableLongTermReference = 0;
--#if OPENH264_MINOR >= 4
-+#if (OPENH264_MAJOR > 1 || (OPENH264_MAJOR == 1 && OPENH264_MINOR >= 4))
-   enc_params.eSpsPpsIdStrategy = CONSTANT_ID;
- #else
-   enc_params.bEnableSpsPpsIdAddition = 0;
--- 
-cgit v1.1
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gstreamer-plugins-bad.git/commitdiff/16b9405a556db94d976847abe4aebb554c08fa47

More information about the pld-cvs-commit mailing list