Return-Path: Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com [209.85.212.180]) by mail.openembedded.org (Postfix) with ESMTP id 4B9AC60F07 for ; Mon, 16 Sep 2013 18:06:40 +0000 (UTC) Received: by mail-wi0-f180.google.com with SMTP id hj3so3868993wib.13 for ; Mon, 16 Sep 2013 11:06:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=OqwnrvYKFWvpsxeBu8kBrxipjjinN7O9kWmX3rg/4kU=; b=PFqADNfT+oc2gOqoj2y2uNr2KPI5LEaV+dbHIVufvXvi9tU73WHKDBQXoDjFiRwNpB uocsB4E1QKz1FLteM5bEyWU40l2lpeWvMc77P4qu7F+YdahPbJZO0npnFYVOGXJDqP0g wZTxkE3KErt2CaW4+j2YZVCgfqVZKSg6m/b7DYTisxaW4ctANUq08vl11aF5LhlDX56O OFbtnEKBwnh+a3vNeXCx21uvOGsa7ip/aVAa2dAxlb8pXK68uQ91EAu/HubIEiiUMMST NUiREmnDM3egKjrHowq7HnGOmjsbrvJJ0PlKZM7QGde+MOlmCvG5tVY8bPFKx1Ow/gvT Srvg== X-Gm-Message-State: ALoCoQkNq4kiy3pnApOpqug0ofPoeyR1536TnUQ0Ti1P/EPbHW0IQeu97wWvXHf2MVxNIJ4hT/sh X-Received: by 10.180.90.197 with SMTP id by5mr14421379wib.43.1379354801821; Mon, 16 Sep 2013 11:06:41 -0700 (PDT) Received: from melchett.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by mx.google.com with ESMTPSA id dx7sm25399911wib.8.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Sep 2013 11:06:41 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 16 Sep 2013 19:06:34 +0100 Message-Id: <1379354796-8157-2-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1379354796-8157-1-git-send-email-ross.burton@intel.com> References: <1379354796-8157-1-git-send-email-ross.burton@intel.com> Subject: [PATCH][V2 2/4] mesa-gl: add GL-only Mesa recipe X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 18:06:40 -0000 Some machines have hardware-specific GL drivers that do EGL and GLES (many ARM boards). Others have their own EGL/GLES drivers and provide a Mesa DRI driver (EMGD). Previously adding Mesa, for software GL/GLX rendering in the first case and hardware GLX in the second, involved bbappends and changing Mesa to be machine-specific. By adding a just-GL Mesa the machine definition can combine it with the hardware drivers cleanly. Signed-off-by: Ross Burton --- meta/conf/distro/include/security_flags.inc | 1 + meta/conf/distro/include/seperatebuilddir.inc | 1 + meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb | 11 +++++++++++ 3 files changed, 13 insertions(+) create mode 100644 meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 2858e46..e313be6 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -28,6 +28,7 @@ SECURITY_CFLAGS_pn-libgcc = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-opensp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-ppp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta/conf/distro/include/seperatebuilddir.inc b/meta/conf/distro/include/seperatebuilddir.inc index 5bd0ab4..21d828f 100644 --- a/meta/conf/distro/include/seperatebuilddir.inc +++ b/meta/conf/distro/include/seperatebuilddir.inc @@ -442,6 +442,7 @@ B_pn-menu-cache = "${SEPB}" B_pn-mesa-demos = "${SEPB}" # src/mapi/mapi/stub.c:51:39: error: 'MAPI_TABLE_NUM_DYNAMIC' undeclared here (not in a function) B_pn-mesa = "${SEPB}" +B_pn-mesa-gl = "${SEPB}" B_pn-minicom = "${SEPB}" # Not automake, no external tree support #B_pn-mkelfimage = "${SEPB}" diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb b/meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb new file mode 100644 index 0000000..0e9dbb5 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb @@ -0,0 +1,11 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +FILESPATH = "${FILE_DIRNAME}/mesa-${PV}:${FILE_DIRNAME}/mesa" + +PROVIDES = "virtual/libgl virtual/mesa" + +PACKAGECONFIG ??= "dri ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + +EXCLUDE_FROM_WORLD = "1" -- 1.7.10.4