File vlc-beta.patch of Package vlc-beta (Revision 42198a9edce6a67117d283b3396dba0b)

Currently displaying revision 42198a9edce6a67117d283b3396dba0b , Show latest

71
 
1
--- a/configure.ac
2
+++ b/configure.ac
3
@@ -10,7 +10,7 @@ VERSION_EXTRA=0
4
 VERSION_DEV=dev
5
 
6
 # libvlc .so version values
7
-LIBVLC_ABI_MAJOR=12
8
+LIBVLC_ABI_MAJOR=123
9
 LIBVLC_ABI_MINOR=0
10
 LIBVLC_ABI_MICRO=0
11
 
12
@@ -2176,7 +2176,7 @@ AS_IF([test "$SYS" = "linux" -a "${enable_linsys}" != "no"], [
13
 dnl
14
 dnl dvdread module: check for libdvdread
15
 dnl
16
-PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 6.0.0], [dvdread input module], [auto])
17
+PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread >= 6.0.0], [dvdread input module], [auto])
18
 
19
 dnl
20
 dnl libdvdnav plugin
21
@@ -2545,7 +2545,7 @@ AC_ARG_ENABLE([mod],
22
   AS_HELP_STRING([--disable-mod],
23
     [do not use libmodplug (default auto)]))
24
 if test "${enable_mod}" != "no" ; then
25
-    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.9.0], [
26
+    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug], [
27
           VLC_ADD_PLUGIN([mod])
28
           VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
29
           VLC_ADD_CFLAGS([mod],[$LIBMODPLUG_CFLAGS]) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
30
@@ -4900,7 +4900,7 @@ AS_IF([test -z "$VLC_COMPILE_HOST"],[
31
    VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
32
 ])
33
 AC_DEFINE_UNQUOTED([VLC_COMPILE_HOST], "$VLC_COMPILE_HOST", [host which ran configure])
34
-AC_DEFINE_UNQUOTED([VLC_COMPILER], "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", [compiler])
35
+AC_DEFINE_UNQUOTED([VLC_COMPILER], "gcc", [compiler])
36
 dnl
37
 dnl  Handle substvars that use $(top_srcdir)
38
 dnl
39
--- a/include/vlc/libvlc_version.h
40
+++ b/include/vlc/libvlc_version.h
41
@@ -54,7 +54,7 @@
42
 
43
 
44
 /** LibVLC ABI major version number, updated when incompatible changes are added */
45
-# define LIBVLC_ABI_VERSION_MAJOR  (12)
46
+# define LIBVLC_ABI_VERSION_MAJOR  (123)
47
 
48
 /** LibVLC ABI minor version number, updated when compatible changes are added */
49
 # define LIBVLC_ABI_VERSION_MINOR  (0)
50
--- a/modules/control/cli/cli.c
51
+++ b/modules/control/cli/cli.c
52
@@ -580,6 +580,7 @@ _Noreturn static void *Run(void *data)
53
 
54
         vlc_restorecancel(canc);
55
     }
56
+    vlc_assert_unreachable();
57
 }
58
 
59
 #else // _WIN32
60
--- a/src/Makefile.am
61
+++ b/src/Makefile.am
62
@@ -585,7 +585,7 @@ libvlccore_la_LDFLAGS = \
63
    $(LDFLAGS_libvlccore) \
64
    -no-undefined \
65
    -export-symbols $(srcdir)/libvlccore.sym \
66
-   -version-info 9:0:0
67
+   -version-info 123:0:0
68
 libvlccore_la_SOURCES += libvlccore.sym
69
 EXTRA_libvlccore_la_DEPENDENCIES = libvlccore.sym
70
 
71