sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (82db17da51f7dc5b50d759b113227add7fd17e58)

From: Treeve Jelbert <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (82db17da51f7dc5b50d759b113227add7fd17e58)
Date: Fri, 12 Mar 2021 08:54:19 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics-libs/mesa/BUILD
| 1
graphics-libs/mesa/CONFIGURE
| 24 ----
graphics-libs/mesa/DETAILS
| 4
graphics-libs/mesa/HISTORY
| 7 +

graphics-libs/mesa/patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch
| 58 ----------
5 files changed, 13 insertions(+), 81 deletions(-)

New commits:
commit 82db17da51f7dc5b50d759b113227add7fd17e58
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesa: => 21.0.0

diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index 4ac0a1a..ff3162a 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -20,7 +20,6 @@ local dri=${MESA_DRI//none} &&
OPTS+=" dri-drivers=${dri// /,} \
gallium-drivers=${gallium// /,} \
vulkan-drivers=${vulkan// /,} \
- osmesa=${MESA_OSMESA// /,} \
platforms=${MESA_EGL// /,} \
glx=${MESA_GLX// /,} \
tools=${MESA_TOOLS// /,} \
diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index 3a9a010..4997d2a 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -3,6 +3,7 @@ persistent_remove MESALIB_VULKAN
persistent_remove MESALIB_BUILD
persistent_remove MESALIB_GALLIUM
persistent_remove MESALIB_DRIVERS
+persistent_remove MESA_OSMESA

# adjust some flags
MESA_GLES1=${MESA_GLES1/true/enabled}
@@ -10,20 +11,20 @@ MESA_GLES2=${MESA_GLES2/true/enabled}
MESA_GLES1=${MESA_GLES1/false/disabled}
MESA_GLES2=${MESA_GLES2/false/disabled}
MESA_EGL=${MESA_EGL/drm/}
+MESA_DRI=${MESA_DRI/swrast/}

. $GRIMOIRE/config_query_multi.function &&
. $GRIMOIRE/MESON_CONFIGURE &&

config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib
gallium-xlib &&
config_query_multi MESA_EGL "window systems to support,recommend x11" x11
wayland &&
-config_query_multi MESA_OSMESA "Build OSmesa - not usually needed, except by
swrast " none classic gallium

config_query_multi MESA_DRM "which libdrm hardware" AMD INTEL NOUVEAU RADEON
&&
# only suggest drivers for specified hardware
-local AVAILABLE_DRIVERS="swrast"
+local AVAILABLE_DRIVERS=""
local AVAILABLE_GALLIUM="svga swrast virgl zink"
-local AVAILABLE_VULKAN=""
+local AVAILABLE_VULKAN="swrast"
if list_find "$MESA_DRM" AMD;then
AVAILABLE_VULKAN+=" amd"
fi &&
@@ -61,23 +62,6 @@ config_query_multi MESA_GALLIUM \
if list_find "$MESA_GALLIUM" all;then
MESA_GALLIUM="$AVAILABLE_GALLIUM"
fi &&
-if list_find "$MESA_GALLIUM" swrast;then
- list_remove MESA_DRI swrast
-fi &&
-
-if list_find "$MESA_OSMESA" classic;then
-# force this option
- list_add MESA_DRI swrast
- list_remove MESA_DRI none
- list_remove MESA_GALLIUM swrast
-fi &&
-
-if list_find "$MESA_OSMESA" gallium;then
-# force this option
- list_add MESA_GALLIUM swrast
- list_remove MESA_GALLIUM none
- list_remove MESA_DRI swrast
-fi &&

# Vulkan support
config_query_multi MESA_VULKAN \
diff --git a/graphics-libs/mesa/DETAILS b/graphics-libs/mesa/DETAILS
index aae67da..78fd27b 100755
--- a/graphics-libs/mesa/DETAILS
+++ b/graphics-libs/mesa/DETAILS
@@ -9,8 +9,8 @@ if [[ "${MESA_BRANCH}" == "scm" ]]; then
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
- VERSION=20.3.2
-
SOURCE_HASH=sha512:0cabf8ddfd20b56098c8f4c081a3c2d4741ef42f40c929645e74284db99cf2a81137d7d279b7b6a0c15dea83905119ddf612411b36344dc22a488de9f311f5ed
+ VERSION=21.0.0
+
SOURCE_HASH=sha512:32f4a74fbc1456dac478fdc3a85e37cedb9ac1e1b7c5434706dc24930a70bc9e857ba6b5bf1e7e05798e259f8ff0b05bad5252c07253cb5d6a9707c7c2e147ad
SOURCE=mesa-$VERSION.tar.xz
SOURCE_URL[0]="https://mesa.freedesktop.org/archive/${SOURCE}";
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesa-${VERSION}
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 268a403..e746c85 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,10 @@
+2021-03-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 21.0.0
+ * 0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch:
delete
+
+2021-01-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE BUILD: remove osmesa, tweak swrast
+
2021-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 20.3.2

diff --git
a/graphics-libs/mesa/patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch

b/graphics-libs/mesa/patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch
deleted file mode 100644
index 68196e2..0000000
---
a/graphics-libs/mesa/patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 434da21a7c81acbe03f0e1621e80904313c0b05c Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney AT mforney.org>
-Date: Wed, 16 Dec 2020 00:48:25 -0800
-Subject: [PATCH] meson: add missing dependency on generated git_sha1.h
-
-Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin AT intel.com>
-Reviewed-by: Eric Anholt <eric AT anholt.net>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8121>
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- src/freedreno/common/meson.build | 1 +
- src/gallium/frontends/lavapipe/meson.build | 2 +-
- src/intel/common/meson.build | 4 ++--
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/freedreno/common/meson.build
b/src/freedreno/common/meson.build
-index 2da6c1eacf8d..30ef23043a7e 100644
---- a/src/freedreno/common/meson.build
-+++ b/src/freedreno/common/meson.build
-@@ -27,6 +27,7 @@ libfreedreno_common = static_library(
- 'freedreno_uuid.c',
- 'freedreno_uuid.h',
- 'freedreno_guardband.h',
-+ sha1_h,
- ],
- include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
- c_args : [no_override_init_args],
-diff --git a/src/gallium/frontends/lavapipe/meson.build
b/src/gallium/frontends/lavapipe/meson.build
-index 972735fcff9c..94c68d14d232 100644
---- a/src/gallium/frontends/lavapipe/meson.build
-+++ b/src/gallium/frontends/lavapipe/meson.build
-@@ -57,7 +57,7 @@ endif
-
- liblavapipe_st = static_library(
- 'lavapipe_st',
-- [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
-+ [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
- link_with : [ libvulkan_wsi ],
- c_args : [ lvp_flags ],
- gnu_symbol_visibility : 'hidden',
-diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
-index 2586b4cf9565..53c458f447d9 100644
---- a/src/intel/common/meson.build
-+++ b/src/intel/common/meson.build
-@@ -42,8 +42,8 @@ files_libintel_common = files(
- )
-
- libintel_common = static_library(
-- ['intel_common', genX_xml_h],
-- files_libintel_common,
-+ 'intel_common',
-+ [files_libintel_common, genX_xml_h, sha1_h],
- include_directories : [inc_include, inc_src, inc_mapi, inc_mesa,
inc_gallium, inc_intel],
- c_args : [no_override_init_args],
- gnu_symbol_visibility : 'hidden',
---
-2.29.2
-

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (82db17da51f7dc5b50d759b113227add7fd17e58), Treeve Jelbert, 03/12/2021