From patchwork Wed Feb 7 09:02:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 127131 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp266663ljc; Wed, 7 Feb 2018 01:03:13 -0800 (PST) X-Google-Smtp-Source: AH8x226OC0yVwcY2IX4FZDOLxAxGYHGOnKOjrVe082Mj6yKqxemz2HvMcV7jP1/n7Uy/fQaBUw67 X-Received: by 10.99.125.82 with SMTP id m18mr4293569pgn.415.1517994193124; Wed, 07 Feb 2018 01:03:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517994193; cv=none; d=google.com; s=arc-20160816; b=Msl1XFvXQPjpPs8ar111RzGjYQAmDCIQFNMtjk5iL9NCwqrPYwIBt4vSM/V2CIrhVA eo8q+h/w0dJegxjCx6zK41bhojQTdzxhoQkGcq968gywJSn/roXDKMeZUrD3p9ZbYePU mOOc2c4Dwgp0eTv2WJUnVIaPnYmMKP79lj/ZG8xnkNZYMOGfJf4mcOtgqRarP+Us+EYr 8fZNnX0pzWVZGMH70dw0+P9IAmvH78OVs52UswktrsvA94EHmTLY8rm4d1nnak20DhzC UrUbARc8mabKyUb3lUNS+XCkAY2uzPg9e4jbgfdt6wxE6hiRdtgFVGAbW7HeAVia91zu 4lmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=B2CeJdEiZk5X6A0PJl4J57twgkBqamUPp+DOxrRgn0Q=; b=iYHTd+uXPMsiy6s4i3uKOCTrCUSJHtLZeCpB0tKbhH8CoB/OnA9OdhpaA+kWlRCNpN HBhUVnpGPfzDSKigUOn4P1quedAYPlqLXaOW4njWz10bduaSTYOK8+AolfaPQs+18sLQ gwAPkvH2kzhIiGtuWWyH2Sl/hR1CWWB+UXzLPfjXX2VvW9G8YTxs+1WF7M+7p1uvMBkm otQtMVNUCBUDg0APAJDe/Wlb4fZ/f/1+BeBY0Y7xMfAh3/ng3nUgLZMkwmWessPCEuuP VowrDkIZGbqSGyN2a/hQ8g/Knjf+Ptz3bCTyBzV5boKbQSaREuxNEjPFetXGlwF3vCTp iJ7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NbVIr0ZK; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l80si826080pfb.178.2018.02.07.01.03.12; Wed, 07 Feb 2018 01:03:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NbVIr0ZK; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 18D617844B; Wed, 7 Feb 2018 09:03:07 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f174.google.com (mail-pf0-f174.google.com [209.85.192.174]) by mail.openembedded.org (Postfix) with ESMTP id F10EC65D00 for ; Wed, 7 Feb 2018 09:03:04 +0000 (UTC) Received: by mail-pf0-f174.google.com with SMTP id y9so66207pfl.2 for ; Wed, 07 Feb 2018 01:03:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=fUIUyz31QwVCyUYgg2EMrrCoe6R0CBmgJAJod7Dz95g=; b=NbVIr0ZKd0AXFNlIvLBLkRafNgSoK+vO6WTm/x/jA0Vxcm1nOBBn0CYG5Sv281kQsy Cm960oXvlE5M8CbuYqvJdj9atkpwMxU5X07u+p/a1AXsfEx2BC12CilXWYncKkaDtLt4 5cZG5kgrKKgmORnw9mP9+H08NIFqdT1bEVSA2oq3noa3hgnJZ+DfqTQyDoUllUokogt5 8+NAGLOGb9MW7KHCy4UC5jdCTZT8N7rokGOKD/4k3qRrfPKZr7GoGVWgdjQJc2deMuwc oXyLrrsW5Z0ia+kQhQIBeaIknTn665NhTI9Z4KmrDaY2uN2999JQL8doxgnN8Sk35Pbc e9+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fUIUyz31QwVCyUYgg2EMrrCoe6R0CBmgJAJod7Dz95g=; b=luN/nZOKqUQ5KMPJFmdnQo5LcPOAJQmuG2tKa3sitbEgnm1q2S25JVjkwCNoLuzAXS 2yU11NW5v2oaGN3xy8Il86dHIZFVKQHF+s+pCZeiNJQO6uaKiIodW6rZOQkQiinGodo0 4DrxCqwxk0ZU3v/MJvozxxKeB3s3IudTgaahS+e+SSuYyRwrXJ4xKLzsnekGKVHoChjJ ObghbGJkkhrNG9sUBqYff6L0JH4PwZ10G9uvgd0xKKAEMqUN/YhhShiWCGY9jZNtxvq5 n6mHcIQxwslZ+RIW8cE8WRb6ByQ3ts86B5sAi+6up48UMic8LIIk8gqW6V8btQ3k8oJ7 zJSw== X-Gm-Message-State: APf1xPDiD5uKT1rhzNZ2EkvCzQVUkF7uADa9eepzBPq/NIf9+fWhX9tP p1Zt0HxzuJKsviDIwNTwYqpvBg== X-Received: by 10.101.70.12 with SMTP id v12mr4324944pgq.327.1517994184581; Wed, 07 Feb 2018 01:03:04 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::5193]) by smtp.gmail.com with ESMTPSA id g15sm2182519pgu.52.2018.02.07.01.03.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2018 01:03:03 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Wed, 7 Feb 2018 01:02:46 -0800 Message-Id: <20180207090246.36346-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 Subject: [OE-core] [PATCH] libepoxy: Define MESA_EGL_NO_X11_HEADERS when GLX is disabled 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: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org This helps when libepoxy is compiled with egl but glx is disabled it also depends on GL implementation provided eglplatform.h to be using MESA_EGL_NO_X11_HEADERS to exclude X11 headers, e.g. mesa, mali-userland implementations use this define to exclude x11 headers Signed-off-by: Khem Raj --- ..._EGL_NO_X11_HEADERS-before-including-eglp.patch | 30 ++++++++++++++++++++++ meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch b/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch new file mode 100644 index 0000000000..ebe5754a7a --- /dev/null +++ b/meta/recipes-graphics/libepoxy/libepoxy/0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch @@ -0,0 +1,30 @@ +From 62e178ddae24c7633d2a03b129dc52261e0a15bf Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Feb 2018 00:48:03 -0800 +Subject: [PATCH] Define MESA_EGL_NO_X11_HEADERS before including eglplatform.h + when X11 is disabled + +This helps in compiling when GL implementations e.g. mesa use +this define to exclude X11 headers + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted [https://github.com/anholt/libepoxy/pull/153] + + src/dispatch_common.h | 3 +++ + 1 file changed, 3 insertions(+) + +Index: libepoxy-1.4.3/src/dispatch_common.h +=================================================================== +--- libepoxy-1.4.3.orig/src/dispatch_common.h ++++ libepoxy-1.4.3/src/dispatch_common.h +@@ -46,6 +46,9 @@ + #include "epoxy/glx.h" + #endif + #if PLATFORM_HAS_EGL ++#if !PLATFORM_HAS_GLX ++#define MESA_EGL_NO_X11_HEADERS 1 ++#endif + #include "epoxy/egl.h" + #endif + #if PLATFORM_HAS_WGL diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb index 72167a2fb8..8a5cb8f49f 100644 --- a/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb +++ b/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://Add-fallback-definition-for-EGL-CAST.patch \ file://0001-Make-it-possible-to-disable-the-use-of-dlvsym-needed.patch \ + file://0001-Define-MESA_EGL_NO_X11_HEADERS-before-including-eglp.patch \ " SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed" SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6"