From patchwork Wed Apr 9 12:54:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Le Bihan X-Patchwork-Id: 337840 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id AE890140166 for ; Wed, 9 Apr 2014 22:54:41 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 50E402FEA1; Wed, 9 Apr 2014 12:54:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4jgd0r24UI6X; Wed, 9 Apr 2014 12:54:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 66B5227455; Wed, 9 Apr 2014 12:54:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 056601BF96D for ; Wed, 9 Apr 2014 12:54:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 026DF89CDB for ; Wed, 9 Apr 2014 12:54:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pd3FpuDa0+oz for ; Wed, 9 Apr 2014 12:54:29 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by hemlock.osuosl.org (Postfix) with ESMTP id A364387B71 for ; Wed, 9 Apr 2014 12:54:28 +0000 (UTC) Received: from pc-eric.femto.urd1.local (unknown [217.128.73.13]) (Authenticated sender: eric.le.bihan.dev@free.fr) by smtp2-g21.free.fr (Postfix) with ESMTPSA id EFE6C4B00EE for ; Wed, 9 Apr 2014 14:54:22 +0200 (CEST) From: Eric Le Bihan To: buildroot@buildroot.org Date: Wed, 9 Apr 2014 14:54:21 +0200 Message-Id: <1397048061-31767-1-git-send-email-eric.le.bihan.dev@free.fr> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH] mesa3d: fix khrplatform.h installation. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Mesa3D only installs khrplatform.h if EGL support is enabled, whereas this header file is needed by the headers of OpenGL|ES and OpenVG. The supplied patch forces Mesa3D to install this header unconditionally. Fixes http://autobuild.buildroot.net/results/e07/e079219d70830a123977c3ee09d3c11b863d0691 Signed-off-by: Eric Le Bihan --- ...atform.h-not-installed-if-EGL-is-disabled.patch | 44 ++++++++++++++++++++++ package/mesa3d/mesa3d.mk | 1 + 2 files changed, 45 insertions(+) create mode 100644 package/mesa3d/mesa3d-0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch diff --git a/package/mesa3d/mesa3d-0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch b/package/mesa3d/mesa3d-0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch new file mode 100644 index 0000000..79df1ce --- /dev/null +++ b/package/mesa3d/mesa3d-0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch @@ -0,0 +1,44 @@ +From 83a1afd73f2d0aff9aa11c1754d6d407983afa7d Mon Sep 17 00:00:00 2001 +From: Eric Le Bihan +Date: Wed, 9 Apr 2014 12:48:36 +0200 +Subject: [PATCH] Fix khrplatform.h not installed if EGL is disabled. + +KHR/khrplatform.h is required by the EGL, GLES and VG headers, but is +only installed if Mesa3d is compiled with EGL support. + +This patch installs this header file unconditionally. + +Signed-off-by: Eric Le Bihan +--- + src/egl/main/Makefile.am | 3 --- + src/mapi/Makefile.am | 3 +++ + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am +index 60cb600..1cd5cd2 100644 +--- a/src/egl/main/Makefile.am ++++ b/src/egl/main/Makefile.am +@@ -126,9 +126,6 @@ pkgconfigdir = $(libdir)/pkgconfig + + pkgconfig_DATA = egl.pc + +-khrdir = $(includedir)/KHR +-khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h +- + egldir = $(includedir)/EGL + egl_HEADERS = \ + $(top_srcdir)/include/EGL/eglext.h \ +diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am +index ef53803..2a8c555 100644 +--- a/src/mapi/Makefile.am ++++ b/src/mapi/Makefile.am +@@ -40,3 +40,6 @@ endif + if HAVE_OPENVG + SUBDIRS += vgapi + endif ++ ++khrdir = $(includedir)/KHR ++khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h +-- +1.9.1 + diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index f40b2ee..1e2cc53 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -9,6 +9,7 @@ MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.bz2 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos MESA3D_LICENSE_FILES = docs/license.html +MESA3D_AUTORECONF = YES MESA3D_INSTALL_STAGING = YES