From patchwork Thu Jan 23 12:02:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dechesne X-Patchwork-Id: 23616 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 11981218DC for ; Thu, 23 Jan 2014 12:02:11 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id ar20sf3286890iec.5 for ; Thu, 23 Jan 2014 04:02:11 -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=JMHo9IjeNGcN2rGRXA12fxbc9Z1n4LPhtCp76gb+ZIg=; b=Wwadnuqw1k5Sieprj4vWc/XApDuwROb/4CgvlTvo9SynmVv/hzFvXB/OX0tEtpW04U nkQcO8hRVV2JPXfaeE1ppeU0Y01oTTK1HohS4w+zVjuiwXQlnvIsZLUKMR1CjOmusRMA leX2psnRY6sUuMVp+GMz8Fk+VclqO0WJuZfJdQavrpetwq1jDBfTQfWKBr6AEf+7WJaa IgSCWKnzjWPAm2w3BvKWSeXRXqoPAFRq5Y18ipnnRq4v2Fz4rS3CxIOcoAPZFJ1tKRSj M621QGrcKXGIvlbc7bIHpJISN5qi0P0tTxRbKKRYDPr1VSVUSJ6v6dpTYp0BpIfusJxG 9lHA== X-Gm-Message-State: ALoCoQmlS/VLrhr9U0wMCpapAyYcBhUXhJoyb+eplZct7ZKVOPqc49ZuO1s1qLupC4V2XaYiVgQU X-Received: by 10.182.33.6 with SMTP id n6mr2866757obi.6.1390478531331; Thu, 23 Jan 2014 04:02:11 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.167 with SMTP id dd7ls310084qeb.81.gmail; Thu, 23 Jan 2014 04:02:11 -0800 (PST) X-Received: by 10.58.4.138 with SMTP id k10mr4329904vek.8.1390478531219; Thu, 23 Jan 2014 04:02:11 -0800 (PST) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id u6si6539324vcx.97.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: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.48; Received: by mail-vb0-f48.google.com with SMTP id q16so968955vbe.21 for ; Thu, 23 Jan 2014 04:02:11 -0800 (PST) X-Received: by 10.58.94.195 with SMTP id de3mr237872veb.39.1390478531121; Thu, 23 Jan 2014 04:02:11 -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 u4csp21020vcz; Thu, 23 Jan 2014 04:02:10 -0800 (PST) X-Received: by 10.194.119.168 with SMTP id kv8mr6279787wjb.41.1390478530169; Thu, 23 Jan 2014 04:02:10 -0800 (PST) Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by mx.google.com with ESMTPS id 10si8929118wjp.35.2014.01.23.04.02.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 04:02:10 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.47 is neither permitted nor denied by best guess record for domain of nicolas.dechesne@linaro.org) client-ip=74.125.82.47; Received: by mail-wg0-f47.google.com with SMTP id m15so1369505wgh.14 for ; Thu, 23 Jan 2014 04:02:09 -0800 (PST) X-Received: by 10.194.78.179 with SMTP id c19mr1046069wjx.84.1390478529608; Thu, 23 Jan 2014 04:02:09 -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.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Jan 2014 04:02:08 -0800 (PST) From: Nicolas Dechesne To: openembedded-core@lists.openembedded.org Cc: patches@linaro.org, Nicolas Dechesne Subject: [PATCH 1/2] libsdl: add PACKAGECONFIG for opengl Date: Thu, 23 Jan 2014 13:02:05 +0100 Message-Id: <1390478526-12041-2-git-send-email-nicolas.dechesne@linaro.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1390478526-12041-1-git-send-email-nicolas.dechesne@linaro.org> References: <1390478526-12041-1-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.212.48 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/libsdl/libsdl_1.2.15.bb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index 4b4ff63..492e228 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" PROVIDES = "virtual/libsdl" 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)}" @@ -40,15 +39,22 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers --disable-xbios --disable-gem --disable-video-dummy \ --enable-input-events --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)} \ --disable-video-svga \ --disable-video-picogui --disable-video-qtopia --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-libdsl = "gl" in .conf +PACKAGECONFIG[gl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PARALLEL_MAKE = ""