- added libcaca patch (fixes build with 0.99.beta20), reenabled caca

[packages/vlc.git] / vlc.spec

diff --git a/vlc.spec b/vlc.spec
index 4aa0ebfc2a0f428165828719be1ec5fb1eb7475e..907221a9ff52f7d94a81b146c753427fbd4ea339 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -46,7 +46,7 @@
 %bcond_without sftp            # SFTP file transfer via libssh2
 %bcond_without shout           # shout access output plugin
 %bcond_without smb             # SMB access plugin
-%bcond_without smb2            # SMB2 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
@@ -70,12 +70,12 @@
 Summary:       VLC - a multimedia player and stream server
 Summary(pl.UTF-8):     VLC - odtwarzacz multimedialny oraz serwer strumieni
 Name:          vlc
-Version:       3.0.12
-Release:       1
+Version:       3.0.16
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       https://download.videolan.org/pub/videolan/vlc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 452d3423bcbaf1b85faebab0c45a7ecf
+# Source0-md5: efc5f7331c033bf81536531c6eba5aa5
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-tremor.patch
 Patch2:                %{name}-mpc.patch
@@ -87,6 +87,8 @@ Patch7:               %{name}-vsxu.patch
 Patch8:                qt-5.15.patch
 Patch9:                %{name}-live.patch
 Patch10:       %{name}-srt.patch
+Patch11:       opencv4.patch
+Patch12:       %{name}-libcaca.patch
 URL:           http://www.videolan.org/vlc/
 %{?with_decklink:BuildRequires:        Blackmagic_DeckLink_SDK}
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
@@ -143,7 +145,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
@@ -179,7 +181,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
@@ -212,7 +214,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
@@ -356,7 +358,7 @@ Requires:   Qt5X11Extras >= %{qt_ver}
 Requires:      desktop-file-utils
 Requires:      hicolor-icon-theme
 Suggests:      dbus-x11 >= 1.6.0
-%{?with_caca:Suggests: libcaca > 0.99-0.beta14.1}
+%{?with_caca:Suggests: libcaca > 0.99-0.beta20}
 Obsoletes:     vlc-gnome
 Obsoletes:     vlc-gtk
 
@@ -431,6 +433,8 @@ Akcje klienta VLC dla Solid.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 %{__libtoolize}
@@ -1162,7 +1166,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
@@ -1255,7 +1259,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