Patchwork alsa-tools: Enable GTK support for X11, Wayland and DirectFB

login
register
mail settings
Submitter Otavio Salvador
Date April 30, 2014, 8:40 p.m.
Message ID <1398890453-24966-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/71345/
State New
Headers show

Comments

Otavio Salvador - April 30, 2014, 8:40 p.m.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Martin Jansa - May 1, 2014, 6:10 a.m.
On Wed, Apr 30, 2014 at 05:40:53PM -0300, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

This should include required bitbake version bump.

> ---
>  meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb | 5 +++--
>  1 file changed, 3 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 dfa9b97..3113481 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,8 @@ 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 \
> -           ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
> +           ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', '', \
> +                                    'file://makefile_no_gtk.patch', d)}"
>  
>  SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51"
>  SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2"
> @@ -20,7 +21,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 ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
> +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', 'gtk+', '', d)}"
>  PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"
>  
>  # configure.ac/.in doesn't exist so force copy
> -- 
> 2.0.0.rc0
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Otavio Salvador - May 1, 2014, 7:38 p.m.
On Thu, May 1, 2014 at 3:10 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Apr 30, 2014 at 05:40:53PM -0300, Otavio Salvador wrote:
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> This should include required bitbake version bump.

Sent a new patch for it.

Patch

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 dfa9b97..3113481 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,8 @@  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 \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
+           ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', '', \
+                                    'file://makefile_no_gtk.patch', d)}"
 
 SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51"
 SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2"
@@ -20,7 +21,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 ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', 'gtk+', '', d)}"
 PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"
 
 # configure.ac/.in doesn't exist so force copy