.gitignore

@@ -1 +1 @@
-SOURCES/gst-plugins-ugly-free-1.16.1.tar.xz
+SOURCES/gst-plugins-ugly-1.22.12.tar.xz

.gstreamer1-plugins-ugly-free.metadata

@@ -1 +1 @@
-404e394c06d39a1bfeae0351006232cce5fbbf64 SOURCES/gst-plugins-ugly-free-1.16.1.tar.xz
+48c936675236f68105a15b681765170a9178f47a SOURCES/gst-plugins-ugly-1.22.12.tar.xz

SOURCES/gst-p-ugly-cleanup.sh

@@ -1,116 +0,0 @@
-#!/bin/sh
-
-# Process a gst-plugins-ugly tarball to remove
-# unwanted GStreamer plugins.
-#
-# See https://bugzilla.redhat.com/show_bug.cgi?id=1397261
-# for details
-#
-# Bastien Nocera <bnocera@redhat.com> - 2010
-# Yaakov Selkowitz <yselkowi@redhat.com> - 2016
-#
-
-SOURCE="$1"
-NEW_SOURCE=`echo $SOURCE | sed 's/ugly-/ugly-free-/'`
-DIRECTORY=`echo $SOURCE | sed 's/\.tar\.xz//'`
-
-ALLOWED="
-xingmux
-"
-
-NOT_ALLOWED="
-asfdemux
-dvdlpcmdec
-dvdsub
-realmedia
-"
-
-error()
-{
-	MESSAGE=$1
-	echo $MESSAGE
-	exit 1
-}
-
-check_allowed()
-{
-	MODULE=$1
-	for i in $ALLOWED ; do
-		if test x$MODULE = x$i ; then
-			return 0;
-		fi
-	done
-	# Ignore errors coming from ext/ directory
-	# they require external libraries so are ineffective anyway
-	return 1;
-}
-
-check_not_allowed()
-{
-	MODULE=$1
-	for i in $NOT_ALLOWED ; do
-		if test x$MODULE = x$i ; then
-			return 0;
-		fi
-	done
-	return 1;
-}
-
-rm -rf $DIRECTORY
-tar xJf $SOURCE || error "Cannot unpack $SOURCE"
-pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\""
-
-unknown=""
-for subdir in gst ext; do
-	for dir in $subdir/* ; do
-		# Don't touch non-directories
-		if ! [ -d $dir ] ; then
-			continue;
-		fi
-		MODULE=`basename $dir`
-		if ( check_not_allowed $MODULE ) ; then
-			echo "**** Removing $MODULE ****"
-			echo "Removing directory $dir"
-			rm -r $dir || error "Cannot remove $dir"
-			if grep -q "AG_GST_CHECK_PLUGIN($MODULE)" configure.ac ; then
-				echo "Removing element check for $MODULE"
-				grep -v "AG_GST_CHECK_PLUGIN($MODULE)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac
-			fi
-			echo "Removing Makefile generation for $MODULE"
-			grep -v "$dir/Makefile" configure.ac > configure.ac.new && mv configure.ac.new configure.ac
-			echo "Removing documentation for $MODULE"
-			if grep -q "$MODULE" docs/plugins/Makefile.am ; then
-				grep -v $dir docs/plugins/Makefile.am > docs/plugins/Makefile.am.new && mv docs/plugins/Makefile.am.new docs/plugins/Makefile.am
-			fi
-			echo
-		elif test $subdir = ext  || test $subdir = sys; then
-			# Ignore library or system non-blacklisted plugins
-			continue;
-		elif ! ( check_allowed $MODULE ) ; then
-			echo "Unknown module in $dir"
-			unknown="$unknown $dir"
-		fi
-	done
-done
-
-echo "Fixing up AC_CONFIG_SRCDIR"
-sed -e '/AC_CONFIG_SRCDIR/s/asfdemux/xingmux/g' configure.ac > configure.ac.new && mv configure.ac.new configure.ac
-
-echo "Fixing up docs/plugins/Makefile.am"
-sed -e ':a;N;$!ba;s| *\\\n\n|\n\n|g' docs/plugins/Makefile.am > docs/plugins/Makefile.am.new && mv docs/plugins/Makefile.am.new docs/plugins/Makefile.am
-
-echo
-
-if test "x$unknown" != "x"; then
-  echo -n "Aborting due to unknown modules: "
-  echo "$unknown" | sed "s/ /\n  /g"
-  exit 1
-fi
-
-autoreconf
-
-popd > /dev/null
-
-tar cJf $NEW_SOURCE $DIRECTORY
-echo "$NEW_SOURCE is ready to use"
-

SPECS/gstreamer1-plugins-ugly-free.spec

@@ -1,54 +1,50 @@
 %global         majorminor 1.0
 
+# Only build amrnb/amrwbdec on fedora
+%if 0%{?fedora}
+%bcond_without amr
+%else
+%bcond_with amr
+%endif
+
 #global gitrel     140
 #global gitcommit  4ca3a22b6b33ad8be4383063e76f79c4d346535d
 #global shortcommit %(c=%{gitcommit}; echo ${c:0:5})
 
-# Only build mpeg2dec on Fedora
-%if 0%{?fedora}
-%bcond_without mpeg2
-%else
-%bcond_with mpeg2
-%endif
-
 Name:           gstreamer1-plugins-ugly-free
-Version:        1.16.1
+Version:        1.22.12
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        GStreamer streaming media framework "ugly" plugins
 
-License:        LGPLv2+ and LGPLv2
+License:        LGPL-2.0-or-later AND LGPL-2.1-or-later AND CC0-1.0
 URL:            http://gstreamer.freedesktop.org/
 %if 0%{?gitrel}
 # git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly
 # cd gst-plugins-ugly; git reset --hard %{gitcommit}; ./autogen.sh; make; make distcheck
-# modified with gst-p-ugly-cleanup.sh from SOURCE1
+Source0:        gst-plugins-ugly-%{version}.tar.xz
 %else
-# The source is:
+Source0:        https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.xz
-# http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{version}.tar.xz
-# modified with gst-p-ugly-cleanup.sh from SOURCE1
 %endif
-Source0:        gst-plugins-ugly-free-%{version}.tar.xz
+
-Source1:        gst-p-ugly-cleanup.sh
+BuildRequires:	meson >= 0.48.0
+BuildRequires:	gcc
 
 BuildRequires:  gstreamer1-devel >= %{version}
 BuildRequires:  gstreamer1-plugins-base-devel >= %{version}
 
 BuildRequires:  check
 BuildRequires:  gettext-devel
-BuildRequires:  gtk-doc
-BuildRequires:  automake autoconf libtool
 
 BuildRequires:  liba52-devel
 BuildRequires:  libcdio-devel
 BuildRequires:  libdvdread-devel
-BuildRequires:  python3-devel
-
-%if %{with mpeg2}
 BuildRequires:  libmpeg2-devel
+%if %{with amr}
+BuildRequires:  opencore-amr-devel
 %endif
 
-# when mpeg2dec was moved here from -ugly
+# when asfdemux, dvdlpcmdec, dvdsub, and realmedia were moved here
-Conflicts: gstreamer1-plugins-ugly < 1.16.0-2
+Conflicts: gstreamer1-plugins-ugly < 1.22.7-2
 
 %description
 GStreamer is a streaming media framework, based on graphs of elements which
@@ -76,21 +72,19 @@ is not fully compatible with LGPL.
 
 %build
 # libsidplay was removed as obsolete, not forbidden
-%configure --disable-silent-rules --disable-fatal-warnings \
+%meson \
-    --with-package-name="Fedora GStreamer-plugins-ugly package" \
+    -D package-name="Fedora GStreamer-plugins-ugly package" \
-    --with-package-origin="http://download.fedoraproject.org" \
+    -D package-origin="http://download.fedoraproject.org" \
-    --enable-debug --disable-static --enable-gtk-doc --enable-experimental \
+    %{!?with_amr:-D amrnb=disabled -D amrwbdec=disabled } \
-%if %{with mpeg2}
+    -D doc=disabled \
-    --enable-mpeg2dec \
+    -D sidplay=disabled \
-%else
+    -D x264=disabled \
-    --disable-mpeg2dec \
+    -D gpl=enabled
-%endif
-    --disable-amrnb --disable-amrwb --disable-sidplay --disable-x264
-make %{?_smp_mflags}
 
+%meson_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
 
 # Register as an AppStream component to be visible in the software center
 #
@@ -143,30 +137,171 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %files -f gst-plugins-ugly-%{majorminor}.lang
 %license COPYING
-%doc AUTHORS README REQUIREMENTS
+%doc AUTHORS NEWS README.md README.static-linking RELEASE REQUIREMENTS
 
 %{_datadir}/appdata/*.appdata.xml
 
 # Plugins without external dependencies
-%{_libdir}/gstreamer-%{majorminor}/libgstxingmux.so
+%{_libdir}/gstreamer-%{majorminor}/libgstasf.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdvdlpcmdec.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdvdsub.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrealmedia.so
 
 # Plugins with external dependencies
 %{_libdir}/gstreamer-%{majorminor}/libgsta52dec.so
 %{_libdir}/gstreamer-%{majorminor}/libgstcdio.so
 %{_libdir}/gstreamer-%{majorminor}/libgstdvdread.so
-%if %{with mpeg2}
 %{_libdir}/gstreamer-%{majorminor}/libgstmpeg2dec.so
+%if %{with amr}
+%{_libdir}/gstreamer-%{majorminor}/libgstamrnb.so
+%{_libdir}/gstreamer-%{majorminor}/libgstamrwbdec.so
+%{_datadir}/gstreamer-%{majorminor}/presets/GstAmrnbEnc.prs
 %endif
 
+%if 0
 %files devel
 %doc %{_datadir}/gtk-doc/html/gst-plugins-ugly-plugins-%{majorminor}
-
+%endif
 
 %changelog
-* Thu Nov 14 2019 Wim Taymans <wtaymans@redhat.com> - 1.16.1-1
+* Sat Nov 09 2024 Wim Taymans <wtaymans@redhat.com> - 1.22.12-3
+- Rebuild
+- Resolves: RHEL-38511, RHEL-41157
+
+* Fri Nov 08 2024 Wim Taymans <wtaymans@redhat.com> - 1.22.12-2
+- Rebuild
+- Resolves: RHEL-38511, RHEL-41157
+
+* Tue Apr 30 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.22.12-1
+- 1.22.12
+
+* Thu Apr 18 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.22.11-1
+- 1.22.11
+
+* Thu Jan 25 2024 Gwyn Ciesla <gwync@protonmail.com> - 1.22.9-1
+- 1.22.9
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Dec 20 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.8-2
+- Enable asfdemux, dvdlpcmdec, dvdsub, and realmedia plugins
+- Disable AMR plugins in RHEL builds
+- Resolves: rhbz#2236889
+
+* Mon Dec 18 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.8-1
+- 1.22.8
+
+* Tue Nov 14 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.7-1
+- 1.22.7
+
+* Fri Jul 21 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.5-1
+- Update to 1.22.5
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu May 25 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.3-1
+- Update to 1.22.3
+
+* Thu Apr 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.2-1
+- Update to 1.22.2
+
+* Wed Mar 15 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-2
+- Rebuild for new AMR plugins.
+
+* Mon Mar 13 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.1-1
+- Update to 1.22.1
+
+* Tue Jan 24 2023 Wim Taymans <wtaymans@redhat.com> - 1.22.0-1
+- Update to 1.22.0
+
+* Fri Jan 20 2023 Wim Taymans <wtaymans@redhat.com> - 1.21.90-1
+- Update to 1.21.90
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 11 2023 Wim Taymans <wtaymans@redhat.com> - 1.20.5-1
+- Update to 1.20.5
+
+* Thu Oct 13 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.4-1
+- Update to 1.20.4
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jul 18 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.3-1
+- Update to 1.20.3
+
+* Fri Feb 4 2022 Wim Taymans <wtaymans@redhat.com> - 1.20.0-1
+- Update to 1.20.0
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Nov 11 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.3-1
+- Update to 1.19.3
+
+* Thu Sep 23 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.2-1
+- Update to 1.19.2
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 03 2021 Wim Taymans <wtaymans@redhat.com> - 1.19.1-1
+- Update to 1.19.1
+
+* Tue Mar 16 2021 Wim Taymans <wtaymans@redhat.com> - 1.18.4-1
+- Update to 1.18.4
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 10 2020 Wim Taymans <wtaymans@redhat.com> - 1.18.2-1
+- Update to 1.18.2
+
+* Fri Oct 30 2020 Wim Taymans <wtaymans@redhat.com> - 1.18.1-1
+- Update to 1.18.1
+
+* Sat Oct 17 2020 Dominik Mierzejewski <rpm@greysector.net> - 1.18.0-2
+- rebuild for libdvdread-6.1 ABI bump
+
+* Tue Sep 8 2020 Wim Taymans <wtaymans@redhat.com> - 1.18.0-1
+- Update to 1.18.0
+
+* Fri Aug 21 2020 Wim Taymans <wtaymans@redhat.com> - 1.17.90-1
+- Update to 1.17.90
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 6 2020 Wim Taymans <wtaymans@redhat.com> - 1.17.2-1
+- Update to 1.17.2
+
+* Mon Jun 22 2020 Wim Taymans <wtaymans@redhat.com> - 1.17.1-1
+- Update to 1.17.1
+
+* Mon Mar 30 2020 Adrian Reber <adrian@lisas.de> - 1.16.2-3
+- Rebuilt for new libcdio (2.1.0)
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 2 2020 Wim Taymans <wtaymans@redhat.com> - 1.16.2-1
+- Update to 1.16.2
+
+* Fri Nov 15 2019 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> - 1.16.1-2
+- rebuild for libdvdread ABI bump
+
+* Tue Sep 24 2019 Wim Taymans <wtaymans@redhat.com> - 1.16.1-1
 - Update to 1.16.1
-- Only enable mpeg2dec on Fedora
+
-- Resolves: rhbz#1756299
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Mon May 20 2019 Rex Dieter <rdieter@fedoraproject.org> - 1.16.0-3
 - Conflicts: gstreamer1-plugins-ugly < 1.16.0-2
@@ -174,8 +309,38 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 * Mon May 13 2019 Yaakov Selkowitz <yselkowi@redhat.com> - 1.16.0-2
 - Enable mpeg2dec plugin (#1709470)
 
-* Mon Aug 13 2018 Troy Dawson <tdawson@redhat.com> - 1.14.0-2
+* Tue Apr 23 2019 Wim Taymans <wtaymans@redhat.com> - 1.16.0-1
-- Add BuildRequest python3-devel
+- Update to 1.16.0
+
+* Fri Mar 01 2019 Wim Taymans <wtaymans@redhat.com> - 1.15.2-1
+- Update to 1.15.2
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jan 25 2019 Wim Taymans <wtaymans@redhat.com> - 1.15.1-1
+- Update to 1.15.1
+
+* Wed Oct 03 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.4-1
+- Update to 1.14.4
+
+* Tue Sep 18 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.3-1
+- Update to 1.14.3
+
+* Mon Jul 23 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.2-1
+- Update to 1.14.2
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri May 25 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.1-3
+- rebuild (#1581325) to update Provides
+
+* Tue May 22 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.14.1-2
+- rebuild (file)
+
+* Mon May 21 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.1-1
+- Update to 1.14.1
 
 * Tue Mar 20 2018 Wim Taymans <wtaymans@redhat.com> - 1.14.0-1
 - Update to 1.14.0