Accepting request 1285358 from multimedia:libs

- Add 5590.patch: opus_header: fix channel mapping family 1 parsing
  (boo#1244167).

OBS-URL: https://build.opensuse.org/request/show/1285358
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=154

5590.patch

@@ -0,0 +1,28 @@
+From a761e1c202b632e7865d18fcf11a2b9e285ea9ae Mon Sep 17 00:00:00 2001
+From: Tristan Matthews <tmatth@videolan.org>
+Date: Wed, 1 Feb 2023 23:39:36 -0500
+Subject: [PATCH] opus_header: fix channel mapping family 1 parsing
+
+Fixes #27808
+
+(cherry picked from commit 79fa6af0a98921f9d34933761f4fe20ef6c35309)
+---
+ modules/codec/opus_header.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/codec/opus_header.c b/modules/codec/opus_header.c
+index 4069a5cf4613..b134b20b625b 100644
+--- a/modules/codec/opus_header.c
++++ b/modules/codec/opus_header.c
+@@ -205,7 +205,7 @@ int opus_header_parse(const unsigned char *packet, int len, OpusHeader *h)
+         h->nb_coupled = ch;
+ 
+         /* Multi-stream support */
+-        if(h->channel_mapping == 2)
++        if(h->channel_mapping <= 2)
+         {
+             if (h->nb_coupled + h->nb_streams > 255)
+                 return 0;
+-- 
+GitLab
+

vlc.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Jun 13 06:38:45 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add 5590.patch: opus_header: fix channel mapping family 1 parsing
+  (boo#1244167).
+
+-------------------------------------------------------------------
+Mon Jan 27 11:32:35 UTC 2025 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Drop opencv sub-package, and hence no longer needed
+  pkgconfig(opencv) BuildRequires and various provides, Supplements
+  and Conflicts.
+
+-------------------------------------------------------------------
+Mon Nov 11 11:11:11 UTC 2024 - olaf@aepfle.de
+
+- Convert BuildRequires from libfaad-devel to pkgconfig(faad2)
+
+-------------------------------------------------------------------
+Sat Nov  2 10:48:44 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Drop the requres_ge libbluray1 statement, which was added as a
+  hack due to a libbluray ABI brak at version 0.5. By now libbluray
+  is at .so.2, so that statement was actually a NOP. as RPM simply
+  ignored in-existing package dependencies.
+
 -------------------------------------------------------------------
 Thu Jun 27 13:54:03 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 

vlc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package vlc
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
 #
 # All modifications and additions to the file contributed by third parties
@@ -56,6 +56,8 @@ Patch4:         fix-build-with-fdk-2.0.patch
 Patch5:         vlc-libplacebo-5.patch
 # PATCH-FIX-UPSTREAM vlc-taglib-2.0.patch dimstar@opensuse.org -- Fix build against taglib 2.0
 Patch6:         vlc-taglib-2.0.patch
+# PATCH-FIX-UPSTREAM
+Patch7:         https://code.videolan.org/videolan/vlc/-/merge_requests/5590.patch
 # PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant
 Patch100:       vlc-projectM-qt5.patch
 # PATCH-FIX-UPSTREAM -- Use OpenCV C++ API
@@ -206,7 +208,6 @@ BuildRequires:  pkgconfig(xi)
 %endif
 %if 0%{?is_opensuse}
 BuildRequires:  pkgconfig(libupnp)
-BuildRequires:  pkgconfig(opencv) > 2.0
 %ifarch %{ix86} x86_64
 %if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
 BuildRequires:  pkgconfig(libprojectM-qt5) >= 2.0.0
@@ -236,7 +237,7 @@ BuildRequires:  libxvidcore-devel
 BuildRequires:  pkgconfig(x264) >= 0.8.6
 BuildRequires:  pkgconfig(x265)
 %if %{with faad}
-BuildRequires:  libfaad-devel
+BuildRequires:  pkgconfig(faad2)
 %endif
 %endif
 
@@ -281,9 +282,6 @@ Summary:        VLC without X dependencies
 Group:          Productivity/Multimedia/Video/Players
 Requires:       libvlc%{libvlc} = %{version}-%{release}
 Requires:       libvlccore%{libvlccore} = %{version}-%{release}
-# This is a hack only due to libbluray not having versioned symbols as well as
-# having a strange ABI/API break between 0.3 and 0.7
-%requires_ge    libbluray1
 Recommends:     %{name}-codecs
 Recommends:     libdvdcss
 Conflicts:      %{conflicts}-noX
@@ -394,28 +392,12 @@ Conflicts:      %{conflicts}-qt
 This subpackage provides a Qt interface for VLC and selects it by
 default when `vlc` is invoked from an X session.
 
-%package opencv
-Summary:        OpenCV plugins for VLC media player
-Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name}-noX = %{version}-%{release}
-# We need the noX package first, as it contains vlc-cache-gen
-Requires(post): %{name}-noX
-# Package split
-Provides:       %{name}:%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
-Conflicts:      %{name} < %{version}-%{release}
-Supplements:    packageand(%{name}-noX:opencv3)
-# Data required for face detection
-Recommends:     opencv3
-
-%description opencv
-This subpackage provides a wrapper plugin for OpenCV for
-OpenCV based video filters and a face detection example.
-
 %prep
 %setup -q
 %patch -P 1 -p1
 %patch -P 4 -p1
 %patch -P 6 -p1
+%patch -P 7 -p1
 %if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
 %patch -P 100 -p1
 %endif
@@ -508,9 +490,6 @@ autoreconf -fiv
 %if %{with opengles}
   --enable-gles2                        \
 %endif
-%if 0%{?is_opensuse}
-   --enable-opencv                      \
-%endif
 %if 0%{?suse_version} >= 1500 && 0%{?is_opensuse}
   --enable-wayland                      \
 %else
@@ -643,16 +622,6 @@ if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
   %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
 fi
 
-%post -n %{name}-opencv
-if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
-  %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
-fi
-
-%postun -n %{name}-opencv
-if [ -x %{_libdir}/vlc/vlc-cache-gen ]; then
-  %{_libdir}/vlc/vlc-cache-gen %{_libdir}/vlc/plugins
-fi
-
 %files
 %exclude %{_libdir}/vlc/libcompat.a
 # The presence of the .desktop file is what gives AppStream the
@@ -1230,12 +1199,6 @@ fi
 %{_libdir}/vlc/plugins/vdpau/libvdpau_sharpen_plugin.so
 %{_libdir}/vlc/plugins/video_output/libglconv_vdpau_plugin.so
 
-%if 0%{?is_opensuse}
-%files opencv
-%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
-%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
-%endif
-
 %files -n libvlc%{libvlc}
 %{_libdir}/libvlc.so.%{libvlc}*