aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2021-04-07 19:31:25 +0200
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2021-04-07 23:24:25 +0200
commit15a2f9b819806d38a7d8172a20f80130b1d60e63 (patch)
tree282137c6c816bd5a0eb5bdd321363951cb294303
parentacd317d907526d8242874afce96e2f4d8345786a (diff)
downloadbuildroot-15a2f9b819806d38a7d8172a20f80130b1d60e63.tar.gz
buildroot-15a2f9b819806d38a7d8172a20f80130b1d60e63.tar.bz2
package/{mesa3d, mesa3d-headers}: bump version to 21.0.2
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 21.0.2: https://lists.freedesktop.org/archives/mesa-announce/2021-April/000625.html DRI swrast driver was removed: https://cgit.freedesktop.org/mesa/mesa/commit/?h=21.0&id=435de835cd639d1b9bb96f81fc224771dc90af6d OSMesa classic support was removed: https://cgit.freedesktop.org/mesa/mesa/commit/?h=21.0&id=ee802372180a2b4460cc7abb53438e45c6b6f1e4 To avoid any conflict, and to show that the new OSMesa is Gallium-based, we name the new option with a _GALLIUM suffix, even though this is now the only OSMesa implementation left. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [yann.morin.1998@free.fr: - rename the new option s/$/_GALLIUM/ - don't drop the the old (pre-classic) legacy option - slightly reword the OSMesa help entry ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-rw-r--r--Config.in.legacy16
-rw-r--r--package/mesa3d-demos/mesa3d-demos.mk2
-rw-r--r--package/mesa3d-headers/mesa3d-headers.mk2
-rw-r--r--package/mesa3d/Config.in21
-rw-r--r--package/mesa3d/mesa3d.hash6
-rw-r--r--package/mesa3d/mesa3d.mk9
-rw-r--r--package/wine/wine.mk2
7 files changed, 31 insertions, 27 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 8ebbc4c295..1f62348f9b 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,22 @@ endif
comment "Legacy options removed in 2021.05"
+config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
+ bool "mesa OSMesa (classic) option removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_MESA3D_OSMESA_GALLIUM
+ help
+ The OSMesa "classic" library option was removed upstream.
+ Only the Gallium-based implementation remains.
+
+config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
+ bool "mesa DRI swrast driver removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
+ help
+ The DRI swrast driver was removed upstream.
+ Only the Gallium-based implementation remains.
+
config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH
bool "kodi-screensaver-crystalmorph removed"
select BR2_LEGACY
diff --git a/package/mesa3d-demos/mesa3d-demos.mk b/package/mesa3d-demos/mesa3d-demos.mk
index e9aa44dc2e..4289acfffb 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_GALLIUM),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..cac50e5b92 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.2
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..0a9e95a799 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_GALLIUM
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,11 +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_GALLIUM
+ bool "OSMesa (Gallium) library"
+ select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
help
- The OSMesa classic API provides functions for
- making off-screen renderings.
+ The OSMesa API provides functions for off-screen rendering.
if BR2_PACKAGE_MESA3D_DRIVER
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index e7b375440d..f171d97a68 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-April/000625.html
+sha256 46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88 mesa-21.0.2.tar.xz
+sha512 c3d7969b56e1c31ee642e3b7143d565c4233173dab7cc5576b686c873c27134dc8292a9f2caa0a0dd3c54d0c89d27d6030f36a2c84f85dcedee7ae80b19e5c3b mesa-21.0.2.tar.xz
# License
sha256 1361129baa4519b6ed27a1bf4aeee33a58b060bf7bb9b6ea415ecede04e35e46 docs/license.rst
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 5105727e8b..793079cc7f 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.2
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
MESA3D_SITE = https://mesa.freedesktop.org/archive
MESA3D_LICENSE = MIT, SGI, Khronos
@@ -101,7 +101,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
@@ -148,10 +147,10 @@ endif
# APIs
-ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_CLASSIC),y)
-MESA3D_CONF_OPTS += -Dosmesa=classic
+ifeq ($(BR2_PACKAGE_MESA3D_OSMESA_GALLIUM),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..08eadb5b7c 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_GALLIUM),y)
WINE_CONF_OPTS += --with-osmesa
WINE_DEPENDENCIES += mesa3d
else