From patchwork Sun Aug 11 13:17:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1145322 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=none (p=none dis=none) header.from=t-online.de 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 46600G2Xwrz9sN1 for ; Sun, 11 Aug 2019 23:18:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A4A4E879A6; Sun, 11 Aug 2019 13:18:03 +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 DLTSUbD71M0y; Sun, 11 Aug 2019 13:18:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 79AF58795A; Sun, 11 Aug 2019 13:18:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0E13D1BF2CC for ; Sun, 11 Aug 2019 13:18:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0787F8795A for ; Sun, 11 Aug 2019 13:18:01 +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 K-EBb9RJk6o3 for ; Sun, 11 Aug 2019 13:18:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by hemlock.osuosl.org (Postfix) with ESMTPS id C5A6087941 for ; Sun, 11 Aug 2019 13:17:59 +0000 (UTC) Received: from fwd16.aul.t-online.de (fwd16.aul.t-online.de [172.20.26.243]) by mailout02.t-online.de (Postfix) with SMTP id 5EC6641F0DDE; Sun, 11 Aug 2019 15:17:58 +0200 (CEST) Received: from fli4l.lan.fli4l (Z2lAfgZZYh4k7-rU2TzHcKTINV2WEwackdjldift5KWPIvfvzdlmL-7CPlMvzowZLf@[84.161.191.122]) by fwd16.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hwnjR-0Vy4WW0; Sun, 11 Aug 2019 15:17:57 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:50594) by fli4l.lan.fli4l with esmtp (Exim 4.92.1) (envelope-from ) id 1hwnjQ-0007YW-T2; Sun, 11 Aug 2019 15:17:57 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 11 Aug 2019 15:17:45 +0200 Message-Id: <20190811131755.30840-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190811131755.30840-1-bernd.kuhls@t-online.de> References: <20190811131755.30840-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: Z2lAfgZZYh4k7-rU2TzHcKTINV2WEwackdjldift5KWPIvfvzdlmL-7CPlMvzowZLf X-TOI-MSGID: 0a063a07-4dee-49da-bbd9-482123313f10 Subject: [Buildroot] [PATCH/next v9 02/12] package/mesa3d: rename OSMesa option 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: =?utf-8?q?Andr=C3=A9_Hentschel?= , Asaf Kahlon , Spenser Gilliland , Romain Naour , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Romain Naour This option is renamed in order to match the naming used by the meson buildsystem. Signed-off-by: Romain Naour Signed-off-by: Bernd Kuhls Acked-by: André Hentschel --- Config.in.legacy | 10 ++++++++++ package/mesa3d-demos/mesa3d-demos.mk | 2 +- package/mesa3d/Config.in | 8 ++++---- package/mesa3d/mesa3d.mk | 2 +- package/wine/wine.mk | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index de05b07c97..4b5a2ce41e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,16 @@ endif ############################################################################### +comment "Legacy options removed in 2019.11" + +config BR2_PACKAGE_MESA3D_OSMESA + bool "mesa OSMesa option renamed" + select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + select BR2_LEGACY + help + The option was renamed in order to match the naming used + by the meson buildsystem. + comment "Legacy options removed in 2019.08" config BR2_GCC_VERSION_6_X diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index ddff9b9ed9..e9aa44dc2e 100644 --- a/package/mesa3d-demos/mesa3d-demos.mk +++ b/package/mesa3d-demos/mesa3d-demos.mk @@ -61,7 +61,7 @@ ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) MESA3D_DEMOS_DEPENDENCIES += libfreeglut MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr # osmesa support depends on glut -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) MESA3D_DEMOS_CONF_OPTS += --enable-osmesa else MESA3D_DEMOS_CONF_OPTS += --disable-osmesa diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 3f44e94229..bd05116aca 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -265,11 +265,11 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= comment "Off-screen Rendering" -config BR2_PACKAGE_MESA3D_OSMESA - bool "OSMesa library" +config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + bool "OSMesa (classic) library" help - The OSMesa API provides functions for making off-screen - renderings. + The OSMesa classic API provides functions for + making off-screen renderings. if BR2_PACKAGE_MESA3D_DRIVER diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index b1799067ee..81736c83d3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -156,7 +156,7 @@ endif # APIs -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) MESA3D_CONF_OPTS += --enable-osmesa else MESA3D_CONF_OPTS += --disable-osmesa diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 78fa860ecf..a09fcdff23 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -195,7 +195,7 @@ else WINE_CONF_OPTS += --without-ldap endif -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d else