Message ID | 1390987553-5131-1-git-send-email-spdawson@gmail.com |
---|---|
State | Accepted |
Commit | e7d309cba02df66ebfe0b9ddd46e26458465125d |
Headers | show |
>>>>> "spdawson" == spdawson <spdawson@gmail.com> writes: > From: Simon Dawson <spdawson@gmail.com> > Signed-off-by: Simon Dawson <spdawson@gmail.com> Committed, thanks.
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index 458fe1c..73b378c 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -21,7 +21,6 @@ VLC_CONF_OPT += \ --disable-quicksync \ --disable-fluidsynth \ --disable-zvbi \ - --disable-libass \ --disable-kate \ --disable-caca \ --disable-jack \ @@ -100,6 +99,13 @@ else VLC_CONF_OPT += --disable-opus endif +ifeq ($(BR2_PACKAGE_LIBASS),y) +VLC_CONF_OPT += --enable-libass +VLC_DEPENDENCIES += libass +else +VLC_CONF_OPT += --disable-libass +endif + ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) VLC_CONF_OPT += --enable-libgcrypt VLC_DEPENDENCIES += libgcrypt