From patchwork Sat Apr 3 09:02:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1461969 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=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FC9tX6nwsz9s1l for ; Sat, 3 Apr 2021 20:03:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 907024196D; Sat, 3 Apr 2021 09:02:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DAfaoj6sTOCZ; Sat, 3 Apr 2021 09:02:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 3BB3341975; Sat, 3 Apr 2021 09:02:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 54AC71BF338 for ; Sat, 3 Apr 2021 09:02:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4440D40E8A for ; Sat, 3 Apr 2021 09:02:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FZ6fx0aJZJT3 for ; Sat, 3 Apr 2021 09:02:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by smtp2.osuosl.org (Postfix) with ESMTPS id 12CA0400A7 for ; Sat, 3 Apr 2021 09:02:50 +0000 (UTC) Received: from fwd18.aul.t-online.de (fwd18.aul.t-online.de [172.20.26.244]) by mailout03.t-online.de (Postfix) with SMTP id 7A8196ED94; Sat, 3 Apr 2021 11:02:47 +0200 (CEST) Received: from fli4l.lan.fli4l (GEY+liZLohxnTkV6eDBi+wNqN3LCeSV+nUuyFM-L+eNb09RqGaA5qrQlG2JlMXGwsN@[84.161.179.67]) by fwd18.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1lScB5-0ksq000; Sat, 3 Apr 2021 11:02:47 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:54554) by fli4l.lan.fli4l with esmtp (Exim 4.94) (envelope-from ) id 1lScB3-0005o8-Ox; Sat, 03 Apr 2021 11:02:46 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 3 Apr 2021 11:02:45 +0200 Message-Id: <20210403090245.760697-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-ID: GEY+liZLohxnTkV6eDBi+wNqN3LCeSV+nUuyFM-L+eNb09RqGaA5qrQlG2JlMXGwsN X-TOI-EXPURGATEID: 150726::1617440567-00012C5A-1C60A5AF/0/0 CLEAN NORMAL X-TOI-MSGID: 334c73bb-1e1b-47b6-95db-4954cafa2e0d Subject: [Buildroot] [PATCH v2 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.0.1 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?= , Romain Naour , "Yann E . MORIN" , Spenser Gilliland Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Release notes: 21.0.0: https://lists.freedesktop.org/archives/mesa-announce/2021-March/000622.html 21.0.1: https://lists.freedesktop.org/archives/mesa-announce/2021-March/000624.html OSMesa classic support was removed: https://cgit.freedesktop.org/mesa/mesa/commit/?h=21.0&id=ee802372180a2b4460cc7abb53438e45c6b6f1e4 DRI swrast driver was removed: https://cgit.freedesktop.org/mesa/mesa/commit/?h=21.0&id=435de835cd639d1b9bb96f81fc224771dc90af6d Signed-off-by: Bernd Kuhls --- v2: - osmesa needs swrast driver (Yann) - updated other packages following the renamed osmesa Config.in option (Yann) Config.in.legacy | 22 ++++++++++++++-------- package/mesa3d-demos/mesa3d-demos.mk | 2 +- package/mesa3d-headers/mesa3d-headers.mk | 2 +- package/mesa3d/Config.in | 20 +++++--------------- package/mesa3d/mesa3d.hash | 6 +++--- package/mesa3d/mesa3d.mk | 9 ++++----- package/wine/wine.mk | 2 +- 7 files changed, 29 insertions(+), 34 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 8ebbc4c295..da48a78158 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2021.05" +config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + bool "mesa OSMesa option renamed" + select BR2_LEGACY + select BR2_PACKAGE_MESA3D_OSMESA + help + The option was renamed in order to match the naming used + by the meson buildsystem. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST + bool "mesa DRI swrast driver removed" + select BR2_LEGACY + help + The DRI swrast driver was removed. + config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH bool "kodi-screensaver-crystalmorph removed" select BR2_LEGACY @@ -886,14 +900,6 @@ config BR2_PACKAGE_KODI_AUDIODECODER_OPUS help This package is incompatible with Kodi 18.x. -config BR2_PACKAGE_MESA3D_OSMESA - bool "mesa OSMesa option renamed" - select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC if BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST - select BR2_LEGACY - help - The option was renamed in order to match the naming used - by the meson buildsystem. - config BR2_PACKAGE_HOSTAPD_DRIVER_RTW bool "hostapd rtl871xdrv driver removed" select BR2_LEGACY diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk index e9aa44dc2e..ddff9b9ed9 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_CLASSIC),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) MESA3D_DEMOS_CONF_OPTS += --enable-osmesa else MESA3D_DEMOS_CONF_OPTS += --disable-osmesa diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 6e2f0b5a79..07c19a04c1 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 20.3.4 +MESA3D_HEADERS_VERSION = 21.0.1 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index a96fd46bbe..6a803d65a4 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -64,7 +64,7 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER select BR2_PACKAGE_MESA3D_GBM if \ !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ !BR2_PACKAGE_MESA3D_OPENGL_EGL && \ - !BR2_PACKAGE_MESA3D_OSMESA_CLASSIC + !BR2_PACKAGE_MESA3D_OSMESA select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \ (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4) @@ -242,15 +242,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST bool "Gallium swrast driver" - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help This is a software opengl implementation using the Gallium3D infrastructure. -comment "Gallium swrast: Only one swrast provider can be built" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA bool "Gallium tegra driver" select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER @@ -334,13 +330,6 @@ comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouv comment "DRI drivers" -config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST - bool "DRI swrast driver" - select BR2_PACKAGE_MESA3D_DRI_DRIVER - help - This is a software opengl implementation using the DRI - infrastructure. - config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 bool "DRI i915 driver" depends on BR2_i386 || BR2_x86_64 @@ -405,10 +394,11 @@ comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= comment "Off-screen Rendering" -config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC - bool "OSMesa (classic) library" +config BR2_PACKAGE_MESA3D_OSMESA + bool "OSMesa library" + select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST help - The OSMesa classic API provides functions for + The OSMesa API provides functions for making off-screen renderings. if BR2_PACKAGE_MESA3D_DRIVER diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index e7b375440d..53e65650c6 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2021-January/000618.html -sha256 dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084 mesa-20.3.4.tar.xz -sha512 81c4d032213b4aef842f1594e0e89bc0045f7ca7ce5f267b62a0f8236eb12ab09c1f780d8b3776b3072f37cd0bd8829f8a1330a749ccf462471b262ef8097477 mesa-20.3.4.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2021-March/000624.html +sha256 379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb mesa-21.0.1.tar.xz +sha512 b31b78778b6092dfaf0712f90de3074217574389c4236f8379c127739874f6bd1b47883140a26445d25e58df87e6207278efd048453096ee710d334b1dcfe419 mesa-21.0.1.tar.xz # License sha256 1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 4ca51f5e71..5fcbdb59dd 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 20.3.4 +MESA3D_VERSION = 21.0.1 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos @@ -102,7 +102,6 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl # DRI Drivers -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau @@ -149,10 +148,10 @@ endif # APIs -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) -MESA3D_CONF_OPTS += -Dosmesa=classic +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) +MESA3D_CONF_OPTS += -Dosmesa=true else -MESA3D_CONF_OPTS += -Dosmesa=none +MESA3D_CONF_OPTS += -Dosmesa=false endif # Always enable OpenGL: diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 3179658cee..0320ca9cd4 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -191,7 +191,7 @@ else WINE_CONF_OPTS += --without-ldap endif -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y) +ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) WINE_CONF_OPTS += --with-osmesa WINE_DEPENDENCIES += mesa3d else