Skip to Content.
Sympa Menu

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

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 (43abe9729a846cf2cffcd399daf994692fbdbb92)
  • Date: Thu, 16 Jun 2022 20:54:17 +0000

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

graphics-libs/mesa/HISTORY | 4 +
graphics-libs/mesa/PRE_BUILD | 1
graphics-libs/mesa/patches-stable/musl-stacksize.patch | 37
+++++++++++++++++
graphics-libs/mesa/patches/musl-stacksize.patch | 37
-----------------
4 files changed, 42 insertions(+), 37 deletions(-)

New commits:
commit 43abe9729a846cf2cffcd399daf994692fbdbb92
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

graphics-libs/mesa: rearranged one musl patch to be applied in stable
branch only

diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 16988eb..74d48cf 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2022-06-16 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches{,-stable}/musl-stacksize.patch: made the patch
to be
+ applied in stable brancch only
+
2022-06-02 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 22.1.1

diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
index 387dbfb..9a8f363 100755
--- a/graphics-libs/mesa/PRE_BUILD
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

apply_patch_dir patches &&
+apply_patch_dir "patches-${MESA_BRANCH}" &&

if is_depends_enabled "$SPELL" smgl-gl_select; then
patch -fp1 -i "$SPELL_DIRECTORY"/0001-install-GL-headers-in-.mesa.patch
diff --git a/graphics-libs/mesa/patches-stable/musl-stacksize.patch
b/graphics-libs/mesa/patches-stable/musl-stacksize.patch
new file mode 100644
index 0000000..db76699
--- /dev/null
+++ b/graphics-libs/mesa/patches-stable/musl-stacksize.patch
@@ -0,0 +1,37 @@
+Origin: Void Linux
+
+diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
+index 45cb6075e6..1a2ea1a450 100644
+--- a/include/c11/threads_posix.h
++++ b/include/c11/threads_posix.h
+@@ -281,15 +281,29 @@ static inline int
+ thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
+ {
+ struct impl_thrd_param *pack;
++#ifdef __GLIBC__
++ pthread_attr_t *attrp = NULL;
++#else
++ pthread_attr_t attr = { 0 };
++ pthread_attr_init(&attr);
++ pthread_attr_setstacksize(&attr, 8388608);
++ pthread_attr_t *attrp = &attr;
++#endif
+ assert(thr != NULL);
+ pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
+ if (!pack) return thrd_nomem;
+ pack->func = func;
+ pack->arg = arg;
+- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
++ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
++#ifndef __GLIBC__
++ pthread_attr_destroy(&attr);
++#endif
+ free(pack);
+ return thrd_error;
+ }
++#ifndef __GLIBC__
++ pthread_attr_destroy(&attr);
++#endif
+ return thrd_success;
+ }
+
diff --git a/graphics-libs/mesa/patches/musl-stacksize.patch
b/graphics-libs/mesa/patches/musl-stacksize.patch
deleted file mode 100644
index db76699..0000000
--- a/graphics-libs/mesa/patches/musl-stacksize.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Origin: Void Linux
-
-diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h
-index 45cb6075e6..1a2ea1a450 100644
---- a/include/c11/threads_posix.h
-+++ b/include/c11/threads_posix.h
-@@ -281,15 +281,29 @@ static inline int
- thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
- {
- struct impl_thrd_param *pack;
-+#ifdef __GLIBC__
-+ pthread_attr_t *attrp = NULL;
-+#else
-+ pthread_attr_t attr = { 0 };
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 8388608);
-+ pthread_attr_t *attrp = &attr;
-+#endif
- assert(thr != NULL);
- pack = (struct impl_thrd_param *)malloc(sizeof(struct impl_thrd_param));
- if (!pack) return thrd_nomem;
- pack->func = func;
- pack->arg = arg;
-- if (pthread_create(thr, NULL, impl_thrd_routine, pack) != 0) {
-+ if (pthread_create(thr, attrp, impl_thrd_routine, pack) != 0) {
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- free(pack);
- return thrd_error;
- }
-+#ifndef __GLIBC__
-+ pthread_attr_destroy(&attr);
-+#endif
- return thrd_success;
- }
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (43abe9729a846cf2cffcd399daf994692fbdbb92), Pavel Vinogradov, 06/16/2022

Archive powered by MHonArc 2.6.24.

Top of Page