- added openh264 patch (fix build with openh264 >= 2); release 5

diff --git a/gstreamer-plugins-bad-openh264.patch b/gstreamer-plugins-bad-openh264.patch
new file mode 100644 (file)
index 0000000..7b09477
--- /dev/null
+++ b/gstreamer-plugins-bad-openh264.patch
@@ -0,0 +1,32 @@
+From d2f6facbfb89f13a891e710b44e1561570de006a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
+ <vjaquez@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
+

diff --git a/gstreamer-plugins-bad.spec b/gstreamer-plugins-bad.spec
index b162770266098b71ace971a9fecae8d027139989..58963b7473f97de451d19c6d305ecb83396b6e77 100644 (file)
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -2,6 +2,7 @@
 # - 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
@@ -66,13 +67,14 @@ 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:       4
+Release:       5
 License:       LGPL v2+
 Group:         Libraries
 Source0:       https://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.xz
 # Source0-md5: e9e562d86c1527c44d904500dd35e326
 Patch0:                %{name}-libdts.patch
 Patch1:                %{name}-mfx.patch
+Patch2:                %{name}-openh264.patch
 URL:           https://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.14
@@ -107,6 +109,7 @@ BuildRequires:      xorg-lib-libXcomposite-devel
 %{?with_gles:BuildRequires:    OpenGLESv2-devel}
 %{?with_openni2:BuildRequires: OpenNI2-devel >= 0.26}
 %{?with_sdl:BuildRequires:     SDL-devel}
+%{?with_vulkan:BuildRequires:  Vulkan-Loader-devel}
 BuildRequires: alsa-lib-devel >= 0.9.1
 BuildRequires: aom-devel
 %{?with_bluez:BuildRequires:   bluez-libs-devel >= 5.0}
@@ -173,6 +176,7 @@ BuildRequires:      libwebp-devel >= 0.2.1
 %{?with_x265:BuildRequires:    libx265-devel}
 %{?with_vulkan:BuildRequires:  libxcb-devel >= 1.10}
 BuildRequires: libxml2-devel >= 1:2.9.2
+%{?with_lv2:BuildRequires:     lilv-devel >= 0.22}
 %{?with_mfx:BuildRequires:     mfx_dispatch-devel}
 %{?with_mjpegtools:BuildRequires:      mjpegtools-devel >= 2.0.0}
 %{?with_nas:BuildRequires:     nas-devel}
@@ -186,8 +190,7 @@ BuildRequires:      opencv-devel < 1:4.1.0
 %{?with_openh264:BuildRequires:        openh264-devel >= 1.3.0}
 # or openjpeg >= 1.5, openjpeg2 is preferred
 BuildRequires: openjpeg2-devel >= 2.1
-# for apexsink (not ported yet) and dtls
-%{?with_lv2:BuildRequires:     lilv-devel >= 0.22}
+# for dtls
 BuildRequires: openssl-devel >= 1.0.1
 BuildRequires: opus-devel >= 0.9.4
 BuildRequires: pango-devel >= 1:1.22.0
@@ -200,7 +203,6 @@ BuildRequires:      srt-devel
 %{?with_uvch264:BuildRequires: udev-glib-devel}
 BuildRequires: vo-aacenc-devel >= 0.1.0
 %{?with_amr:BuildRequires:     vo-amrwbenc-devel >= 0.1.0}
-%{?with_vulkan:BuildRequires:  Vulkan-Loader-devel}
 # wayland-client, wayland-cursor, wayland-scanner
 %{?with_wayland:BuildRequires: wayland-devel >= 1.11.0}
 %{?with_wayland:BuildRequires: wayland-protocols >= 1.15}
@@ -1305,6 +1307,7 @@ Wtyczka GStreamera skanująca kody kreskowe.
 %setup -q -n %{gstname}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}