Patchwork alsa-tools: Disable use of GTK+ when using DirectFB

login
register
mail settings
Submitter Otavio Salvador
Date July 15, 2014, 9:33 p.m.
Message ID <1405460022-20428-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/75717/
State New
Headers show

Comments

Otavio Salvador - July 15, 2014, 9:33 p.m.
The GTK+3 does not provide support for DirectFB backend so we cannot
enable GTK+ features of alsa-tools in this case.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Ross Burton - July 16, 2014, 3:42 p.m.
On 15 July 2014 22:33, Otavio Salvador <otavio@ossystems.com.br> wrote:
> -PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', 'gtk+', '', d)}"
> +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk+', '', d)}"
>  PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"

Some tools use GTK+2 and some use GTK+3, so as GTK+ 2 has DirectFB
support you could add pkgconfigs for gtk2 and gtk3, and still get some
tools when using directfb.

Then again, the packageconfig doesn't add any determinism so this is
fairly broken anyway.

Ross
Otavio Salvador - July 16, 2014, 4:20 p.m.
On Wed, Jul 16, 2014 at 12:42 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 15 July 2014 22:33, Otavio Salvador <otavio@ossystems.com.br> wrote:
>> -PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', 'gtk+', '', d)}"
>> +PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk+', '', d)}"
>>  PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"
>
> Some tools use GTK+2 and some use GTK+3, so as GTK+ 2 has DirectFB
> support you could add pkgconfigs for gtk2 and gtk3, and still get some
> tools when using directfb.
>
> Then again, the packageconfig doesn't add any determinism so this is
> fairly broken anyway.

Yes I know but I don't think it is worth it at this moment. The build
is broken now and most users been using X11 so I think it is not a
blocker.

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 62d71ea..d3f0a79 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 \
-           ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', '', \
+           ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', '', \
                                     'file://makefile_no_gtk.patch', d)}"
 
 SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51"
@@ -21,7 +21,7 @@  inherit autotools-brokensep pkgconfig
 
 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_any('DISTRO_FEATURES', 'x11 wayland directfb', 'gtk+', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk+', '', d)}"
 PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"
 
 # configure.ac/.in doesn't exist so force copy