Changes of Revision 18

vlc-beta.spec Changed
x
 
1
@@ -18,7 +18,8 @@
2
 
3
 %define libvlc 123
4
 %define libvlccore 123
5
-%bcond_with    vlc_modplug
6
+%bcond_without vlc_modplug
7
+%bcond_with    vlc_opencv
8
 %bcond_with    vlc_vulkan
9
 %bcond_with    vlc_wayland
10
 %bcond_without freerdp2
11
@@ -42,6 +43,7 @@
12
 Patch0:         vlc.hostname.patch
13
 Patch1:         vlc.a52dec.patch
14
 Patch2:         vlc.dvdread6.patch
15
+Patch3:         vlc.libmodplug.patch
16
 Patch5:         fix_lib_version.patch
17
 Patch6:         fix_freerdp2_detection.patch
18
 Patch7:         fix_lua53_luaL_checkint.patch
19
@@ -92,7 +94,7 @@
20
 BuildRequires:  pkgconfig(libebml) >= 1.3.6
21
 BuildRequires:  pkgconfig(libmatroska)
22
 %if %{with vlc_modplug}
23
-BuildRequires:  pkgconfig(libmodplug) >= 0.8.9.0
24
+BuildRequires:  pkgconfig(libmodplug)
25
 %endif
26
 BuildRequires:  pkgconfig(shine) >= 3.0.0
27
 %ifarch %ix86 x86_64
28
@@ -271,6 +273,7 @@
29
 %patch0 -p1
30
 %patch1 -p1
31
 %patch2 -p1
32
+%patch3 -p1
33
 %patch5 -p1
34
 %if %{with freerdp2}
35
 %patch6 -p1
36
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