From patchwork Fri Mar 10 11:11:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 737355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vfl2w69Fyz9s76 for ; Fri, 10 Mar 2017 22:12:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 934468ABB1; Fri, 10 Mar 2017 11:12:06 +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 360wzVWsugXK; Fri, 10 Mar 2017 11:12:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CE9DB8AB93; Fri, 10 Mar 2017 11:12:04 +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 CBCBC1C0E4A for ; Fri, 10 Mar 2017 11:12:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CA53A8A4D3 for ; Fri, 10 Mar 2017 11:12:03 +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 MoOFhK2gnkhZ for ; Fri, 10 Mar 2017 11:12:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by whitealder.osuosl.org (Postfix) with ESMTP id F40458A236 for ; Fri, 10 Mar 2017 11:11:59 +0000 (UTC) Received: from hhmail02.hh.imgtec.org (unknown [10.100.10.20]) by Forcepoint Email with ESMTPS id D89878ECE501F; Fri, 10 Mar 2017 11:11:54 +0000 (GMT) Received: from vriera-linux.le.imgtec.org (192.168.154.36) by hhmail02.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Fri, 10 Mar 2017 11:11:58 +0000 From: Vicente Olivert Riera To: Date: Fri, 10 Mar 2017 11:11:50 +0000 Message-ID: <20170310111150.9480-1-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 2.10.2 MIME-Version: 1.0 X-Originating-IP: [192.168.154.36] Subject: [Buildroot] [PATCH] libepoxy: EGL dependency is mandatory 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The --disable-egl configure option doesn't exist: configure: WARNING: unrecognized options: [snip] --disable-egl If you don't have EGL support the configure script will fail like this: checking for EGL... no configure: error: Package requirements (egl) were not met: Fixes: http://autobuild.buildroot.net/results/3eca5ba26a521f6cc5a611309ba066472af7769c http://autobuild.buildroot.net/results/cf9ec7da196d70548ae1413e4a3730314f6434d6 http://autobuild.buildroot.net/results/069b80101afc4719db6d6d41cf5fc923be21ddc0 Signed-off-by: Vicente Olivert Riera Reviewed-by: Romain Naour Tested-by: Romain Naour --- package/libepoxy/Config.in | 6 +++--- package/libepoxy/libepoxy.mk | 9 +-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/package/libepoxy/Config.in b/package/libepoxy/Config.in index c87366a..54b8272 100644 --- a/package/libepoxy/Config.in +++ b/package/libepoxy/Config.in @@ -1,12 +1,12 @@ config BR2_PACKAGE_LIBEPOXY bool "libepoxy" select BR2_PACKAGE_XUTIL_UTIL_MACROS - depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_HAS_LIBEGL help Epoxy is a library for handling OpenGL function pointer management for you. https://github.com/anholt/libepoxy -comment "libepoxy needs an OpenGL and/or OpenGL EGL backend" - depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL +comment "libepoxy needs an OpenGL EGL backend" + depends on !BR2_PACKAGE_HAS_LIBEGL diff --git a/package/libepoxy/libepoxy.mk b/package/libepoxy/libepoxy.mk index be8c55e..0f5d802 100644 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@ -9,17 +9,10 @@ LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).1 LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES -LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros +LIBEPOXY_DEPENDENCIES = host-pkgconf libegl xutil_util-macros LIBEPOXY_LICENSE = MIT LIBEPOXY_LICENSE_FILES = COPYING -ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) -LIBEPOXY_CONF_OPTS += --enable-egl -LIBEPOXY_DEPENDENCIES += libegl -else -LIBEPOXY_CONF_OPTS += --disable-egl -endif - ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_XLIB_LIBX11),yy) LIBEPOXY_CONF_OPTS += --enable-glx LIBEPOXY_DEPENDENCIES += libgl xlib_libX11