fix release build for uClibc raspberry-pi

5 files changed, 7 insertions, 66 deletions

diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 6c73f3fb9..4ea5f47c6 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		vlc
-PKG_VERSION:=		2.0.7
+PKG_VERSION:=		2.1.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3b0e465b0990097b65abaf3e25589957
+PKG_MD5SUM:=		1331cd853d56762c96afcb92dd498348
 PKG_DESCR:=		Media Player
 PKG_SECTION:=		multimedia
 PKG_BUILDDEP:=		ffmpeg xcb-util libtheora libgcrypt libmad
@@ -15,6 +15,7 @@ PKG_URL:=		http://www.videolan.org/vlc/
 PKG_SITES:=		http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
 
 PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
 
diff --git a/package/vlc/patches/patch-configure b/package/vlc/patches/patch-configure
deleted file mode 100644
index 0989f6776..000000000
--- a/package/vlc/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- vlc-2.0.3.orig/configure	2012-07-04 17:43:18.000000000 +0200
-+++ vlc-2.0.3/configure	2012-07-26 16:16:15.000000000 +0200
-@@ -24739,7 +24739,7 @@ fi
-   LIBS="${LIBS_save}"
- 
- 
-- for a in all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration; do
-+ for a in all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var; do
- 
- 
-   CFLAGS_save="${CFLAGS}"
-@@ -46952,7 +46952,7 @@ fi
- 
- 
- VERSION_MESSAGE="${VERSION} ${CODENAME}"
--COPYRIGHT_MESSAGE="Copyright © ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
-+COPYRIGHT_MESSAGE="Copyright ${COPYRIGHT_YEARS} VLC authors and VideoLAN"
- 
- cat >>confdefs.h <<_ACEOF
- #define VERSION_MESSAGE "${VERSION_MESSAGE}"
diff --git a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c b/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
index 74a5b7675..59643a5b3 100644
--- a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
+++ b/package/vlc/patches/patch-modules_misc_inhibit_xdg_c
@@ -1,8 +1,8 @@
---- vlc-2.0.3.orig/modules/misc/inhibit/xdg.c	2011-12-08 19:00:26.000000000 +0100
-+++ vlc-2.0.3/modules/misc/inhibit/xdg.c	2012-07-26 16:36:07.000000000 +0200
-@@ -27,7 +27,6 @@
- #include <vlc_inhibit.h>
+--- vlc-2.1.1.orig/modules/misc/inhibit/xdg.c	2013-06-24 20:00:38.000000000 +0200
++++ vlc-2.1.1/modules/misc/inhibit/xdg.c	2013-12-06 19:42:43.000000000 +0100
+@@ -28,7 +28,6 @@
  #include <assert.h>
+ #include <errno.h>
  #include <signal.h>
 -#include <spawn.h>
  #include <sys/wait.h>
diff --git a/package/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c b/package/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c
deleted file mode 100644
index 00f1a5f77..000000000
--- a/package/vlc/patches/patch-modules_misc_inhibit_xscreensaver_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- vlc-2.0.3.orig/modules/misc/inhibit/xscreensaver.c	2011-12-08 19:00:26.000000000 +0100
-+++ vlc-2.0.3/modules/misc/inhibit/xscreensaver.c	2012-07-26 16:36:21.000000000 +0200
-@@ -39,7 +39,6 @@
- #include <sys/wait.h>
- #include <fcntl.h>
- #include <signal.h>
--#include <spawn.h>
- 
- /*****************************************************************************
-  * Local prototypes
diff --git a/package/vlc/patches/patch-src_posix_linux_specific_c b/package/vlc/patches/patch-src_posix_linux_specific_c
deleted file mode 100644
index a5cdc1534..000000000
--- a/package/vlc/patches/patch-src_posix_linux_specific_c
+++ /dev/null
@@ -1,30 +0,0 @@
---- vlc-2.0.3.orig/src/posix/linux_specific.c	2011-12-08 19:00:28.000000000 +0100
-+++ vlc-2.0.3/src/posix/linux_specific.c	2012-07-26 16:08:31.000000000 +0200
-@@ -83,27 +83,8 @@ static struct
-     unsigned refs;
- } once = { VLC_STATIC_MUTEX, 0 };
- 
--#ifdef __GLIBC__
--# include <gnu/libc-version.h>
--# include <stdlib.h>
--#endif
--
- void system_Init (void)
- {
--#ifdef __GLIBC__
--    const char *glcv = gnu_get_libc_version ();
--
--    /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
--     * especially in sterror_r(). Even if we have NLS disabled, the calling
--     * process might have called setlocale(). */
--    if (strverscmp (glcv, "2.5") >= 0 && strverscmp (glcv, "2.8") < 0)
--    {
--        fputs ("LibVLC has detected an unusable buggy GNU/libc version.\n"
--               "Please update to version 2.8 or newer.\n", stderr);
--        fflush (stderr);
--    }
--#endif
--
-     vlc_mutex_lock (&once.lock);
-     if (once.refs++ == 0)
-         set_libvlc_path ();