commit:     8881a5b73e3b7289a4a170b30dc04525097a8427
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Mar 19 20:33:43 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Mar 19 20:33:43 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=8881a5b7

media-libs/mesa: add most recent versions

reliance on __GLIBC__ in `u_endian.h` causes build for radeon and other gallium
cards to be broken.

Also add an `execinfo.h` patch that should fix USE=debug builds.

 media-libs/mesa/Manifest                           |  10 +
 media-libs/mesa/files/eselect-mesa.conf.9.2        |  38 ++
 media-libs/mesa/files/mesa-11-execinfo.patch       |  68 +++
 ...er-Work-around-build-failure-with-AltiVec.patch |  70 +++
 media-libs/mesa/files/mesa-13-musl_endian.patch    |  12 +
 ...er-Work-around-build-failure-with-AltiVec.patch |  69 +++
 media-libs/mesa/mesa-13.0.5.ebuild                 | 513 ++++++++++++++++++++
 media-libs/mesa/mesa-17.0.1.ebuild                 | 518 +++++++++++++++++++++
 media-libs/mesa/metadata.xml                       |  38 ++
 9 files changed, 1336 insertions(+)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
new file mode 100644
index 0000000..d1af0fa
--- /dev/null
+++ b/media-libs/mesa/Manifest
@@ -0,0 +1,10 @@
+AUX eselect-mesa.conf.9.2 1630 SHA256 
c1ca0e3fddc12b49c5db1739f2d57a0afd6856824d677b16f5903972bc0b631d SHA512 
0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5
 WHIRLPOOL 
6df6aa625cf445f68d69742184a75f9472cc7d59b068f2755ddac4201f1ad8d4518d04f62cb1228061a7d75e1e7b31048c16e8a50ec64480a3347a0a0a3850b8
+AUX mesa-11-execinfo.patch 3063 SHA256 
150a0f8f6324db046538756fcf79a082fb1e64afe46bd679cc7965b0ebd71d15 SHA512 
f30d4b79f5120dc8ff338a16b8c0c3cd1dc25dae3854f9e1c20eeb1a8115f48f01167dd11d316c788f715723815d37a21d65cf6026d65ef424335a481cb93090
 WHIRLPOOL 
da15270c3efba6a1ff1968fa131f63b6d2472b05111a51d5da7d29095a9089f715d8b4bbfbba31e3858076b4ef6e5f3f9ed6c83b6faee44c48c4022756535489
+AUX mesa-13-clover-Work-around-build-failure-with-AltiVec.patch 2317 SHA256 
02dd7e59ea5d08d4a66b2f7353bb427b71ed8e6638b50da593d35165a032ac42 SHA512 
6b3cd038c0a61b4d64ec0b645086d7cf2c74b97bd0febe5229c88d78e8dc3a4cbd2876a06ca2394f819dd04b0397722fc76c4ce5939c5c58f40ef0d2e2bcbe84
 WHIRLPOOL 
0200946c578dfb47782533052e86804c8534d2da056670dad0712e694ca22a6983e433f0a355f489472814969c74558f113b03f01c3fd4c3bb671f09a2bf49b0
+AUX mesa-13-musl_endian.patch 417 SHA256 
3686132ef3a57b607c223705a18f32da7fa7f58fecd5b118f3d7f5df3697cd11 SHA512 
6b351de61e0d3ed5cc37233df8f915ca3e3d80291944556124c88408da2471c3b65fb5c355f1e78ca24a8ed1e007e3efd7c7fc52d08b509eaa66fc368b751ab2
 WHIRLPOOL 
7d1c0cfbb6a914df589c9f41939e6e7054aa6bfe8b2bed79e25a2d1bc44cb4d7b01a21b5e39aeeca27d9ebffdf0fb7f9af651a845316a131826521f11197ffc1
+AUX mesa-17-clover-Work-around-build-failure-with-AltiVec.patch 2176 SHA256 
d26cb6f3abd2c4e3190dc1621f4bd27ec0dbb3d16ac599b9614e809428935de3 SHA512 
35e1df05720e2911d01403e588b500102792b730c2bea6276560a6e6bb506afbe11e2aa59d3929eca550509605eef190a64826934f7c28ef235b2274c182aedf
 WHIRLPOOL 
614fd2985a26d3f764720722186a20600aaf5a2dd29e85ce23bf899839bb858bc1eafd1733137577a8436a622e7515e423754e669c495aa37d36de141db10993
+DIST mesa-13.0.5.tar.xz 9171480 SHA256 
bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87 SHA512 
db5f6a97b40ee6e45ba81280ab4543354e9f274c7112c5a43b8970244f329902a22f68d5eeddad5b64502507f462ffbcc028efc5dff93822adf95d30ba5903c1
 WHIRLPOOL 
164116608908331d4e8d69c4d2b92dc22e8e6d98725a20e8c2da5cc24b4e9ae9e05ee9c7209d55371b419e0f4e6c1d4752a46d149a968a6b83612aa77f7e480e
+DIST mesa-17.0.1.tar.xz 9447712 SHA256 
96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c SHA512 
f3a807fbf30327a1dccb690e484276ab1b2b1e33b0440884b6476607e08aa3513d5c9d4b6dd345415decb93747d334c70bffe9e49eae787b48ef6c08989aeb7c
 WHIRLPOOL 
955800014b4155eba5dea6f4ae50e7a302467d4063a5ff0378b6c3b833f924787fd923248f8746bdbbef3e57135ae44eb1a38248c08112ad5435b645fc955ec4
+EBUILD mesa-13.0.5.ebuild 13682 SHA256 
c0941589335d956bff393fbd26114b2017d1f71fae94e06becaae8a1c52f0b0c SHA512 
e407f73610a8d6c7e3456a051dac01bb577a4714128568f276c7e8811b9fc7ac050f29e2770861c1addb561a6828006cfb9f3f18a215448df61b6f9f03f9a7df
 WHIRLPOOL 
71ebf88582419ef5175a04a5ea2d286fe8d2946c95ab354bc2a3a52386ba7100010d5bf92dc9c0c1f0ee4d65353636e2482ef911663b55f932547613d0520b48
+EBUILD mesa-17.0.1.ebuild 13718 SHA256 
2b7031253f392cd3040e9cab0b5037668fa65c09ec62bf8725908bdc67af5039 SHA512 
204824c9e7940660cc8167e702f24a8404a98a6de8e330411705a9a31a1f56591a2946d5cd9bfd6494c98b122143a68709f7bd7a978fcccf0fc0402eaad4a622
 WHIRLPOOL 
79f8decd28b033ff7c545f912f5af38bd21dd587f4d9a5e9e6e2cfb365ee532463dd6b307f35e7a258c75dcbf287bff99ffbc53a922b232f1eed8a338d368511
+MISC metadata.xml 2440 SHA256 
98874315e8480a14f26b8395eb2573b85dbe402a8bb30a72aa2cc884bc0512a2 SHA512 
47237a5fd95a9c58b1857b27da2558ecf46266630eeb7514db2f276f0a8c82a0751122d71a27b4949a1a66df75bbe9e5a833b1f12a86214614e6777849d4c5d8
 WHIRLPOOL 
5742264ad29f82e98a96044efb74fb230e7a8cc4d58ad569676e8ffc9a86873d5148de86e8a101a11ee465e204cae47f1ec8d50ba8a8c0d75070cb705a03eef8

diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 
b/media-libs/mesa/files/eselect-mesa.conf.9.2
new file mode 100644
index 0000000..18bfaff
--- /dev/null
+++ b/media-libs/mesa/files/eselect-mesa.conf.9.2
@@ -0,0 +1,38 @@
+# mesa classic/gallium implementations in this release
+
+# Syntax description:
+# * MESA_IMPLEMENTATIONS contains a space-delimited list of switchable
+#   classic/gallium implementations.
+# * MESA_DRIVERS is an associative array, for each member "foo" of
+#   MESA_IMPLEMENTATIONS it contains the following elements:
+#   foo,description - Human-readable description of the driver
+#   foo,classicdriver - Filename of the classic driver
+#   foo,galliumdriver - Filename of the gallium driver
+#   foo,default - which of classic or gallium is chosen by default
+
+MESA_IMPLEMENTATIONS="i915 i965 r300 r600 sw"
+declare -A MESA_DRIVERS || die "MESA_DRIVERS already in environment and not 
associative."
+
+MESA_DRIVERS[i915,description]="i915 (Intel 915, 945)"
+MESA_DRIVERS[i915,classicdriver]="i915_dri.so"
+MESA_DRIVERS[i915,galliumdriver]="i915g_dri.so"
+MESA_DRIVERS[i915,default]="gallium"
+
+MESA_DRIVERS[i965,description]="i965 (Intel GMA 965, G/Q3x, G/Q4x, HD)"
+MESA_DRIVERS[i965,classicdriver]="i965_dri.so"
+MESA_DRIVERS[i965,default]="classic"
+
+MESA_DRIVERS[r300,description]="r300 (Radeon R300-R500)"
+MESA_DRIVERS[r300,classicdriver]="r300_dri.so"
+MESA_DRIVERS[r300,galliumdriver]="r300g_dri.so"
+MESA_DRIVERS[r300,default]="gallium"
+
+MESA_DRIVERS[r600,description]="r600 (Radeon R600-R700, Evergreen, Northern 
Islands)"
+MESA_DRIVERS[r600,classicdriver]="r600_dri.so"
+MESA_DRIVERS[r600,galliumdriver]="r600g_dri.so"
+MESA_DRIVERS[r600,default]="gallium"
+
+MESA_DRIVERS[sw,description]="sw (Software renderer)"
+MESA_DRIVERS[sw,classicdriver]="swrast_dri.so"
+MESA_DRIVERS[sw,galliumdriver]="swrastg_dri.so"
+MESA_DRIVERS[sw,default]="gallium"

diff --git a/media-libs/mesa/files/mesa-11-execinfo.patch 
b/media-libs/mesa/files/mesa-11-execinfo.patch
new file mode 100644
index 0000000..0eefba8
--- /dev/null
+++ b/media-libs/mesa/files/mesa-11-execinfo.patch
@@ -0,0 +1,68 @@
+diff -Naur mesa-11.1.2.orig/configure.ac mesa-11.1.2/configure.ac
+--- mesa-11.1.2.orig/configure.ac      2016-02-10 15:57:54.000000000 -0800
++++ mesa-11.1.2/configure.ac   2016-03-09 13:27:47.979302937 -0800
+@@ -681,6 +681,7 @@
+ AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
+ AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
+ AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
++AC_CHECK_HEADER([execinfo.h], [DEFINES="$DEFINES -DHAVE_EXECINFO_H"])
+ 
+ dnl Check to see if dlopen is in default libraries (like Solaris, which
+ dnl has it in libc), or if libdl is needed to get it.
+diff -Naur mesa-11.1.2.orig/src/gallium/auxiliary/util/u_debug_symbol.c 
mesa-11.1.2/src/gallium/auxiliary/util/u_debug_symbol.c
+--- mesa-11.1.2.orig/src/gallium/auxiliary/util/u_debug_symbol.c       
2016-01-17 23:39:26.000000000 -0800
++++ mesa-11.1.2/src/gallium/auxiliary/util/u_debug_symbol.c    2016-03-09 
13:29:27.255060988 -0800
+@@ -219,7 +219,7 @@
+ #endif /* PIPE_OS_WINDOWS */
+ 
+ 
+-#if defined(__GLIBC__) && !defined(__UCLIBC__)
++#if defined(HAVE_EXECINFO_H)
+ 
+ #include <execinfo.h>
+ 
+@@ -240,7 +240,7 @@
+    return TRUE;
+ }
+ 
+-#endif /* defined(__GLIBC__) && !defined(__UCLIBC__) */
++#endif /* defined(HAVE_EXECINFO_H) */
+ 
+ 
+ void
+diff -Naur mesa-11.1.2.orig/src/mapi/glapi/gen/gl_gentable.py 
mesa-11.1.2/src/mapi/glapi/gen/gl_gentable.py
+--- mesa-11.1.2.orig/src/mapi/glapi/gen/gl_gentable.py 2016-02-10 
15:57:54.000000000 -0800
++++ mesa-11.1.2/src/mapi/glapi/gen/gl_gentable.py      2016-03-09 
13:28:14.624506395 -0800
+@@ -44,7 +44,7 @@
+ #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 -Naur mesa-11.1.2.orig/src/mapi/glapi/glapi_gentable.c 
mesa-11.1.2/src/mapi/glapi/glapi_gentable.c
+--- mesa-11.1.2.orig/src/mapi/glapi/glapi_gentable.c   2016-02-10 
16:24:49.000000000 -0800
++++ mesa-11.1.2/src/mapi/glapi/glapi_gentable.c        2016-03-09 
13:28:38.411688029 -0800
+@@ -36,7 +36,7 @@
+ #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 -Naur mesa-11.1.2.orig/src/mesa/drivers/dri/i915/intel_regions.c 
mesa-11.1.2/src/mesa/drivers/dri/i915/intel_regions.c
+--- mesa-11.1.2.orig/src/mesa/drivers/dri/i915/intel_regions.c 2016-01-17 
23:39:26.000000000 -0800
++++ mesa-11.1.2/src/mesa/drivers/dri/i915/intel_regions.c      2016-03-09 
13:30:18.483460168 -0800
+@@ -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

diff --git 
a/media-libs/mesa/files/mesa-13-clover-Work-around-build-failure-with-AltiVec.patch
 
b/media-libs/mesa/files/mesa-13-clover-Work-around-build-failure-with-AltiVec.patch
new file mode 100644
index 0000000..0d2c65a
--- /dev/null
+++ 
b/media-libs/mesa/files/mesa-13-clover-Work-around-build-failure-with-AltiVec.patch
@@ -0,0 +1,70 @@
+From 71a2b2e8a580d2c0bee84b898d8531b27f3c7811 Mon Sep 17 00:00:00 2001
+From: Matt Turner <[email protected]>
+Date: Thu, 2 Mar 2017 04:43:21 +0000
+Subject: [PATCH] clover: Work around build failure with AltiVec.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=587210
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68504
+Acked-by: Francisco Jerez <[email protected]>
+(cherry picked from commit 7d1195c1e4d071fe796bf5f210c468ea1cc86225)
+---
+ configure.ac                                  | 14 ++++++++++++++
+ src/gallium/state_trackers/clover/Makefile.am |  3 +++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index fd78fbb..3646e45 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1974,6 +1974,20 @@ if test "x$enable_opencl" = xyes; then
+     if test "x$have_libelf" != xyes; then
+        AC_MSG_ERROR([Clover requires libelf])
+     fi
++
++    if test "x${ac_cv_cxx_compiler_gnu}" = xyes; then
++        altivec_enabled=no
++        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
++        #if !defined(__VEC__) || !defined(__ALTIVEC__)
++        #error "AltiVec not enabled"
++        #endif
++        ])], altivec_enabled=yes)
++
++        if test "$altivec_enabled" = yes; then
++            CLOVER_STD_OVERRIDE="-std=gnu++11"
++        fi
++        AC_SUBST([CLOVER_STD_OVERRIDE])
++    fi
+ fi
+ AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
+ AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
+diff --git a/src/gallium/state_trackers/clover/Makefile.am 
b/src/gallium/state_trackers/clover/Makefile.am
+index 8abcfec..edf1e26 100644
+--- a/src/gallium/state_trackers/clover/Makefile.am
++++ b/src/gallium/state_trackers/clover/Makefile.am
+@@ -33,6 +33,7 @@ noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
+ 
+ libcltgsi_la_CXXFLAGS = \
+       -std=c++11 \
++      $(CLOVER_STD_OVERRIDE) \
+       $(VISIBILITY_CXXFLAGS)
+ 
+ libcltgsi_la_SOURCES = $(TGSI_SOURCES)
+@@ -41,6 +42,7 @@ libclllvm_la_CXXFLAGS = \
+       -std=c++11 \
+       $(VISIBILITY_CXXFLAGS) \
+       $(LLVM_CXXFLAGS) \
++      $(CLOVER_STD_OVERRIDE) \
+       $(DEFINES) \
+       $(LIBELF_CFLAGS) \
+       -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
+@@ -51,6 +53,7 @@ libclllvm_la_SOURCES = $(LLVM_SOURCES)
+ 
+ libclover_la_CXXFLAGS = \
+       -std=c++11 \
++      $(CLOVER_STD_OVERRIDE) \
+       $(VISIBILITY_CXXFLAGS)
+ 
+ libclover_la_LIBADD = \
+-- 
+2.10.2
+

diff --git a/media-libs/mesa/files/mesa-13-musl_endian.patch 
b/media-libs/mesa/files/mesa-13-musl_endian.patch
new file mode 100644
index 0000000..1276605
--- /dev/null
+++ b/media-libs/mesa/files/mesa-13-musl_endian.patch
@@ -0,0 +1,12 @@
+diff -Naur mesa-13.0.5.orig/src/util/u_endian.h mesa-13.0.5/src/util/u_endian.h
+--- mesa-13.0.5.orig/src/util/u_endian.h       2017-03-19 12:40:43.808781967 
-0700
++++ mesa-13.0.5/src/util/u_endian.h    2017-03-19 12:49:01.731158551 -0700
+@@ -27,7 +27,7 @@
+ #ifndef U_ENDIAN_H
+ #define U_ENDIAN_H
+ 
+-#if defined(__GLIBC__) || defined(ANDROID)
++#if defined(__linux__)
+ #include <endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN

diff --git 
a/media-libs/mesa/files/mesa-17-clover-Work-around-build-failure-with-AltiVec.patch
 
b/media-libs/mesa/files/mesa-17-clover-Work-around-build-failure-with-AltiVec.patch
new file mode 100644
index 0000000..87f5f9d
--- /dev/null
+++ 
b/media-libs/mesa/files/mesa-17-clover-Work-around-build-failure-with-AltiVec.patch
@@ -0,0 +1,69 @@
+From 7d1195c1e4d071fe796bf5f210c468ea1cc86225 Mon Sep 17 00:00:00 2001
+From: Matt Turner <[email protected]>
+Date: Thu, 2 Mar 2017 04:43:21 +0000
+Subject: [PATCH] clover: Work around build failure with AltiVec.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=587210
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68504
+Acked-by: Francisco Jerez <[email protected]>
+---
+ configure.ac                                  | 14 ++++++++++++++
+ src/gallium/state_trackers/clover/Makefile.am |  3 +++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index a3d1a00..57c4b1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2033,6 +2033,20 @@ if test "x$enable_opencl" = xyes; then
+        AC_MSG_ERROR([Clover requires libelf])
+     fi
+ 
++    if test "x${ac_cv_cxx_compiler_gnu}" = xyes; then
++        altivec_enabled=no
++        AC_COMPILE_IFELSE([AC_LANG_SOURCE([
++        #if !defined(__VEC__) || !defined(__ALTIVEC__)
++        #error "AltiVec not enabled"
++        #endif
++        ])], altivec_enabled=yes)
++
++        if test "$altivec_enabled" = yes; then
++            CLOVER_STD_OVERRIDE="-std=gnu++11"
++        fi
++        AC_SUBST([CLOVER_STD_OVERRIDE])
++    fi
++
+     llvm_require_version $LLVM_REQUIRED_OPENCL "opencl"
+ 
+     llvm_add_default_components "opencl"
+diff --git a/src/gallium/state_trackers/clover/Makefile.am 
b/src/gallium/state_trackers/clover/Makefile.am
+index a657e5b..3213935 100644
+--- a/src/gallium/state_trackers/clover/Makefile.am
++++ b/src/gallium/state_trackers/clover/Makefile.am
+@@ -32,6 +32,7 @@ noinst_LTLIBRARIES = libclover.la libcltgsi.la libclllvm.la
+ 
+ libcltgsi_la_CXXFLAGS = \
+       -std=c++11 \
++      $(CLOVER_STD_OVERRIDE) \
+       $(VISIBILITY_CXXFLAGS)
+ 
+ libcltgsi_la_SOURCES = $(TGSI_SOURCES)
+@@ -40,6 +41,7 @@ libclllvm_la_CXXFLAGS = \
+       -std=c++11 \
+       $(VISIBILITY_CXXFLAGS) \
+       $(LLVM_CXXFLAGS) \
++      $(CLOVER_STD_OVERRIDE) \
+       $(DEFINES) \
+       $(LIBELF_CFLAGS) \
+       -DLIBCLC_INCLUDEDIR=\"$(LIBCLC_INCLUDEDIR)/\" \
+@@ -50,6 +52,7 @@ libclllvm_la_SOURCES = $(LLVM_SOURCES)
+ 
+ libclover_la_CXXFLAGS = \
+       -std=c++11 \
++      $(CLOVER_STD_OVERRIDE) \
+       $(VISIBILITY_CXXFLAGS)
+ 
+ libclover_la_LIBADD = \
+-- 
+2.10.2
+

diff --git a/media-libs/mesa/mesa-13.0.5.ebuild 
b/media-libs/mesa/mesa-13.0.5.ebuild
new file mode 100644
index 0000000..b8fca01
--- /dev/null
+++ b/media-libs/mesa/mesa-13.0.5.ebuild
@@ -0,0 +1,513 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999 ]]; then
+       GIT_ECLASS="git-r3"
+       EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/";
+
+if [[ $PV == 9999 ]]; then
+       SRC_URI=""
+else
+       SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz";
+       KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+INTEL_CARDS="i915 i965 intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vc4 vmware"
+for card in ${VIDEO_CARDS}; do
+       IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gcrypt gles1 gles2
+       libressl +llvm +nettle +nptl opencl osmesa pax_kernel openmax openssl 
pic
+       selinux vaapi valgrind vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+       || ( gcrypt libressl nettle openssl )
+       d3d9?   ( dri3 gallium )
+       llvm?   ( gallium )
+       opencl? ( gallium llvm )
+       openmax? ( gallium )
+       gles1?  ( egl )
+       gles2?  ( egl )
+       vaapi? ( gallium )
+       vdpau? ( gallium )
+       vulkan? ( video_cards_i965 )
+       wayland? ( egl gbm )
+       xa?  ( gallium )
+       video_cards_freedreno?  ( gallium )
+       video_cards_intel?  ( classic )
+       video_cards_i915?   ( || ( classic gallium ) )
+       video_cards_i965?   ( classic )
+       video_cards_nouveau? ( || ( classic gallium ) )
+       video_cards_radeon? ( || ( classic gallium )
+                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
+       video_cards_r100?   ( classic )
+       video_cards_r200?   ( classic )
+       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+       video_cards_r600?   ( gallium )
+       video_cards_radeonsi?   ( gallium llvm )
+       video_cards_vmware? ( gallium )
+       ${PYTHON_REQUIRED_USE}
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.72"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+       !<x11-base/xorg-server-1.7
+       !<=x11-proto/xf86driproto-2.0.3
+       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+       classic? ( app-eselect/eselect-mesa )
+       gallium? ( app-eselect/eselect-mesa )
+       >=app-eselect/eselect-opengl-1.3.0
+       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+       llvm? (
+               video_cards_radeonsi? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               video_cards_r600? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               video_cards_radeon? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               >=sys-devel/llvm-3.6.0:0=[${MULTILIB_USEDEP}]
+       )
+       nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
+       !nettle? (
+               gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] )
+               !gcrypt? (
+                       libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+                       !libressl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+               )
+       )
+       opencl? (
+                               app-eselect/eselect-opencl
+                               dev-libs/libclc
+                               virtual/libelf:0=[${MULTILIB_USEDEP}]
+                       )
+       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+       vaapi? (
+               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
+               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+       )
+       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+       wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
+       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vmware?,${MULTILIB_USEDEP}]
+"
+for card in ${INTEL_CARDS}; do
+       RDEPEND="${RDEPEND}
+               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+       "
+done
+
+for card in ${RADEON_CARDS}; do
+       RDEPEND="${RDEPEND}
+               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+       "
+done
+RDEPEND="${RDEPEND}
+       video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
+# LLVM < 3.9 is out of the game
+DEPEND="${RDEPEND}
+       llvm? (
+               video_cards_radeonsi? ( || (
+                       sys-devel/llvm[llvm_targets_AMDGPU]
+                       sys-devel/llvm[video_cards_radeon]
+               ) )
+       )
+       opencl? (
+                               >=sys-devel/llvm-3.4.2:0=[${MULTILIB_USEDEP}]
+                               >=sys-devel/clang-3.4.2:0=[${MULTILIB_USEDEP}]
+                               >=sys-devel/gcc-4.6
+       )
+       sys-devel/gettext
+       virtual/pkgconfig
+       valgrind? ( dev-util/valgrind )
+       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+       dri3? (
+               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+       )
+       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+       sys-devel/bison
+       sys-devel/flex
+       ${PYTHON_DEPS}
+       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+       !pic? (
+               usr/lib*/libglapi.so.0.0.0
+               usr/lib*/libGLESv1_CM.so.1.1.0
+               usr/lib*/libGLESv2.so.2.0.0
+               usr/lib*/libGL.so.1.2.0
+               usr/lib*/libOSMesa.so.8.0.0
+       )
+)"
+
+pkg_setup() {
+       # warning message for bug 459306
+       if use llvm && has_version sys-devel/llvm[!debug=]; then
+               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
sys-devel/llvm"
+               ewarn "detected! This can cause problems. For details, see bug 
459306."
+       fi
+
+       python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-11-execinfo.patch
+       epatch "${FILESDIR}"/${PN}-13-musl_endian.patch
+       epatch 
"${FILESDIR}"/${PN}-13-clover-Work-around-build-failure-with-AltiVec.patch
+
+       eautoreconf
+}
+
+multilib_src_configure() {
+       local myconf
+
+       if use classic; then
+               # Configurable DRI drivers
+               driver_enable swrast
+
+               # Intel code
+               driver_enable video_cards_i915 i915
+               driver_enable video_cards_i965 i965
+               if ! use video_cards_i915 && \
+                       ! use video_cards_i965; then
+                       driver_enable video_cards_intel i915 i965
+               fi
+
+               # Nouveau code
+               driver_enable video_cards_nouveau nouveau
+
+               # ATI code
+               driver_enable video_cards_r100 radeon
+               driver_enable video_cards_r200 r200
+               if ! use video_cards_r100 && \
+                               ! use video_cards_r200; then
+                       driver_enable video_cards_radeon radeon r200
+               fi
+       fi
+
+       if use egl; then
+               myconf+=" --with-egl-platforms=x11$(use wayland && echo 
",wayland")$(use gbm && echo ",drm")"
+       fi
+
+       if use gallium; then
+               myconf+="
+                       $(use_enable d3d9 nine)
+                       $(use_enable llvm gallium-llvm)
+                       $(use_enable openmax omx)
+                       $(use_enable vaapi va)
+                       $(use_enable vdpau)
+                       $(use_enable xa)
+                       $(use_enable xvmc)
+               "
+               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+               gallium_enable swrast
+               gallium_enable video_cards_vc4 vc4
+               gallium_enable video_cards_vmware svga
+               gallium_enable video_cards_nouveau nouveau
+               gallium_enable video_cards_i915 i915
+               if ! use video_cards_i915 && \
+                       ! use video_cards_i965; then
+                       gallium_enable video_cards_intel i915
+               fi
+
+               gallium_enable video_cards_r300 r300
+               gallium_enable video_cards_r600 r600
+               gallium_enable video_cards_radeonsi radeonsi
+               if ! use video_cards_r300 && \
+                               ! use video_cards_r600; then
+                       gallium_enable video_cards_radeon r300 r600
+               fi
+
+               gallium_enable video_cards_freedreno freedreno
+               # opencl stuff
+               if use opencl; then
+                       myconf+="
+                               $(use_enable opencl)
+                               --with-clang-libdir="${EPREFIX}/usr/lib"
+                               "
+               fi
+       fi
+
+       if use vulkan; then
+               vulkan_enable video_cards_i965 intel
+
+               # radv is disabled due to dependence on >=llvm-3.9, bug 607660
+               #vulkan_enable video_cards_radeonsi radeon
+       fi
+
+       # x86 hardened pax_kernel needs glx-rts, bug 240956
+       if [[ ${ABI} == x86 ]]; then
+               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+       fi
+
+       # on abi_x86_32 hardened we need to have asm disable
+       if [[ ${ABI} == x86* ]] && use pic; then
+               myconf+=" --disable-asm"
+       fi
+
+       if use gallium; then
+               myconf+=" $(use_enable osmesa gallium-osmesa)"
+       else
+               myconf+=" $(use_enable osmesa)"
+       fi
+
+       # build fails with BSD indent, bug #428112
+       use userland_GNU || export INDENT=cat
+
+       ECONF_SOURCE="${S}" \
+       econf \
+               --enable-dri \
+               --enable-glx \
+               --enable-shared-glapi \
+               --disable-shader-cache \
+               $(use_enable !bindist texture-float) \
+               $(use_enable d3d9 nine) \
+               $(use_enable debug) \
+               $(use_enable dri3) \
+               $(use_enable egl) \
+               $(use_enable gbm) \
+               $(use_enable gles1) \
+               $(use_enable gles2) \
+               $(use_enable nptl glx-tls) \
+               --enable-valgrind=$(usex valgrind auto no) \
+               --enable-llvm-shared-libs \
+               --with-dri-drivers=${DRI_DRIVERS} \
+               --with-gallium-drivers=${GALLIUM_DRIVERS} \
+               --with-vulkan-drivers=${VULKAN_DRIVERS} \
+               --with-sha1=$(usex nettle libnettle $(usex gcrypt libgcrypt 
libcrypto)) \
+               PYTHON2="${PYTHON}" \
+               ${myconf}
+}
+
+multilib_src_install() {
+       emake install DESTDIR="${D}"
+
+       if use classic || use gallium; then
+                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
+                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
+                       keepdir /usr/$(get_libdir)/dri
+                       dodir /usr/$(get_libdir)/mesa
+                       for x in ${gallium_drivers[@]}; do
+                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
+                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+                                               || die "Failed to move ${x}"
+                               fi
+                       done
+                       if use classic; then
+                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
+                       fi
+                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+                               if [ -f ${x} -o -L ${x} ]; then
+                                       mv -f "${x}" "${x/dri/mesa}" \
+                                               || die "Failed to move ${x}"
+                               fi
+                       done
+                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
+                       ln -s ../mesa/*.so . || die "Creating symlink failed"
+                       # remove symlinks to drivers known to eselect
+                       for x in ${gallium_drivers[@]}; do
+                               if [ -f ${x} -o -L ${x} ]; then
+                                       rm "${x}" || die "Failed to remove ${x}"
+                               fi
+                       done
+                       popd
+               eend $?
+       fi
+       if use opencl; then
+               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
+               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+               dodir ${cl_dir}/{lib,include}
+               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+                       "${ED}"${cl_dir}
+               fi
+               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+                       mv -f "${ED}"/usr/include/CL \
+                       "${ED}"${cl_dir}/include
+               fi
+               eend $?
+       fi
+
+       if use openmax; then
+               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
+               doenvd "${T}"/99mesaxdgomx
+               keepdir /usr/share/mesa/xdg
+       fi
+}
+
+multilib_src_install_all() {
+       prune_libtool_files --all
+       einstalldocs
+
+       if use !bindist; then
+               dodoc docs/patents.txt
+       fi
+
+       # Install config file for eselect mesa
+       insinto /usr/share/mesa
+       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+
+       # Mesa should not install these
+       if use vulkan; then
+               rm "${ED}"/usr/include/vulkan/{vulkan.h,vk_platform.h} || die
+       fi
+}
+
+multilib_src_test() {
+       if use llvm; then
+               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
+               pushd src/gallium/drivers/llvmpipe >/dev/null || die
+               emake ${llvm_tests}
+               pax-mark m ${llvm_tests}
+               popd >/dev/null || die
+       fi
+       emake check
+}
+
+pkg_postinst() {
+       # Switch to the xorg implementation.
+       echo
+       eselect opengl set --use-old ${OPENGL_DIR}
+
+       # Select classic/gallium drivers
+       if use classic || use gallium; then
+               eselect mesa set --auto
+       fi
+
+       # Switch to mesa opencl
+       if use opencl; then
+               eselect opencl set --use-old ${PN}
+       fi
+
+       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
+       if use openmax; then
+               ebegin "Registering OpenMAX drivers"
+               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+                       omxregister-bellagio
+               eend $?
+       fi
+
+       # warn about patent encumbered texture-float
+       if use !bindist; then
+               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
+               elog "enabled. Please see patents.txt for an explanation."
+       fi
+
+       if ! has_version media-libs/libtxc_dxtn; then
+               elog "Note that in order to have full S3TC support, it is 
necessary to install"
+               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
+               elog "textures in some apps, and some others even require this 
to run."
+       fi
+}
+
+pkg_prerm() {
+       if use openmax; then
+               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+       fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       DRI_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       DRI_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}
+
+gallium_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       GALLIUM_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       GALLIUM_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}
+
+vulkan_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       VULKAN_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       VULKAN_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}

diff --git a/media-libs/mesa/mesa-17.0.1.ebuild 
b/media-libs/mesa/mesa-17.0.1.ebuild
new file mode 100644
index 0000000..4638859
--- /dev/null
+++ b/media-libs/mesa/mesa-17.0.1.ebuild
@@ -0,0 +1,518 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
+
+if [[ ${PV} = 9999 ]]; then
+       GIT_ECLASS="git-r3"
+       EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/";
+
+if [[ $PV == 9999 ]]; then
+       SRC_URI=""
+else
+       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+INTEL_CARDS="i915 i965 intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante 
vmware"
+for card in ${VIDEO_CARDS}; do
+       IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+       +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau
+       vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+       d3d9?   ( dri3 gallium )
+       llvm?   ( gallium )
+       opencl? ( gallium llvm )
+       openmax? ( gallium )
+       gles1?  ( egl )
+       gles2?  ( egl )
+       vaapi? ( gallium )
+       vdpau? ( gallium )
+       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+                 video_cards_radeonsi? ( llvm ) )
+       wayland? ( egl gbm )
+       xa?  ( gallium )
+       video_cards_freedreno?  ( gallium )
+       video_cards_intel?  ( classic )
+       video_cards_i915?   ( || ( classic gallium ) )
+       video_cards_i965?   ( classic )
+       video_cards_imx?    ( gallium )
+       video_cards_nouveau? ( || ( classic gallium ) )
+       video_cards_radeon? ( || ( classic gallium )
+                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
+       video_cards_r100?   ( classic )
+       video_cards_r200?   ( classic )
+       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+       video_cards_r600?   ( gallium )
+       video_cards_radeonsi?   ( gallium llvm )
+       video_cards_vivante? ( gallium gbm )
+       video_cards_vmware? ( gallium )
+       ${PYTHON_REQUIRED_USE}
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.74"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+       !<x11-base/xorg-server-1.7
+       !<=x11-proto/xf86driproto-2.0.3
+       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+       classic? ( app-eselect/eselect-mesa )
+       gallium? ( app-eselect/eselect-mesa )
+       >=app-eselect/eselect-opengl-1.3.0
+       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+       llvm? (
+               video_cards_radeonsi? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+                       vulkan? (
+                               || (
+                                       sys-devel/llvm:4[${MULTILIB_USEDEP}]
+                                       
>=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) )
+               )
+               video_cards_r600? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               video_cards_radeon? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               || (
+                       sys-devel/llvm:4[${MULTILIB_USEDEP}]
+                       >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
+               )
+               <sys-devel/llvm-5:=[${MULTILIB_USEDEP}]
+       )
+       opencl? (
+                               app-eselect/eselect-opencl
+                               dev-libs/libclc
+                               virtual/libelf:0=[${MULTILIB_USEDEP}]
+                       )
+       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+       vaapi? (
+               >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
+               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+       )
+       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+       wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
+       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+"
+for card in ${INTEL_CARDS}; do
+       RDEPEND="${RDEPEND}
+               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+       "
+done
+
+for card in ${RADEON_CARDS}; do
+       RDEPEND="${RDEPEND}
+               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+       "
+done
+RDEPEND="${RDEPEND}
+       video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
+# LLVM < 3.9 is out of the game
+DEPEND="${RDEPEND}
+       llvm? (
+               video_cards_radeonsi? ( || (
+                       sys-devel/llvm[llvm_targets_AMDGPU]
+                       sys-devel/llvm[video_cards_radeon]
+               ) )
+       )
+       opencl? (
+               || (
+                       sys-devel/llvm:4[${MULTILIB_USEDEP}]
+                       >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
+               )
+               || (
+                       sys-devel/clang:4[${MULTILIB_USEDEP}]
+                       >=sys-devel/clang-3.6.0:0[${MULTILIB_USEDEP}]
+               )
+               >=sys-devel/gcc-4.6
+       )
+       sys-devel/gettext
+       virtual/pkgconfig
+       valgrind? ( dev-util/valgrind )
+       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+       dri3? (
+               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+       )
+       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+       sys-devel/bison
+       sys-devel/flex
+       ${PYTHON_DEPS}
+       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+       !pic? (
+               usr/lib*/libglapi.so.0.0.0
+               usr/lib*/libGLESv1_CM.so.1.1.0
+               usr/lib*/libGLESv2.so.2.0.0
+               usr/lib*/libGL.so.1.2.0
+               usr/lib*/libOSMesa.so.8.0.0
+       )
+)"
+
+pkg_setup() {
+       # warning message for bug 459306
+       if use llvm && has_version sys-devel/llvm[!debug=]; then
+               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
sys-devel/llvm"
+               ewarn "detected! This can cause problems. For details, see bug 
459306."
+       fi
+
+       if use llvm || use opencl; then
+               LLVM_MAX_SLOT=4 llvm_pkg_setup
+       fi
+       python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       eapply "${FILESDIR}"/${PN}-11-execinfo.patch
+       eapply "${FILESDIR}"/${PN}-13-musl_endian.patch
+       eapply 
"${FILESDIR}"/${PN}-17-clover-Work-around-build-failure-with-AltiVec.patch
+
+       eautoreconf
+
+       eapply_user
+}
+
+multilib_src_configure() {
+       local myconf
+
+       if use classic; then
+               # Configurable DRI drivers
+               driver_enable swrast
+
+               # Intel code
+               driver_enable video_cards_i915 i915
+               driver_enable video_cards_i965 i965
+               if ! use video_cards_i915 && \
+                       ! use video_cards_i965; then
+                       driver_enable video_cards_intel i915 i965
+               fi
+
+               # Nouveau code
+               driver_enable video_cards_nouveau nouveau
+
+               # ATI code
+               driver_enable video_cards_r100 radeon
+               driver_enable video_cards_r200 r200
+               if ! use video_cards_r100 && \
+                               ! use video_cards_r200; then
+                       driver_enable video_cards_radeon radeon r200
+               fi
+       fi
+
+       if use egl; then
+               myconf+=" --with-egl-platforms=x11$(use wayland && echo 
",wayland")$(use gbm && echo ",drm")"
+       fi
+
+       if use gallium; then
+               myconf+="
+                       $(use_enable d3d9 nine)
+                       $(use_enable llvm gallium-llvm)
+                       $(use_enable openmax omx)
+                       $(use_enable vaapi va)
+                       $(use_enable vdpau)
+                       $(use_enable xa)
+                       $(use_enable xvmc)
+               "
+               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+               gallium_enable swrast
+               gallium_enable video_cards_vc4 vc4
+               gallium_enable video_cards_vivante etnaviv
+               gallium_enable video_cards_vmware svga
+               gallium_enable video_cards_nouveau nouveau
+               gallium_enable video_cards_i915 i915
+               gallium_enable video_cards_imx imx
+               if ! use video_cards_i915 && \
+                       ! use video_cards_i965; then
+                       gallium_enable video_cards_intel i915
+               fi
+
+               gallium_enable video_cards_r300 r300
+               gallium_enable video_cards_r600 r600
+               gallium_enable video_cards_radeonsi radeonsi
+               if ! use video_cards_r300 && \
+                               ! use video_cards_r600; then
+                       gallium_enable video_cards_radeon r300 r600
+               fi
+
+               gallium_enable video_cards_freedreno freedreno
+               # opencl stuff
+               if use opencl; then
+                       myconf+="
+                               $(use_enable opencl)
+                               --with-clang-libdir="${EPREFIX}/usr/lib"
+                               "
+               fi
+       fi
+
+       if use vulkan; then
+               vulkan_enable video_cards_i965 intel
+               vulkan_enable video_cards_radeonsi radeon
+       fi
+
+       # x86 hardened pax_kernel needs glx-rts, bug 240956
+       if [[ ${ABI} == x86 ]]; then
+               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+       fi
+
+       # on abi_x86_32 hardened we need to have asm disable
+       if [[ ${ABI} == x86* ]] && use pic; then
+               myconf+=" --disable-asm"
+       fi
+
+       if use gallium; then
+               myconf+=" $(use_enable osmesa gallium-osmesa)"
+       else
+               myconf+=" $(use_enable osmesa)"
+       fi
+
+       # build fails with BSD indent, bug #428112
+       use userland_GNU || export INDENT=cat
+
+       ECONF_SOURCE="${S}" \
+       econf \
+               --enable-dri \
+               --enable-glx \
+               --enable-shared-glapi \
+               $(use_enable !bindist texture-float) \
+               $(use_enable d3d9 nine) \
+               $(use_enable debug) \
+               $(use_enable dri3) \
+               $(use_enable egl) \
+               $(use_enable gbm) \
+               $(use_enable gles1) \
+               $(use_enable gles2) \
+               $(use_enable nptl glx-tls) \
+               --enable-valgrind=$(usex valgrind auto no) \
+               --enable-llvm-shared-libs \
+               --with-dri-drivers=${DRI_DRIVERS} \
+               --with-gallium-drivers=${GALLIUM_DRIVERS} \
+               --with-vulkan-drivers=${VULKAN_DRIVERS} \
+               PYTHON2="${PYTHON}" \
+               ${myconf}
+}
+
+multilib_src_install() {
+       emake install DESTDIR="${D}"
+
+       if use classic || use gallium; then
+                       ebegin "Moving DRI/Gallium drivers for dynamic 
switching"
+                       local gallium_drivers=( i915_dri.so i965_dri.so 
r300_dri.so r600_dri.so swrast_dri.so )
+                       keepdir /usr/$(get_libdir)/dri
+                       dodir /usr/$(get_libdir)/mesa
+                       for x in ${gallium_drivers[@]}; do
+                               if [ -f "$(get_libdir)/gallium/${x}" ]; then
+                                       mv -f 
"${ED}/usr/$(get_libdir)/dri/${x}" 
"${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+                                               || die "Failed to move ${x}"
+                               fi
+                       done
+                       if use classic; then
+                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
+                       fi
+                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+                               if [ -f ${x} -o -L ${x} ]; then
+                                       mv -f "${x}" "${x/dri/mesa}" \
+                                               || die "Failed to move ${x}"
+                               fi
+                       done
+                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd 
failed"
+                       ln -s ../mesa/*.so . || die "Creating symlink failed"
+                       # remove symlinks to drivers known to eselect
+                       for x in ${gallium_drivers[@]}; do
+                               if [ -f ${x} -o -L ${x} ]; then
+                                       rm "${x}" || die "Failed to remove ${x}"
+                               fi
+                       done
+                       popd
+               eend $?
+       fi
+       if use opencl; then
+               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
+               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+               dodir ${cl_dir}/{lib,include}
+               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+                       "${ED}"${cl_dir}
+               fi
+               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+                       mv -f "${ED}"/usr/include/CL \
+                       "${ED}"${cl_dir}/include
+               fi
+               eend $?
+       fi
+
+       if use openmax; then
+               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
+               doenvd "${T}"/99mesaxdgomx
+               keepdir /usr/share/mesa/xdg
+       fi
+}
+
+multilib_src_install_all() {
+       find "${ED}" -name '*.la' -delete
+       einstalldocs
+
+       if use !bindist; then
+               dodoc docs/patents.txt
+       fi
+
+       # Install config file for eselect mesa
+       insinto /usr/share/mesa
+       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+       if use llvm; then
+               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
+               pushd src/gallium/drivers/llvmpipe >/dev/null || die
+               emake ${llvm_tests}
+               pax-mark m ${llvm_tests}
+               popd >/dev/null || die
+       fi
+       emake check
+}
+
+pkg_postinst() {
+       # Switch to the xorg implementation.
+       echo
+       eselect opengl set --use-old ${OPENGL_DIR}
+
+       # Select classic/gallium drivers
+       if use classic || use gallium; then
+               eselect mesa set --auto
+       fi
+
+       # Switch to mesa opencl
+       if use opencl; then
+               eselect opencl set --use-old ${PN}
+       fi
+
+       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
+       if use openmax; then
+               ebegin "Registering OpenMAX drivers"
+               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+                       omxregister-bellagio
+               eend $?
+       fi
+
+       # warn about patent encumbered texture-float
+       if use !bindist; then
+               elog "USE=\"bindist\" was not set. Potentially patent 
encumbered code was"
+               elog "enabled. Please see patents.txt for an explanation."
+       fi
+
+       if ! has_version media-libs/libtxc_dxtn; then
+               elog "Note that in order to have full S3TC support, it is 
necessary to install"
+               elog "media-libs/libtxc_dxtn as well. This may be necessary to 
get nice"
+               elog "textures in some apps, and some others even require this 
to run."
+       fi
+}
+
+pkg_prerm() {
+       if use openmax; then
+               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+       fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       DRI_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       DRI_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}
+
+gallium_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       GALLIUM_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       GALLIUM_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}
+
+vulkan_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       VULKAN_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       VULKAN_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
new file mode 100644
index 0000000..054cb72
--- /dev/null
+++ b/media-libs/mesa/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>X11</name>
+       </maintainer>
+       <use>
+               <flag name="bindist">Disable patent-encumbered 
ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float 
extensions.</flag>
+               <flag name="classic">Build drivers based on the classic 
architecture.</flag>
+               <flag name="d3d9">Enable Direct 3D9 API through Nine state 
tracker. Can be used together with patched wine.</flag>
+               <flag name="dri3">Enable DRI3 support.</flag>
+               <flag name="egl">Enable EGL support.</flag>
+               <flag name="gallium">Build drivers based on Gallium3D, the new 
architecture for 3D graphics drivers.</flag>
+               <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low 
level sha1 utility functions.</flag>
+               <flag name="gbm">Enable the Graphics Buffer Manager for EGL on 
KMS.</flag>
+               <flag name="gles1">Enable GLESv1 support.</flag>
+               <flag name="gles2">Enable GLESv2 support.</flag>
+               <flag name="libressl">Use <pkg>dev-libs/libressl</pkg> for low 
level sha1 utility functions.</flag>
+               <flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
+               <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for low 
level sha1 utility functions.</flag>
+               <flag name="opencl">Enable the Clover Gallium OpenCL state 
tracker.</flag>
+               <flag name="openmax">Enable OpenMAX video decode/encode 
acceleration for Gallium3D.</flag>
+               <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for low 
level sha1 utility functions. May cause issues with games from Steam.</flag>
+               <flag name="osmesa">Build the Mesa library for off-screen 
rendering.</flag>
+               <flag name="pax_kernel">Enable if the user plans to run the 
package under a pax enabled hardened kernel</flag>
+               <flag name="pic">disable optimized assembly code that is not 
PIC friendly</flag>
+               <flag name="valgrind">Compile in valgrind memory hints</flag>
+               <flag name="vdpau">Enable the VDPAU acceleration interface for 
the Gallium3D Video Layer.</flag>
+               <flag name="vulkan">Enable Vulkan drivers</flag>
+               <flag name="wayland">Enable support for dev-libs/wayland</flag>
+               <flag name="xa">Enable the XA (X Acceleration) API for 
Gallium3D.</flag>
+               <flag name="xvmc">Enable the XvMC acceleration interface for 
the Gallium3D Video Layer.</flag>
+       </use>
+       <upstream>
+               <remote-id type="sourceforge">mesa3d</remote-id>
+       </upstream>
+</pkgmetadata>

Reply via email to