From 1b5c9717744eea5d166c6425d5607b7c4a3e2f76 Mon Sep 17 00:00:00 2001 From: Nicolas Aguirre Date: Tue, 8 Apr 2014 10:06:01 +0000 Subject: [PATCH] Detect x11 and wayland support in distro and install framebuffer libs in case of wayland and x11 ones otherwise. --- recipes-graphics/libgles/sunxi-mali_git.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/recipes-graphics/libgles/sunxi-mali_git.bb b/recipes-graphics/libgles/sunxi-mali_git.bb index 99ecff3..77c0c36 100644 --- a/recipes-graphics/libgles/sunxi-mali_git.bb +++ b/recipes-graphics/libgles/sunxi-mali_git.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://README;md5=a103ac69c166fcd98a67a9917dd7affd" COMPATIBLE_MACHINE = "(mele|meleg|cubieboard|cubieboard2|cubietruck|olinuxino-a10|olinuxino-a13|olinuxino-a20)" -DEPENDS = "virtual/libx11 libxau libxdmcp libdrm dri2proto libdri2" - # These libraries shouldn't get installed in world builds unless something # explicitly depends upon them. EXCLUDE_FROM_WORLD = "1" @@ -20,8 +18,15 @@ SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git" S = "${WORKDIR}/git" +DEPENDS = "libdrm dri2proto" + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" +PACKAGECONFIG[wayland] = "EGL_TYPE=framebuffer,,," +PACKAGECONFIG[x11] = "EGL_TYPE=x11,,virtual/libx11 libxau libxdmcp libdri2," + + do_configure() { - DESTDIR=${D}/ VERSION=r3p0 ABI=armhf EGL_TYPE=x11 make config + DESTDIR=${D}/ VERSION=r3p0 ABI=armhf ${EXTRA_OECONF} make config } do_install() {