summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-02-26 06:26:50 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-02-26 06:27:01 +0100
commit8494263e8c6d0d307dcd29b3afc654bb8603179d (patch)
treed028bb4278e5902b0d1abb14826a24b46b153fa9 /package
parent4fc4fbf63c6b55752579021a460f50d4bf399ae4 (diff)
vlc: use libmatroska
Diffstat (limited to 'package')
-rw-r--r--package/vlc/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 5db3e61d2..24341fbc7 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -16,13 +16,16 @@ PKG_URL:= http://www.videolan.org/vlc/
PKG_SITES:= http://download.videolan.org/pub/videolan/vlc/$(PKG_VERSION)/
PKG_FLAVOURS_VLC:= WITH_BLURAY WITH_MAD WITH_OGG WITH_OPUS WITH_SPEEX WITH_THEORA
-PKG_FLAVOURS_VLC+= WITH_VPX
+PKG_FLAVOURS_VLC+= WITH_VPX WITH_MATROSKA
PKGFD_WITH_BLURAY:= enable bluray support
PKGFB_WITH_BLURAY:= libbluray
PKGFS_WITH_BLURAY:= libbluray
PKGFD_WITH_MAD:= enable mp3 support
PKGFB_WITH_MAD:= libmad
PKGFS_WITH_MAD:= libmad
+PKGFD_WITH_MATROSKA:= enable matroska support
+PKGFB_WITH_MATROSKA:= libmatroska
+PKGFS_WITH_MATROSKA:= libmatroska
PKGFD_WITH_OGG:= enable ogg support
PKGFB_WITH_OGG:= libogg
PKGFS_WITH_OGG:= libogg
@@ -77,6 +80,11 @@ CONFIGURE_ARGS+= --enable-mad
else
CONFIGURE_ARGS+= --disable-mad
endif
+ifneq ($(ADK_PACKAGE_VLC_WITH_MATROSKA),)
+CONFIGURE_ARGS+= --enable-mkv
+else
+CONFIGURE_ARGS+= --disable-mkv
+endif
ifneq ($(ADK_PACKAGE_VLC_WITH_OGG),)
CONFIGURE_ARGS+= --enable-ogg
else