[OE-core] [PATCH 2/2] alsa-tools: Enable GTK support for X11 and Wayland

[Otavio Salvador]

On Tue, Apr 1, 2014 at 3:50 PM, Denys Dmytriyenko <denis at denix.org> wrote:
> On Tue, Apr 01, 2014 at 02:08:00PM -0300, Otavio Salvador wrote:
>> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
>> ---
>> This patch depends on the alsa-tools one I sent some minutes ago
>>
>>  meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
>> index 4f64a38..fdbe82a 100644
>> --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
>> +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
>> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1
>>  SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
>>             file://mips_has_no_io_h.patch \
>>             file://autotools.patch \
>> -           ${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
>> +           ${@base_any_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
>
> What's the reason to use any_contains here?

Forgot to add the wayland to the list. Good catch.

>>  SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51"
>>  SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2"
>> @@ -20,7 +20,7 @@ inherit autotools-brokensep
>>
>>  EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'"
>>
>> -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
>> +PACKAGECONFIG ??= "${@base_any_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
>
> Same here - what's the reason for the change?

Same here.

>>  PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"
>>
>>  # configure.ac/.in doesn't exist so force copy

I am looking at the other changes Richard has commented and will send a v2.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750