Accepting request 1240535 from multimedia:libs

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

vlc.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
 

vlc.spec

@@ -206,7 +206,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
@@ -391,22 +390,6 @@ 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
@@ -505,9 +488,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
@@ -640,16 +620,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
@@ -1227,12 +1197,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}*