Overview

Request 4555 (accepted)

- Update to 20190830.61c7eacc1e

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

vlc-beta.changes Changed
x
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Sun Sep  1 19:31:20 UTC 2019 - olaf@aepfle.de
4
+
5
+- Update to 20190830.61c7eacc1e
6
+
7
+-------------------------------------------------------------------
8
 Sun Jul 21 09:02:40 UTC 2019 - olaf@aepfle.de
9
 
10
 - Update to 20190720.683a76b6cb 
11
vlc-beta.spec Changed
172
 
1
@@ -18,10 +18,10 @@
2
 
3
 %define libvlc 123
4
 %define libvlccore 123
5
+%bcond_without vlc_modplug
6
+%bcond_without vlc_opencv
7
 %bcond_with    vlc_vulkan
8
 %bcond_with    vlc_wayland
9
-%bcond_without freerdp2
10
-%bcond_with    freerdp
11
 %bcond_with    fdk_aac
12
 %ifarch %arm
13
 %bcond_without opengles
14
@@ -29,7 +29,7 @@
15
 %bcond_with opengles
16
 %endif
17
 Name:           vlc-beta
18
-Version:        4.0.0.20190720.683a76b6cb
19
+Version:        4.0.0.20190830.61c7eacc1e
20
 Release:        0
21
 Summary:        Video Lan Client multimedia player (preview of the upcoming 4.x version)
22
 License:        GPL-2.0+ and LGPL-2.1+
23
@@ -41,6 +41,7 @@
24
 Patch0:         vlc.hostname.patch
25
 Patch1:         vlc.a52dec.patch
26
 Patch2:         vlc.dvdread6.patch
27
+Patch3:         vlc.libmodplug.patch
28
 Patch5:         fix_lib_version.patch
29
 Patch6:         fix_freerdp2_detection.patch
30
 Patch7:         fix_lua53_luaL_checkint.patch
31
@@ -70,27 +71,26 @@
32
 BuildRequires:  pkgconfig(vulkan) >= 1.0.26
33
 %endif
34
 BuildRequires:  pkgconfig(libbluray) >= 0.6.2
35
+%if %{with vlc_opencv}
36
 BuildRequires:  pkgconfig(opencv) > 2.0
37
+%endif
38
 BuildRequires:  pkgconfig(smbclient)
39
 BuildRequires:  pkgconfig(libssh2)
40
 BuildRequires:  pkgconfig(libnfs) >= 1.10.0
41
 BuildRequires:  pkgconfig(libv4l2)
42
 BuildRequires:  pkgconfig(libcddb) >= 0.9.5
43
 BuildRequires:  pkgconfig(libvncclient) >= 0.9.9
44
-%if %{with freerdp2}
45
 BuildRequires:  pkgconfig(freerdp2)
46
-%endif
47
-%if %{with freerdp}
48
-BuildRequires:  pkgconfig(freerdp) >= 1.0.1
49
-%endif
50
 BuildRequires:  pkgconfig(libdvbpsi) >= 1.2.0
51
 BuildRequires:  pkgconfig(libgme)
52
 BuildRequires:  pkgconfig(ogg) >= 1.0
53
 BuildRequires:  pkgconfig(vorbis) >= 1.1
54
 BuildRequires:  pkgconfig(shout) >= 2.1
55
-BuildRequires:  pkgconfig(libebml)
56
+BuildRequires:  pkgconfig(libebml) >= 1.3.6
57
 BuildRequires:  pkgconfig(libmatroska)
58
-BuildRequires:  pkgconfig(libmodplug) >= 0.8.4
59
+%if %{with vlc_modplug}
60
+BuildRequires:  pkgconfig(libmodplug)
61
+%endif
62
 BuildRequires:  pkgconfig(shine) >= 3.0.0
63
 %ifarch %ix86 x86_64
64
 BuildRequires:  libcrystalhd-devel
65
@@ -106,6 +106,7 @@
66
 BuildRequires:  pkgconfig(libswscale)
67
 BuildRequires:  pkgconfig(libpostproc)
68
 BuildRequires:  faad2-devel
69
+BuildRequires:  pkgconfig(dav1d)
70
 BuildRequires:  pkgconfig(vpx) >= 1.5.0
71
 BuildRequires:  pkgconfig(twolame)
72
 %if %{with fdk_aac}
73
@@ -268,10 +269,9 @@
74
 %patch0 -p1
75
 %patch1 -p1
76
 %patch2 -p1
77
+%patch3 -p1
78
 %patch5 -p1
79
-%if %{with freerdp2}
80
 %patch6 -p1
81
-%endif
82
 %patch7 -p1
83
 
84
 %build
85
@@ -304,6 +304,8 @@
86
    --disable-gprof \
87
    --disable-cprof \
88
    --disable-coverage \
89
+   --disable-mod \
90
+   --disable-opencv \
91
    --disable-sdl-image \
92
    --without-sanitizer \
93
    --enable-optimizations \
94
@@ -333,7 +335,9 @@
95
    --enable-dvdread \
96
    --enable-dvdnav \
97
    --enable-bluray \
98
+%if %{with vlc_opencv}
99
    --enable-opencv \
100
+%endif
101
    --enable-smbclient \
102
    --disable-dsm \
103
    --enable-sftp \
104
@@ -344,9 +348,7 @@
105
    --enable-libcddb \
106
    --disable-screen \
107
    --enable-vnc \
108
-%if %{with freerdp} || %{with freerdp2}
109
    --enable-freerdp \
110
-%endif
111
    --disable-macosx-avfoundation \
112
    --disable-asdcp \
113
    --enable-dvbpsi \
114
@@ -355,7 +357,9 @@
115
    --enable-ogg \
116
    --enable-shout \
117
    --enable-matroska \
118
+%if %{with vlc_modplug}
119
    --enable-mod \
120
+%endif
121
    --disable-mpc \
122
    --disable-omxil \
123
    --disable-rpi-omxil \
124
@@ -373,7 +377,7 @@
125
    --enable-postproc \
126
    --enable-faad \
127
    --disable-aom \
128
-   --disable-dav1d \
129
+   --enable-dav1d \
130
    --disable-vpx \
131
    --enable-vpx \
132
    --enable-twolame \
133
@@ -626,9 +630,7 @@
134
 %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so
135
 %{_libdir}/vlc/plugins/access/libnfs_plugin.so
136
 %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so
137
-%if %{with freerdp} || %{with freerdp2}
138
 %{_libdir}/vlc/plugins/access/librdp_plugin.so
139
-%endif
140
 %{_libdir}/vlc/plugins/access/librtp_plugin.so
141
 %{_libdir}/vlc/plugins/access/libsdp_plugin.so
142
 %{_libdir}/vlc/plugins/access/libshm_plugin.so
143
@@ -687,6 +689,7 @@
144
 %{_libdir}/vlc/plugins/codec/libcrystalhd_plugin.so
145
 %endif
146
 %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so
147
+%{_libdir}/vlc/plugins/codec/libdav1d_plugin.so
148
 %{_libdir}/vlc/plugins/codec/libdca_plugin.so
149
 %{_libdir}/vlc/plugins/codec/libddummy_plugin.so
150
 %{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
151
@@ -758,7 +761,9 @@
152
 %{_libdir}/vlc/plugins/demux/libimage_plugin.so
153
 %{_libdir}/vlc/plugins/demux/libmjpeg_plugin.so
154
 %{_libdir}/vlc/plugins/demux/libmkv_plugin.so
155
+%if %{with vlc_modplug}
156
 %{_libdir}/vlc/plugins/demux/libmod_plugin.so
157
+%endif
158
 %{_libdir}/vlc/plugins/demux/libmp4_plugin.so
159
 %{_libdir}/vlc/plugins/demux/libmpgv_plugin.so
160
 %{_libdir}/vlc/plugins/demux/libnoseek_plugin.so
161
@@ -933,8 +938,10 @@
162
 %{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
163
 %{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
164
 %{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so
165
+%if %{with vlc_opencv}
166
 %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
167
 %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
168
+%endif
169
 %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
170
 %{_libdir}/vlc/plugins/video_filter/libpostproc_plugin.so
171
 %{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so
172
vlc.libmodplug.patch Added
13
 
1
@@ -0,0 +1,11 @@
2
+--- a/configure.ac
3
++++ b/configure.ac
4
+@@ -2324,7 +2324,7 @@ AC_ARG_ENABLE([mod],
5
+   AS_HELP_STRING([--disable-mod],
6
+     [do not use libmodplug (default auto)]))
7
+ if test "${enable_mod}" != "no" ; then
8
+-    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.9.0], [
9
++    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug], [
10
+           VLC_ADD_PLUGIN([mod])
11
+           VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
12
+           VLC_ADD_CFLAGS([mod],[$LIBMODPLUG_CFLAGS]) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
13
vlc-beta-4.0.0.20190720.683a76b6cb.tar.xz Deleted
vlc-beta-4.0.0.20190830.61c7eacc1e.tar.xz Added
Refresh
Refresh
Request History
Olaf Hering's avatar

olh created request over 5 years ago

- Update to 20190830.61c7eacc1e


Olaf Hering's avatar

olh accepted request over 5 years ago