X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvlc.git;a=blobdiff_plain;f=vlc.spec;h=b6e9e2b51b85073726c9d6007010950a3620791c;hp=36c7f5d3934b7b2d55704b5e8aa2a5a69e75a3e5;hb=10d182a;hpb=7f845cce4f7c230141d3cbf4ec1e28413f9100dd

diff --git a/vlc.spec b/vlc.spec
index 36c7f5d..b6e9e2b 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -5,7 +5,7 @@
 #   ./modules/gui/skins2/parser/builder.cpp:            string path = (*it) + sep + "fonts" + sep + "FreeSans.ttf";
 # - %{_prefix}/lib cleanup for x86_64
 # - configs to /etc (../http/.hosts)
-# - qvlc should be in qt4 or such package not generic X11
+# - qvlc should be in qt5 or such package not generic X11
 # - /usr/share/vlc/utils scripts insecure (use /tmp hardcoded paths)
 # - [recheck old TODO]: flac plugin doesn't work with mono files
 # - --enable-wma-fixed (fixed-point WMA - does it make sense on non-embedded?)
@@ -21,16 +21,18 @@
 %bcond_without	alsa		# ALSA access/audio output plugins
 %bcond_without	bonjour		# bonjour service discovery plugin
 %bcond_without	bpg		# BPG files support
-%bcond_without	caca		# caca video output plugin
+%bcond_with	caca		# caca video output plugin
 %bcond_without	crystalhd	# crystalhd codec plugin
 %bcond_with	daala		# daala codec plugin (experimental)
 %bcond_with	decklink	# Blackmagic DeskLink output support (BR: proprietary SDK)
 %bcond_without	dv		# dv access plugins
 %bcond_with	fdk_aac		# FDK-AAC encoder plugin (GPL 3 incompatible; enable as subpackage?)
+%bcond_with	fluidlite	# FluidLite instead of FluidSynth library in fluidsynth plugin
 %bcond_with	freerdp		# RDP/Remote Desktop client support
 %bcond_with	glesv1		# OpenGL ES v1 support
 %bcond_with	glesv2		# OpenGL ES v2 support
 %bcond_without	gnutls		# gnutls misc plugin
+%bcond_without	goom		# GOOM! audio visualization
 %bcond_without	jack		# jack access/audio output plugin
 %bcond_without	kde		# KDE Solid actions
 %bcond_without	lirc		# lirc control plugin
@@ -40,11 +42,11 @@
 %bcond_without	notify		# libnotify notification plugin
 %bcond_without	opencv		# OpenCV video filter [needs vlc API update]
 %bcond_with	oss4		# OSSv4
-%bcond_with	qt5		# Qt5 instead of Qt4
 %bcond_with	projectM	# projectm visualization plugin
 %bcond_without	sftp		# SFTP file transfer via libssh2
 %bcond_without	shout		# shout access output plugin
 %bcond_without	smb		# SMB access plugin
+%bcond_with	smb2		# SMB2 access plugin (requires unreleased version)
 %bcond_without	speex		# speex codec plugin
 %bcond_without	static_libs	# don't build static libraries
 %bcond_without	svg		# svg text renderer plugin
@@ -68,20 +70,26 @@
 Summary:	VLC - a multimedia player and stream server
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
-Version:	3.0.8
-Release:	7
+Version:	3.0.16
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
-Source0:	http://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	744442ec0c145453ea1d257914c8072e
+Source0:	https://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	efc5f7331c033bf81536531c6eba5aa5
 Patch0:		%{name}-buildflags.patch
 Patch1:		%{name}-tremor.patch
 Patch2:		%{name}-mpc.patch
 Patch3:		xmas-sucks.patch
 Patch4:		no-cache.patch
 Patch5:		%{name}-fdk_aac.patch
-Patch6:		%{name}-libplacebo.patch
+Patch6:		%{name}-extern.patch
+Patch7:		%{name}-vsxu.patch
+Patch8:		qt-5.15.patch
+Patch9:		%{name}-live.patch
+Patch10:	%{name}-srt.patch
+Patch11:	opencv4.patch
 URL:		http://www.videolan.org/vlc/
+%{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK}
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
 BuildRequires:	EGL-devel >= %{?with_glesv2:1.1}%{!?with_glesv2:1.0}
 BuildRequires:	OpenGL-devel
@@ -107,15 +115,18 @@ BuildRequires:	automake
 %{?with_daala:BuildRequires:	daala-devel}
 BuildRequires:	dav1d-devel
 BuildRequires:	dbus-devel >= 1.6.0
-%{?with_decklink:BuildRequires:	Blackmagic_DeckLink_SDK}
 BuildRequires:	desktop-file-utils
 BuildRequires:	faad2-devel >= 2.5
 %{?with_fdk_aac:BuildRequires:	fdk-aac-devel}
 # libavcodec >= 57.37.100, libavformat >= 53.21.0, libavutil >= 52.4.0, libswscale, libpostproc
 BuildRequires:	ffmpeg-devel >= 3.1
 BuildRequires:	flac-devel >= 1.1.3
+%if %{with fluidlite}
+BuildRequires:	fluidlite-devel
+%else
 BuildRequires:	fluidsynth-devel >= 1.1.2
-BuildRequires:	fontconfig-devel >= 2.11
+%endif
+BuildRequires:	fontconfig-devel >= 1:2.11
 %{?with_freerdp:BuildRequires:	freerdp-devel >= 1.0.1}
 BuildRequires:	freetype-devel >= 2
 BuildRequires:	fribidi-devel
@@ -144,16 +155,15 @@ BuildRequires:	libdts-devel >= 0.0.5
 BuildRequires:	libdvbpsi-devel >= 1.2.0
 BuildRequires:	libdvdnav-devel >= 4.9.1
 BuildRequires:	libdvdread-devel >= 4.9.1
-BuildRequires:	libebml-devel >= 1.0.0
+BuildRequires:	libebml-devel >= 1.3.6
 BuildRequires:	libgcrypt-devel >= 1.6.0
-BuildRequires:	libgoom2-devel
+%{?with_goom:BuildRequires:	libgoom2-devel}
 BuildRequires:	libidn-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libkate-devel >= 0.3.0
 BuildRequires:	libmad-devel
 BuildRequires:	libmatroska-devel >= 1.0.0
-# >= 0.8.4 but not 0.8.8
-BuildRequires:	libmodplug-devel >= 0.8.4
+BuildRequires:	libmodplug-devel >= 0.8.9.0
 BuildRequires:	libmpeg2-devel > 0.3.2
 BuildRequires:	libmpg123-devel
 BuildRequires:	libmtp-devel >= 1.0.0
@@ -170,9 +180,10 @@ BuildRequires:	libsamplerate-devel
 BuildRequires:	libsecret-devel >= 0.18
 %{?with_shout:BuildRequires:	libshout-devel >= 2.1}
 BuildRequires:	libsidplay2-devel
+%{?with_smb2:BuildRequires:	libsmb2-devel >= 4.0.0}
 %{?with_smb:BuildRequires:	libsmbclient-devel >= 3.6.13}
 %{?with_sftp:BuildRequires:	libssh2-devel}
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtar-devel
 BuildRequires:	libtheora-devel >= 1.0
 BuildRequires:	libtiger-devel >= 0.3.1
@@ -194,15 +205,15 @@ BuildRequires:	libvpx-devel >= 1.5.0
 BuildRequires:	libxcb-devel >= 1.6
 BuildRequires:	libxml2-devel >= 1:2.5
 %{?with_lirc:BuildRequires:	lirc-devel}
-%{?with_live:BuildRequires:	live-devel >= 2014.07.04}
+%{?with_live:BuildRequires:	live-devel >= 2020.12.23}
 BuildRequires:	lua52 >= 5.2
 BuildRequires:	lua52-devel >= 5.2
 %{?with_mfx:BuildRequires:	mfx_dispatch-devel}
-BuildRequires:	microdns-devel
+BuildRequires:	microdns-devel >= 0.1.2
 BuildRequires:	minizip-devel
 BuildRequires:	musepack-devel
 BuildRequires:	ncurses-devel
-%{?with_opencv:BuildRequires:	opencv-devel > 2.0}
+%{?with_opencv:BuildRequires:	opencv-devel > 4}
 BuildRequires:	opus-devel >= 1.0.3
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	protobuf-devel >= 2.5.0
@@ -214,10 +225,11 @@ BuildRequires:	soxr-devel >= 0.1.2
 BuildRequires:	spatialaudio-devel
 %{?with_speex:BuildRequires:	speex-devel > 1:1.1.0}
 %{?with_speex:BuildRequires:	speexdsp-devel >= 1.2}
-BuildRequires:	srt-devel >= 1.2.2
+BuildRequires:	srt-devel >= 1.4.1
 BuildRequires:	sysfsutils-devel
 BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	taglib-devel >= 1.9
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	tremor-devel
 %{?with_twolame:BuildRequires:	twolame-devel}
 %{?with_udev:BuildRequires:	udev-devel >= 1:142}
@@ -228,15 +240,61 @@ BuildRequires:	wayland-protocols >= 1.4
 BuildRequires:	xcb-util-keysyms-devel >= 0.3.4
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
-%{?with_qt5:BuildRequires:	xorg-lib-libXi-devel}
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXpm-devel
 BuildRequires:	xorg-proto-xproto-devel
+BuildRequires:	xz
 BuildRequires:	zlib-devel
 BuildRequires:	zvbi-devel >= 0.2.28
 Requires(post):	/sbin/ldconfig
+Requires:	SDL_image >= 1.2.10
+%{?with_alsa:Requires:	alsa-lib >= 1.0.24}
+Requires:	aribb24 >= 1.0.1
+Requires:	aribb25 >= 0.2.6
+%{?with_svg:Requires:	cairo >= 1.13.1}
+%if %{without fluidlite}
+Requires:	fluidsynth >= 1.1.2
+%endif
+Requires:	fontconfig-libs >= 1:2.11
+%{?with_gnutls:Requires:	gnutls >= 3.3.6}
+Requires:	libarchive >= 3.1.0
+Requires:	libass >= 0.9.8
+Requires:	libbluray >= 0.6.2
+Requires:	libcddb >= 0.9.5
+Requires:	libchromaprint >= 0.6.0
+Requires:	libdsm >= 0.2.0
+Requires:	libdvbpsi >= 1.2.0
+Requires:	libebml >= 1.3.6
+Requires:	libgcrypt >= 1.6.0
+Requires:	libkate >= 0.3.0
+Requires:	libmodplug >= 0.8.9.0
+Requires:	libmpeg2 > 0.3.2
+Requires:	libmtp >= 1.0.0
+Requires:	libnfs >= 1.10.0
+Requires:	libogg >= 1:1.0
+%{?with_libplacebo:Requires:	libplacebo >= 0.2.1}
+%{?with_svg:Requires:	librsvg >= 2.9.0}
+Requires:	libsecret >= 0.18
+%{?with_smb2:Requires:	libsmb2 >= 3.0.0}
+Requires:	libtheora >= 1.0
+Requires:	libtiger >= 0.3.1
+Requires:	libvncserver >= 0.9.9
+Requires:	libvorbis >= 1:1.1
+Requires:	libvpx >= 1.5.0
+Requires:	libxcb >= 1.6
+Requires:	libxml2 >= 1:2.5
 Requires:	lua52-libs > 5.2.3-2
+Requires:	microdns >= 0.1.2
+Requires:	opus >= 1.0.3
+Requires:	pulseaudio-libs >= 1.0
+Requires:	schroedinger >= 1.0.10
+Requires:	soxr >= 0.1.2
+%{?with_speex:Requires:	speex > 1:1.1.0}
+%{?with_speex:Requires:	speexdsp >= 1.2}
+Requires:	srt >= 1.4.1
+Requires:	taglib >= 1.9
 Requires:	wayland >= 1.5.91
+Requires:	xcb-util-keysyms >= 0.3.4
 Requires:	xdg-utils
 Obsoletes:	browser-plugin-vlc
 Obsoletes:	vlc-GGI
@@ -292,13 +350,14 @@ Requires(post,postun):	gtk-update-icon-cache
 Requires:	%{name} = %{version}-%{release}
 Requires:	Qt5Core >= %{qt_ver}
 Requires:	Qt5Gui >= %{qt_ver}
+Requires:	Qt5Gui-platform-xcb >= %{qt_ver}
 Requires:	Qt5Svg >= %{qt_ver}
 Requires:	Qt5Widgets >= %{qt_ver}
 Requires:	Qt5X11Extras >= %{qt_ver}
 Requires:	desktop-file-utils
 Requires:	hicolor-icon-theme
 Suggests:	dbus-x11 >= 1.6.0
-Suggests:	libcaca > 0.99-0.beta14.1
+%{?with_caca:Suggests:	libcaca > 0.99-0.beta14.1}
 Obsoletes:	vlc-gnome
 Obsoletes:	vlc-gtk
 
@@ -369,6 +428,11 @@ Akcje klienta VLC dla Solid.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 %{__libtoolize}
@@ -411,12 +475,18 @@ Akcje klienta VLC dla Solid.
 	%{?with_fdk_aac:--enable-fdkaac} \
 	--enable-faad \
 	--enable-flac \
+%if %{with fluidlite}
+	--disable-fluidsynth \
+%else
+	--disable-fluidlite \
+%endif
 	%{?with_freerdp:--enable-freerdp}%{!?with_freerdp:--disable-freerdp} \
 	--enable-freetype \
 	--enable-fribidi \
 	%{?with_glesv1:--enable-gles1} \
 	%{?with_glesv2:--enable-gles2} \
 	%{!?with_gnutls:--disable-gnutls} \
+	--enable-goom%{!?with_goom:=no} \
 	%{?with_jack:--enable-jack} \
 	%{!?with_libplacebo:--disable-libplacebo} \
 	--enable-lirc%{!?with_lirc:=no} \
@@ -437,6 +507,7 @@ Akcje klienta VLC dla Solid.
 	--enable-shine \
 	--enable-shout%{!?with_shout:=no} \
 	--enable-skins2 \
+	%{?with_smb2:--enable-smb2} \
 	%{!?with_smb:--disable-smbclient} \
 	--enable-sout \
 	%{!?with_speex:--disable-speex} \
@@ -569,7 +640,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libhttp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libhttps_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libimem_plugin.so
+# R: libnfs >= 1.10.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libnfs_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/access/librist_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libsatip_plugin.so
 %if %{with sftp}
 # R: libssh2
@@ -580,6 +653,10 @@ rm -rf $RPM_BUILD_ROOT
 # R: libsmbclient
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libsmb_plugin.so
 %endif
+%if %{with smb2}
+# R: libsmb2 >= 3.0.0
+%attr(755,root,root) %{_libdir}/vlc/plugins/access/libsmb2_plugin.so
+%endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libtcp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libudp_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libvdr_plugin.so
@@ -590,7 +667,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with decklink}
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libdecklink_plugin.so
 %endif
-# R: libdsm
+# R: libdsm >= 0.2.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libdsm_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libdtv_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libdvb_plugin.so
@@ -600,7 +677,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libdvdread_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libidummy_plugin.so
-# R: libbluray >= 0.3.0
+# R: libbluray >= 0.6.2
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so
 # R: libvncserver >= 0.9.9
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libvnc_plugin.so
@@ -629,6 +706,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_http_plugin.so
 # R: libgcrypt >= 1.1.94
 %attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_livehttp_plugin.so
+%attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_rist_plugin.so
 %if %{with shout}
 # R: shout >= 2.1
 %attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_shout_plugin.so
@@ -637,6 +715,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_srt_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access_output/libaccess_output_udp_plugin.so
 %dir %{_libdir}/vlc/plugins/audio_filter
+# R: spatialaudio
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libspatialaudio_plugin.so
 # R: a52dec-libs >= 0.7.3
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libaudio_format_plugin.so
@@ -657,6 +736,7 @@ rm -rf $RPM_BUILD_ROOT
 # R: libsamplerate
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libsamplerate_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libscaletempo_pitch_plugin.so
+# R: soxr >= 0.1.2
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libsoxr_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libscaletempo_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/audio_filter/libsimple_channel_mixer_plugin.so
@@ -689,7 +769,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libaom_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libaraw_plugin.so
-# R: aribb24
+# R: aribb24 >= 1.0.1
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libaribsub_plugin.so
 # R: ffmpeg-libs (libavcodec >= 54.34.0 libavutil >= 51.22.0)
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libavcodec_plugin.so
@@ -702,6 +782,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so
+# R: libdts >= 0.0.5
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libdca_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libddummy_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
@@ -716,7 +797,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 # R: flac
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libflac_plugin.so
-# R: fluidsynth >= 1.1.2
+# R: fluidsynth >= 1.1.2 or fluidlite
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libg711_plugin.so
 # R: gstreamer-plugins-base >= 1.0
@@ -730,6 +811,7 @@ rm -rf $RPM_BUILD_ROOT
 # R: libmpeg2-libs > 0.3.2
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/liblibmpeg2_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/liblpcm_plugin.so
+# R: libmpg123
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libmpg123_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/liboggspots_plugin.so
 # R: libomxil-bellagio (dlopened, no .so NEEDED dependency)
@@ -785,7 +867,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvaapi_drm_plugin.so
 # R: libvorbis >= 1.1
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvorbis_plugin.so
-# R: libvpx
+# R: libvpx >= 1.5.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/codec/libvpx_plugin.so
 # R: libx264
 %{?with_x264:%attr(755,root,root) %{_libdir}/vlc/plugins/codec/libx264_plugin.so}
@@ -833,7 +915,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
 # R: libebml >= 1.0.0 libmatroska >= 1.0.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
-# R: libmodplug >= 0.8.4, libmodplug != 0.8.8
+# R: libmodplug >= 0.8.9.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmod_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libmp4_plugin.so
 # R: musepack-libs
@@ -856,7 +938,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libsid_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libsmf_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libsubtitle_plugin.so
-# R: libdvbpsi
+# R: libdvbpsi >= 1.2.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libts_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libtta_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/demux/libty_plugin.so
@@ -872,6 +954,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/keystore/libfile_keystore_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/keystore/libkwallet_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/keystore/libmemory_keystore_plugin.so
+# R: libsecret >= 0.18
 %attr(755,root,root) %{_libdir}/vlc/plugins/keystore/libsecret_plugin.so
 %dir %{_libdir}/vlc/plugins/logger
 %attr(755,root,root) %{_libdir}/vlc/plugins/logger/libconsole_logger_plugin.so
@@ -1081,7 +1164,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so
 %if %{with opencv}
 # R: opencv
-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
+#%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
@@ -1132,7 +1215,7 @@ rm -rf $RPM_BUILD_ROOT
 # R: OpenGL
 %attr(755,root,root) %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so
 # R: libgoom2
-%attr(755,root,root) %{_libdir}/vlc/plugins/visualization/libgoom_plugin.so
+%{?with_goom:%attr(755,root,root) %{_libdir}/vlc/plugins/visualization/libgoom_plugin.so}
 %if %{with projectM}
 # R: libprojectM >= 2.0.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so