Packman Build Service PMBS

vlc-beta.changes Changed

vlc-beta.spec Changed

@@ -19,8 +19,6 @@
 %define libvlc 123
 %define libvlccore 123
 %bcond_with    vlc_vulkan
-%bcond_without vlc_libbluray
-%bcond_with    vlc_opencv
 %bcond_with    vlc_wayland
 %bcond_without freerdp2
 %bcond_with    freerdp
@@ -30,7 +28,7 @@
 %bcond_with opengles
 %endif
 Name:           vlc-beta
-Version:        4.0.0.20190208.a34939f5f6
+Version:        4.0.0.20190225.3525276eff
 Release:        0
 Summary:        Video Lan Client multimedia player (preview of the upcoming 4.x version)
 License:        GPL-2.0+ and LGPL-2.1+
@@ -41,24 +39,13 @@
 Source3:        %{name}-rpmlintrc
 Patch0:         vlc.hostname.patch
 Patch1:         vlc.a52dec.patch
+Patch2:         vlc.dvdread6.patch
 Patch5:         fix_lib_version.patch
 Patch6:         fix_freerdp2_detection.patch
 Patch7:         fix_lua53_luaL_checkint.patch
 
-%if 0%{?suse_version} > 1320
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
-%else
-%if 0%{?sle_version} == 120300
-# Leap 42.3 / SLE12SP3Backports
-BuildRequires:  gcc7
-BuildRequires:  gcc7-c++
-%else
-# Leap 42.2
-BuildRequires:  gcc6
-BuildRequires:  gcc6-c++
-%endif
-%endif
 BuildRequires:  flex
 BuildRequires:  bison
 BuildRequires:  gettext-devel >= 0.19.8
@@ -75,18 +62,14 @@
 BuildRequires:  pkgconfig(libraw1394) >= 2.0.1
 BuildRequires:  pkgconfig(libavc1394) >= 0.5.3
 BuildRequires:  pkgconfig(zvbi-0.2) >= 0.2.28
-BuildRequires:  pkgconfig(dvdnav) > 4.9.0
-BuildRequires:  pkgconfig(dvdread) > 4.9.0
+BuildRequires:  pkgconfig(dvdnav) >= 6.0.0
+BuildRequires:  pkgconfig(dvdread) >= 6.0.0
 %if %{with vlc_vulkan}
 BuildRequires:  pkgconfig(libplacebo) >= 1.7
 BuildRequires:  pkgconfig(vulkan) >= 1.0.26
 %endif
-%if %{with vlc_libbluray}
 BuildRequires:  pkgconfig(libbluray) >= 0.6.2
-%endif
-%if %{with vlc_opencv}
 BuildRequires:  opencv-qt5-devel > 2.0
-%endif
 BuildRequires:  pkgconfig(smbclient)
 BuildRequires:  pkgconfig(libssh2)
 BuildRequires:  pkgconfig(libnfs) >= 1.10.0
@@ -123,9 +106,7 @@
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libpostproc)
 BuildRequires:  faad2-devel
-%if 0%{?suse_version} > 1320
 BuildRequires:  pkgconfig(vpx) >= 1.5.0
-%endif
 BuildRequires:  pkgconfig(twolame)
 BuildRequires:  pkgconfig(fdk-aac)
 BuildRequires:  pkgconfig(liba52)
@@ -145,9 +126,7 @@
 BuildRequires:  pkgconfig(fluidsynth) >= 1.1.2
 BuildRequires:  pkgconfig(libass) >= 0.9.8
 BuildRequires:  pkgconfig(kate) >= 0.3.0
-%if 0%{?suse_version} > 1320
 BuildRequires:  pkgconfig(tiger) >= 0.3.1
-%endif
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(xcb) >= 1.6
 BuildRequires:  pkgconfig(xcb-render)
@@ -155,7 +134,6 @@
 BuildRequires:  pkgconfig(xcb-composite)
 BuildRequires:  pkgconfig(xproto)
 BuildRequires:  pkgconfig(xcursor)
-BuildRequires:  pkgconfig(xcb-xv) >= 1.1.90.1
 BuildRequires:  pkgconfig(xcb-randr) >= 1.3
 BuildRequires:  pkgconfig(xcb-keysyms) >= 0.3.4
 BuildRequires:  pkgconfig(vdpau) >= 0.6
@@ -194,13 +172,8 @@
 BuildRequires:  pkgconfig(xcb-xkb)
 BuildRequires:  pkgconfig(xkbcommon-x11)
 BuildRequires:  libtar-devel
-%if 0%{?suse_version} > 1320
 BuildRequires:  pkgconfig(ncursesw)
-%endif
 BuildRequires:  pkgconfig(lirc)
-%if 0%{?suse_version} < 1320
-BuildRequires:  pkgconfig(libprojectM) >= 2.0.0
-%endif
 BuildRequires:  pkgconfig(avahi-client) >= 0.6
 BuildRequires:  pkgconfig(libudev) >= 142
 BuildRequires:  pkgconfig(libmtp) >= 1.0.0
@@ -291,13 +264,12 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch5 -p1
 %if %{with freerdp2}
 %patch6 -p1
 %endif
-%if 0%{?suse_version} > 1320
 %patch7 -p1
-%endif
 
 # fix builddate info
 # Remove build time references so build-compare can do its work
@@ -366,14 +338,8 @@
 	--enable-linsys \
 	--enable-dvdread \
 	--enable-dvdnav \
-	--disable-bluray \
-%if %{with vlc_libbluray}
 	--enable-bluray \
-%endif
-	--disable-opencv \
-%if %{with vlc_opencv}
 	--enable-opencv \
-%endif
 	--enable-smbclient \
 	--disable-dsm \
 	--enable-sftp \
@@ -417,9 +383,7 @@
 	--disable-aom \
 	--disable-dav1d \
 	--disable-vpx \
-%if 0%{?suse_version} > 1320
 	--enable-vpx \
-%endif
 	--enable-twolame \
 	--enable-fdkaac \
 	--enable-a52 \
@@ -452,9 +416,7 @@
 	--disable-aribb25 \
 	--enable-kate \
 	--disable-tiger \
-%if 0%{?suse_version} > 1320
 	--enable-tiger \
-%endif
 	--enable-css \
 	--disable-gles2 \
 %if %{with opengles}
@@ -501,16 +463,11 @@
 	--without-breakpad \
 	--disable-minimal-macosx \
 	--disable-ncurses \
-%if 0%{?suse_version} > 1320
 	--enable-ncurses \
-%endif
 	--enable-lirc \
 	--disable-srt \
 	--disable-goom \
 	--disable-projectm \
-%if 0%{?suse_version} < 1320
-	--enable-projectm \
-%endif
 	--disable-vsxu \
 	--enable-avahi \
 	--enable-udev \
@@ -585,9 +542,6 @@
 %{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so
 %endif
 %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so
-%if 0%{?suse_version} < 1320
-%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
-%endif
 
 %files noX-lang -f vlc.lang
 %defattr(-,root,root)
@@ -597,10 +551,8 @@
 %doc %{_datadir}/doc/vlc/
 %doc NEWS AUTHORS COPYING THANKS README
 %{_bindir}/cvlc
-%if 0%{?suse_version} > 1320
 %{_bindir}/nvlc
 %{_mandir}/man1/nvlc*
-%endif
 %{_bindir}/rvlc
 %{_bindir}/vlc
 %{_bindir}/vlc-wrapper
@@ -681,9 +633,7 @@
 %{_libdir}/vlc/plugins/access/libdvdread_plugin.so
 %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so
 %{_libdir}/vlc/plugins/access/libidummy_plugin.so
-%if %{with vlc_libbluray}

vlc.dvdread6.patch Added

vlc-beta-4.0.0.20190208.a34939f5f6.tar.xz Deleted

vlc-beta-4.0.0.20190225.3525276eff.tar.xz Added

Changes of Revision 2