Packman Build Service PMBS

Changes of Revision 4

vlc-beta.changes Changed

vlc-beta.spec Changed

@@ -28,7 +28,7 @@
 %bcond_with opengles
 %endif
 Name:           vlc-beta
-Version:        4.0.0.20190225.3525276eff
+Version:        4.0.0.20190331.50cf146e83
 Release:        0
 Summary:        Video Lan Client multimedia player (preview of the upcoming 4.x version)
 License:        GPL-2.0+ and LGPL-2.1+
@@ -90,7 +90,6 @@
 BuildRequires:  pkgconfig(libebml)
 BuildRequires:  pkgconfig(libmatroska)
 BuildRequires:  pkgconfig(libmodplug) >= 0.8.4
-BuildRequires:  libmpcdec-devel
 BuildRequires:  pkgconfig(shine) >= 3.0.0
 %ifarch %ix86 x86_64
 BuildRequires:  libcrystalhd-devel
@@ -259,8 +258,6 @@
 The all new Qt interface for the VLC VideoLAN Client.
 
 %prep
-echo '********* ENTERED PREP PHASE ********'
-date
 %setup -q
 %patch0 -p1
 %patch1 -p1
@@ -271,20 +268,18 @@
 %endif
 %patch7 -p1
 
+%build
 # fix builddate info
 # Remove build time references so build-compare can do its work
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE1} '+%%H:%%M')
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE1} '+%%b %%e %%Y')
-sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt/dialogs/help.cpp src/config/help.c
-sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/config/help.c
-
+sed -i~ "
+s/__TIME__/\"$FAKE_BUILDTIME\"/
+s/__DATE__/\"$FAKE_BUILDDATE\"/
+" src/config/help.c modules/gui/qt/dialogs/help.cpp
+#
 echo %{version} > ./src/revision.txt
-echo '********* ENDED PREP PHASE *********'
-date
-
-%build
-echo '********* BOOTSTRAPPING *********'
-date
+#
 export BUILDCC=gcc
 export CC=gcc
 export CXX=g++
@@ -300,6 +295,8 @@
 test -x "$(type -p gcc-8)" && export BUILDCC="$_"
 test -x "$(type -p gcc-8)" && export CC="$_"
 test -x "$(type -p g++-8)" && export CXX="$_"
+sed -i~ '/if.*enable_winstore_app/s@ -a test @ -a @' configure.ac
+diff -u "$_"~ "$_" && exit 1
 ./bootstrap
 %configure --help
 %configure \
@@ -307,6 +304,7 @@
 	--without-libfuzzer \
 	--enable-shared \
 	--enable-dbus \
+	--disable-avx \
 	--disable-debug \
 	--disable-gprof \
 	--disable-cprof \
@@ -353,7 +351,6 @@
 %if %{with freerdp} || %{with freerdp2}
 	--enable-freerdp \
 %endif
-	--disable-macosx-qtkit \
 	--disable-macosx-avfoundation \
 	--disable-asdcp \
 	--enable-dvbpsi \
@@ -401,7 +398,6 @@
 	--enable-schroedinger \
 	--enable-png \
 	--enable-jpeg \
-	--disable-bgp \
 	--disable-x262 \
 	--enable-x265 \
 	--disable-x26410b \
@@ -423,7 +419,6 @@
 	--enable-gles2 \
 %endif
 	--enable-xcb \
-	--enable-xvideo \
 	--enable-vdpau \
 	--disable-wayland \
 %if %{with vlc_wayland}
@@ -494,14 +489,10 @@
 	--enable-vlc \
 	--enable-nls
 
-echo '********* FINISHED CONFIGURE *********'
-date
-make %{?_smp_mflags}
+%make_build
 
 %install
-echo '********* ENTERED INSTALL PHASE *********'
-date
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 mkdir -p %{buildroot}/%{_datadir}/pixmaps
 ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
 find %{buildroot} -type f -name "*.la" -delete -print
@@ -595,7 +586,6 @@
 %dir %{_libdir}/vlc/plugins/video_splitter
 %dir %{_libdir}/vlc/plugins/visualization
 %dir %{_libexecdir}/vlc
-# Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg.
 %{_libdir}/vlc/libvlc_pulse.so.0
 %{_libdir}/vlc/libvlc_pulse.so.0.0.0
 %{_libdir}/vlc/libvlc_vdpau.so.0
@@ -750,7 +740,6 @@
 %{_libdir}/vlc/plugins/control/liblirc_plugin.so
 %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
 %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
-%{_libdir}/vlc/plugins/control/libmotion_plugin.so
 %{_libdir}/vlc/plugins/control/libnetsync_plugin.so
 %{_libdir}/vlc/plugins/control/liboldrc_plugin.so
 %{_libdir}/vlc/plugins/demux/libadaptive_plugin.so
@@ -773,7 +762,6 @@
 %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
 %{_libdir}/vlc/plugins/demux/libmod_plugin.so
 %{_libdir}/vlc/plugins/demux/libmp4_plugin.so
-#{_libdir}/vlc/plugins/demux/libmpc_plugin.so
 %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so
 %{_libdir}/vlc/plugins/demux/libnoseek_plugin.so
 %{_libdir}/vlc/plugins/demux/libnsc_plugin.so

vlc-beta-4.0.0.20190225.3525276eff.tar.xz Deleted

vlc-beta-4.0.0.20190331.50cf146e83.tar.xz Added