Packman Build Service PMBS

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

Currently displaying revision b95754344b2b62c3b278e753476c951f , Show latest

--- a/buildsystem/check_qml_module.py
+++ b/buildsystem/check_qml_module.py
@@ -50,7 +50,7 @@ class QmlModuleChecker:
                 "-qmlFiles", f.name,
                 "-importPath", self.qmlpath
             ],
-            capture_output=True,
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
             )
 
         if ret.returncode != 0:
@@ -83,16 +83,16 @@ class QmlModuleChecker:
             print("qmake not found")
             return False
 
-        if qtconf:
+        if False:
             ret = subprocess.run(
                 [ qmake, "-qtconf", qtconf, "-query"],
-                capture_output=True,
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                 encoding="utf8"
             )
         else:
             ret = subprocess.run(
                 [ qmake, "-query"],
-                capture_output=True,
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                 encoding="utf8"
             )
 
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ VERSION_EXTRA=0
 VERSION_DEV=dev
 
 # libvlc .so version values
-LIBVLC_ABI_MAJOR=12
+LIBVLC_ABI_MAJOR=123
 LIBVLC_ABI_MINOR=0
 LIBVLC_ABI_MICRO=0
 
@@ -2124,7 +2124,7 @@ AS_IF([test "$SYS" = "linux" -a "${enable_linsys}" != "no"], [
 dnl
 dnl dvdread module: check for libdvdread
 dnl
-PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 6.0.0], [dvdread input module], [auto])
+PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread >= 6.0.0], [dvdread input module], [auto])
 
 dnl
 dnl libdvdnav plugin
@@ -2471,7 +2471,7 @@ AC_ARG_ENABLE([mod],
   AS_HELP_STRING([--disable-mod],
     [do not use libmodplug (default auto)]))
 if test "${enable_mod}" != "no" ; then
-    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.9.0], [
+    PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug], [
           VLC_ADD_PLUGIN([mod])
           VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
           VLC_ADD_CFLAGS([mod],[$LIBMODPLUG_CFLAGS]) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod
@@ -4750,7 +4750,7 @@ AS_IF([test -z "$VLC_COMPILE_HOST"],[
    VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`
 ])
 AC_DEFINE_UNQUOTED([VLC_COMPILE_HOST], "$VLC_COMPILE_HOST", [host which ran configure])
-AC_DEFINE_UNQUOTED([VLC_COMPILER], "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", [compiler])
+AC_DEFINE_UNQUOTED([VLC_COMPILER], "gcc", [compiler])
 dnl
 dnl  Handle substvars that use $(top_srcdir)
 dnl
--- a/include/vlc/libvlc_version.h
+++ b/include/vlc/libvlc_version.h
@@ -54,7 +54,7 @@
 
 
 /** LibVLC ABI major version number, updated when incompatible changes are added */
-# define LIBVLC_ABI_VERSION_MAJOR  (12)
+# define LIBVLC_ABI_VERSION_MAJOR  (123)
 
 /** LibVLC ABI minor version number, updated when compatible changes are added */
 # define LIBVLC_ABI_VERSION_MINOR  (0)
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -300,7 +300,11 @@ static int Open( vlc_object_t *p_this )
     p_sys->i_flags |= A52_ADJUST_LEVEL;
 
     /* Initialize liba52 */
+#ifdef A52_ACCEL_DETECT
+    p_sys->p_liba52 = a52_init();
+#else
     p_sys->p_liba52 = a52_init( 0 );
+#endif
     if( p_sys->p_liba52 == NULL )
     {
         msg_Err( p_this, "unable to initialize liba52" );
--- a/modules/control/cli/cli.c
+++ b/modules/control/cli/cli.c
@@ -580,6 +580,7 @@ static void *Run(void *data)
 
         vlc_restorecancel(canc);
     }
+    vlc_assert_unreachable();
 }
 
 #else // _WIN32
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -566,7 +566,7 @@ libvlccore_la_LDFLAGS = \
 	$(LDFLAGS_libvlccore) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
-	-version-info 9:0:0
+	-version-info 123:0:0
 libvlccore_la_SOURCES += libvlccore.sym
 EXTRA_libvlccore_la_DEPENDENCIES = libvlccore.sym