From fd6d9906aa4dba5df8aee56404dc735243ad5f96 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Wed, 20 Dec 2023 17:57:09 -0500
Subject: [PATCH] Enable dvbsuboverlay and siren plugins

---
 gst-p-bad-cleanup.sh             |  5 ++---
 gstreamer1-plugins-bad-free.spec | 24 +++++++++++++++---------
 sources                          |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh
index 5afdb52..73b0312 100755
--- a/gst-p-bad-cleanup.sh
+++ b/gst-p-bad-cleanup.sh
@@ -44,6 +44,7 @@ dccp
 debugutils
 dtmf
 dvbsubenc
+dvbsuboverlay
 faceoverlay
 festival
 fieldanalysis
@@ -97,6 +98,7 @@ sdi
 sdp
 segmentclip
 selector
+siren
 smooth
 speed
 stereo
@@ -118,10 +120,7 @@ y4m
 "
 
 NOT_ALLOWED="
-dvbsuboverlay
 dvdspu
-real
-siren
 "
 
 error()
diff --git a/gstreamer1-plugins-bad-free.spec b/gstreamer1-plugins-bad-free.spec
index 9cbb505..a2b2a5a 100644
--- a/gstreamer1-plugins-bad-free.spec
+++ b/gstreamer1-plugins-bad-free.spec
@@ -11,18 +11,18 @@
 
 Name:           gstreamer1-plugins-bad-free
 Version:        1.22.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GStreamer streaming media framework "bad" plugins
 
 License:        LGPLv2+ and LGPLv2
 URL:            http://gstreamer.freedesktop.org/
 %if 0%{?gitrel}
-# git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-good
-# cd gst-plugins-good; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck
+# git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-bad
+# cd gst-plugins-bad; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck
 # modified with gst-p-bad-cleanup.sh from SOURCE1
 %else
 # The source is:
-# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
+# https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
 # modified with gst-p-bad-cleanup.sh from SOURCE1
 %endif
 Source0:        gst-plugins-bad-free-%{version}.tar.xz
@@ -136,6 +136,8 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 # libgstfdkaac.so used to be shipped in -nonfree
 Obsoletes: gstreamer1-plugins-bad-nonfree < 1.16.1-2
 %endif
+# dtsdec, dvbsuboverlay, siren used to be shipped in -freeworld
+Conflicts: gstreamer1-plugins-bad-freeworld < 1.22.7-2
 
 # Drop after f36
 Provides: gst-transcoder = 1.16.0-4
@@ -291,7 +293,7 @@ aren't tested well enough, or the code is not of good enough quality.
     %{!?with_extras:-D spandsp=disabled } \
     %{!?with_extras:-D voamrwbenc=disabled } \
     -D x265=disabled \
-    -D dvbsuboverlay=disabled -D dvdspu=disabled -D siren=disabled \
+    -D dvdspu=disabled \
     -D opensles=disabled -D tinyalsa=disabled \
     -D wasapi=disabled -D wasapi2=disabled -D avtp=disabled \
     -D dc1394=disabled -D directfb=disabled -D iqa=disabled \
@@ -418,14 +420,11 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/gstreamer-%{majorminor}/libgstcoloreffects.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdash.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdvbsubenc.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdvbsuboverlay.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfaceoverlay.so
 %if %{with extras}
 %{_libdir}/gstreamer-%{majorminor}/libgstfbdevsink.so
 %endif
-
-%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
-%{_libdir}/gstreamer-%{majorminor}/libgstfdkaac.so
-%endif
 %{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfieldanalysis.so
 %{_libdir}/gstreamer-%{majorminor}/libgstfreeverb.so
@@ -462,6 +461,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsegmentclip.so
 %{_libdir}/gstreamer-%{majorminor}/libgstshm.so
+%{_libdir}/gstreamer-%{majorminor}/libgstsiren.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsmooth.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsmoothstreaming.so
 %{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
@@ -489,6 +489,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/gstreamer-%{majorminor}/libgstclosedcaption.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcolormanagement.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdtls.so
+%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9
+%{_libdir}/gstreamer-%{majorminor}/libgstfdkaac.so
+%endif
 %{_libdir}/gstreamer-%{majorminor}/libgsthls.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgtkwayland.so
@@ -700,6 +703,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 
 
 %changelog
+* Wed Dec 20 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.8-2
+- Enable dvbsuboverlay and siren plugins
+
 * Mon Dec 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.8-1
 - 1.22.8
 
diff --git a/sources b/sources
index 0c95129..1f14c9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gst-plugins-bad-free-1.22.8.tar.xz) = 15750f7d44f8bf6df5bf5d46c5a076cfa57f56787731ffe1c9e3ca2465d6bf780ca2984a0e2ea7e1a536e5c0a890bcce0fadabf9ef156c0322c23ae0b3508243
+SHA512 (gst-plugins-bad-free-1.22.8.tar.xz) = 37842951c7c5fda62c0663c1aa455f4a53fc2dd2520a66a16b2396dc7287e4555ce60e63bf77fe02ee0a69ba5c5fdd8c96f4e571cd499e68733eb9d0c28bfbdb