Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

 graphics-libs/mesa/BUILD                                |    4 -
 graphics-libs/mesa/CONFIGURE                            |   39 
+---------------
 graphics-libs/mesa/DETAILS                              |    4 -
 graphics-libs/mesa/HISTORY                              |    6 ++
 graphics-libs/mesa/PRE_BUILD                            |    1 
 graphics-libs/mesa/patches-scm/add-use-elf-tls.patch    |   22 ---------
 graphics-libs/mesa/patches-stable/add-use-elf-tls.patch |   14 -----
 graphics-libs/mesa/patches/add-use-elf-tls.patch        |   22 +++++++++
 8 files changed, 34 insertions(+), 78 deletions(-)

New commits:
commit 359adb6cafbd11d65c3c83eae7f2cc32b6b3d147
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

    graphics-libs/mesa: version 22.0.0

diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index d7c7024..26e377e 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -24,10 +24,6 @@ local vulkan=${MESA_VULKAN//none} &&
 local gallium=${MESA_GALLIUM//none} &&
 local dri=${MESA_DRI//none} &&
 
-if [[ "${MESA_BRANCH}" == "stable" ]]; then
-  OPTS+=" dri-drivers=${dri// /,} swr-arches=${MESA_ARCH// /,}"
-fi &&
-
 OPTS+=" gallium-drivers=${gallium// /,} \
      vulkan-drivers=${vulkan// /,} \
           platforms=${MESA_EGL// /,} \
diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index 32b8e4a..4b26973 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -4,6 +4,9 @@ persistent_remove MESALIB_BUILD
 persistent_remove MESALIB_GALLIUM
 persistent_remove MESALIB_DRIVERS
 persistent_remove MESA_OSMESA
+persistent_remove MESA_DRI &&
+persistent_remove MESA_ARCH &&
+list_remove MESA_GLX "gallium-xlib" &&
 
 # adjust some flags
 MESA_GLES1=${MESA_GLES1/true/enabled}
@@ -35,42 +38,8 @@ if list_find "$MESA_DRM" NOUVEAU;then
   AVAILABLE_GALLIUM+=" nouveau"
 fi &&
 
-# Mesa has dropped DRI drivers. The code below (except in the else clause)
-# should be deleted when stable release with no DRI drivers will be out.
-if [[ "${MESA_BRANCH}" == "stable" ]]; then
-  local AVAILABLE_DRI="" &&
-  MESA_DRI=${MESA_DRI/swrast/} &&
+config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib &&
 
-  config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib 
gallium-xlib &&
-
-  if list_find "$MESA_DRM" RADEON;then
-    AVAILABLE_DRI+=" r100 r200"
-  fi &&
-  if list_find "$MESA_DRM" INTEL;then
-    AVAILABLE_DRI+=" i915 i965"
-  fi &&
-  if list_find "$MESA_DRM" NOUVEAU;then
-    AVAILABLE_DRI+=" nouveau"
-  fi &&
-
-  if list_find "$MESA_GLX" dri;then
-    config_query_multi MESA_DRI \
-                     "which DRI drivers to build?" \
-                     all $AVAILABLE_DRI &&
-
-    if list_find "$MESA_DRI" all; then
-      MESA_DRI="$AVAILABLE_DRI"
-    fi
-  fi &&
-  MESA_DRI="${MESA_DRI# }" &&
-  config_query_multi MESA_ARCH   "which arch" avx avx2 knl skx
-else
-  list_remove MESA_GLX "gallium-xlib" &&
-  config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib &&
-
-  persistent_remove MESA_DRI &&
-  persistent_remove MESA_ARCH
-fi &&
 
 # Gallium support
 
diff --git a/graphics-libs/mesa/DETAILS b/graphics-libs/mesa/DETAILS
index 7a8903f..686b634 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=21.3.7
-     
SOURCE_HASH="sha256:b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d:UPSTREAM_HASH"
+         VERSION=22.0.0
+     
SOURCE_HASH="sha256:e6c41928b5b9917485bd67cec22d15e62cad7a358bf4c711a647979987601250:UPSTREAM_HASH"
           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 61399d7..ab3ba40 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,9 @@
+2022-03-10 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 22.0.0
+       * CONFIGURE, BUILD: removed the DRI drivers code
+       * PRE_BUILD, patches{,-{scm,stable}}/add-use-elf-tls.patch: merged the
+         patches, dropped old patch for stable
+
 2022-02-24 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 21.3.7
 
diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
index c8a9fd7..387dbfb 100755
--- a/graphics-libs/mesa/PRE_BUILD
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -1,7 +1,6 @@
 default_pre_build    &&
 cd "$SOURCE_DIRECTORY" &&
 
-apply_patch_dir "patches-${MESA_BRANCH}" &&
 apply_patch_dir patches &&
 
 if is_depends_enabled "$SPELL" smgl-gl_select; then
diff --git a/graphics-libs/mesa/patches-scm/add-use-elf-tls.patch 
b/graphics-libs/mesa/patches-scm/add-use-elf-tls.patch
deleted file mode 100644
index 654431f..0000000
--- a/graphics-libs/mesa/patches-scm/add-use-elf-tls.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git meson.build meson.build
-index e1e94e71049..96ab3fb3e45 100644
---- a/meson.build
-+++ b/meson.build
-@@ -481,6 +481,9 @@ foreach platform : _platforms
-   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
- endforeach
- 
-+use_elf_tls = false
-+with_use_elf_tls = get_option('use-elf-tls')
-+if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and 
with_use_elf_tls)
- use_elf_tls = true
- pre_args += '-DUSE_ELF_TLS'
- 
-@@ -491,6 +494,7 @@ if with_platform_android and 
get_option('platform-sdk-version') >= 29
-   c_args += '-fno-emulated-tls'
-   cpp_args += '-fno-emulated-tls'
- endif
-+endif
- 
- # -mtls-dialect=gnu2 speeds up non-initial-exec TLS significantly but 
requires
- # full toolchain (including libc) support.
diff --git a/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch 
b/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch
deleted file mode 100644
index 851fa33..0000000
--- a/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git meson.build meson.build
-index e1e94e71049..96ab3fb3e45 100644
---- a/meson.build
-+++ b/meson.build
-@@ -447,7 +447,8 @@ endif
- 
- # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
- use_elf_tls = false
--if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and
-+with_use_elf_tls = get_option('use-elf-tls')
-+if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and 
with_use_elf_tls and
-     (not with_platform_android or get_option('platform-sdk-version') >= 29) 
and
-     (not with_platform_windows or not with_shared_glapi))
-   pre_args += '-DUSE_ELF_TLS'
diff --git a/graphics-libs/mesa/patches/add-use-elf-tls.patch 
b/graphics-libs/mesa/patches/add-use-elf-tls.patch
index 2a8ae6d..b22246c 100644
--- a/graphics-libs/mesa/patches/add-use-elf-tls.patch
+++ b/graphics-libs/mesa/patches/add-use-elf-tls.patch
@@ -2,6 +2,28 @@ Upstream: https://gitlab.freedesktop.org/mesa/mesa/issues/966
 Origin: Void Linux
 Status: Pending
 
+diff --git meson.build meson.build
+index e1e94e71049..96ab3fb3e45 100644
+--- a/meson.build
++++ b/meson.build
+@@ -481,6 +481,9 @@ foreach platform : _platforms
+   pre_args += '-DHAVE_@0@_PLATFORM'.format(platform.to_upper())
+ endforeach
+ 
++use_elf_tls = false
++with_use_elf_tls = get_option('use-elf-tls')
++if (not ['freebsd', 'openbsd', 'haiku'].contains(host_machine.system()) and 
with_use_elf_tls)
+ use_elf_tls = true
+ pre_args += '-DUSE_ELF_TLS'
+ 
+@@ -491,6 +494,7 @@ if with_platform_android and 
get_option('platform-sdk-version') >= 29
+   c_args += '-fno-emulated-tls'
+   cpp_args += '-fno-emulated-tls'
+ endif
++endif
+ 
+ # -mtls-dialect=gnu2 speeds up non-initial-exec TLS significantly but 
requires
+ # full toolchain (including libc) support.
 diff --git meson_options.txt meson_options.txt
 index a7030aba31e..966cfeca298 100644
 --- a/meson_options.txt