diff options
| -rw-r--r-- | package/vlc/Makefile | 49 | ||||
| -rw-r--r-- | package/vlc/patches/patch-modules_misc_inhibit_xdg_c | 10 | ||||
| -rw-r--r-- | package/vlc/patches/patch-src_posix_error_c | 14 |
3 files changed, 55 insertions, 18 deletions
diff --git a/package/vlc/Makefile b/package/vlc/Makefile index 3d4681678..3bc67d76c 100644 --- a/package/vlc/Makefile +++ b/package/vlc/Makefile @@ -4,17 +4,29 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= vlc -PKG_VERSION:= 2.2.0 +PKG_VERSION:= 2.2.1 PKG_RELEASE:= 1 -PKG_HASH:= 5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517 +PKG_HASH:= 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb PKG_DESCR:= popular media player PKG_SECTION:= mm/video PKG_BUILDDEP:= ffmpeg xcb-util libtheora libgcrypt libmad alsa-lib -PKG_DEPENDS:= libffmpeg xcb-util libtheora libgcrypt alsa-lib +PKG_DEPENDS:= libpthread librt libffmpeg xcb-util libtheora libgcrypt alsa-lib PKG_URL:= http://www.videolan.org/vlc/ PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/ -PKG_LIBC_DEPENDS:= glibc musl +PKG_FLAVOURS_VLC:= WITH_BLURAY WITH_OPUS WITH_SPEEX WITH_THEORA +PKGFD_WITH_BLURAY:= enable bluray support +PKGFB_WITH_BLURAY:= libbluray +PKGFS_WITH_BLURAY:= libbluray +PKGFD_WITH_OPUS:= enable opus support +PKGFB_WITH_OPUS:= opus +PKGFS_WITH_OPUS:= libopus +PKGFD_WITH_SPEEX:= enable speex support +PKGFB_WITH_SPEEX:= speex +PKGFS_WITH_SPEEX:= libspeex +PKGFD_WITH_THEORA:= enable theora support +PKGFB_WITH_THEORA:= libtheora +PKGFS_WITH_THEORA:= libtheora include $(ADK_TOPDIR)/mk/package.mk @@ -27,21 +39,42 @@ CONFIGURE_ARGS+= --disable-lua \ --disable-dbus \ --disable-a52 \ --disable-fribidi \ - --disable-qt4 \ --disable-skins2 \ --disable-dvdnav \ - --disable-glx \ --disable-libxml2 \ - --disable-smb \ --disable-xcb \ --without-kde-solid \ --enable-libgcrypt \ --enable-mad \ - --enable-theora \ --disable-optimizations \ --disable-static \ --disable-avcodec +ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),) +CONFIGURE_ARGS+= --disable-neon +endif + +ifneq ($(ADK_PACKAGE_VLC_WITH_BLURAY),) +CONFIGURE_ARGS+= --enable-libbluray +else +CONFIGURE_ARGS+= --disable-libbluray +endif +ifneq ($(ADK_PACKAGE_VLC_WITH_OPUS),) +CONFIGURE_ARGS+= --enable-opus +else +CONFIGURE_ARGS+= --disable-opus +endif +ifneq ($(ADK_PACKAGE_VLC_WITH_SPEEX),) +CONFIGURE_ARGS+= --enable-speex +else +CONFIGURE_ARGS+= --disable-speex +endif +ifneq ($(ADK_PACKAGE_VLC_WITH_THEORA),) +CONFIGURE_ARGS+= --enable-theora +else +CONFIGURE_ARGS+= --disable-theora +endif + vlc-install: $(INSTALL_DIR) $(IDIR_VLC)/usr/bin $(INSTALL_DIR) $(IDIR_VLC)/usr/lib/vlc/plugins diff --git a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c b/package/vlc/patches/patch-modules_misc_inhibit_xdg_c deleted file mode 100644 index 59643a5b3..000000000 --- a/package/vlc/patches/patch-modules_misc_inhibit_xdg_c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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> - - static int Open (vlc_object_t *); diff --git a/package/vlc/patches/patch-src_posix_error_c b/package/vlc/patches/patch-src_posix_error_c new file mode 100644 index 000000000..3e720ec00 --- /dev/null +++ b/package/vlc/patches/patch-src_posix_error_c @@ -0,0 +1,14 @@ +--- vlc-2.2.1.orig/src/posix/error.c 2014-08-14 02:20:04.000000000 -0500 ++++ vlc-2.2.1/src/posix/error.c 2015-04-25 21:13:22.287684003 -0500 +@@ -48,7 +48,11 @@ static const char *vlc_strerror_l(int er + errno = saved_errno; + } + ++#if defined(__UCLIBC__) ++ const char *buf = strerror_r(errnum, loc, 100); ++#else + const char *buf = strerror_l(errnum, loc); ++#endif + + freelocale(loc); + return buf; |