From 8626f950d20f93b815fda66035befe45be91633d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 2 Nov 2020 00:08:38 +0100 Subject: [PATCH] Update to 1.18.1 --- .gitignore | 1 + gst-p-bad-cleanup.sh | 21 ++---- gst-plugins-bad-1.16.2-make43.patch | 91 -------------------------- mingw-gstreamer1-plugins-bad-free.spec | 56 ++++++++-------- sources | 2 +- 5 files changed, 33 insertions(+), 138 deletions(-) delete mode 100644 gst-plugins-bad-1.16.2-make43.patch diff --git a/.gitignore b/.gitignore index 5605db4..3134b41 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /gst-plugins-bad-free-1.14.1.tar.xz /gst-plugins-bad-free-1.14.2.tar.xz /gst-plugins-bad-free-1.16.2.tar.xz +/gst-plugins-bad-free-1.18.1.tar.xz diff --git a/gst-p-bad-cleanup.sh b/gst-p-bad-cleanup.sh index 23b8efa..2f8d8b7 100755 --- a/gst-p-bad-cleanup.sh +++ b/gst-p-bad-cleanup.sh @@ -41,6 +41,7 @@ dataurisrc dccp debugutils dtmf +dvbsubenc faceoverlay festival fieldanalysis @@ -84,6 +85,8 @@ proxy qtmux rawparse removesilence +rist +rtmp2 rtp rtpmux rtpvp8 @@ -96,7 +99,9 @@ smooth speed stereo subenc +switchbin timecode +transcode tta valve videofilters @@ -164,20 +169,6 @@ for subdir in gst ext sys; 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 - # Urgh - if test $MODULE = real ; then - grep -v "AG_GST_DISABLE_PLUGIN(real)" configure.ac > configure.ac.new && mv configure.ac.new configure.ac - fi - 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 @@ -197,8 +188,6 @@ if test "x$unknown" != "x"; then exit 1 fi -autoreconf - popd > /dev/null tar cJf $NEW_SOURCE $DIRECTORY diff --git a/gst-plugins-bad-1.16.2-make43.patch b/gst-plugins-bad-1.16.2-make43.patch deleted file mode 100644 index fb43ae4..0000000 --- a/gst-plugins-bad-1.16.2-make43.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- gst-plugins-bad-1.16.2/common/glib-gen.mak -+++ gst-plugins-bad-1.16.2/common/glib-gen.mak -@@ -1,11 +1,13 @@ - # these are the variables your Makefile.am should set - # the example is based on the colorbalance interface - -+H := \# -+ - #glib_enum_headers=$(colorbalance_headers) - #glib_enum_define=GST_COLOR_BALANCE - #glib_enum_prefix=gst_color_balance - --enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") - - # these are all the rules generating the relevant files - %-marshal.h: %-marshal.list ---- gst-plugins-bad-1.16.2/common/gst-glib-gen.mak -+++ gst-plugins-bad-1.16.2/common/gst-glib-gen.mak -@@ -1,14 +1,16 @@ - # these are the variables your Makefile.am should set - # the example is based on the colorbalance interface - -+H := \# -+ - #glib_enum_headers=$(colorbalance_headers) - #glib_enum_define=GST_COLOR_BALANCE - #glib_gen_prefix=gst_color_balance - #glib_gen_basename=colorbalance - #glib_gen_decl_banner=GST_EXPORT --#glib_gen_decl_include=\#include -+#glib_gen_decl_include=$(H)include - --enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\") -+enum_headers=$(foreach h,$(glib_enum_headers),\n$(H)include \"$(h)\") - - # these are all the rules generating the relevant files - $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list ---- gst-plugins-bad-1.16.2/gst-libs/gst/interfaces/Makefile.am -+++ gst-plugins-bad-1.16.2/gst-libs/gst/interfaces/Makefile.am -@@ -5,13 +5,15 @@ - headers_photography = \ - photography.h - -+H := \# -+ - # variables used for enum/marshal generation - glib_enum_headers=$(headers_photography) - glib_enum_define=GST_PHOTOGRAPHY - glib_gen_prefix=gst_photography - glib_gen_basename=photography - glib_gen_decl_banner=GST_PHOTOGRAPHY_API --glib_gen_decl_include=\#include -+glib_gen_decl_include=$(H)include - - built_sources = \ - photography-enumtypes.c ---- gst-plugins-bad-1.16.2/gst-libs/gst/mpegts/Makefile.am -+++ gst-plugins-bad-1.16.2/gst-libs/gst/mpegts/Makefile.am -@@ -47,11 +47,13 @@ - gst-scte-section.h \ - gst-dvb-descriptor.h - -+H := \# -+ - glib_enum_define=GST_MPEGTS - glib_gen_prefix=gst_mpegts - glib_gen_basename=gstmpegts - glib_gen_decl_banner=GST_MPEGTS_API --glib_gen_decl_include=\#include -+glib_gen_decl_include=$(H)include - - BUILT_SOURCES = gstmpegts-enumtypes.c gstmpegts-enumtypes.h - nodist_libgstmpegts_@GST_API_VERSION@_la_SOURCES = gstmpegts-enumtypes.c ---- gst-plugins-bad-1.16.2/gst-libs/gst/webrtc/Makefile.am -+++ gst-plugins-bad-1.16.2/gst-libs/gst/webrtc/Makefile.am -@@ -1,11 +1,13 @@ - lib_LTLIBRARIES = libgstwebrtc-@GST_API_VERSION@.la - -+H := \# -+ - glib_enum_headers = dtlstransport.h icetransport.h rtptransceiver.h webrtc_fwd.h - glib_enum_define = GST_WEBRTC - glib_gen_prefix = gst_webrtc - glib_gen_basename = webrtc - glib_gen_decl_banner=GST_WEBRTC_API --glib_gen_decl_include=\#include -+glib_gen_decl_include=$(H)include - - built_sources = webrtc-enumtypes.c - built_headers = webrtc-enumtypes.h diff --git a/mingw-gstreamer1-plugins-bad-free.spec b/mingw-gstreamer1-plugins-bad-free.spec index 4d7db7f..e03ab8b 100644 --- a/mingw-gstreamer1-plugins-bad-free.spec +++ b/mingw-gstreamer1-plugins-bad-free.spec @@ -3,8 +3,8 @@ %global api_version 1.0 Name: mingw-gstreamer1-plugins-bad-free -Version: 1.16.2 -Release: 3%{?dist} +Version: 1.18.1 +Release: 1%{?dist} Summary: Cross compiled GStreamer1 plug-ins "bad" # The freeze and nfs plugins are LGPLv2 (only) @@ -16,12 +16,12 @@ URL: http://gstreamer.freedesktop.org/ Source0: gst-plugins-bad-free-%{version}.tar.xz Source1: gst-p-bad-cleanup.sh -# Fix build with Make 4.3 -Patch0: gst-plugins-bad-1.16.2-make43.patch - BuildArch: noarch -BuildRequires: autoconf automake libtool gettext-devel +BuildRequires: gettext +BuildRequires: gcc-c++ +BuildRequires: meson + BuildRequires: mingw32-filesystem >= 95 BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw32-gcc @@ -113,41 +113,34 @@ well enough, or the code is not of good enough quality. %build -autoreconf -i - # chromaprint was enabled in the !mingw package in 6eadf04 # openal, openjpeg, ofa, webp were enabled in the !mingw package in c609b28 # there are mingw-openjpeg and mingw-webp packages available # uvch264 was enabled in the !mingw package in fcee991 # curl and winks are disabled only in the mingw package -%mingw_configure \ - --disable-silent-rules --disable-fatal-warnings \ - --with-package-name="Fedora Mingw GStreamer-plugins-bad package" \ - --with-package-origin="http://download.fedoraproject.org" \ - --disable-examples \ - --enable-debug --disable-static --disable-gtk-doc --enable-experimental \ - --disable-dts --disable-faac --disable-faad --disable-nas \ - --disable-mimic --disable-libmms --disable-mpeg2enc --disable-mplex \ - --disable-neon --disable-rtmp --disable-xvid \ - --disable-flite --disable-mpg123 --disable-sbc --disable-opencv \ - --disable-spandsp --disable-voamrwbenc --disable-x265 \ - --disable-chromaprint \ - --disable-openal --disable-openjpeg --disable-ofa --disable-webp \ - --disable-uvch264 \ - --disable-curl \ - --disable-winks +%mingw_meson \ + -Dpackage-name="Fedora Mingw GStreamer-plugins-bad package" \ + -Dpackage-origin="http://download.fedoraproject.org" \ + -Dexamples=disabled \ + -Ddts=disabled \ + -Dfaac=disabled -Dfaad=disabled \ + -Dlibmms=disabled -Dmpeg2enc=disabled -Dmplex=disabled \ + -Dneon=disabled -Drtmp=disabled \ + -Dflite=disabled -Dsbc=disabled -Dopencv=disabled \ + -Dspandsp=disabled -Dvoamrwbenc=disabled -Dx265=disabled \ + -Dchromaprint=disabled \ + -Dopenal=disabled -Dopenjpeg=disabled -Dofa=disabled -Dwebp=disabled \ + -Duvch264=disabled -Dcurl=disabled -Dwinks=disabled -Ddvbsuboverlay=disabled -%mingw_make %{?_smp_mflags} +%mingw_ninja %install -%mingw_make install DESTDIR=%{buildroot} +%mingw_ninja_install # Clean out files that should not be part of the rpm. -rm -f %{buildroot}%{mingw32_libdir}/gstreamer-%{api_version}/*.a -rm -f %{buildroot}%{mingw64_libdir}/gstreamer-%{api_version}/*.a - -find %{buildroot} -name '*.la' -delete +rm -f %{buildroot}%{mingw32_libdir}/gstreamer-%{api_version}/*.dll.a +rm -f %{buildroot}%{mingw64_libdir}/gstreamer-%{api_version}/*.dll.a %mingw_find_lang gstreamer1-plugins-bad-free --all-name @@ -421,6 +414,9 @@ find %{buildroot} -name '*.la' -delete %changelog +* Mon Nov 02 2020 Sandro Mani - 1.18.1-1 +- Update to 1.18.1 + * Wed Aug 12 13:38:11 GMT 2020 Sandro Mani - 1.16.2-3 - Rebuild (mingw-gettext) diff --git a/sources b/sources index 50e80bc..9dc804a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-plugins-bad-free-1.16.2.tar.xz) = 6115773c1bb2a2689860fd153d5c84fee9337338d36076f44f772fd6017e04f5843d51e76db63d5517199dcb9310c0edb33eb65269a2962e292cc84d4fa560a7 +SHA512 (gst-plugins-bad-free-1.18.1.tar.xz) = e0993729e9f1b1c3ceccc39de75162e7102fb961ba79e558e16c1ab14ff5fe830953eaf8c367f21368de9f0250147eabab3289f26a94e50ea9dace8c8f29e8b1