File vlc-beta.patch of Package vlc-beta (Revision edd18fae9a6bc3d465cfb9d5d4a4709a)

Currently displaying revision edd18fae9a6bc3d465cfb9d5d4a4709a , Show latest

105
 
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
@@ -2091,7 +2091,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
@@ -2406,7 +2406,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
@@ -4676,7 +4676,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/codec/a52.c
71
+++ b/modules/codec/a52.c
72
@@ -300,7 +300,11 @@ static int Open( vlc_object_t *p_this )
73
     p_sys->i_flags |= A52_ADJUST_LEVEL;
74
75
     /* Initialize liba52 */
76
+#ifdef A52_ACCEL_DETECT
77
+    p_sys->p_liba52 = a52_init();
78
+#else
79
     p_sys->p_liba52 = a52_init( 0 );
80
+#endif
81
     if( p_sys->p_liba52 == NULL )
82
     {
83
         msg_Err( p_this, "unable to initialize liba52" );
84
--- a/modules/control/cli/cli.c
85
+++ b/modules/control/cli/cli.c
86
@@ -577,6 +577,7 @@ static void *Run(void *data)
87
88
         vlc_restorecancel(canc);
89
     }
90
+    vlc_assert_unreachable();
91
 }
92
93
 #else // _WIN32
94
--- a/src/Makefile.am
95
+++ b/src/Makefile.am
96
@@ -554,7 +554,7 @@ libvlccore_la_LDFLAGS = \
97
    $(LDFLAGS_libvlccore) \
98
    -no-undefined \
99
    -export-symbols $(srcdir)/libvlccore.sym \
100
-   -version-info 9:0:0
101
+   -version-info 123:0:0
102
 libvlccore_la_SOURCES += libvlccore.sym
103
 EXTRA_libvlccore_la_DEPENDENCIES = libvlccore.sym
104
105
​
Locations
Help
Contact