File vlc-beta.patch of Package vlc-beta (Revision 1c50c29340213d8781200766aeb018b4)

Currently displaying revision 1c50c29340213d8781200766aeb018b4 , Show latest

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