Merge and update to 1.22.1-1

1 year ago · d6dd4f4e35
parent 774d3016e9 df48b66956
commit d6dd4f4e35
4 changed files with 80 additions and 26 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/gst-plugins-bad-1.18.4.tar.xz
+SOURCES/gst-plugins-bad-1.22.1.tar.xz
--- a/.gstreamer1-plugins-bad-freeworld.metadata
+++ b/.gstreamer1-plugins-bad-freeworld.metadata
@ -1 +1 @@
-1d7205aab58fed7ede5992f9f42f964842c0379c  SOURCES/gst-plugins-bad-1.18.4.tar.xz
+d61beffd9936a47ed32b0c5c93f50a10adfede3e  SOURCES/gst-plugins-bad-1.22.1.tar.xz
--- a/SOURCES/build_what_we_need_only.patch
+++ b/SOURCES/build_what_we_need_only.patch
@ -1,7 +1,8 @@
 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 @@
+--- a/ext/meson.build	2023-01-23 19:29:34.000000000 +0000
+++ b/ext/meson.build	2023-02-19 12:17:51.741137633 +0000
+@@ -1,75 +1,9 @@
+-subdir('aes')
 -subdir('assrender')
 -subdir('aom')
 -subdir('avtp')
@ -22,13 +23,16 @@ diff -uNrp a/ext/meson.build b/ext/meson.build
 -subdir('flite')
 -subdir('fluidsynth')
 -subdir('gme')
+-subdir('gs')
 -subdir('gsm')
+-subdir('gtk')
 -subdir('hls')
 -subdir('iqa')
+-subdir('isac')
 -subdir('kate')
 -subdir('ladspa')
+-subdir('ldac')
 subdir('libde265')
- subdir('libmms')
 -subdir('lv2')
 -subdir('mdns')
 -subdir('modplug')
@ -36,8 +40,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 +50,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 +77,15 @@ 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
-@@ -1,18 +1,4 @@
+--- a/gst/meson.build	2023-01-23 19:29:34.000000000 +0000
+++ b/gst/meson.build	2023-02-19 12:17:51.742137630 +0000
+@@ -1,19 +1,4 @@
 -foreach plugin : ['accurip', 'adpcmdec', 'adpcmenc', 'aiff', 'asfmux',
 -                  'audiobuffersplit', 'audiofxbad', 'audiomixmatrix',
 -                  'audiolatency', 'audiovisualizers', 'autoconvert', 'bayer',
-                  'camerabin2', 'coloreffects', 'debugutils', 'dvbsubenc',
+-                  'camerabin2', 'codecalpha', 'codectimestamper', 'coloreffects',
+-                  'debugutils', 'dvbsubenc',
 -                  'dvbsuboverlay', 'dvdspu', 'faceoverlay', 'festival',
 -                  'fieldanalysis', 'freeverb', 'frei0r', 'gaudieffects', 'gdp',
 -                  'geometrictransform', 'id3tag', 'inter', 'interlace',
@ -96,9 +102,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	2023-01-23 19:29:34.000000000 +0000
+++ b/meson.build	2023-02-19 12:17:51.743137626 +0000
+@@ -309,6 +309,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 +113,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
+@@ -540,13 +542,9 @@ pkgconfig.generate(
+ 
+ gpl_allowed = get_option('gpl').allowed()
 
 -subdir('gst-libs')
 subdir('gst')
@ -118,8 +124,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')
-
--- a/SPECS/gstreamer1-plugins-bad-freeworld.spec
+++ b/SPECS/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.22.1
 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,11 +72,12 @@ 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
+%doc AUTHORS NEWS README.md README.static-linking RELEASE REQUIREMENTS
 %license COPYING
 # Take the whole dir for proper dir ownership (shared with other plugin pkgs)
 %{_datadir}/gstreamer-1.0
@ -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,9 +103,52 @@ rm -rf %{buildroot}%{_datadir}/gstreamer-1.0/encoding-profiles/


 %changelog
-* Mon Oct 30 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.18.4-1
+* Mon Oct 30 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.22.1-1
 - Rebuilt for MSVSphere 9.2

+* Wed Mar 29 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1:1.22.1-1
+- Updated to version 1.22.1.
+
+* Sun Feb 19 2023 Leigh Scott <leigh123linux@gmail.com> - 1:1.22.0-1
+- Update gstreamer1-plugins-ugly to 1.22.0
+
+* Thu Jan 12 2023 Vitaly Zaitsev <vitaly@easycoding.org> - 1:1.20.5-1
+- Updated to version 1.20.5.
+
+* Sat Nov 12 2022 Leigh Scott <leigh123linux@gmail.com> - 1:1.20.4-1
+- Updated to version 1.20.4
+
+* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1:1.20.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+  5.1
+
+* Fri Jul 22 2022 Vitaly Zaitsev <vitaly@easycoding.org> - 1:1.20.3-1
+- Updated to version 1.20.3.
+
+* Sun Feb 06 2022 Sérgio Basto <sergio@serjux.com> - 1:1.20.0-1
+- Update gstreamer1-plugins-bad-freeworld to 1.20.0
+
+* Sun Nov 14 2021 Sérgio Basto <sergio@serjux.com> - 1:1.19.3-1
+- Update gstreamer1-plugins-bad-freeworld to 1.19.3
+
+* Sat Oct 09 2021 Sérgio Basto <sergio@serjux.com> - 1:1.19.2-1
+- Update gstreamer1-plugins-bad-freeworld to 1.19.2
+
+* Sat Oct 09 2021 Sérgio Basto <sergio@serjux.com> - 1:1.19.1-3
+- gstreamer1.prov is broken and hangs, workarround it
+
+* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:1.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 08 2021 Leigh Scott <leigh123linux@gmail.com> - 1.19.1-1
+- Update
+
+* Sat Apr 17 2021 Leigh Scott <leigh123linux@gmail.com> - 1.18.4-3
+- Rebuild for new mjpegtools
+
+* Wed Apr 14 2021 Leigh Scott <leigh123linux@gmail.com> - 1.18.4-2
+- Rebuild for new x265
+
 * Wed Mar 17 2021 Leigh Scott <leigh123linux@gmail.com> - 1.18.4-1
 - 1.18.4