Changes of Revision 4

vlc-beta.changes Changed
x
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Mon Apr  1 09:39:41 UTC 2019 - olaf@aepfle.de
4
+
5
+- Update to 20190331.50cf146e83
6
+
7
+-------------------------------------------------------------------
8
 Mon Feb 25 16:44:12 UTC 2019 - olaf@aepfle.de
9
 
10
 - Update to 20190225.3525276eff
11
vlc-beta.spec Changed
137
 
1
@@ -28,7 +28,7 @@
2
 %bcond_with opengles
3
 %endif
4
 Name:           vlc-beta
5
-Version:        4.0.0.20190225.3525276eff
6
+Version:        4.0.0.20190331.50cf146e83
7
 Release:        0
8
 Summary:        Video Lan Client multimedia player (preview of the upcoming 4.x version)
9
 License:        GPL-2.0+ and LGPL-2.1+
10
@@ -90,7 +90,6 @@
11
 BuildRequires:  pkgconfig(libebml)
12
 BuildRequires:  pkgconfig(libmatroska)
13
 BuildRequires:  pkgconfig(libmodplug) >= 0.8.4
14
-BuildRequires:  libmpcdec-devel
15
 BuildRequires:  pkgconfig(shine) >= 3.0.0
16
 %ifarch %ix86 x86_64
17
 BuildRequires:  libcrystalhd-devel
18
@@ -259,8 +258,6 @@
19
 The all new Qt interface for the VLC VideoLAN Client.
20
 
21
 %prep
22
-echo '********* ENTERED PREP PHASE ********'
23
-date
24
 %setup -q
25
 %patch0 -p1
26
 %patch1 -p1
27
@@ -271,20 +268,18 @@
28
 %endif
29
 %patch7 -p1
30
 
31
+%build
32
 # fix builddate info
33
 # Remove build time references so build-compare can do its work
34
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE1} '+%%H:%%M')
35
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE1} '+%%b %%e %%Y')
36
-sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt/dialogs/help.cpp src/config/help.c
37
-sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt/dialogs/help.cpp src/config/help.c
38
-
39
+sed -i~ "
40
+s/__TIME__/\"$FAKE_BUILDTIME\"/
41
+s/__DATE__/\"$FAKE_BUILDDATE\"/
42
+" src/config/help.c modules/gui/qt/dialogs/help.cpp
43
+#
44
 echo %{version} > ./src/revision.txt
45
-echo '********* ENDED PREP PHASE *********'
46
-date
47
-
48
-%build
49
-echo '********* BOOTSTRAPPING *********'
50
-date
51
+#
52
 export BUILDCC=gcc
53
 export CC=gcc
54
 export CXX=g++
55
@@ -300,6 +295,8 @@
56
 test -x "$(type -p gcc-8)" && export BUILDCC="$_"
57
 test -x "$(type -p gcc-8)" && export CC="$_"
58
 test -x "$(type -p g++-8)" && export CXX="$_"
59
+sed -i~ '/if.*enable_winstore_app/s@ -a test @ -a @' configure.ac
60
+diff -u "$_"~ "$_" && exit 1
61
 ./bootstrap
62
 %configure --help
63
 %configure \
64
@@ -307,6 +304,7 @@
65
    --without-libfuzzer \
66
    --enable-shared \
67
    --enable-dbus \
68
+   --disable-avx \
69
    --disable-debug \
70
    --disable-gprof \
71
    --disable-cprof \
72
@@ -353,7 +351,6 @@
73
 %if %{with freerdp} || %{with freerdp2}
74
    --enable-freerdp \
75
 %endif
76
-   --disable-macosx-qtkit \
77
    --disable-macosx-avfoundation \
78
    --disable-asdcp \
79
    --enable-dvbpsi \
80
@@ -401,7 +398,6 @@
81
    --enable-schroedinger \
82
    --enable-png \
83
    --enable-jpeg \
84
-   --disable-bgp \
85
    --disable-x262 \
86
    --enable-x265 \
87
    --disable-x26410b \
88
@@ -423,7 +419,6 @@
89
    --enable-gles2 \
90
 %endif
91
    --enable-xcb \
92
-   --enable-xvideo \
93
    --enable-vdpau \
94
    --disable-wayland \
95
 %if %{with vlc_wayland}
96
@@ -494,14 +489,10 @@
97
    --enable-vlc \
98
    --enable-nls
99
 
100
-echo '********* FINISHED CONFIGURE *********'
101
-date
102
-make %{?_smp_mflags}
103
+%make_build
104
 
105
 %install
106
-echo '********* ENTERED INSTALL PHASE *********'
107
-date
108
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
109
+%make_install
110
 mkdir -p %{buildroot}/%{_datadir}/pixmaps
111
 ln -s %{_datadir}/icons/hicolor/48x48/apps/vlc.png %{buildroot}/%{_datadir}/pixmaps/vlc.png
112
 find %{buildroot} -type f -name "*.la" -delete -print
113
@@ -595,7 +586,6 @@
114
 %dir %{_libdir}/vlc/plugins/video_splitter
115
 %dir %{_libdir}/vlc/plugins/visualization
116
 %dir %{_libexecdir}/vlc
117
-# Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg.
118
 %{_libdir}/vlc/libvlc_pulse.so.0
119
 %{_libdir}/vlc/libvlc_pulse.so.0.0.0
120
 %{_libdir}/vlc/libvlc_vdpau.so.0
121
@@ -750,7 +740,6 @@
122
 %{_libdir}/vlc/plugins/control/liblirc_plugin.so
123
 %{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
124
 %{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
125
-%{_libdir}/vlc/plugins/control/libmotion_plugin.so
126
 %{_libdir}/vlc/plugins/control/libnetsync_plugin.so
127
 %{_libdir}/vlc/plugins/control/liboldrc_plugin.so
128
 %{_libdir}/vlc/plugins/demux/libadaptive_plugin.so
129
@@ -773,7 +762,6 @@
130
 %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
131
 %{_libdir}/vlc/plugins/demux/libmod_plugin.so
132
 %{_libdir}/vlc/plugins/demux/libmp4_plugin.so
133
-#{_libdir}/vlc/plugins/demux/libmpc_plugin.so
134
 %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so
135
 %{_libdir}/vlc/plugins/demux/libnoseek_plugin.so
136
 %{_libdir}/vlc/plugins/demux/libnsc_plugin.so
137
vlc-beta-4.0.0.20190225.3525276eff.tar.xz Deleted
vlc-beta-4.0.0.20190331.50cf146e83.tar.xz Added