Request 4555 (accepted)

Overview

Request 4555 (accepted)

- Update to 20190830.61c7eacc1e

Created by olh about 5 years ago
In state accepted

Submit vlc-beta

Submit package Staging / vlc-beta to package Essentials / vlc-beta

vlc-beta.changes Changed

vlc-beta.spec Changed

@@ -18,10 +18,10 @@
 
 %define libvlc 123
 %define libvlccore 123
+%bcond_without vlc_modplug
+%bcond_without vlc_opencv
 %bcond_with    vlc_vulkan
 %bcond_with    vlc_wayland
-%bcond_without freerdp2
-%bcond_with    freerdp
 %bcond_with    fdk_aac
 %ifarch %arm
 %bcond_without opengles
@@ -29,7 +29,7 @@
 %bcond_with opengles
 %endif
 Name:           vlc-beta
-Version:        4.0.0.20190720.683a76b6cb
+Version:        4.0.0.20190830.61c7eacc1e
 Release:        0
 Summary:        Video Lan Client multimedia player (preview of the upcoming 4.x version)
 License:        GPL-2.0+ and LGPL-2.1+
@@ -41,6 +41,7 @@
 Patch0:         vlc.hostname.patch
 Patch1:         vlc.a52dec.patch
 Patch2:         vlc.dvdread6.patch
+Patch3:         vlc.libmodplug.patch
 Patch5:         fix_lib_version.patch
 Patch6:         fix_freerdp2_detection.patch
 Patch7:         fix_lua53_luaL_checkint.patch
@@ -70,27 +71,26 @@
 BuildRequires:  pkgconfig(vulkan) >= 1.0.26
 %endif
 BuildRequires:  pkgconfig(libbluray) >= 0.6.2
+%if %{with vlc_opencv}
 BuildRequires:  pkgconfig(opencv) > 2.0
+%endif
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libssh2)
 BuildRequires:  pkgconfig(libnfs) >= 1.10.0
 BuildRequires:  pkgconfig(libv4l2)
 BuildRequires:  pkgconfig(libcddb) >= 0.9.5
 BuildRequires:  pkgconfig(libvncclient) >= 0.9.9
-%if %{with freerdp2}
 BuildRequires:  pkgconfig(freerdp2)
-%endif
-%if %{with freerdp}
-BuildRequires:  pkgconfig(freerdp) >= 1.0.1
-%endif
 BuildRequires:  pkgconfig(libdvbpsi) >= 1.2.0
 BuildRequires:  pkgconfig(libgme)
 BuildRequires:  pkgconfig(ogg) >= 1.0
 BuildRequires:  pkgconfig(vorbis) >= 1.1
 BuildRequires:  pkgconfig(shout) >= 2.1
-BuildRequires:  pkgconfig(libebml)
+BuildRequires:  pkgconfig(libebml) >= 1.3.6
 BuildRequires:  pkgconfig(libmatroska)
-BuildRequires:  pkgconfig(libmodplug) >= 0.8.4
+%if %{with vlc_modplug}
+BuildRequires:  pkgconfig(libmodplug)
+%endif
 BuildRequires:  pkgconfig(shine) >= 3.0.0
 %ifarch %ix86 x86_64
 BuildRequires:  libcrystalhd-devel
@@ -106,6 +106,7 @@
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libpostproc)
 BuildRequires:  faad2-devel
+BuildRequires:  pkgconfig(dav1d)
 BuildRequires:  pkgconfig(vpx) >= 1.5.0
 BuildRequires:  pkgconfig(twolame)
 %if %{with fdk_aac}
@@ -268,10 +269,9 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch5 -p1
-%if %{with freerdp2}
 %patch6 -p1
-%endif
 %patch7 -p1
 
 %build
@@ -304,6 +304,8 @@
 	--disable-gprof \
 	--disable-cprof \
 	--disable-coverage \
+	--disable-mod \
+	--disable-opencv \
 	--disable-sdl-image \
 	--without-sanitizer \
 	--enable-optimizations \
@@ -333,7 +335,9 @@
 	--enable-dvdread \
 	--enable-dvdnav \
 	--enable-bluray \
+%if %{with vlc_opencv}
 	--enable-opencv \
+%endif
 	--enable-smbclient \
 	--disable-dsm \
 	--enable-sftp \
@@ -344,9 +348,7 @@
 	--enable-libcddb \
 	--disable-screen \
 	--enable-vnc \
-%if %{with freerdp} || %{with freerdp2}
 	--enable-freerdp \
-%endif
 	--disable-macosx-avfoundation \
 	--disable-asdcp \
 	--enable-dvbpsi \
@@ -355,7 +357,9 @@
 	--enable-ogg \
 	--enable-shout \
 	--enable-matroska \
+%if %{with vlc_modplug}
 	--enable-mod \
+%endif
 	--disable-mpc \
 	--disable-omxil \
 	--disable-rpi-omxil \
@@ -373,7 +377,7 @@
 	--enable-postproc \
 	--enable-faad \
 	--disable-aom \
-	--disable-dav1d \
+	--enable-dav1d \
 	--disable-vpx \
 	--enable-vpx \
 	--enable-twolame \
@@ -626,9 +630,7 @@
 %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so
 %{_libdir}/vlc/plugins/access/libnfs_plugin.so
 %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
-%if %{with freerdp} || %{with freerdp2}
 %{_libdir}/vlc/plugins/access/librdp_plugin.so
-%endif
 %{_libdir}/vlc/plugins/access/librtp_plugin.so
 %{_libdir}/vlc/plugins/access/libsdp_plugin.so
 %{_libdir}/vlc/plugins/access/libshm_plugin.so
@@ -687,6 +689,7 @@
 %{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
 %endif
 %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so
+%{_libdir}/vlc/plugins/codec/libdav1d_plugin.so
 %{_libdir}/vlc/plugins/codec/libdca_plugin.so
 %{_libdir}/vlc/plugins/codec/libddummy_plugin.so
 %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
@@ -758,7 +761,9 @@
 %{_libdir}/vlc/plugins/demux/libimage_plugin.so
 %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
 %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
+%if %{with vlc_modplug}
 %{_libdir}/vlc/plugins/demux/libmod_plugin.so
+%endif
 %{_libdir}/vlc/plugins/demux/libmp4_plugin.so
 %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so
 %{_libdir}/vlc/plugins/demux/libnoseek_plugin.so
@@ -933,8 +938,10 @@
 %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
 %{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so
+%if %{with vlc_opencv}
 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+%endif
 %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
 %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so

vlc.libmodplug.patch Added

vlc-beta-4.0.0.20190720.683a76b6cb.tar.xz Deleted

vlc-beta-4.0.0.20190830.61c7eacc1e.tar.xz Added

Build Results
RPM Lint

Refresh

Comments for request 4555 0

Request History

olh created request about 5 years ago

- Update to 20190830.61c7eacc1e

olh accepted request about 5 years ago