Release 4 (by relup.sh)

[packages/vlc.git] / vlc.spec

diff --git a/vlc.spec b/vlc.spec
index 11c1448ac33cd06e3efc6e043fa3960e3902e81a..c8d16b6a2be99e310077051e8d3e3d54e4c81d8b 100644 (file)
--- 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,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.11.1
-Release:       1
+Version:       3.0.16
+Release:       4
 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: efc5f7331c033bf81536531c6eba5aa5
 Patch0:                %{name}-buildflags.patch
 Patch1:                %{name}-tremor.patch
 Patch2:                %{name}-mpc.patch
@@ -86,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
@@ -142,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
@@ -155,7 +158,7 @@ BuildRequires:      libdvdnav-devel >= 4.9.1
 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 +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
@@ -211,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
@@ -227,6 +230,8 @@ 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: tpm2-tss-devel
 BuildRequires: tremor-devel
 %{?with_twolame:BuildRequires: twolame-devel}
 %{?with_udev:BuildRequires:    udev-devel >= 1:142}
@@ -240,6 +245,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 +277,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
@@ -353,7 +359,7 @@ 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.beta20}
 Obsoletes:     vlc-gnome
 Obsoletes:     vlc-gtk
 
@@ -428,6 +434,8 @@ Akcje klienta VLC dla Solid.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 %{__libtoolize}
@@ -481,6 +489,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} \
@@ -636,6 +645,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,6 +709,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
@@ -1156,7 +1167,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 +1218,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 +1260,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