| 1 |
commit: 9322efe89c8b65579c2216ec96978dd5ad608753 |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Dec 11 22:29:23 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Mon Dec 11 22:29:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9322efe8 |
| 7 |
|
| 8 |
media-libs/mesa: fix patch |
| 9 |
|
| 10 |
media-libs/mesa/files/mesa-17-execinfo.patch | 77 ++++++++++++++++++++++++++++ |
| 11 |
media-libs/mesa/mesa-17.3.0.ebuild | 2 +- |
| 12 |
2 files changed, 78 insertions(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/media-libs/mesa/files/mesa-17-execinfo.patch b/media-libs/mesa/files/mesa-17-execinfo.patch |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..87b2ce6 |
| 17 |
--- /dev/null |
| 18 |
+++ b/media-libs/mesa/files/mesa-17-execinfo.patch |
| 19 |
@@ -0,0 +1,77 @@ |
| 20 |
+diff -Naur mesa-17.3.0.orig/configure.ac mesa-17.3.0/configure.ac |
| 21 |
+--- mesa-17.3.0.orig/configure.ac 2017-12-08 05:49:11.000000000 -0800 |
| 22 |
++++ mesa-17.3.0/configure.ac 2017-12-11 14:11:53.587811247 -0800 |
| 23 |
+@@ -794,6 +794,7 @@ |
| 24 |
+ AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) |
| 25 |
+ AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) |
| 26 |
+ AC_CHECK_FUNC([memfd_create], [DEFINES="$DEFINES -DHAVE_MEMFD_CREATE"]) |
| 27 |
++AC_CHECK_HEADER([execinfo.h], [DEFINES="$DEFINES -DHAVE_EXECINFO_H"]) |
| 28 |
+ |
| 29 |
+ AC_MSG_CHECKING([whether strtod has locale support]) |
| 30 |
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[ |
| 31 |
+diff -Naur mesa-17.3.0.orig/src/gallium/auxiliary/util/u_debug_symbol.c mesa-17.3.0/src/gallium/auxiliary/util/u_debug_symbol.c |
| 32 |
+--- mesa-17.3.0.orig/src/gallium/auxiliary/util/u_debug_symbol.c 2017-12-08 05:49:11.000000000 -0800 |
| 33 |
++++ mesa-17.3.0/src/gallium/auxiliary/util/u_debug_symbol.c 2017-12-11 14:13:52.780809112 -0800 |
| 34 |
+@@ -219,7 +219,7 @@ |
| 35 |
+ #endif /* PIPE_OS_WINDOWS */ |
| 36 |
+ |
| 37 |
+ |
| 38 |
+-#if defined(__GLIBC__) && !defined(__UCLIBC__) |
| 39 |
++#if defined(HAVE_EXECINFO_H) |
| 40 |
+ |
| 41 |
+ #include <execinfo.h> |
| 42 |
+ |
| 43 |
+@@ -240,7 +240,7 @@ |
| 44 |
+ return TRUE; |
| 45 |
+ } |
| 46 |
+ |
| 47 |
+-#endif /* defined(__GLIBC__) && !defined(__UCLIBC__) */ |
| 48 |
++#endif /* defined(HAVE_EXECINFO_H) */ |
| 49 |
+ |
| 50 |
+ |
| 51 |
+ void |
| 52 |
+@@ -252,7 +252,7 @@ |
| 53 |
+ } |
| 54 |
+ #endif |
| 55 |
+ |
| 56 |
+-#if defined(__GLIBC__) && !defined(__UCLIBC__) |
| 57 |
++#if defined(HAVE_EXECINFO_H) |
| 58 |
+ if (debug_symbol_name_glibc(addr, buf, size)) { |
| 59 |
+ return; |
| 60 |
+ } |
| 61 |
+diff -Naur mesa-17.3.0.orig/src/mapi/glapi/gen/gl_gentable.py mesa-17.3.0/src/mapi/glapi/gen/gl_gentable.py |
| 62 |
+--- mesa-17.3.0.orig/src/mapi/glapi/gen/gl_gentable.py 2017-12-08 05:49:11.000000000 -0800 |
| 63 |
++++ mesa-17.3.0/src/mapi/glapi/gen/gl_gentable.py 2017-12-11 14:11:53.587811247 -0800 |
| 64 |
+@@ -43,7 +43,7 @@ |
| 65 |
+ #endif |
| 66 |
+ |
| 67 |
+ #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\ |
| 68 |
+- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) |
| 69 |
++ || (!defined(GLXEXT) && defined(DEBUG) && defined(HAVE_EXECINFO_H)) |
| 70 |
+ #define USE_BACKTRACE |
| 71 |
+ #endif |
| 72 |
+ |
| 73 |
+diff -Naur mesa-17.3.0.orig/src/mapi/glapi/glapi_gentable.c mesa-17.3.0/src/mapi/glapi/glapi_gentable.c |
| 74 |
+--- mesa-17.3.0.orig/src/mapi/glapi/glapi_gentable.c 2017-12-08 05:49:45.000000000 -0800 |
| 75 |
++++ mesa-17.3.0/src/mapi/glapi/glapi_gentable.c 2017-12-11 14:11:53.588811247 -0800 |
| 76 |
+@@ -36,7 +36,7 @@ |
| 77 |
+ #endif |
| 78 |
+ |
| 79 |
+ #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \ |
| 80 |
+- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)) |
| 81 |
++ || (!defined(GLXEXT) && defined(DEBUG) && defined(HAVE_EXECINFO_H)) |
| 82 |
+ #define USE_BACKTRACE |
| 83 |
+ #endif |
| 84 |
+ |
| 85 |
+diff -Naur mesa-17.3.0.orig/src/mesa/drivers/dri/i915/intel_regions.c mesa-17.3.0/src/mesa/drivers/dri/i915/intel_regions.c |
| 86 |
+--- mesa-17.3.0.orig/src/mesa/drivers/dri/i915/intel_regions.c 2017-12-08 05:49:11.000000000 -0800 |
| 87 |
++++ mesa-17.3.0/src/mesa/drivers/dri/i915/intel_regions.c 2017-12-11 14:11:53.588811247 -0800 |
| 88 |
+@@ -57,7 +57,7 @@ |
| 89 |
+ */ |
| 90 |
+ #define DEBUG_BACKTRACE_SIZE 0 |
| 91 |
+ |
| 92 |
+-#if DEBUG_BACKTRACE_SIZE == 0 |
| 93 |
++#if DEBUG_BACKTRACE_SIZE == 0 || !defined(HAVE_EXECINFO_H) |
| 94 |
+ /* Use the standard debug output */ |
| 95 |
+ #define _DBG(...) DBG(__VA_ARGS__) |
| 96 |
+ #else |
| 97 |
|
| 98 |
diff --git a/media-libs/mesa/mesa-17.3.0.ebuild b/media-libs/mesa/mesa-17.3.0.ebuild |
| 99 |
index 1513134..49ae075 100644 |
| 100 |
--- a/media-libs/mesa/mesa-17.3.0.ebuild |
| 101 |
+++ b/media-libs/mesa/mesa-17.3.0.ebuild |
| 102 |
@@ -280,7 +280,7 @@ pkg_setup() { |
| 103 |
} |
| 104 |
|
| 105 |
src_prepare() { |
| 106 |
- eapply "${FILESDIR}"/${PN}-11-execinfo.patch |
| 107 |
+ eapply "${FILESDIR}"/${PN}-17-execinfo.patch |
| 108 |
eapply "${FILESDIR}"/${PN}-13-musl_endian.patch |
| 109 |
|
| 110 |
eautoreconf |
Archives