- updated to 1.16.3

- removed obsolete make,no-common patches
- versioned Obsoletes

diff --git a/gstreamer-make.patch b/gstreamer-make.patch
deleted file mode 100644 (file)
index 75ddfa9..0000000
--- a/gstreamer-make.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-make 4.3 no longer recognizes '#' in macros as comment; use workaround to be compatible with old and current make
---- gstreamer-1.16.2/common/gst-glib-gen.mak.orig      2019-04-19 11:16:18.000000000 +0200
-+++ gstreamer-1.16.2/common/gst-glib-gen.mak   2020-03-28 20:29:17.924914360 +0100
-@@ -8,7 +8,8 @@
- #glib_gen_decl_banner=GST_EXPORT
- #glib_gen_decl_include=\#include <gst/foo/foo-prelude.h>
- 
--enum_headers=$(foreach h,$(glib_enum_headers),\n\#include \"$(h)\")
-+gst_hash=\#
-+enum_headers=$(foreach h,$(glib_enum_headers),\n$(gst_hash)include \"$(h)\")
- 
- # these are all the rules generating the relevant files
- $(glib_gen_basename)-marshal.h: $(glib_gen_basename)-marshal.list

diff --git a/gstreamer-plugins-bad-no-common.patch b/gstreamer-plugins-bad-no-common.patch
deleted file mode 100644 (file)
index 46c57ce..0000000
--- a/gstreamer-plugins-bad-no-common.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- gst-plugins-bad-1.16.2/ext/lv2/gstlv2.h.orig       2019-04-19 11:16:36.000000000 +0200
-+++ gst-plugins-bad-1.16.2/ext/lv2/gstlv2.h    2020-07-08 21:00:03.729990534 +0200
-@@ -28,40 +28,40 @@
- 
- #include "gstlv2utils.h"
- 
--LilvWorld *world;
--LilvNode *atom_class;
--LilvNode *audio_class;
--LilvNode *control_class;
--LilvNode *cv_class;
--LilvNode *event_class;
--LilvNode *input_class;
--LilvNode *output_class;
--LilvNode *preset_class;
--LilvNode *state_iface;
--LilvNode *state_uri;
--
--LilvNode *integer_prop;
--LilvNode *toggled_prop;
--LilvNode *designation_pred;
--LilvNode *in_place_broken_pred;
--LilvNode *optional_pred;
--LilvNode *group_pred;
--LilvNode *supports_event_pred;
--LilvNode *label_pred;
--
--LilvNode *center_role;
--LilvNode *left_role;
--LilvNode *right_role;
--LilvNode *rear_center_role;
--LilvNode *rear_left_role;
--LilvNode *rear_right_role;
--LilvNode *lfe_role;
--LilvNode *center_left_role;
--LilvNode *center_right_role;
--LilvNode *side_left_role;
--LilvNode *side_right_role;
-+extern LilvWorld *world;
-+extern LilvNode *atom_class;
-+extern LilvNode *audio_class;
-+extern LilvNode *control_class;
-+extern LilvNode *cv_class;
-+extern LilvNode *event_class;
-+extern LilvNode *input_class;
-+extern LilvNode *output_class;
-+extern LilvNode *preset_class;
-+extern LilvNode *state_iface;
-+extern LilvNode *state_uri;
-+
-+extern LilvNode *integer_prop;
-+extern LilvNode *toggled_prop;
-+extern LilvNode *designation_pred;
-+extern LilvNode *in_place_broken_pred;
-+extern LilvNode *optional_pred;
-+extern LilvNode *group_pred;
-+extern LilvNode *supports_event_pred;
-+extern LilvNode *label_pred;
-+
-+extern LilvNode *center_role;
-+extern LilvNode *left_role;
-+extern LilvNode *right_role;
-+extern LilvNode *rear_center_role;
-+extern LilvNode *rear_left_role;
-+extern LilvNode *rear_right_role;
-+extern LilvNode *lfe_role;
-+extern LilvNode *center_left_role;
-+extern LilvNode *center_right_role;
-+extern LilvNode *side_left_role;
-+extern LilvNode *side_right_role;
- 
--GstStructure *lv2_meta_all;
-+extern GstStructure *lv2_meta_all;
- 
- void gst_lv2_filter_register_element (GstPlugin *plugin,
-                                       GstStructure * lv2_meta);
---- gst-plugins-bad-1.16.2/ext/lv2/gstlv2.c.orig       2019-04-19 11:16:36.000000000 +0200
-+++ gst-plugins-bad-1.16.2/ext/lv2/gstlv2.c    2020-07-09 06:23:27.262986607 +0200
-@@ -69,6 +69,39 @@
- #error "Unsupported OS"
- #endif
- 
-+LilvWorld *world;
-+LilvNode *atom_class;
-+LilvNode *audio_class;
-+LilvNode *control_class;
-+LilvNode *cv_class;
-+LilvNode *event_class;
-+LilvNode *input_class;
-+LilvNode *output_class;
-+LilvNode *preset_class;
-+LilvNode *state_iface;
-+LilvNode *state_uri;
-+
-+LilvNode *integer_prop;
-+LilvNode *toggled_prop;
-+LilvNode *designation_pred;
-+LilvNode *in_place_broken_pred;
-+LilvNode *optional_pred;
-+LilvNode *group_pred;
-+LilvNode *supports_event_pred;
-+LilvNode *label_pred;
-+
-+LilvNode *center_role;
-+LilvNode *left_role;
-+LilvNode *right_role;
-+LilvNode *rear_center_role;
-+LilvNode *rear_left_role;
-+LilvNode *rear_right_role;
-+LilvNode *lfe_role;
-+LilvNode *center_left_role;
-+LilvNode *center_right_role;
-+LilvNode *side_left_role;
-+LilvNode *side_right_role;
-+
- GstStructure *lv2_meta_all = NULL;
- 
- static void

diff --git a/gstreamer-plugins-bad.spec b/gstreamer-plugins-bad.spec
index 321f206e208c4486f6f0c06690d1458b95b5de84..6ec58a01e2d62028fb7714256105b04088351258 100644 (file)
--- a/gstreamer-plugins-bad.spec
+++ b/gstreamer-plugins-bad.spec
@@ -61,22 +61,20 @@
 
 %define                gstname         gst-plugins-bad
 %define                gstmver         1.0
-%define                gst_ver         1.16.2
-%define                gstpb_ver       1.16.2
+%define                gst_ver         1.16.3
+%define                gstpb_ver       1.16.3
 Summary:       Bad GStreamer Streaming-media framework plugins
 Summary(pl.UTF-8):     Złe wtyczki do środowiska obróbki strumieni GStreamer
 Name:          gstreamer-plugins-bad
-Version:       1.16.2
-Release:       5
+Version:       1.16.3
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
 Source0:       https://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.xz
-# Source0-md5: ccc7404230afddec723bbdb63c89feec
+# Source0-md5: 8969ea1aec3411c13d0e7dd27ccaaef1
 Patch0:                %{name}-libdts.patch
 Patch1:                %{name}-mfx.patch
 Patch2:                %{name}-neon.patch
-Patch3:                gstreamer-make.patch
-Patch4:                %{name}-no-common.patch
 URL:           https://gstreamer.freedesktop.org/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.14
@@ -88,7 +86,6 @@ BuildRequires:        gstreamer-devel >= %{gst_ver}
 BuildRequires: gstreamer-gl-devel >= %{gst_ver}
 BuildRequires: gstreamer-plugins-base-devel >= %{gstpb_ver}
 BuildRequires: gtk-doc >= 1.12
-BuildRequires: libnice-devel >= 0.1.14
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: orc-devel >= 0.4.17
 BuildRequires: pkgconfig >= 1:0.9.0
@@ -134,6 +131,7 @@ BuildRequires:      gnustep-gui-devel
 %endif
 BuildRequires: graphene-devel >= 1.4.0
 %{?with_ladspa:BuildRequires:  ladspa-devel >= 1.12}
+BuildRequires: lcms2-devel >= 2.7
 BuildRequires: libass-devel >= 0.10.2
 %{?with_bs2b:BuildRequires:    libbs2b-devel >= 3.1.0}
 %{?with_chromaprint:BuildRequires:     libchromaprint-devel}
@@ -148,11 +146,10 @@ BuildRequires:    libexif-devel >= 1:0.6.16
 BuildRequires: libiptcdata-devel >= 1.0.2
 BuildRequires: libjpeg-devel
 %{?with_kate:BuildRequires:    libkate-devel >= 0.1.7}
-BuildRequires: lcms2-devel >= 2.7
 BuildRequires: liblrdf-devel
 %{?with_mms:BuildRequires:     libmms-devel >= 0.4}
 BuildRequires: libmodplug-devel
-%{?with_musepack:BuildRequires:        musepack-devel}
+BuildRequires: libnice-devel >= 0.1.14
 %{?with_ofa:BuildRequires:     libofa-devel >= 0.9.3}
 BuildRequires: libopenmpt-devel
 %{?with_spc:BuildRequires:     libopenspc-devel >= 0.3.99}
@@ -181,6 +178,7 @@ BuildRequires:      libxml2-devel >= 1:2.9.2
 %{?with_lv2:BuildRequires:     lilv-devel >= 0.22}
 %{?with_mfx:BuildRequires:     mfx_dispatch-devel}
 %{?with_mjpegtools:BuildRequires:      mjpegtools-devel >= 2.0.0}
+%{?with_musepack:BuildRequires:        musepack-devel}
 %{?with_nas:BuildRequires:     nas-devel}
 %{?with_neon:BuildRequires:    neon-devel >= 0.27.0}
 # for hls, could also use libgcrypt>=1.2.0 or openssl
@@ -197,7 +195,6 @@ BuildRequires:      openssl-devel >= 1.0.1
 BuildRequires: opus-devel >= 0.9.4
 BuildRequires: pango-devel >= 1:1.22.0
 %{?with_sbc:BuildRequires:     sbc-devel >= 1.0}
-BuildRequires: schroedinger-devel >= 1.0.10
 BuildRequires: soundtouch-devel >= 1.4
 BuildRequires: spandsp-devel >= 1:0.0.6
 BuildRequires: srt-devel
@@ -223,10 +220,10 @@ Requires: gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
 Requires:      libxml2 >= 1:2.8
 Requires:      orc >= 0.4.17
-Obsoletes:     gstreamer-cdaudio
-Obsoletes:     gstreamer-quicktime
-Obsoletes:     gstreamer-schroedinger
-Obsoletes:     gstreamer-vcd
+Obsoletes:     gstreamer-cdaudio < 1.0
+Obsoletes:     gstreamer-quicktime < 0.10
+Obsoletes:     gstreamer-schroedinger < 1.14
+Obsoletes:     gstreamer-vcd < 0.10
 Conflicts:     openwebrtc < 0.3.0-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -313,7 +310,7 @@ Summary(pl.UTF-8):  Złe wtyczki efektów dźwiękowych dla GStreamera
 Group:         Libraries
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
-Obsoletes:     gstreamer-audio-effects
+Obsoletes:     gstreamer-audio-effects < 0.10
 
 %description -n gstreamer-audio-effects-bad
 Bad GStreamer audio effects plugins.
@@ -328,7 +325,7 @@ Group:              Libraries
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
 Provides:      gstreamer-audiosink = %{version}
-Obsoletes:     gstreamer-nas
+Obsoletes:     gstreamer-nas < 0.10
 
 %description -n gstreamer-audiosink-nas
 GStreamer NAS audio output plugin.
@@ -388,7 +385,7 @@ Group:              Libraries
 Requires:      bluez-libs >= 5.0
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
-Obsoletes:     gstreamer-bluetooth
+Obsoletes:     gstreamer-bluetooth < 1.2
 
 %description -n gstreamer-bluez
 GStreamer plugin for Bluez-based bluetooth support.
@@ -541,7 +538,7 @@ Summary(pl.UTF-8):  Wtyczka GStreamera dekodująca dźwięk GME
 Group:         Libraries
 Requires:      game-music-emu >= 0.5.6
 Requires:      gstreamer >= %{gst_ver}
-Obsoletes:     gstreamer-nsf
+Obsoletes:     gstreamer-nsf < 1.6
 Obsoletes:     gstreamer-spc < 1.16.0
 
 %description -n gstreamer-gme
@@ -850,7 +847,7 @@ Summary(pl.UTF-8):  Wtyczka OpenJPEG dla GStreamera
 Group:         Libraries
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
-Obsoletes:     gstreamer-jasper
+Obsoletes:     gstreamer-jasper < 1.0
 
 %description -n gstreamer-openjpeg
 GStreamer OpenJPEG plugin - OpenJPEG-based JPEG2000 decoder/encoder.
@@ -895,7 +892,7 @@ Group:              Libraries
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
 Requires:      opus >= 0.9.4
-Obsoletes:     gstreamer-celt
+Obsoletes:     gstreamer-celt < 1.2
 
 %description -n gstreamer-opusparse
 GStreamer OPUS audio decoder/encoder plugin.
@@ -1154,7 +1151,7 @@ Group:            Libraries
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
 Provides:      gstreamer-videosink = %{version}
-Obsoletes:     gstreamer-SDL
+Obsoletes:     gstreamer-SDL < 0.10
 
 %description -n gstreamer-videosink-sdl
 Plugin for sending output to the Simple Direct Media architecture.
@@ -1302,7 +1299,7 @@ Summary(pl.UTF-8):        Wtyczka GStreamera dekodująca przy użyciu biblioteki xvid
 Group:         Libraries
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
-Obsoletes:     gstreamer-divx
+Obsoletes:     gstreamer-divx < 1.0
 
 %description -n gstreamer-xvid
 GStreamer xvid decoder plugin.
@@ -1329,8 +1326,6 @@ Wtyczka GStreamera skanująca kody kreskowe.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}