[gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/

[gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/

[Aric Belsito]

commit:     aa222c14bc8cb16654abcf7b809f09bc0ce6c512
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Wed Dec 13 01:11:53 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Wed Dec 13 01:11:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=aa222c14

media-libs/mesa: fix ifdef guards in pthread patch

 media-libs/mesa/files/mesa-17-musl-pthread.patch | 44 +++++++++---------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/media-libs/mesa/files/mesa-17-musl-pthread.patch b/media-libs/mesa/files/mesa-17-musl-pthread.patch
index a488b69..aac95af 100644
--- a/media-libs/mesa/files/mesa-17-musl-pthread.patch
+++ b/media-libs/mesa/files/mesa-17-musl-pthread.patch
@@ -1,49 +1,39 @@
 diff -Naur mesa-17.3.0.orig/src/gallium/state_trackers/nine/nine_debug.c mesa-17.3.0/src/gallium/state_trackers/nine/nine_debug.c
---- mesa-17.3.0.orig/src/gallium/state_trackers/nine/nine_debug.c	2017-12-08 05:49:11.000000000 -0800
-+++ mesa-17.3.0/src/gallium/state_trackers/nine/nine_debug.c	2017-12-11 14:24:00.264798233 -0800
-@@ -73,11 +73,8 @@
+--- mesa-17.3.0.orig/src/gallium/state_trackers/nine/nine_debug.c	2017-12-12 16:55:53.885552821 -0800
++++ mesa-17.3.0/src/gallium/state_trackers/nine/nine_debug.c	2017-12-12 17:09:36.048538098 -0800
+@@ -73,8 +73,8 @@
      }
  
  #if defined(HAVE_PTHREAD)
 -#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
 -      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
++#  if defined(__linux__) && !(defined(__GLIBC__) || \
++      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
      if (dbg_flags & DBG_TID)
          tid = pthread_self();
--#  endif
- #endif
- 
-     if (dbg_flags & flag) {
+ #  endif
 diff -Naur mesa-17.3.0.orig/src/util/u_thread.h mesa-17.3.0/src/util/u_thread.h
---- mesa-17.3.0.orig/src/util/u_thread.h	2017-12-08 05:49:11.000000000 -0800
-+++ mesa-17.3.0/src/util/u_thread.h	2017-12-11 14:19:54.898802627 -0800
-@@ -34,6 +34,7 @@
- 
- #ifdef HAVE_PTHREAD
- #include <signal.h>
-+#include <sys/prctl.h>
- #endif
- 
- 
-@@ -61,10 +62,7 @@
+--- mesa-17.3.0.orig/src/util/u_thread.h	2017-12-12 16:55:53.915552820 -0800
++++ mesa-17.3.0/src/util/u_thread.h	2017-12-12 17:09:34.079538133 -0800
+@@ -61,8 +61,8 @@
  static inline void u_thread_setname( const char *name )
  {
  #if defined(HAVE_PTHREAD)
 -#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
 -      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
--   pthread_setname_np(pthread_self(), name);
--#  endif
-+   prctl(PR_SET_NAME, name);
++#  if defined(__linux__) && !(defined(__GLIBC__) || \
++      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
+    pthread_setname_np(pthread_self(), name);
+ #  endif
  #endif
-    (void)name;
- }
-@@ -92,10 +90,7 @@
+@@ -92,8 +92,8 @@
  static inline bool u_thread_is_self(thrd_t thread)
  {
  #if defined(HAVE_PTHREAD)
 -#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
 -      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
++#  if defined(__linux__) && !(defined(__GLIBC__) || \
++      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
     return pthread_equal(pthread_self(), thread);
--#  endif
+ #  endif
  #endif
-    return false;
- }

[gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/

[Anthony G. Basile]

commit:     c574022b7d9ecd047be2c82223736b953b8f7d23
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  7 15:56:51 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 15:56:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=c574022b

media-libs/mesa: fix mesa-18-musl-pthread.patch, fix issue 173

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/mesa/files/mesa-18-musl-pthread.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-libs/mesa/files/mesa-18-musl-pthread.patch b/media-libs/mesa/files/mesa-18-musl-pthread.patch
index 2db1667..a6af63e 100644
--- a/media-libs/mesa/files/mesa-18-musl-pthread.patch
+++ b/media-libs/mesa/files/mesa-18-musl-pthread.patch
@@ -7,8 +7,8 @@ diff -Naur mesa-18.0.0-rc2.orig/src/gallium/state_trackers/nine/nine_debug.c mes
  #if defined(HAVE_PTHREAD)
 -#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
 -      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
-+#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
++#  if defined(__linux__) && (!defined(__GLIBC__) || \
++      __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
      if (dbg_flags & DBG_TID)
          tid = pthread_self();
  #  endif
@@ -22,8 +22,8 @@ diff -Naur mesa-18.0.0-rc2.orig/src/util/u_thread.h mesa-18.0.0-rc2/src/util/u_t
 -#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
 -      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12)) && \
 -      defined(__linux__)
-+#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
++#  if defined(__linux__) && (!defined(__GLIBC__) || \
++      __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
     pthread_setname_np(pthread_self(), name);
  #  endif
  #endif
@@ -34,7 +34,7 @@ diff -Naur mesa-18.0.0-rc2.orig/src/util/u_thread.h mesa-18.0.0-rc2/src/util/u_t
 -#  if defined(__GNU_LIBRARY__) && defined(__GLIBC__) && defined(__GLIBC_MINOR__) && \
 -      (__GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
 +#  if defined(__linux__) && !(defined(__GLIBC__) || \
-+      (__GLIBC__ < 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)))
++      __GLIBC__ >= 3 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 12))
     return pthread_equal(pthread_self(), thread);
  #  endif
  #endif

[gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/

[Jory Pratt]

commit:     ab49b80cc09d292ae659cadc4bdbc91837bbe401
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  9 20:26:07 2019 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Jul  9 20:26:07 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=ab49b80c

media-libs/mesa: Clean up unused patches

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 .../files/mesa-19.1.0-cache_stack_overflow.patch   | 56 --------------
 media-libs/mesa/files/mesa-19.1.0-execinfo.patch   | 90 ----------------------
 2 files changed, 146 deletions(-)

diff --git a/media-libs/mesa/files/mesa-19.1.0-cache_stack_overflow.patch b/media-libs/mesa/files/mesa-19.1.0-cache_stack_overflow.patch
deleted file mode 100644
index 3d6a8df..0000000
--- a/media-libs/mesa/files/mesa-19.1.0-cache_stack_overflow.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 594d2ec43022871f3b9ad2737e9d7bb97991b2bb Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Mon, 17 Jun 2019 09:57:46 -0500
-Subject: [PATCH] The disk cache code tries to allocate a 256 Kbyte buffer on
- the stack. Since musl only gives 80 Kbyte of stack space per thread, this
- causes a trap.
-
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- src/util/disk_cache.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
-index 9977c38..c23abdb 100644
---- a/src/util/disk_cache.c
-+++ b/src/util/disk_cache.c
-@@ -732,7 +732,7 @@ static size_t
- deflate_and_write_to_disk(const void *in_data, size_t in_data_size, int dest,
-                           const char *filename)
- {
--   unsigned char out[BUFSIZE];
-+   unsigned char *out;
- 
-    /* allocate deflate state */
-    z_stream strm;
-@@ -749,6 +749,11 @@ deflate_and_write_to_disk(const void *in_data, size_t in_data_size, int dest,
-    /* compress until end of in_data */
-    size_t compressed_size = 0;
-    int flush;
-+
-+   out = calloc(1, BUFSIZE);
-+   if (out == NULL)
-+      return 0;
-+
-    do {
-       int remaining = in_data_size - BUFSIZE;
-       flush = remaining > 0 ? Z_NO_FLUSH : Z_FINISH;
-@@ -770,6 +775,7 @@ deflate_and_write_to_disk(const void *in_data, size_t in_data_size, int dest,
-          ssize_t written = write_all(dest, out, have);
-          if (written == -1) {
-             (void)deflateEnd(&strm);
-+            free(out);
-             return 0;
-          }
-       } while (strm.avail_out == 0);
-@@ -784,6 +790,7 @@ deflate_and_write_to_disk(const void *in_data, size_t in_data_size, int dest,
- 
-    /* clean up and return */
-    (void)deflateEnd(&strm);
-+   free(out);
-    return compressed_size;
- }
- 
--- 
-2.22.0
-

diff --git a/media-libs/mesa/files/mesa-19.1.0-execinfo.patch b/media-libs/mesa/files/mesa-19.1.0-execinfo.patch
deleted file mode 100644
index 473b9a8..0000000
--- a/media-libs/mesa/files/mesa-19.1.0-execinfo.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 46036cd6b8c0da94262aaccd5c8bcaad0c93babd Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Tue, 7 May 2019 21:47:40 -0500
-Subject: [PATCH] Fix execinfo.h inclusion for libc's that do not support
-
----
- meson.build                                 | 2 +-
- src/gallium/auxiliary/util/u_debug_symbol.c | 8 ++++----
- src/mapi/glapi/gen/gl_gentable.py           | 2 +-
- src/mesa/drivers/dri/i915/intel_regions.c   | 2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index f72bdc9..6b7200c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1040,7 +1040,7 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major')
-   pre_args += '-DMAJOR_IN_MKDEV'
- endif
- 
--foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h']
-+foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h']
-   if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
-     pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
-   endif
-diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c
-index 22e6c8c..d8380b7 100644
---- a/src/gallium/auxiliary/util/u_debug_symbol.c
-+++ b/src/gallium/auxiliary/util/u_debug_symbol.c
-@@ -219,7 +219,7 @@ debug_symbol_name_dbghelp(const void *addr, char* buf, unsigned size)
- #endif /* PIPE_OS_WINDOWS */
- 
- 
--#if defined(__GLIBC__) && !defined(__UCLIBC__)
-+#if defined(HAVE_EXECINFO_H)
- 
- #include <execinfo.h>
- 
-@@ -240,7 +240,7 @@ debug_symbol_name_glibc(const void *addr, char* buf, unsigned size)
-    return TRUE;
- }
- 
--#endif /* defined(__GLIBC__) && !defined(__UCLIBC__) */
-+#endif /* defined(HAVE_EXECINFO_H) */
- 
- 
- void
-@@ -252,11 +252,11 @@ debug_symbol_name(const void *addr, char* buf, unsigned size)
-    }
- #endif
- 
--#if defined(__GLIBC__) && !defined(__UCLIBC__)
-+#if defined(HAVE_EXECINFO_H)
-    if (debug_symbol_name_glibc(addr, buf, size)) {
-        return;
-    }
--#endif
-+#endif /* defined(HAVE_EXECINFO_H) */
- 
-    util_snprintf(buf, size, "%p", addr);
-    buf[size - 1] = 0;
-diff --git a/src/mapi/glapi/gen/gl_gentable.py b/src/mapi/glapi/gen/gl_gentable.py
-index 9d8923c..92e1a54 100644
---- a/src/mapi/glapi/gen/gl_gentable.py
-+++ b/src/mapi/glapi/gen/gl_gentable.py
-@@ -45,7 +45,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i
- #endif
- 
- #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
--	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__))
-+	|| (!defined(GLXEXT) && defined(DEBUG) && defined(HAVE_EXECINFO_H))
- #define USE_BACKTRACE
- #endif
- 
-diff --git a/src/mesa/drivers/dri/i915/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c
-index fee7348..803ea93 100644
---- a/src/mesa/drivers/dri/i915/intel_regions.c
-+++ b/src/mesa/drivers/dri/i915/intel_regions.c
-@@ -57,7 +57,7 @@
-  */
- #define DEBUG_BACKTRACE_SIZE 0
- 
--#if DEBUG_BACKTRACE_SIZE == 0
-+#if DEBUG_BACKTRACE_SIZE == 0 || !defined(HAVE_EXECINFO_H)
- /* Use the standard debug output */
- #define _DBG(...) DBG(__VA_ARGS__)
- #else
--- 
-2.21.0
-

[gentoo-commits] proj/musl:master commit in: media-libs/mesa/files/

[Jory Pratt]

commit:     2c8b54c80a5b1619c4f8335554157873ac8f4009
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  6 16:59:57 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 16:59:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=2c8b54c8

media-libs/mesa: cleanup unused patch

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 ...ify-the-maximum-required-libdrm-in-dri.pc.patch | 33 ----------------------
 1 file changed, 33 deletions(-)

diff --git a/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch b/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch
deleted file mode 100644
index 0989752..0000000
--- a/media-libs/mesa/files/mesa-20.0.4-meson-Specify-the-maximum-required-libdrm-in-dri.pc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 316b352e946a9993a20f28abc741d34455a957a8 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Mon, 13 Apr 2020 09:20:18 -0700
-Subject: [PATCH] meson: Specify the maximum required libdrm in dri.pc
-
-When dealing with a regression in libdrm-2.4.101, I masked the package
-in Gentoo. In doing so, we discovered that Mesa's dri.pc specifies a
-version requirement in dri.pc for >= the version of libdrm Mesa was
-built against, thus preventing packages from being rebuilt with the
-older version of libdrm installed.
-
-Let's reduce this version requirement to the latest libdrm required by
-Mesa instead, since libdrm is backward compatible.
----
- src/mesa/drivers/dri/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build
-index acf7d2eb128..b09ca16e38a 100644
---- a/src/mesa/drivers/dri/meson.build
-+++ b/src/mesa/drivers/dri/meson.build
-@@ -86,7 +86,7 @@ endif
- if with_dri
-   dri_req_private = []
-   if dep_libdrm.found()
--    dri_req_private = ['libdrm >= ' + dep_libdrm.version()]
-+    dri_req_private = ['libdrm >= ' + _drm_ver]
-   endif
- 
-   pkg.generate(
--- 
-2.24.1
-