From patchwork Thu Nov 20 20:04:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 412860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 7416E1400F1 for ; Fri, 21 Nov 2014 07:04:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D1B2196B97; Thu, 20 Nov 2014 20:04:20 +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 KVPZnNeRL9kr; Thu, 20 Nov 2014 20:04:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A173596BC1; Thu, 20 Nov 2014 20:04:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id BABD21CEB99 for ; Thu, 20 Nov 2014 20:04:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B7CEF3445A for ; Thu, 20 Nov 2014 20:04:17 +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 RH7ujASjjCuV for ; Thu, 20 Nov 2014 20:04:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout08.t-online.de (mailout08.t-online.de [194.25.134.20]) by silver.osuosl.org (Postfix) with ESMTPS id D328A32D68 for ; Thu, 20 Nov 2014 20:04:15 +0000 (UTC) Received: from fwd40.aul.t-online.de (fwd40.aul.t-online.de [172.20.26.139]) by mailout08.t-online.de (Postfix) with SMTP id 0D6841F95A8 for ; Thu, 20 Nov 2014 21:04:12 +0100 (CET) Received: from fli4l.lan.fli4l (rCOghsZd8h4dQnD8hJ0hjqzGPQI8vJnSyJEBfD+E+KtmTSG08msW1W9fNM2subyQhq@[79.247.177.190]) by fwd40.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1XrXxY-1oSj8y0; Thu, 20 Nov 2014 21:04:08 +0100 Received: from fli4lbuild64.lan.fli4l ([192.168.1.51]:59595) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.84) (envelope-from ) id 1XrXxW-0001Kf-QQ; Thu, 20 Nov 2014 21:04:07 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 20 Nov 2014 21:04:03 +0100 Message-Id: <1416513843-26663-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 X-ID: rCOghsZd8h4dQnD8hJ0hjqzGPQI8vJnSyJEBfD+E+KtmTSG08msW1W9fNM2subyQhq X-TOI-MSGID: 9e4177a6-1c04-4447-877e-d2168ca2af1f Cc: Bernd Kuhls Subject: [Buildroot] [PATCH v2 1/1] package/mesa3d-demos: Fix build error 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" Fixes http://autobuild.buildroot.net/results/8f2/8f292f1151089d20f33c599320941cb5435c0199/ http://autobuild.buildroot.net/results/f3d/f3db50d0c5c74fecafd6b4bdd89f97e8e566d820/ http://autobuild.buildroot.net/results/ac0/ac0f22bf87e2b48bd2191de88999404d1c55de9b/ http://autobuild.buildroot.net/results/da8/da87a3e81b19ad038661f5653b544f4c8cfd389d/ http://autobuild.buildroot.net/results/d51/d51d22754a37f790d2de5a4836237b8eea417124/ http://autobuild.buildroot.net/results/347/347b2f79111548ae00f40879c1b5f3c4c1c7091e/ http://autobuild.buildroot.net/results/aef/aef73a3bc770c3784025642f6a2c276944117112/ http://autobuild.buildroot.net/results/901/90152f1cfa09ad4d37700b340204f8b75850c582/ Signed-off-by: Bernd Kuhls --- v2: Updated patch according to comments from Peter http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/99050 package/mesa3d-demos/Config.in | 2 ++ package/mesa3d-demos/mesa3d-demos.mk | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in index e2b2e05..d63c47b 100644 --- a/package/mesa3d-demos/Config.in +++ b/package/mesa3d-demos/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_MESA3D_DEMOS bool "mesa3d-demos" + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG help diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index 9b60dc9..2db7f56 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -11,11 +11,11 @@ MESA3D_DEMOS_AUTORECONF = YES MESA3D_DEMOS_DEPENDENCIES = host-pkgconf MESA3D_DEMOS_LICENSE = MIT -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu -MESA3D_DEMOS_CONF_OPTS += --enable-gl +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 else -MESA3D_DEMOS_CONF_OPTS += --disable-gl +MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11 endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)