File vlc-beta.patch of Package vlc-beta (Revision 8)
Currently displaying revision 8 , Show latest
82
1
--- a/configure.ac
2
+++ b/configure.ac
3
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
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
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
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
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/codec/a52.c
51
+++ b/modules/codec/a52.c
52
53
p_sys->i_flags |= A52_ADJUST_LEVEL;
54
55
/* Initialize liba52 */
56
- p_sys->p_liba52 = a52_init( 0 );
57
+ p_sys->p_liba52 = a52_init();
58
if( p_sys->p_liba52 == NULL )
59
{
60
msg_Err( p_this, "unable to initialize liba52" );
61
--- a/modules/control/cli/cli.c
62
+++ b/modules/control/cli/cli.c
63
64
65
vlc_restorecancel(canc);
66
}
67
+ vlc_assert_unreachable();
68
}
69
70
#else // _WIN32
71
--- a/src/Makefile.am
72
+++ b/src/Makefile.am
73
74
$(LDFLAGS_libvlccore) \
75
-no-undefined \
76
-export-symbols $(srcdir)/libvlccore.sym \
77
- -version-info 9:0:0
78
+ -version-info 123:0:0
79
libvlccore_la_DEPENDENCIES = libvlccore.sym
80
if HAVE_WIN32
81
libvlccore_la_DEPENDENCIES += libvlccore_win32_rc.$(OBJEXT)
82