[oe] [meta-multimedia][PATCH 2/2] vlc: make sdl optional (enabled by default)

[Rafaël Carré]

On 10/02/2016 14:19, Martin Jansa wrote:
> On Wed, Feb 10, 2016 at 01:54:22PM +0100, Rafaël Carré wrote:
>> ---
> 
> Did you forget to add sdl to default PACKAGECONFIG?

Oops yes,

sdl also depends on x11 and I am not sure how to add that dependency:
Something like

	{@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}

?

>>  meta-multimedia/recipes-multimedia/vlc/vlc.inc | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> index 2887a68..c85a811 100644
>> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>> @@ -6,7 +6,7 @@ LICENSE = "GPL-2.0"
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>>  
>>  DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
>> -   virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
>> +   dbus dbus-glib libxml2 gnutls \
>>     tremor faad2 ffmpeg flac fluidsynth alsa-lib \
>>     lua-native lua libidn \
>>     avahi jpeg xz libmodplug mpeg2dec \
>> @@ -25,7 +25,6 @@ EXTRA_OECONF = "\
>>      --disable-screen --disable-caca \
>>      --enable-httpd --enable-vlm \
>>      --enable-freetype \
>> -    --enable-sdl \ 
>>      --enable-png \
>>      --enable-tremor \
>>      --enable-v4l2 --disable-aa --disable-faad \
>> @@ -41,6 +40,7 @@ EXTRA_OECONF = "\
>>  
>>  PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
>>  PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
>> +PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image "
>>  PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
>>  PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
>>  PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"
>> -- 
>> 2.5.0