From patchwork Thu Jan 23 12:02:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dechesne X-Patchwork-Id: 23617 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B03FB203BE for ; Thu, 23 Jan 2014 12:02:13 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id v10sf3868383pde.1 for ; Thu, 23 Jan 2014 04:02:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=82cRAWoObvqOitMcFLsUc049CnIa9gDWfWcaAhX98f0=; b=BJjo/Y/dc4JxTFneO/zmqj4duAt3cXbAk/2hxtoOqR1E6Vt+Nr9MApBd/8k2dJrSf/ oTHBeZuVWXksE3IwsoelYjeN0ZKC0obgw8OU1kQzrPVPg+yTSAjmTlcuCyalC7o/+Wnd fDbrQblulIx83pXYPk5AUZcstI+TMK+M5UqYufjtIx+rlP7gjdIamPbkA+Dl+76CEkDW 7qH6DevjxGj45N4pi+Gz77kDE3RpRVoCF7t/pnRlyOExX7emPEeRkadkeKv54YFgRVcK 5hhtld/wxDP0ThZsqIMDPBl5y4FZ0tQ+n44Hmtv6G7TiwUDAGe+SdL8gy6huRlqtKUTZ i0QQ== X-Gm-Message-State: ALoCoQmyYqPT8RFdCRXukZddJHSdwHM4EO836MdPIVgqKfQ0EtZ6PqbFT+prMX2aDBKrOn5tg8Pu X-Received: by 10.66.26.132 with SMTP id l4mr2804257pag.2.1390478532964; Thu, 23 Jan 2014 04:02:12 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.165 with SMTP id l34ls266349qgd.5.gmail; Thu, 23 Jan 2014 04:02:12 -0800 (PST) X-Received: by 10.58.85.133 with SMTP id h5mr4352050vez.4.1390478532852; Thu, 23 Jan 2014 04:02:12 -0800 (PST) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id s4si6534906vcy.136.2014.01.23.04.02.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 04:02:12 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ia6so977450vcb.24 for ; Thu, 23 Jan 2014 04:02:12 -0800 (PST) X-Received: by 10.58.180.227 with SMTP id dr3mr1392852vec.36.1390478532713; Thu, 23 Jan 2014 04:02:12 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp21023vcz; Thu, 23 Jan 2014 04:02:12 -0800 (PST) X-Received: by 10.180.184.105 with SMTP id et9mr23581729wic.36.1390478531744; Thu, 23 Jan 2014 04:02:11 -0800 (PST) Received: from mail-we0-f182.google.com (mail-we0-f182.google.com [74.125.82.182]) by mx.google.com with ESMTPS id ni5si9069783wic.61.2014.01.23.04.02.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 04:02:11 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.182 is neither permitted nor denied by best guess record for domain of nicolas.dechesne@linaro.org) client-ip=74.125.82.182; Received: by mail-we0-f182.google.com with SMTP id w62so1037683wes.27 for ; Thu, 23 Jan 2014 04:02:11 -0800 (PST) X-Received: by 10.194.83.9 with SMTP id m9mr3303285wjy.39.1390478531133; Thu, 23 Jan 2014 04:02:11 -0800 (PST) Received: from localhost.localdomain (gau06-1-78-243-126-63.fbx.proxad.net. [78.243.126.63]) by mx.google.com with ESMTPSA id ci4sm21793194wjc.21.2014.01.23.04.02.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jan 2014 04:02:10 -0800 (PST) From: Nicolas Dechesne To: openembedded-core@lists.openembedded.org Cc: patches@linaro.org, Nicolas Dechesne Subject: [PATCH 2/2] libsdl2: add PACKAGECONFIG for opengl Date: Thu, 23 Jan 2014 13:02:06 +0100 Message-Id: <1390478526-12041-3-git-send-email-nicolas.dechesne@linaro.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1390478526-12041-2-git-send-email-nicolas.dechesne@linaro.org> References: <1390478526-12041-1-git-send-email-nicolas.dechesne@linaro.org> <1390478526-12041-2-git-send-email-nicolas.dechesne@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: nicolas.dechesne@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , As discussed in [1], SDL recipe makes the wrong assumption that 'opengl' in DISTRO_FEATURES implies GL/GLX. However 'opengl' could also mean GLES/EGL, and the recipe fails to build in such situations. So we add a PACKAGECONFIG option for opengl so that the build can be made to work on gles/egl with a simple .bbappend. The default PACKAGECONFIG is set to the same value as previously, e.g. 'gl' is enabled if 'opengl' is found in DISTRO_FEATURES. [1] http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088735.html Signed-off-by: Nicolas Dechesne --- meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb index 7958f7b..57d1bd1 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb @@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=0605ca7e995ab1217e0bb988731a87fe" PROVIDES = "virtual/libsdl2" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ tslib" DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" @@ -33,14 +32,21 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ --disable-video-dummy \ --enable-input-tslib --enable-pthreads \ ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ --enable-sdl-dlopen \ --disable-rpath \ --disable-pulseaudio" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \ +" + PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," +# SDL wrongly assumes that opengl means GL/GLX, when using GLES/EGL, do: +# PACKAGECONFIG_remove = "gl" in .bbappend +# or PACKAGECONFIG_remove_pn-libdsl2 = "gl" in .conf +PACKAGECONFIG[gl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PARALLEL_MAKE = ""