Packman Build Service PMBS

File vlc-beta.patch of Package vlc-beta (Revision 8b606f8920c0223c436a40231d1cbcf8)

Currently displaying revision 8b606f8920c0223c436a40231d1cbcf8 , Show latest

control/cli/cli.c: In function 'Run':
control/cli/cli.c:541:1: error: no return statement in function returning non-void [-Werror=return-type]

--- a/configure.ac
+++ b/configure.ac
@@ -2105,7 +2105,7 @@ AS_IF([test "$SYS" = "linux" -a "${enabl
 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
@@ -2443,7 +2443,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
--- a/modules/control/cli/cli.c
+++ b/modules/control/cli/cli.c
@@ -529,9 +529,8 @@ static void cli_client_delete(struct cli
     free(cl);
 }
 
-static void *Run(void *data)
+static void _Run(intf_thread_t *intf)
 {
-    intf_thread_t *intf = data;
     intf_sys_t *sys = intf->p_sys;
 
     vlc_thread_set_name("vlc-cli-server");
@@ -566,6 +565,13 @@ static void *Run(void *data)
     }
 }
 
+static void *Run(void *data)
+{
+    intf_thread_t *intf = data;
+    _Run(intf);
+    return NULL;
+}
+
 #else
 static void msg_vprint(intf_thread_t *p_intf, const char *psz_fmt, va_list args)
 {