[Buildroot] [PATCH 1/1] package/{mesa3d, mesa3d-headers}: bump version to 21.0.0
Bernd Kuhls
bernd.kuhls at t-online.de
Sat Mar 13 07:32:11 UTC 2021
Release notes:
https://lists.freedesktop.org/archives/mesa-announce/2021-March/000622.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 <bernd.kuhls at t-online.de>
---
Config.in.legacy | 22 ++++++++++++++--------
package/mesa3d-headers/mesa3d-headers.mk | 2 +-
package/mesa3d/Config.in | 19 ++++---------------
package/mesa3d/mesa3d.hash | 6 +++---
package/mesa3d/mesa3d.mk | 9 ++++-----
5 files changed, 26 insertions(+), 32 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-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 6e2f0b5a79..4b462d05b8 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.0
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..6eb4f37b23 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,10 @@ 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"
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..235578197b 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/000622.html
+sha256 e6204e98e6a8d77cf9dc5d34f99dd8e3ef7144f3601c808ca0dd26ba522e0d84 mesa-21.0.0.tar.xz
+sha512 32f4a74fbc1456dac478fdc3a85e37cedb9ac1e1b7c5434706dc24930a70bc9e857ba6b5bf1e7e05798e259f8ff0b05bad5252c07253cb5d6a9707c7c2e147ad mesa-21.0.0.tar.xz
# License
sha256 1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46 docs/license.rst
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 4ca51f5e71..04a03980df 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.0
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:
--
2.29.2
More information about the buildroot
mailing list