From patchwork Sun Dec 13 18:12:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 556206 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 2946714031C for ; Mon, 14 Dec 2015 05:12:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DEA27A5D44; Sun, 13 Dec 2015 18:12:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U9LZtk73V6Ve; Sun, 13 Dec 2015 18:12:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 29111A5D2A; Sun, 13 Dec 2015 18:12:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 95EA31C1038 for ; Sun, 13 Dec 2015 18:12:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 90A268C499 for ; Sun, 13 Dec 2015 18:12:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z7XjyBFQlhnb for ; Sun, 13 Dec 2015 18:12:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout12.t-online.de (mailout12.t-online.de [194.25.134.22]) by whitealder.osuosl.org (Postfix) with ESMTPS id E77BE8BF5A for ; Sun, 13 Dec 2015 18:12:39 +0000 (UTC) Received: from fwd09.aul.t-online.de (fwd09.aul.t-online.de [172.20.27.151]) by mailout12.t-online.de (Postfix) with SMTP id ACB3958CBDE for ; Sun, 13 Dec 2015 19:12:37 +0100 (CET) Received: from fli4l.lan.fli4l (GvH6zmZaghKwfEzoyoUjVEa5aDztaIDyQUXqGSaz251x-gYNZDMGtJLFMsv4WWFZKr@[79.221.107.61]) by fwd09.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1a8B8N-3vQgKW0; Sun, 13 Dec 2015 19:12:35 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:57938 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-SHA256:128) (Exim 4.86) (envelope-from ) id 1a8B8M-0000Pu-H9; Sun, 13 Dec 2015 19:12:34 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 13 Dec 2015 19:12:32 +0100 Message-Id: <1450030352-31812-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.6.2 X-ID: GvH6zmZaghKwfEzoyoUjVEa5aDztaIDyQUXqGSaz251x-gYNZDMGtJLFMsv4WWFZKr X-TOI-MSGID: f9fb83ff-953f-4dac-a38a-17332727a8e3 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] package/mesa3d-demos: Disable glesv1 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" The only files enabled by glesv1 support are in src/egl/opengles1/ Quoting src/egl/opengles1/Makefile.am: Most of the files present in this directory contain which breaks a wayland-only build because the build system does not take care of the x11 dependency here. Since these files are "not too interesting" anyway we just disable glesv1 support. Also remove a copy- and-paste artifact from 0001-demos-optional-gl.patch. Fixes http://autobuild.buildroot.net/results/b3e/b3ed3ee174a3ddce84bf64039eac39d4e6e75b71/ Signed-off-by: Bernd Kuhls --- package/mesa3d-demos/0001-demos-optional-gl.patch | 3 --- package/mesa3d-demos/mesa3d-demos.mk | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/mesa3d-demos/0001-demos-optional-gl.patch b/package/mesa3d-demos/0001-demos-optional-gl.patch index 0415bbc..6470e9d 100644 --- a/package/mesa3d-demos/0001-demos-optional-gl.patch +++ b/package/mesa3d-demos/0001-demos-optional-gl.patch @@ -72,6 +72,3 @@ Index: mesa3d-demos-8.1.0/src/util/Makefile.am if HAVE_GLUT AM_CFLAGS += \ -diff -uNr mesa-demos-8.3.0.org/configure.ac mesa-demos-8.3.0/configure.ac ---- mesa-demos-8.3.0.org/configure.ac 2015-12-09 22:06:44.000000000 +0100 -+++ mesa-demos-8.3.0/configure.ac 2015-12-12 17:06:10.484295811 +0100 diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 016095b..cfc5406 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -11,6 +11,8 @@ MESA3D_DEMOS_AUTORECONF = YES MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT +MESA3D_DEMOS_CONF_OPTS = --disable-gles1 + ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11 @@ -27,9 +29,9 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) MESA3D_DEMOS_DEPENDENCIES += libgles -MESA3D_DEMOS_CONF_OPTS += --enable-gles1 --enable-gles2 +MESA3D_DEMOS_CONF_OPTS += --enable-gles2 else -MESA3D_DEMOS_CONF_OPTS += --disable-gles1 --disable-gles2 +MESA3D_DEMOS_CONF_OPTS += --disable-gles2 endif ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y)