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 <[email protected]> -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 <[email protected]> ---- - 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 <[email protected]> -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 -
