Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0172f792def1f25e6ea1a8c7b8ac97faa7899d50)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0172f792def1f25e6ea1a8c7b8ac97faa7899d50)
  • Date: Mon, 1 Aug 2022 00:32:40 +0000

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

graphics-libs/mesa/BUILD | 5 +
graphics-libs/mesa/HISTORY | 4 +
graphics-libs/mesa/patches-stable/add-use-elf-tls.patch | 43
++++++++++++++++
graphics-libs/mesa/patches/add-use-elf-tls.patch | 43
----------------
4 files changed, 51 insertions(+), 44 deletions(-)

New commits:
commit 0172f792def1f25e6ea1a8c7b8ac97faa7899d50
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

graphics-libs/mesa: moved the patch about use_elf_tls to stable, scm has
it
enabled always now

diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index 26e377e..97fc589 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -20,6 +20,10 @@ case "$HOST" in
MESA_TOOLS="${MESA_TOOLS% }"
;;
esac &&
+if [[ "${MESA_BRANCH}" == "stable" ]]; then
+ OPTS+=" use-elf-tls=false"
+fi &&
+
local vulkan=${MESA_VULKAN//none} &&
local gallium=${MESA_GALLIUM//none} &&
local dri=${MESA_DRI//none} &&
@@ -29,7 +33,6 @@ OPTS+=" gallium-drivers=${gallium// /,} \
platforms=${MESA_EGL// /,} \
glx=${MESA_GLX// /,} \
tools=${MESA_TOOLS// /,} \
- use-elf-tls=false \
$MESA_GLES1 $MESA_GLES2" &&

default_build
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 6e8cd99..1d1aca0 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2022-07-31 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, patches{,-{,stable}/add-use-elf-tls.patch: moved the patch
and option
+ to enable/disable ELF_TLS to stable, scm autodetects it now
+
2022-07-16 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 22.1.4

diff --git a/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch
b/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch
new file mode 100644
index 0000000..b22246c
--- /dev/null
+++ b/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch
@@ -0,0 +1,43 @@
+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
++++ b/meson_options.txt
+@@ -446,6 +446,12 @@ option(
+ value : 25,
+ description : 'Android Platform SDK version. Default: Nougat version.'
+ )
++option(
++ 'use-elf-tls',
++ type : 'boolean',
++ value : true,
++ description : 'Build support for initial-exec TLS model'
++)
+ option(
+ 'zstd',
+ type : 'combo',
diff --git a/graphics-libs/mesa/patches/add-use-elf-tls.patch
b/graphics-libs/mesa/patches/add-use-elf-tls.patch
deleted file mode 100644
index b22246c..0000000
--- a/graphics-libs/mesa/patches/add-use-elf-tls.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
-+++ b/meson_options.txt
-@@ -446,6 +446,12 @@ option(
- value : 25,
- description : 'Android Platform SDK version. Default: Nougat version.'
- )
-+option(
-+ 'use-elf-tls',
-+ type : 'boolean',
-+ value : true,
-+ description : 'Build support for initial-exec TLS model'
-+)
- option(
- 'zstd',
- type : 'combo',



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (0172f792def1f25e6ea1a8c7b8ac97faa7899d50), Pavel Vinogradov, 07/31/2022

Archive powered by MHonArc 2.6.24.

Top of Page