From patchwork Mon Apr 27 20:09:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1277896 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=grinn-global.com Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 499wq433Rnz9sSJ for ; Tue, 28 Apr 2020 06:09:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3409F87E3B; Mon, 27 Apr 2020 20:09:32 +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 y0xV-BtOPalu; Mon, 27 Apr 2020 20:09:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id BB39C87DAA; Mon, 27 Apr 2020 20:09:29 +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 EB6931BF29D for ; Mon, 27 Apr 2020 20:09:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E520084627 for ; Mon, 27 Apr 2020 20:09:22 +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 i0J4w7RCbIKl for ; Mon, 27 Apr 2020 20:09:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp.megiteam.pl (smtp.megiteam.pl [31.186.83.105]) by whitealder.osuosl.org (Postfix) with ESMTPS id 66E8C8303A for ; Mon, 27 Apr 2020 20:09:21 +0000 (UTC) Received: from host-81-161-203-250.oxylion.net.pl ([81.161.203.250] helo=bartekk-pc.lan) by smtp.megiteam.pl with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86.2_XX) (envelope-from ) id 1jTA46-0004ga-Ag; Mon, 27 Apr 2020 22:09:18 +0200 From: Bartosz Bilas To: buildroot@buildroot.org Date: Mon, 27 Apr 2020 22:09:09 +0200 Message-Id: <20200427200909.6753-1-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/cegui: disable ogre support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Bilas Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Buildroot's ogre version isn't compatible with current (v0-8-7) cegui therefore disable support for that. It will be restored when upstream will switch to the new version. Fixes: - http://autobuild.buildroot.net/results/8ee717ac4d596fc0af274037841ac4ed6862ddaa/ Signed-off-by: Bartosz Bilas --- package/cegui/cegui.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/package/cegui/cegui.mk b/package/cegui/cegui.mk index 434201b1f8..673340194a 100644 --- a/package/cegui/cegui.mk +++ b/package/cegui/cegui.mk @@ -10,7 +10,8 @@ CEGUI_LICENSE = MIT CEGUI_LICENSE_FILES = COPYING CEGUI_INSTALL_STAGING = YES CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF \ - -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF + -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF \ + -DCEGUI_BUILD_RENDERER_OGRE=OFF CEGUI_DEPENDENCIES = glm \ $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \ $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \ @@ -25,13 +26,6 @@ else CEGUI_CONF_OPTS += -DCEGUI_USE_EPOXY=OFF endif -ifeq ($(BR2_PACKAGE_OGRE),y) -CEGUI_DEPENDENCIES += ogre -CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=ON -else -CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=OFF -endif - ifeq ($(BR2_PACKAGE_EXPAT),y) CEGUI_DEPENDENCIES += expat CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON