diff --git a/gst-plugins-bad-0.10.9-libx264.patch b/gst-plugins-bad-0.10.9-libx264.patch deleted file mode 100644 index 0156492..0000000 --- a/gst-plugins-bad-0.10.9-libx264.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru gst-plugins-bad-0.10.9.orig/ext/x264/gstx264enc.c gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c ---- gst-plugins-bad-0.10.9.orig/ext/x264/gstx264enc.c 2008-10-11 01:13:43.000000000 +0200 -+++ gst-plugins-bad-0.10.9/ext/x264/gstx264enc.c 2008-11-19 17:21:36.000000000 +0100 -@@ -541,7 +541,7 @@ - encoder->x264param.i_frame_reference = encoder->ref; - encoder->x264param.i_bframe = encoder->bframes; - encoder->x264param.b_bframe_pyramid = encoder->b_pyramid; -- encoder->x264param.b_bframe_adaptive = encoder->b_adapt; -+ encoder->x264param.i_bframe_adaptive = encoder->b_adapt; - encoder->x264param.b_interlaced = encoder->interlaced; - encoder->x264param.b_deblocking_filter = 1; - encoder->x264param.i_deblocking_filter_alphac0 = 0; diff --git a/gst-plugins-bad-1.20.5-opencv-4.7.patch b/gst-plugins-bad-1.20.5-opencv-4.7.patch deleted file mode 100644 index 0fc88eb..0000000 --- a/gst-plugins-bad-1.20.5-opencv-4.7.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8d5ac30955cf052a12ef8c87c0cae6d124d4d7b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= - =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= -Date: Fri, 30 Dec 2022 17:10:12 +0000 -Subject: [PATCH] meson: Accept latest version of opencv 4.x - -We've been bumping along the maximum opencv 4.x version for years, -just accept all opencv versions till someone reports breakage. - -Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1680 - -Part-of: ---- - subprojects/gst-plugins-bad/ext/opencv/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subprojects/gst-plugins-bad/ext/opencv/meson.build b/subprojects/gst-plugins-bad/ext/opencv/meson.build -index 77c9f443894..37e20156eb6 100644 ---- a/subprojects/gst-plugins-bad/ext/opencv/meson.build -+++ b/subprojects/gst-plugins-bad/ext/opencv/meson.build -@@ -71,7 +71,7 @@ if opencv_found - endif - - if not opencv_found -- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.7.0'], required : false) -+ opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false) - opencv_found = opencv_dep.found() - if opencv_found - foreach h : libopencv4_headers --- -GitLab - diff --git a/gst-plugins-bad-1.20.5-zxing-cpp-1.4.patch b/gst-plugins-bad-1.20.5-zxing-cpp-1.4.patch deleted file mode 100644 index 952a1fa..0000000 --- a/gst-plugins-bad-1.20.5-zxing-cpp-1.4.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 7cfc3130a7906c199861d2ef331a07d749a4b769 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= -Date: Tue, 22 Nov 2022 12:32:52 +0100 -Subject: [PATCH] zxing: update to 1.4.0 tag - -Part-of: ---- - subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp | 4 ++-- - subprojects/gst-plugins-bad/ext/zxing/meson.build | 5 +++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp b/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp -index 5f296ecab79..7836dbbcf18 100644 ---- a/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp -+++ b/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp -@@ -368,7 +368,7 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter, GstVideoFrame * frame) - auto result = ReadBarcode ({(unsigned char *)data, width, height, zxing->image_format}, hints); - if (result.isValid ()) { - GST_DEBUG_OBJECT (zxing, "Symbol found. Text: %s Format: %s", -- TextUtfEncoding::ToUtf8 (result.text ()).c_str (), -+ result.text ().c_str (), - ToString (result.format ())); - } else { - goto out; -@@ -396,7 +396,7 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter, GstVideoFrame * frame) - "running-time", G_TYPE_UINT64, running_time, - "type", G_TYPE_STRING, ToString (result.format ()), - "symbol", G_TYPE_STRING, -- TextUtfEncoding::ToUtf8 (result.text ()).c_str (), NULL); -+ result.text ().c_str (), NULL); - - if (zxing->attach_frame) { - /* create a sample from image */ -diff --git a/subprojects/gst-plugins-bad/ext/zxing/meson.build b/subprojects/gst-plugins-bad/ext/zxing/meson.build -index 5992f0d9e02..2dbad9ab1ee 100644 ---- a/subprojects/gst-plugins-bad/ext/zxing/meson.build -+++ b/subprojects/gst-plugins-bad/ext/zxing/meson.build -@@ -2,16 +2,17 @@ zxing_sources = [ - 'gstzxing.cpp', - 'gstzxingplugin.c', - ] --zxing_dep = dependency('zxing', version : '>= 1.1.1', required : get_option('zxing')) -+zxing_dep = dependency('zxing', version : '>= 1.4.0', required : get_option('zxing')) - if zxing_dep.found() - gstzxing = library('gstzxing', - zxing_sources, - c_args : gst_plugins_bad_args, -+ cpp_args: '-DZX_USE_UTF8', - include_directories : [configinc], - dependencies : [gstvideo_dep, zxing_dep], - install : true, - install_dir : plugins_install_dir, -- override_options : ['cpp_std=c++11'], -+ override_options : ['cpp_std=c++17'], - ) - plugins += [gstzxing] - endif --- -GitLab - diff --git a/gst-plugins-bad-1.20.5-zxing-cpp-2.0.0.patch b/gst-plugins-bad-1.20.5-zxing-cpp-2.0.0.patch deleted file mode 100644 index 08d86bc..0000000 --- a/gst-plugins-bad-1.20.5-zxing-cpp-2.0.0.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas -Date: Sat, 7 Jan 2023 16:18:03 +0100 -Subject: [PATCH] Support zxing-c++ 2.0 - -format is a C++ string in 2.0 ---- - subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp b/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp -index 7836dbbcf18e..a8a0f7b49aa4 100644 ---- a/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp -+++ b/subprojects/gst-plugins-bad/ext/zxing/gstzxing.cpp -@@ -62,6 +62,7 @@ - - #include "ReadBarcode.h" - #include "TextUtfEncoding.h" -+#include "ZXVersion.h" - - using namespace ZXing; - -@@ -369,32 +370,40 @@ gst_zxing_transform_frame_ip (GstVideoFilter * vfilter, GstVideoFrame * frame) - if (result.isValid ()) { - GST_DEBUG_OBJECT (zxing, "Symbol found. Text: %s Format: %s", - result.text ().c_str (), -+#if ZXING_VERSION_MAJOR >= 2 -+ ToString (result.format ()).c_str ()); -+#else - ToString (result.format ())); -+#endif - } else { - goto out; - } - - /* extract results */ - if (zxing->message) { - GstMessage *m; - GstStructure *s; - GstSample *sample; - GstCaps *sample_caps; - GstClockTime timestamp, running_time, stream_time; - - timestamp = GST_BUFFER_TIMESTAMP (frame->buffer); - running_time = - gst_segment_to_running_time (&GST_BASE_TRANSFORM (zxing)->segment, - GST_FORMAT_TIME, timestamp); - stream_time = - gst_segment_to_stream_time (&GST_BASE_TRANSFORM (zxing)->segment, - GST_FORMAT_TIME, timestamp); - - s = gst_structure_new ("barcode", - "timestamp", G_TYPE_UINT64, timestamp, - "stream-time", G_TYPE_UINT64, stream_time, - "running-time", G_TYPE_UINT64, running_time, -+#if ZXING_VERSION_MAJOR >= 2 -+ "type", G_TYPE_STRING, ToString (result.format ()).c_str (), -+#else - "type", G_TYPE_STRING, ToString (result.format ()), -+#endif - "symbol", G_TYPE_STRING, - result.text ().c_str (), NULL); - diff --git a/gst-plugins-bad.spec b/gst-plugins-bad.spec index dedf681..e27db02 100644 --- a/gst-plugins-bad.spec +++ b/gst-plugins-bad.spec @@ -2,7 +2,7 @@ %define libname lib%{name} Name: gst-plugins-bad -Version: 1.24.10 +Version: 1.24.11 Release: 1mamba Summary: A set of plug-ins for gstreamer that aren't up to par compared to the rest Group: System/Multimedia @@ -11,10 +11,6 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://gstreamer.freedesktop.org/modules/gst-plugins-bad.html Source: http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz -Patch0: %{name}-0.10.9-libx264.patch -Patch1: gst-plugins-bad-1.20.5-opencv-4.7.patch -Patch2: gst-plugins-bad-1.20.5-zxing-cpp-1.4.patch -Patch3: gst-plugins-bad-1.20.5-zxing-cpp-2.0.0.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -139,15 +135,9 @@ Requires: gtk-doc %description apidocs This package includes the %{name} API documentation. -%debug_package %prep %setup -q -n gst-plugins-bad-%{version} -%define _default_patch_fuzz 2 -#%patch0 -p1 -#%patch1 -p3 -b .opencv-4.7 -#%patch2 -p3 -b .zxing-cpp-1.4 -#%patch 3 -p3 -b .zxing-cpp-2.0.0 %build %meson @@ -196,6 +186,9 @@ This package includes the %{name} API documentation. #%{_datadir}/gtk-doc/html/gst-plugins-bad-libs-%{apiver}/* %changelog +* Wed Jan 08 2025 Automatic Build System 1.24.11-1mamba +- automatic version update by autodist + * Thu Dec 05 2024 Automatic Build System 1.24.10-1mamba - automatic version update by autodist