X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=vlc.spec;h=dfae782b5004c8b32b57c489136518963184b8eb;hb=4b6d58c9a2e4d8c74dbb85862b41affdd4305443;hp=11c1448ac33cd06e3efc6e043fa3960e3902e81a;hpb=baa64774bee9bafb406041f46d3038e5d62ddfa1;p=packages%2Fvlc.git

diff --git a/vlc.spec b/vlc.spec
index 11c1448..dfae782 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -32,8 +32,9 @@
 %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_with	kde		# KDE Solid actions
 %bcond_without	lirc		# lirc control plugin
 %bcond_without	libplacebo	# libplacebo support in gl plugin
 %bcond_without	live		# live555 demuxer plugin
@@ -69,23 +70,21 @@
 Summary:	VLC - a multimedia player and stream server
 Summary(pl.UTF-8):	VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:		vlc
-Version:	3.0.11.1
+Version:	3.0.18
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Multimedia
 Source0:	https://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	f797dc97305639f6270df619fe1c5962
+# Source0-md5:	f3c031357c0eeffb41e928eca220a803
 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}-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
@@ -142,7 +141,7 @@ BuildRequires:	libass-devel >= 0.9.8
 %{?with_dv:BuildRequires:	libavc1394-devel >= 0.5.3}
 BuildRequires:	libbluray-devel >= 0.6.2
 %{?with_bpg:BuildRequires:	libbpg-devel}
-%{?with_caca:BuildRequires:	libcaca-devel >= 0.99-0.beta14}
+%{?with_caca:BuildRequires:	libcaca-devel >= 0.99-0.beta20}
 BuildRequires:	libcddb-devel >= 0.9.5
 BuildRequires:	libcdio-devel >= 0.78.2
 BuildRequires:	libchromaprint-devel >= 0.6.0
@@ -151,11 +150,11 @@ BuildRequires:	libdc1394-devel >= 2.1.0
 BuildRequires:	libdsm-devel >= 0.2.0
 BuildRequires:	libdts-devel >= 0.0.5
 BuildRequires:	libdvbpsi-devel >= 1.2.0
-BuildRequires:	libdvdnav-devel >= 4.9.1
+BuildRequires:	libdvdnav-devel > 4.9.0
 BuildRequires:	libdvdread-devel >= 4.9.1
 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
@@ -178,7 +177,7 @@ BuildRequires:	libsamplerate-devel
 BuildRequires:	libsecret-devel >= 0.18
 %{?with_shout:BuildRequires:	libshout-devel >= 2.1}
 BuildRequires:	libsidplay2-devel
-%{?with_smb2:BuildRequires:	libsmb2-devel >= 3.0.0}
+%{?with_smb2:BuildRequires:	libsmb2-devel >= 4.0.0}
 %{?with_smb:BuildRequires:	libsmbclient-devel >= 3.6.13}
 %{?with_sftp:BuildRequires:	libssh2-devel}
 BuildRequires:	libstdc++-devel >= 6:4.7
@@ -211,7 +210,7 @@ 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
@@ -223,10 +222,12 @@ 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.4.1
+BuildRequires:	srt-devel >= 1.3.0
 BuildRequires:	sysfsutils-devel
 BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	taglib-devel >= 1.9
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	tpm2-tss-devel
 BuildRequires:	tremor-devel
 %{?with_twolame:BuildRequires:	twolame-devel}
 %{?with_udev:BuildRequires:	udev-devel >= 1:142}
@@ -240,6 +241,7 @@ BuildRequires:	xorg-lib-libXext-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
@@ -271,7 +273,7 @@ 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}
+%{?with_smb2:Requires:	libsmb2 >= 4.0.0}
 Requires:	libtheora >= 1.0
 Requires:	libtiger >= 0.3.1
 Requires:	libvncserver >= 0.9.9
@@ -287,15 +289,16 @@ 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:	srt >= 1.3.0
 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
-Obsoletes:	vlc-SDL
-Obsoletes:	vlc-esd
+Obsoletes:	browser-plugin-vlc < 2
+Obsoletes:	vlc-GGI < 2
+Obsoletes:	vlc-SDL < 2.2.6-3
+Obsoletes:	vlc-esd < 1
+Obsoletes:	vlc-iceweasel-plugin < 1.0.0-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -319,6 +322,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe VLC
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	dbus-devel >= 1.6.0
+Obsoletes:	vlc-static < 1.0.0-3
 
 %description devel
 VLC header files.
@@ -353,9 +357,10 @@ 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
-Obsoletes:	vlc-gnome
-Obsoletes:	vlc-gtk
+%{?with_caca:Suggests:	libcaca > 0.99-0.beta20}
+Obsoletes:	vlc-gnome < 0.8.1-2
+Obsoletes:	vlc-gnome1 < 0.8.1-2
+Obsoletes:	vlc-gtk < 0.8.1-2
 
 %description X11
 X11 output plugin for VLC. Contains GUI image/icon resources.
@@ -423,11 +428,9 @@ Akcje klienta VLC dla Solid.
 %endif
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%patch11 -p1
 
 %build
 %{__libtoolize}
@@ -481,6 +484,7 @@ Akcje klienta VLC dla Solid.
 	%{?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} \
@@ -619,7 +623,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libaccess_oss_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
-# R: srt >= 1.2.2
+# R: srt >= 1.3.0
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libaccess_srt_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/access/libattachment_plugin.so
 # R: ffmpeg-libs (libavformat >= 53.21.0 libavcodec libavutil)
@@ -636,6 +640,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -699,11 +704,12 @@ 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
 %endif
-# R: srt >= 1.2.2
+# R: srt >= 1.3.0
 %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
@@ -1156,7 +1162,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
@@ -1207,7 +1213,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
@@ -1249,7 +1255,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libaa_plugin.so
 %endif
 %if %{with caca}
-# R: libcaca >= 0.99-0.beta14
+# R: libcaca >= 0.99-0.beta20
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
 %endif
 # R: EGL, xorg-lib-libX11