Sync from SUSE:SLFO:Main gstreamer-plugins-bad revision 8d0b8fb1b033051110e49cf869d71f36

This commit is contained in:
2025-04-24 00:11:10 +02:00
parent 01e8575ba1
commit af202c9446
3 changed files with 85 additions and 2 deletions

View File

@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Apr 10 15:55:01 UTC 2025 - Michael Gorse <mgorse@suse.com>
- Add va-codecs-check-size.patch: skip codecs that report maximum
width or height lower than minimum (boo#1239937
glfo#gstreamer/gstreamer!8736).
-------------------------------------------------------------------
Wed Apr 2 15:20:08 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
- Replace pkgconfig(libsoup-2.4) with pkgconfig(libsoup-3.0)
BuildRequires: align with what meson setup checks for. Lucky us,
soup-3.0 was already pulled in via different dependency.
-------------------------------------------------------------------
Fri Mar 14 09:58:41 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Disable nvcodec/cuda on aarch64 and %arm as it fails to build
-------------------------------------------------------------------
Wed Mar 12 06:55:24 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>

View File

@@ -82,6 +82,12 @@
%bcond_with svtav1
%endif
%ifarch aarch64 %arm
%bcond_with cuda_nvdec
%else
%bcond_without cuda_nvdec
%endif
Name: gstreamer-plugins-bad
Version: 1.26.0
Release: 0
@@ -94,6 +100,8 @@ Source2: gstreamer-plugins-bad.appdata.xml
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE spandsp3.patch jengelh@inai.de -- Fix build against spandsp 3.x. Patch is not upstreamable in this form
Patch2: spandsp3.patch
# PATCH-FIX-UPSTREAM va-codecs-check-size.patch boo#1239937 mgorse@suse.com -- skip codecs that report maximum width or height lower than minimum.
Patch3: va-codecs-check-size.patch
%if %{with fdk_aac}
BuildRequires: pkgconfig(fdk-aac) >= 0.1.4
@@ -104,7 +112,7 @@ BuildRequires: gobject-introspection-devel
BuildRequires: ladspa-devel
BuildRequires: libgme-devel
BuildRequires: libgsm-devel
BuildRequires: meson >= 1.1
BuildRequires: meson >= 1.4
BuildRequires: musepack-devel
BuildRequires: orc >= 0.4.11
BuildRequires: pkgconfig
@@ -158,7 +166,7 @@ BuildRequires: pkgconfig(libopenmpt)
BuildRequires: pkgconfig(libpng) >= 1.2
BuildRequires: pkgconfig(libqrencode)
BuildRequires: pkgconfig(librsvg-2.0) >= 2.14
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libsoup-3.0)
BuildRequires: pkgconfig(libsrtp2) >= 2.1.0
BuildRequires: pkgconfig(libssh2) >= 1.4.3
BuildRequires: pkgconfig(libusb-1.0)
@@ -470,6 +478,7 @@ anything media-related,from real-time sound processing to playing
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
%if %{with cuda_nvdec}
%package -n libgstcuda-1_0-0
Summary: GStreamer Streaming-Media Framework Plug-Ins
Group: System/Libraries
@@ -480,6 +489,7 @@ that operate on media data. Applications using this library can do
anything media-related,from real-time sound processing to playing
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
%endif
%package -n libgstwebrtcnice-1_0-0
Summary: GStreamer Streaming-Media Framework Plug-Ins
@@ -535,7 +545,9 @@ Requires: libgstbadaudio-1_0-0 = %{version}
Requires: libgstbasecamerabinsrc-1_0-0 = %{version}
Requires: libgstcodecparsers-1_0-0 = %{version}
Requires: libgstcodecs-1_0-0 = %{version}
%if %{with cuda_nvdec}
Requires: libgstcuda-1_0-0 = %{version}
%endif
Requires: libgstdxva-1_0-0 = %{version}
Requires: libgstinsertbin-1_0-0 = %{version}
Requires: libgstisoff-1_0-0 = %{version}
@@ -552,11 +564,15 @@ Requires: libgstvulkan-1_0-0 = %{version}
Requires: libgstwayland-1_0-0 = %{version}
Requires: libgstwebrtc-1_0-0 = %{version}
Requires: libgstwebrtcnice-1_0-0 = %{version}
%if %{with cuda_nvdec}
Requires: typelib-1_0-CudaGst-1_0 = %{version}
%endif
Requires: typelib-1_0-GstAnalytics-1_0 = %{version}
Requires: typelib-1_0-GstBadAudio-1_0 = %{version}
Requires: typelib-1_0-GstCodecs-1_0 = %{version}
%if %{with cuda_nvdec}
Requires: typelib-1_0-GstCuda-1_0 = %{version}
%endif
Requires: typelib-1_0-GstDxva-1_0 = %{version}
Requires: typelib-1_0-GstInsertBin-1_0 = %{version}
Requires: typelib-1_0-GstMpegts-1_0 = %{version}
@@ -732,6 +748,7 @@ anything media-related, from real-time sound processing to playing
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
%if %{with cuda_nvdec}
%package -n typelib-1_0-GstCuda-1_0
Summary: Introspection bindings for GStreamer Streaming-Media Framework Plug-Ins
Group: System/Libraries
@@ -753,6 +770,7 @@ that operate on media data. Applications using this library can do
anything media-related, from real-time sound processing to playing
videos. Its plug-in-based architecture means that new data types or
processing capabilities can be added simply by installing new plug-ins.
%endif
%package -n typelib-1_0-GstVa-1_0
Summary: Introspection bindings for GStreamer Streaming-Media Framework Plug-Ins
@@ -897,6 +915,9 @@ export PYTHON=%{_bindir}/python3
%else
-D msdk=disabled \
-D qsv=disabled \
%endif
%if %{without cuda_nvdec}
-D nvcodec=disabled \
%endif
-D amfcodec=disabled \
-D directshow=disabled \
@@ -947,7 +968,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%ldconfig_scriptlets -n libgstbasecamerabinsrc-1_0-0
%ldconfig_scriptlets -n libgstcodecs-1_0-0
%ldconfig_scriptlets -n libgstcodecparsers-1_0-0
%if %{with cuda_nvdec}
%ldconfig_scriptlets -n libgstcuda-1_0-0
%endif
%ldconfig_scriptlets -n libgstdxva-1_0-0
%ldconfig_scriptlets -n libgstinsertbin-1_0-0
%ldconfig_scriptlets -n libgstisoff-1_0-0
@@ -1055,7 +1078,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/gstreamer-%{gst_branch}/libgstlegacyrawparse.so
%{_libdir}/gstreamer-%{gst_branch}/libgstneonhttpsrc.so
%{_libdir}/gstreamer-%{gst_branch}/libgstnetsim.so
%if %{with cuda_nvdec}
%{_libdir}/gstreamer-%{gst_branch}/libgstnvcodec.so
%endif
%{_libdir}/gstreamer-%{gst_branch}/libgstopenexr.so
%{_libdir}/gstreamer-%{gst_branch}/libgstopusparse.so
%{_libdir}/gstreamer-%{gst_branch}/libgstpcapparse.so
@@ -1198,8 +1223,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n libgstwayland-1_0-0
%{_libdir}/libgstwayland-%{gst_branch}.so.*
%if %{with cuda_nvdec}
%files -n libgstcuda-1_0-0
%{_libdir}/libgstcuda-%{gst_branch}.so.0*
%endif
%files -n libgstwebrtcnice-1_0-0
%{_libdir}/libgstwebrtcnice-%{gst_branch}.so.0*
@@ -1252,11 +1279,13 @@ find %{buildroot} -type f -name "*.la" -delete -print
%files -n typelib-1_0-GstWebRTC-1_0
%{_libdir}/girepository-1.0/GstWebRTC-1.0.typelib
%if %{with cuda_nvdec}
%files -n typelib-1_0-CudaGst-1_0
%{_libdir}/girepository-1.0/CudaGst-1.0.typelib
%files -n typelib-1_0-GstCuda-1_0
%{_libdir}/girepository-1.0/GstCuda-1.0.typelib
%endif
%files -n typelib-1_0-GstVa-1_0
%{_libdir}/girepository-1.0/GstVa-1.0.typelib
@@ -1281,7 +1310,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/pkgconfig/gstreamer-webrtc-%{gst_branch}.pc
%{_libdir}/pkgconfig/gstreamer-play-%{gst_branch}.pc
%{_libdir}/pkgconfig/gstreamer-wayland-%{gst_branch}.pc
%if %{with cuda_nvdec}
%{_libdir}/pkgconfig/gstreamer-cuda-%{gst_branch}.pc
%endif
%{_libdir}/pkgconfig/gstreamer-va-%{gst_branch}.pc
%{_libdir}/pkgconfig/gstreamer-webrtc-nice-%{gst_branch}.pc
%{_datadir}/gir-1.0/*.gir

View File

@@ -0,0 +1,33 @@
From 3ac5bb2d3689bdb28363a2b2ca74301a010f73ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sun, 30 Mar 2025 13:10:42 +0300
Subject: [PATCH] va: Skip codecs that report maximum width or height lower
than minimum
This happens on F42 with the JPEG decoders for some reason and trying to
actually use them with any resolution simply gives a "resolution not supported"
error.
A minimum of 64 is correctly reported though and trying to create caps with an
int range of [64, 0] gives critical warnings.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8736>
---
subprojects/gst-plugins-bad/sys/va/gstvacaps.c | 4 ++++
1 file changed, 4 insertions(+)
diff -urp gst-plugins-bad-1.26.0.orig/sys/va/gstvacaps.c gst-plugins-bad-1.26.0/sys/va/gstvacaps.c
--- gst-plugins-bad-1.26.0.orig/sys/va/gstvacaps.c 2025-04-10 10:51:23.742040072 -0500
+++ gst-plugins-bad-1.26.0/sys/va/gstvacaps.c 2025-04-10 10:51:44.074193658 -0500
@@ -351,6 +351,10 @@ gst_va_create_raw_caps_from_config (GstV
if (formats->len == 0)
goto bail;
+ /* if driver reports maximum width or height lower than minimum then skip */
+ if (max_width < min_width || max_height < min_height)
+ goto bail;
+
if (!fix_raw_formats (display, profile, entrypoint, formats))
goto bail;
Only in gst-plugins-bad-1.26.0/sys/va: gstvacaps.c.orig