diff --git a/.gitignore b/.gitignore index 43383de..33b6900 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /gst-plugins-ugly-free-1.16.0.tar.xz /gst-plugins-ugly-free-1.16.1.tar.xz /gst-plugins-ugly-free-1.16.2.tar.xz +/gst-plugins-ugly-free-1.17.1.tar.xz diff --git a/gst-p-ugly-cleanup.sh b/gst-p-ugly-cleanup.sh index 6fc69cf..2e1a149 100755 --- a/gst-p-ugly-cleanup.sh +++ b/gst-p-ugly-cleanup.sh @@ -72,16 +72,6 @@ for subdir in gst ext; do 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 @@ -93,12 +83,6 @@ for subdir in gst ext; do 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 @@ -107,8 +91,6 @@ if test "x$unknown" != "x"; then exit 1 fi -autoreconf - popd > /dev/null tar cJf $NEW_SOURCE $DIRECTORY diff --git a/gstreamer1-plugins-ugly-free.spec b/gstreamer1-plugins-ugly-free.spec index 5280df0..a76e808 100644 --- a/gstreamer1-plugins-ugly-free.spec +++ b/gstreamer1-plugins-ugly-free.spec @@ -5,8 +5,8 @@ #global shortcommit %(c=%{gitcommit}; echo ${c:0:5}) Name: gstreamer1-plugins-ugly-free -Version: 1.16.2 -Release: 3%{?dist} +Version: 1.17.1 +Release: 1%{?dist} Summary: GStreamer streaming media framework "ugly" plugins License: LGPLv2+ and LGPLv2 @@ -23,12 +23,14 @@ URL: http://gstreamer.freedesktop.org/ 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 @@ -65,16 +67,18 @@ is not fully compatible with LGPL. %build # libsidplay was removed as obsolete, not forbidden -%configure --disable-silent-rules --disable-fatal-warnings \ - --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-sidplay --disable-x264 -make %{?_smp_mflags} +%meson \ + -D package-name="Fedora GStreamer-plugins-ugly package" \ + -D package-origin="http://download.fedoraproject.org" \ + -D doc=disabled \ + -D amrnb=disabled -D amrwbdec=disabled -D sidplay=disabled \ + -D x264=disabled -D asfdemux=disabled -D dvdlpcmdec=disabled \ + -D dvdsub=disabled -D realmedia=disabled +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT +%meson_install # Register as an AppStream component to be visible in the software center # @@ -140,11 +144,15 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/gstreamer-%{majorminor}/libgstdvdread.so %{_libdir}/gstreamer-%{majorminor}/libgstmpeg2dec.so +%if 0 %files devel %doc %{_datadir}/gtk-doc/html/gst-plugins-ugly-plugins-%{majorminor} - +%endif %changelog +* Mon Jun 22 2020 Wim Taymans - 1.17.1-1 +- Update to 1.17.1 + * Mon Mar 30 2020 Adrian Reber - 1.16.2-3 - Rebuilt for new libcdio (2.1.0) diff --git a/sources b/sources index 2c47eba..a73c90e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-plugins-ugly-free-1.16.2.tar.xz) = 3c639d4e3e36e1c195a0a1df8a052be8721517b617963e6089dd512fa1c11f6c5548c5fb4c484f4826d54e7b8588c3cd71eb52dcd60145d8ce5966d6920837f0 +SHA512 (gst-plugins-ugly-free-1.17.1.tar.xz) = 0e55be436ec709730b4a987f38a7161946c5dab4f163793ad2ca0957ff4930f7fab353dee8f26fb41fd87bee4379e0fa1d86bd15c1e6c8a77a52a8fe288c39e4