commit 4a2549364a6a8768427849a9e6b8f350f587729b Author: Vitaly Zaitsev <vitaly(a)easycoding.org&gt; Date: Fri Jul 22 14:35:02 2022 +0200 Reverted el9 commits from Rawhide. This reverts commit 9764e8b0913eb1d78633421c3242d546254d696b. This reverts commit 05cdf3f675c7cc874c09efcc58861d1c5838b464. This reverts commit c0f0f5ab48202c9f384fd103f6bbdf695eeba648. This reverts commit ff35b27a22feafaa3a7960907dd5a2f286ee44a8. This reverts commit 19ae9fa10d242afff0415e6f984211eaa220acd6. This reverts commit 8240b8cefe19a15267d52699f24392c9fe82186a. This reverts commit 411e9a31c76e7da64cbe4682cb6090389ee6679a. This reverts commit 2bf7ab0540f78697e99a09df36255bc6adc14b78. This reverts commit 430a35c170fd6d7bc2569e5bdaee2a72215f1762. This reverts commit 940554c65b0f9c5ae309f4a007d96dc586702f58. This reverts commit fa7357055457dcae4ea663797659df2ca98b7295. This reverts commit 3b21b8b0a5df40a6bbacc60402f42520a59a6503. This reverts commit 4d9c4690b17927c16ba616f6b6e704a2f65d5069. build_what_we_need_only.patch | 37 +++++++++++++++++---------------- gstreamer1-plugins-bad-freeworld.spec | 39 +++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 55 insertions(+), 23 deletions(-) --- diff --git a/build_what_we_need_only.patch b/build_what_we_need_only.patch index 562996b..8b6f50d 100644 --- a/build_what_we_need_only.patch +++ b/build_what_we_need_only.patch @@ -1,7 +1,7 @@ -diff -uNrp a/ext/meson.build b/ext/meson.build ---- a/ext/meson.build 2020-08-20 16:14:26.000000000 +0100 -+++ b/ext/meson.build 2020-08-23 14:38:26.171082319 +0100 -@@ -1,69 +1,10 @@ +--- ./ext/meson.build.orig 2021-09-23 01:34:51.166608300 +0100 ++++ ./ext/meson.build 2021-10-09 17:52:41.117762463 +0100 +@@ -1,74 +1,9 @@ +-subdir('aes') -subdir('assrender') -subdir('aom') -subdir('avtp') @@ -22,13 +22,15 @@ diff -uNrp a/ext/meson.build b/ext/meson.build -subdir('flite') -subdir('fluidsynth') -subdir('gme') +-subdir('gs') -subdir('gsm') -subdir('hls') -subdir('iqa') +-subdir('isac') -subdir('kate') -subdir('ladspa') +-subdir('ldac') subdir('libde265') - subdir('libmms') -subdir('lv2') -subdir('mdns') -subdir('modplug') @@ -36,8 +38,9 @@ diff -uNrp a/ext/meson.build b/ext/meson.build subdir('mplex') -subdir('musepack') -subdir('neon') --subdir('ofa') +-subdir('onnx') -subdir('openal') +-subdir('openaptx') -subdir('opencv') -subdir('openexr') -subdir('openh264') @@ -45,6 +48,7 @@ diff -uNrp a/ext/meson.build b/ext/meson.build -subdir('openmpt') -subdir('openni2') -subdir('opus') +-subdir('qroverlay') -subdir('resindvd') -subdir('rsvg') subdir('rtmp') @@ -71,15 +75,14 @@ diff -uNrp a/ext/meson.build b/ext/meson.build subdir('x265') -subdir('zxing') -subdir('zbar') - diff -uNrp a/gst/meson.build b/gst/meson.build ---- a/gst/meson.build 2020-08-20 16:14:27.000000000 +0100 -+++ b/gst/meson.build 2020-08-23 14:38:26.172082317 +0100 +--- a/gst/meson.build 2021-06-01 00:14:25.000000000 +0100 ++++ b/gst/meson.build 2021-06-08 13:30:36.516757191 +0100 @@ -1,18 +1,4 @@ -foreach plugin : ['accurip', 'adpcmdec', 'adpcmenc', 'aiff', 'asfmux', - 'audiobuffersplit', 'audiofxbad', 'audiomixmatrix', - 'audiolatency', 'audiovisualizers', 'autoconvert', 'bayer', -- 'camerabin2', 'coloreffects', 'debugutils', 'dvbsubenc', +- 'camerabin2', 'codecalpha', 'coloreffects', 'debugutils', 'dvbsubenc', - 'dvbsuboverlay', 'dvdspu', 'faceoverlay', 'festival', - 'fieldanalysis', 'freeverb', 'frei0r', 'gaudieffects', 'gdp', - 'geometrictransform', 'id3tag', 'inter', 'interlace', @@ -96,9 +99,9 @@ diff -uNrp a/gst/meson.build b/gst/meson.build subdir(plugin) endif diff -uNrp a/meson.build b/meson.build ---- a/meson.build 2020-08-20 16:14:27.000000000 +0100 -+++ b/meson.build 2020-08-23 14:38:26.173082315 +0100 -@@ -279,6 +279,8 @@ +--- a/meson.build 2021-06-01 00:14:25.000000000 +0100 ++++ b/meson.build 2021-06-08 13:32:38.208390976 +0100 +@@ -292,6 +292,8 @@ gstapp_dep = dependency('gstreamer-app-1 fallback : ['gst-plugins-base', 'app_dep']) gstaudio_dep = dependency('gstreamer-audio-1.0', version : gst_req, fallback : ['gst-plugins-base', 'audio_dep']) @@ -107,9 +110,9 @@ diff -uNrp a/meson.build b/meson.build gstfft_dep = dependency('gstreamer-fft-1.0', version : gst_req, fallback : ['gst-plugins-base', 'fft_dep']) gstriff_dep = dependency('gstreamer-riff-1.0', version : gst_req, -@@ -461,14 +463,9 @@ - plugins_pkgconfig_install_dir = disabler() - endif +@@ -494,13 +496,9 @@ pkgconfig.generate( + + gpl_allowed = get_option('gpl').allowed() -subdir('gst-libs') subdir('gst') @@ -118,8 +121,6 @@ diff -uNrp a/meson.build b/meson.build -subdir('tests') subdir('data') -subdir('tools') --subdir('pkgconfig') if have_orcc update_orc_dist_files = find_program('scripts/update-orc-dist-files.py') - diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec index ad0ab91..40e6da0 100644 --- a/gstreamer1-plugins-bad-freeworld.spec +++ b/gstreamer1-plugins-bad-freeworld.spec @@ -1,6 +1,11 @@ + +# gstreamer1.prov is broken and hangs, workarround it +%global __gstreamer1_provides %{nil} + Summary: GStreamer 1.0 streaming media framework "bad" plug-ins Name: gstreamer1-plugins-bad-freeworld -Version: 1.18.4 +Epoch: 1 +Version: 1.20.0 Release: 1%{?dist} License: LGPLv2+ URL: https://gstreamer.freedesktop.org/ @@ -17,9 +22,10 @@ BuildRequires: libXt-devel BuildRequires: orc-devel BuildRequires: libdca-devel BuildRequires: faad2-devel -BuildRequires: libmms-devel BuildRequires: mjpegtools-devel >= 2.0.0 BuildRequires: librtmp-devel +BuildRequires: openssl-devel + %ifarch x86_64 BuildRequires: svt-hevc-devel Provides: gstreamer1-svt-hevc = %{version}-%{release} @@ -54,6 +60,7 @@ well enough, or the code is not of good enough quality. -D doc=disabled \ -D introspection=disabled \ -D examples=disabled \ + -D gpl=enabled \ %ifnarch x86_64 -D svthevcenc=disabled \ %endif @@ -65,8 +72,9 @@ well enough, or the code is not of good enough quality. %install %meson_install - rm -rf %{buildroot}%{_datadir}/gstreamer-1.0/encoding-profiles/ +rm -rf %{buildroot}%{_libdir}/pkgconfig + %files %doc AUTHORS NEWS README RELEASE @@ -83,7 +91,6 @@ rm -rf %{buildroot}%{_datadir}/gstreamer-1.0/encoding-profiles/ %{_libdir}/gstreamer-1.0/libgstde265.so %{_libdir}/gstreamer-1.0/libgstdtsdec.so %{_libdir}/gstreamer-1.0/libgstfaad.so -%{_libdir}/gstreamer-1.0/libgstmms.so %{_libdir}/gstreamer-1.0/libgstmpeg2enc.so %{_libdir}/gstreamer-1.0/libgstmplex.so %{_libdir}/gstreamer-1.0/libgstrtmp.so @@ -96,6 +103,30 @@ rm -rf %{buildroot}%{_datadir}/gstreamer-1.0/encoding-profiles/ %changelog +* Sun Feb 06 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 1:1.20.0-1 +- Update gstreamer1-plugins-bad-freeworld to 1.20.0 + +* Sun Nov 14 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1:1.19.3-1 +- Update gstreamer1-plugins-bad-freeworld to 1.19.3 + +* Sat Oct 09 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1:1.19.2-1 +- Update gstreamer1-plugins-bad-freeworld to 1.19.2 + +* Sat Oct 09 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1:1.19.1-3 +- gstreamer1.prov is broken and hangs, workarround it + +* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1:1.19.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jun 08 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.19.1-1 +- Update + +* Sat Apr 17 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.18.4-3 +- Rebuild for new mjpegtools + +* Wed Apr 14 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.18.4-2 +- Rebuild for new x265 + * Wed Mar 17 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.18.4-1 - 1.18.4 diff --git a/sources b/sources index 0fb6091..a922307 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-plugins-bad-1.18.4.tar.xz) = 02123e054419f5ce6ca2ebe0bdf23572269ea4120bf463b4d672efbe5d9e5d417d4d711cc80094be974c4569f754d8b2ad93f59b827e3b018d450582834cb125 +SHA512 (gst-plugins-bad-1.20.0.tar.xz) = d79fedba96517c25d2ba3925405933671fa05e350b8e133277a7c1d509e08a49ceeb50c016e23e798667fa0b09783105914f06538bdcaae969fdba8ac385a51b