From patchwork Sat Apr 4 16:51:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1266432 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.137; helo=fraxinus.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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48vjVs2kDcz9sPF for ; Sun, 5 Apr 2020 02:51:14 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E149986160; Sat, 4 Apr 2020 16:51:11 +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 l5-Xuhsxjk5N; Sat, 4 Apr 2020 16:51:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2EDD486166; Sat, 4 Apr 2020 16:51:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 61A641BF3BB for ; Sat, 4 Apr 2020 16:51:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 58AA786166 for ; Sat, 4 Apr 2020 16:51:10 +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 JyYPDYIs6CEy for ; Sat, 4 Apr 2020 16:51:09 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id F2BE186160 for ; Sat, 4 Apr 2020 16:51:08 +0000 (UTC) Received: from host-81-161-192-57.oxylion.net.pl ([81.161.192.57] 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 1jKm0e-0008BX-Iq; Sat, 04 Apr 2020 18:51:05 +0200 From: Bartosz Bilas To: buildroot@buildroot.org Date: Sat, 4 Apr 2020 18:51:00 +0200 Message-Id: <20200404165101.34931-1-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/cegui/cegui.mk: fix typos 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" Configure options should be passed via CONF_OPTS not CONF_OTPS. Signed-off-by: Bartosz Bilas --- package/cegui/cegui.mk | 52 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package/cegui/cegui.mk b/package/cegui/cegui.mk index 657492a7f7..9a15511816 100644 --- a/package/cegui/cegui.mk +++ b/package/cegui/cegui.mk @@ -25,93 +25,93 @@ endif ifeq ($(BR2_PACKAGE_OGRE),y) CEGUI_DEPENDENCIES += ogre -CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_OGRE=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_OGRE=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=OFF endif ifeq ($(BR2_PACKAGE_EXPAT),y) CEGUI_DEPENDENCIES += expat -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF endif ifeq ($(BR2_PACKAGE_IRRLICHT),y) CEGUI_DEPENDENCIES += irrlicht -CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF endif ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_IMAGE),yy) CEGUI_DEPENDENCIES += sdl2 sdl2_image -CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF endif ifeq ($(BR2_PACKAGE_PCRE),y) CEGUI_DEPENDENCIES += pcre -CEGUI_CONF_OTPS += -DCEGUI_HAS_PCRE_REGEX=ON +CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=ON else -CEGUI_CONF_OTPS += -DCEGUI_HAS_PCRE_REGEX=OFF +CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=OFF endif ifeq ($(BR2_PACKAGE_FREETYPE),y) CEGUI_DEPENDENCIES += freetype -CEGUI_CONF_OTPS += -DCEGUI_HAS_FREETYPE=ON +CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=ON else -CEGUI_CONF_OTPS += -DCEGUI_HAS_FREETYPE=OFF +CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF endif ifeq ($(BR2_PACKAGE_MINIZIP),y) CEGUI_DEPENDENCIES += minizip -CEGUI_CONF_OTPS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON +CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON else -CEGUI_CONF_OTPS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF +CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF endif ifeq ($(BR2_PACKAGE_XERCES),y) CEGUI_DEPENDENCIES += xerces -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF endif ifeq ($(BR2_PACKAGE_LIBXML2),y) CEGUI_DEPENDENCIES += libxml2 -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF endif ifeq ($(BR2_PACKAGE_RAPIDXML),y) CEGUI_DEPENDENCIES += rapidxml -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF endif ifeq ($(BR2_PACKAGE_TINYXML),y) CEGUI_DEPENDENCIES += tinyxml -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF endif ifeq ($(BR2_PACKAGE_TINYXML2),y) CEGUI_DEPENDENCIES += tinyxml2 -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF endif ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y) CEGUI_DEPENDENCIES += libfreeimage -CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON +CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON else -CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF +CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF endif $(eval $(cmake-package)) From patchwork Sat Apr 4 16:51:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1266433 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 48vjVy1Jgfz9sPF for ; Sun, 5 Apr 2020 02:51:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 000FD884D2; Sat, 4 Apr 2020 16:51:16 +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 NnMlFxThOLe6; Sat, 4 Apr 2020 16:51:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9A9DF8841F; Sat, 4 Apr 2020 16:51:13 +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 591871BF3BB for ; Sat, 4 Apr 2020 16:51:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 55BE8877FD for ; Sat, 4 Apr 2020 16:51:11 +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 YNiCgKDVrSSk for ; Sat, 4 Apr 2020 16:51:10 +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 DDEDB877FA for ; Sat, 4 Apr 2020 16:51:09 +0000 (UTC) Received: from host-81-161-192-57.oxylion.net.pl ([81.161.192.57] 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 1jKm0g-0008BX-3a; Sat, 04 Apr 2020 18:51:06 +0200 From: Bartosz Bilas To: buildroot@buildroot.org Date: Sat, 4 Apr 2020 18:51:01 +0200 Message-Id: <20200404165101.34931-2-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200404165101.34931-1-b.bilas@grinn-global.com> References: <20200404165101.34931-1-b.bilas@grinn-global.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/cegui: disable xerces 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" Disable temporarily xerces's support due to used char16_t type which is not supported in the currently used cegui version (0-8-7) due to forced c++03 standard. Fixes: - http://autobuild.buildroot.net/results/ea04be78b31b3409801597fc0ebe04627742c0c8 - http://autobuild.buildroot.net/results/7de3a07c304e3939ec9fd164328d004a5a9bba6d - http://autobuild.buildroot.net/results/472b4e8438c9100e06e401296f0417a463e5fcf1 Signed-off-by: Bartosz Bilas --- package/cegui/cegui.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/cegui/cegui.mk b/package/cegui/cegui.mk index 9a15511816..89b662f153 100644 --- a/package/cegui/cegui.mk +++ b/package/cegui/cegui.mk @@ -9,6 +9,7 @@ CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION)) CEGUI_LICENSE = MIT CEGUI_LICENSE_FILES = COPYING CEGUI_INSTALL_STAGING = YES +CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF CEGUI_DEPENDENCIES = glm \ $(if $(BR2_PACKAGE_LIBGLFW),libglfw) \ $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \ @@ -72,13 +73,6 @@ else CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF endif -ifeq ($(BR2_PACKAGE_XERCES),y) -CEGUI_DEPENDENCIES += xerces -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON -else -CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF -endif - ifeq ($(BR2_PACKAGE_LIBXML2),y) CEGUI_DEPENDENCIES += libxml2 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON