graphics-libs/mesa: dropped stable branch patches

5 files changed, 3 insertions, 85 deletions

diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index 905ca51119..4206e6ca90 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -20,9 +20,6 @@ case "$HOST" in
   MESA_TOOLS="${MESA_TOOLS% }"
   ;;
 esac &&
-if [[ "${MESA_BRANCH}" == "stable" ]]; then
-  OPTS+=" use-elf-tls=false"
-fi &&
 
 if is_depends_enabled "${SPELL}" libva &&
  ! list_find "${MESA_VA_CODECS}" "none"; then
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index cfa45808c4..6c3f1a3c4d 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,6 +1,8 @@
 2022-09-28 Pavel Vinogradov <public@sourcemage.org>
-	* BUILD, DEPENDS: added option so build some patented codecs for video
+	* BUILD, DEPENDS: added option to build some patented codecs for video
 	  acceleration
+	* BUILD, PRE_BUILD, patches-stable/*: removed stable patches, merged into
+	  upstream
 
 2022-09-21 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 22.2.0
diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
index 9a8f363bcd..387dbfbcfe 100755
--- a/graphics-libs/mesa/PRE_BUILD
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -2,7 +2,6 @@ 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/add-use-elf-tls.patch b/graphics-libs/mesa/patches-stable/add-use-elf-tls.patch
deleted file mode 100644
index b22246c81c..0000000000
--- a/graphics-libs/mesa/patches-stable/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',
diff --git a/graphics-libs/mesa/patches-stable/musl-stacksize.patch b/graphics-libs/mesa/patches-stable/musl-stacksize.patch
deleted file mode 100644
index db76699a24..0000000000
--- a/graphics-libs/mesa/patches-stable/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;
- }
-