File vlc-beta.patch of Package vlc-beta
--- 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
@@ -2157,7 +2157,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
@@ -2524,7 +2524,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
@@ -4853,7 +4853,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/audio_output/Makefile.am
+++ b/modules/audio_output/Makefile.am
@@ -2,7 +2,8 @@ aoutdir = $(pluginsdir)/audio_output
aout_LTLIBRARIES =
# Install the pkglib/pkglibexec first before relinking the modules.
# This ensures libtool re-linking is not racy.
-install-aoutLTLIBRARIES: install-pkglibLTLIBRARIES
+installaoutLTLIBRARIES = install-aoutLTLIBRARIES
+$(installaoutLTLIBRARIES): install-pkglibLTLIBRARIES
libvlc_android_audioformat_jni_la_SOURCES = \
audio_output/android/audioformat_jni.c \
--- a/modules/control/cli/cli.c
+++ b/modules/control/cli/cli.c
@@ -580,6 +580,7 @@ _Noreturn static void *Run(void *data)
vlc_restorecancel(canc);
}
+ vlc_assert_unreachable();
}
#else // _WIN32
--- a/modules/hw/vdpau/Makefile.am
+++ b/modules/hw/vdpau/Makefile.am
@@ -1,7 +1,8 @@
vdpaudir = $(pluginsdir)/vdpau
# Install the pkglib/pkglibexec first before relinking the modules.
# This ensures libtool re-linking is not racy.
-install-vpdauLTLIBRARIES: install-pkglibLTLIBRARIES
+installvpdauLTLIBRARIES = install-vdpauLTLIBRARIES
+$(installvpdauLTLIBRARIES): install-pkglibLTLIBRARIES
libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -2,7 +2,8 @@ voutdir = $(pluginsdir)/video_output
vout_LTLIBRARIES =
# Install the pkglib/pkglibexec first before relinking the modules.
# This ensures libtool re-linking is not racy.
-install-voutLTLIBRARIES: install-pkglibLTLIBRARIES
+installvoutLTLIBRARIES = install-voutLTLIBRARIES
+$(installvoutLTLIBRARIES): install-pkglibLTLIBRARIES
EXTRA_DIST += video_output/README
--- 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