From f2e8d80474dc09e9c1d8f23039cc19dda3e82d4a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 21 2020 21:08:06 +0000 Subject: import gstreamer1-plugins-ugly-free-1.16.1-1.el8 --- diff --git a/.gitignore b/.gitignore index a1d0c52..94c5c4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gst-plugins-ugly-free-1.14.0.tar.xz +SOURCES/gst-plugins-ugly-free-1.16.1.tar.xz diff --git a/.gstreamer1-plugins-ugly-free.metadata b/.gstreamer1-plugins-ugly-free.metadata index 937c632..5b11ebb 100644 --- a/.gstreamer1-plugins-ugly-free.metadata +++ b/.gstreamer1-plugins-ugly-free.metadata @@ -1 +1 @@ -e1afa14dd7ab880afa494c8a6bdc3ca496337358 SOURCES/gst-plugins-ugly-free-1.14.0.tar.xz +404e394c06d39a1bfeae0351006232cce5fbbf64 SOURCES/gst-plugins-ugly-free-1.16.1.tar.xz diff --git a/SPECS/gstreamer1-plugins-ugly-free.spec b/SPECS/gstreamer1-plugins-ugly-free.spec index 1336fec..f6b5fa5 100644 --- a/SPECS/gstreamer1-plugins-ugly-free.spec +++ b/SPECS/gstreamer1-plugins-ugly-free.spec @@ -4,9 +4,16 @@ #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.14.0 -Release: 2%{?dist} +Version: 1.16.1 +Release: 1%{?dist} Summary: GStreamer streaming media framework "ugly" plugins License: LGPLv2+ and LGPLv2 @@ -36,6 +43,13 @@ BuildRequires: libcdio-devel BuildRequires: libdvdread-devel BuildRequires: python3-devel +%if %{with mpeg2} +BuildRequires: libmpeg2-devel +%endif + +# when mpeg2dec was moved here from -ugly +Conflicts: gstreamer1-plugins-ugly < 1.16.0-2 + %description GStreamer is a streaming media framework, based on graphs of elements which operate on media data. @@ -66,8 +80,12 @@ is not fully compatible with LGPL. --with-package-name="Fedora GStreamer-plugins-ugly package" \ --with-package-origin="http://download.fedoraproject.org" \ --enable-debug --disable-static --enable-gtk-doc --enable-experimental \ - --disable-amrnb --disable-amrwb \ - --disable-mpeg2dec --disable-sidplay --disable-x264 +%if %{with mpeg2} + --enable-mpeg2dec \ +%else + --disable-mpeg2dec \ +%endif + --disable-amrnb --disable-amrwb --disable-sidplay --disable-x264 make %{?_smp_mflags} @@ -136,12 +154,26 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/gstreamer-%{majorminor}/libgsta52dec.so %{_libdir}/gstreamer-%{majorminor}/libgstcdio.so %{_libdir}/gstreamer-%{majorminor}/libgstdvdread.so +%if %{with mpeg2} +%{_libdir}/gstreamer-%{majorminor}/libgstmpeg2dec.so +%endif %files devel %doc %{_datadir}/gtk-doc/html/gst-plugins-ugly-plugins-%{majorminor} %changelog +* Thu Nov 14 2019 Wim Taymans - 1.16.1-1 +- Update to 1.16.1 +- Only enable mpeg2dec on Fedora +- Resolves: rhbz#1756299 + +* Mon May 20 2019 Rex Dieter - 1.16.0-3 +- Conflicts: gstreamer1-plugins-ugly < 1.16.0-2 + +* Mon May 13 2019 Yaakov Selkowitz - 1.16.0-2 +- Enable mpeg2dec plugin (#1709470) + * Mon Aug 13 2018 Troy Dawson - 1.14.0-2 - Add BuildRequest python3-devel