[gentoo-commits] proj/x11:master commit in: media-libs/mesa/, profiles/, media-libs/mesa/files/

2015-08-22 Thread Matt Turner
commit: 7481dcac7f35e8f5cdb92ca0dbf03bf6fab5e801
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Aug 23 03:34:34 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Aug 23 03:34:34 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=7481dcac

media-libs/mesa: Delete (moved to main tree).

 media-libs/mesa/files/eselect-mesa.conf.9.2|  39 --
 media-libs/mesa/files/glx_ro_text_segm.patch   |  28 --
 .../mesa-9.2-dont-require-llvm-for-r300.patch  |  12 -
 .../mesa--dont-require-llvm-for-r300.patch |  11 -
 media-libs/mesa/mesa-.ebuild   | 456 -
 media-libs/mesa/metadata.xml   |  27 --
 profiles/package.mask  |   1 -
 7 files changed, 574 deletions(-)

diff --git a/media-libs/mesa/files/eselect-mesa.conf.9.2 
b/media-libs/mesa/files/eselect-mesa.conf.9.2
deleted file mode 100644
index ff590f5..000
--- a/media-libs/mesa/files/eselect-mesa.conf.9.2
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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,galliumdriver]=ilo_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/glx_ro_text_segm.patch 
b/media-libs/mesa/files/glx_ro_text_segm.patch
deleted file mode 100644
index 495b7dc..000
--- a/media-libs/mesa/files/glx_ro_text_segm.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-2011-02-09 Jeremy Huddleston jerem...@freedesktop.org
-
-   #240956
-   * configure.ac  add support to enable readonly test segment on x86
-
 configure.ac.orig  2008-11-17 23:19:38.0 +0100
-+++ configure.ac   2008-11-17 23:20:17.0 +0100
-@@ -499,6 +499,20 @@
- enable_xcb=no
- fi
- 
-+
-+dnl readonly text segment on x86 hardened platforms
-+AC_ARG_ENABLE([glx_rts],
-+[AS_HELP_STRING([--enable-glx-rts],
-+[on x86, use a readonly text segment for libGL 
@:@default=disabled@:@])],
-+[enable_glx_rts=$enableval],
-+[enable_glx_rts=no])
-+if test x$enable_glx_rts = xyes; then
-+DEFINES=$DEFINES -DGLX_X86_READONLY_TEXT
-+else
-+enable_glx_rts=no
-+fi
-+
-+
- dnl
- dnl libGL configuration per driver
- dnl

diff --git a/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch 
b/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch
deleted file mode 100644
index bd24787..000
--- a/media-libs/mesa/files/mesa-9.2-dont-require-llvm-for-r300.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 21a1986..94b2247 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -1777,7 +1777,6 @@ if test x$with_gallium_drivers != x; then
- xr300)
- HAVE_GALLIUM_R300=yes
- PKG_CHECK_MODULES([RADEON], [libdrm_radeon = 
$LIBDRM_RADEON_REQUIRED])
--gallium_require_llvm Gallium R300
- GALLIUM_DRIVERS_DIRS=$GALLIUM_DRIVERS_DIRS r300
- gallium_check_st radeon/drm dri-r300   xvmc-r300 
vdpau-r300
- ;;

diff --git a/media-libs/mesa/files/mesa--dont-require-llvm-for-r300.patch 
b/media-libs/mesa/files/mesa--dont-require-llvm-for-r300.patch
deleted file mode 100644
index a85a3c1..000
--- a/media-libs/mesa/files/mesa--dont-require-llvm-for-r300.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
 a/configure.ac 2014-03-03 04:05:33.110522943 +0100
-+++ b/configure.ac 

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

2015-07-01 Thread Matt Turner
commit: a8ba559451c48a8bd5cca0ec3e30f5659fa9fa95
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Thu Jul  2 00:55:10 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Thu Jul  2 00:55:10 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=a8ba5594

media-libs/mesa: Sync from main tree.

The r300 hunk is fixing a mistake made in commit 97a8d669.

 media-libs/mesa/mesa-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index bc3aa0c..6f349fd 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = * ]]; then
EXPERIMENTAL=true
 fi
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
 
@@ -66,7 +66,7 @@ REQUIRED_USE=
video_cards_radeon? ( || ( classic gallium ) )
video_cards_r100?   ( classic )
video_cards_r200?   ( classic )
-   video_cards_r300?   ( gallium )
+   video_cards_r300?   ( gallium llvm )
video_cards_r600?   ( gallium )
video_cards_radeonsi?   ( gallium llvm )
video_cards_vmware? ( gallium )
@@ -263,7 +263,7 @@ multilib_src_configure() {

fi
 
-   # on abi_x86_32 hardened we need to have asm disable  
+   # on abi_x86_32 hardened we need to have asm disable
if [[ ${ABI} == x86* ]]  use pic; then
myconf+= --disable-asm
fi



[gentoo-commits] proj/x11:master commit in: media-libs/mesa/, x11-base/xorg-server/, x11-libs/libXvMC/, x11-proto/glproto/

2015-04-01 Thread Matt Turner
commit: 2acd91ea6da44e0c40320371afa5493c8c3f39cc
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Wed Apr  1 18:50:07 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Wed Apr  1 18:50:07 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=2acd91ea

Update app-admin - app-eselect.

 media-libs/mesa/mesa-.ebuild | 8 
 x11-base/xorg-server/xorg-server-.ebuild | 2 +-
 x11-libs/libXvMC/libXvMC-.ebuild | 2 +-
 x11-proto/glproto/glproto-.ebuild| 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index c15dbd1..bc3aa0c 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -80,9 +80,9 @@ 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-admin/eselect-mesa )
-   gallium? ( app-admin/eselect-mesa )
-   =app-admin/eselect-opengl-1.3.0
+   classic? ( app-eselect/eselect-mesa )
+   gallium? ( app-eselect/eselect-mesa )
+   =app-eselect/eselect-opengl-1.3.0
udev? ( kernel_linux? ( =virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
gbm? ( =virtual/libudev-215:=[${MULTILIB_USEDEP}] )
@@ -108,7 +108,7 @@ RDEPEND=
=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
)
opencl? (
-   app-admin/eselect-opencl
+   app-eselect/eselect-opencl
dev-libs/libclc
|| (

=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]

diff --git a/x11-base/xorg-server/xorg-server-.ebuild 
b/x11-base/xorg-server/xorg-server-.ebuild
index 013f205..22c83d8 100644
--- a/x11-base/xorg-server/xorg-server-.ebuild
+++ b/x11-base/xorg-server/xorg-server-.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86
 IUSE_SERVERS=dmx kdrive xephyr xnest xorg xvfb
 IUSE=${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib 
+udev unwind wayland
 
-CDEPEND==app-admin/eselect-opengl-1.3.0
+CDEPEND==app-eselect/eselect-opengl-1.3.0
dev-libs/openssl
media-libs/freetype
=x11-apps/iceauth-1.0.2

diff --git a/x11-libs/libXvMC/libXvMC-.ebuild 
b/x11-libs/libXvMC/libXvMC-.ebuild
index 878e4de..f2a36d7 100644
--- a/x11-libs/libXvMC/libXvMC-.ebuild
+++ b/x11-libs/libXvMC/libXvMC-.ebuild
@@ -18,4 +18,4 @@ RDEPEND==x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
=x11-proto/videoproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
 DEPEND=${RDEPEND}
-PDEPEND=app-admin/eselect-xvmc
+PDEPEND=app-eselect/eselect-xvmc

diff --git a/x11-proto/glproto/glproto-.ebuild 
b/x11-proto/glproto/glproto-.ebuild
index 6cae993..a25708b 100644
--- a/x11-proto/glproto/glproto-.ebuild
+++ b/x11-proto/glproto/glproto-.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86
 LICENSE=SGI-B-2.0
 IUSE=
 
-RDEPEND==app-admin/eselect-opengl-1.3.0
+RDEPEND==app-eselect/eselect-opengl-1.3.0
 DEPEND=
 
 src_install() {



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

2015-03-28 Thread Matt Turner
commit: 11f0202d9ca79352223a56aa08a44df0533393a6
Author: Nikoli nikoli AT gmx DOT us
AuthorDate: Sat Mar 28 19:33:04 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Mar 28 19:33:04 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=11f0202d

media-libs/mesa: Don't depend on libelf for r600.

It's only needed for the LLVM backend (opencl or radeonsi).

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=542808

 media-libs/mesa/mesa-.ebuild | 4 
 1 file changed, 4 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 1add486..ffec51d 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -98,10 +98,6 @@ RDEPEND=
=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
) )
-   video_cards_r600? ( || (
-   =dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-   =dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-   ) )
!video_cards_r600? (
video_cards_radeon? ( || (

=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]



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

2015-03-28 Thread Matt Turner
commit: fd404d0d17cff9f1428ba1e7dd556276168c67ad
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sat Mar 28 19:36:35 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Mar 28 19:36:35 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=fd404d0d

media-libs/mesa: Depend on libXfixes.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=542812

 media-libs/mesa/mesa-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index ffec51d..1b23826 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -93,6 +93,7 @@ RDEPEND=
=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? ( || (
=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]



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

2015-03-28 Thread Matt Turner
commit: 7c4685110a8b18a8f52bcfacf7a9057051a7d751
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sat Mar 28 19:44:04 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Mar 28 19:44:04 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=7c468511

media-libs/mesa: Add ~arm64 keyword from main tree.

 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 82d9bc9..6d6b5e9 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE=MIT
 SLOT=0
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux 
~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 RESTRICT=!bindist? ( bindist )
 
 INTEL_CARDS=i915 i965 ilo intel



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

2015-03-28 Thread Matt Turner
commit: 0a46fb739637ec6f43d8c21bcca506d69c92848e
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sat Mar 28 19:41:38 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Mar 28 19:41:38 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=0a46fb73

media-libs/mesa: Don't depend on codegen tools if PV != .

 media-libs/mesa/mesa-.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 1b23826..82d9bc9 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -135,7 +135,6 @@ for card in ${RADEON_CARDS}; do
 done
 
 DEPEND=${RDEPEND}
-   ${PYTHON_DEPS}
llvm? (
video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
)
@@ -144,9 +143,6 @@ DEPEND=${RDEPEND}
=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
=sys-devel/gcc-4.6
)
-   sys-devel/bison
-   sys-devel/flex
-   $(python_gen_any_dep =dev-python/mako-0.7.3[\${PYTHON_USEDEP}])
sys-devel/gettext
virtual/pkgconfig
=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
@@ -159,6 +155,12 @@ DEPEND=${RDEPEND}
=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
 
+[[ ${PV} ==  ]]  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}



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

2015-03-28 Thread Matt Turner
commit: 3c37f4a3c389387524f494e398ff73098dbf35ca
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sat Mar 28 19:44:23 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Mar 28 19:44:23 2015 +
URL:https://gitweb.gentoo.org/proj/x11.git/commit/?id=3c37f4a3

media-libs/mesa: Raise libdrm requirement to 2.4.60.

 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 6d6b5e9..c15dbd1 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -73,7 +73,7 @@ REQUIRED_USE=
${PYTHON_REQUIRED_USE}
 
 
-LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.57
+LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.60
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND=



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

2015-03-01 Thread Matt Turner
commit: 4305e9d51bb7c848f127e2d7d5f3bdb585a13877
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Mar  1 19:23:48 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Mar  1 19:23:48 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4305e9d5

media-libs/llvm: Drop r600-llvm-compiler USE flag.

The flag enabled the R600 LLVM compiler backend for graphics shaders
(the LLVM backend is used for OpenCL regardless), but it's disabled by
default at build-time and even after you enable it you have to enable it
at runtime as well. See

http://cgit.freedesktop.org/mesa/mesa/commit/?id=7286739b9beea4683a29fe91850688a07ce23e1a

for details.

---
 media-libs/mesa/mesa-.ebuild | 17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 2001177..1add486 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -43,29 +43,22 @@ done
 
 IUSE=${IUSE_VIDEO_CARDS}
bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-   +nptl opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux
-   +udev vaapi vdpau wayland xvmc xa kernel_FreeBSD
+   +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+   wayland xvmc xa kernel_FreeBSD
 
 REQUIRED_USE=
d3d9?   ( dri3 gallium )
llvm?   ( gallium )
-   opencl? (
-   gallium
-   llvm
-   video_cards_r600? ( r600-llvm-compiler )
-   video_cards_radeon? ( r600-llvm-compiler )
-   video_cards_radeonsi? ( r600-llvm-compiler )
-   )
+   opencl? ( gallium llvm )
openmax? ( gallium )
gles1?  ( egl )
gles2?  ( egl )
-   r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 
video_cards_radeonsi video_cards_radeon ) )
vaapi? ( gallium )
vdpau? ( gallium )
wayland? ( egl gbm )
xa?  ( gallium )
video_cards_freedreno?  ( gallium )
-   video_cards_intel?  ( || ( classic ) )
+   video_cards_intel?  ( classic )
video_cards_i915?   ( || ( classic gallium ) )
video_cards_i965?   ( classic )
video_cards_ilo?( gallium )
@@ -147,7 +140,6 @@ done
 DEPEND=${RDEPEND}
${PYTHON_DEPS}
llvm? (
-   r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
)
opencl? (
@@ -232,7 +224,6 @@ multilib_src_configure() {
$(use_enable d3d9 nine)
$(use_enable llvm gallium-llvm)
$(use_enable openmax omx)
-   $(use_enable r600-llvm-compiler)
$(use_enable vaapi va)
$(use_enable vdpau)
$(use_enable xa)



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

2015-03-01 Thread Matt Turner
commit: d1921d17d1567713d350edf42998c5d92395b67c
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Mar  1 20:24:56 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Mar  1 20:24:56 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d1921d17

media-libs/mesa: Drop r600-llvm-compiler description from metadata.xml.

---
 media-libs/mesa/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index e127975..ec5c3b6 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -18,7 +18,6 @@
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='r600-llvm-compiler'Build the LLVM based r600 shader 
compiler./flag
flag name='vaapi'Enable the VAAPI acceleration interface for the 
Gallium3D Video Layer./flag
flag name='vdpau'Enable the VDPAU acceleration interface for the 
Gallium3D Video Layer./flag
flag name='wayland'Enable support for dev-libs/wayland/flag



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

2015-02-28 Thread Matt Turner
commit: 3c7d03cf0f534fe7c828114172b2efc626163b81
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sat Feb 28 22:21:17 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Feb 28 22:21:51 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3c7d03cf

media-libs/mesa: Add bindist restriction.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=541494

---
 media-libs/mesa/mesa-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 5b960db..2001177 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -32,6 +32,7 @@ fi
 LICENSE=MIT
 SLOT=0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+RESTRICT=!bindist? ( bindist )
 
 INTEL_CARDS=i915 i965 ilo intel
 RADEON_CARDS=r100 r200 r300 r600 radeon radeonsi



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

2015-02-22 Thread Matt Turner
commit: 847d2e8178a035718b0391af3c40500bfccb0767
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Feb 22 18:34:07 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Feb 22 18:34:07 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=847d2e81

media-libs/mesa: Add missing PYTHON_USEDEP to mako dependency.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=540968

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 1e59d81..5b960db 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -156,7 +156,7 @@ DEPEND=${RDEPEND}
)
sys-devel/bison
sys-devel/flex
-   =dev-python/mako-0.7.3[${PYTHON_USEDEP}]
+   $(python_gen_any_dep =dev-python/mako-0.7.3[\${PYTHON_USEDEP}])
sys-devel/gettext
virtual/pkgconfig
=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]



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

2015-02-22 Thread Matt Turner
commit: 1179da283260a39de306e5b7ee98f3d1d6e8c179
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sun Feb 22 06:45:32 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sun Feb 22 06:45:32 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1179da28

media-libs/mesa: Fix mako[${PYTHON_USEDEP}] dependency.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=540968

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index e9bea9d..1e59d81 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -156,7 +156,7 @@ DEPEND=${RDEPEND}
)
sys-devel/bison
sys-devel/flex
-   =dev-python/mako-0.7.3
+   =dev-python/mako-0.7.3[${PYTHON_USEDEP}]
sys-devel/gettext
virtual/pkgconfig
=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]



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

2015-02-20 Thread Matt Turner
commit: df37a577ac602be5c5d8b5783b3d8d66b9b2b91e
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Sat Feb 21 07:31:17 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Feb 21 07:37:56 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=df37a577

media-libs/mesa: Update for 10.5.

---
 media-libs/mesa/mesa-.ebuild | 61 +---
 1 file changed, 13 insertions(+), 48 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 9596cb8..e9bea9d 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -13,31 +13,23 @@ fi
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit base autotools multilib multilib-minimal flag-o-matic \
-   python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
 
 OPENGL_DIR=xorg-x11
 
-MY_PN=${PN/m/M}
-MY_P=${MY_PN}-${PV/_/-}
-MY_SRC_P=${MY_PN}Lib-${PV/_/-}
-
+MY_P=${P/_/-}
 FOLDER=${PV/_rc*/}
 
 DESCRIPTION=OpenGL-like graphic library for Linux
 HOMEPAGE=http://mesa3d.sourceforge.net/;
 
-#SRC_PATCHES=mirror://gentoo/${P}-gentoo-patches-01.tar.bz2
-if [[ $PV = * ]]; then
-   SRC_URI=${SRC_PATCHES}
+if [[ $PV == * ]]; then
+   SRC_URI=
 else
-   
SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-   ${SRC_PATCHES}
+   SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz;
 fi
 
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE=MIT SGI-B-2.0
+LICENSE=MIT
 SLOT=0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 
@@ -72,7 +64,7 @@ REQUIRED_USE=
wayland? ( egl gbm )
xa?  ( gallium )
video_cards_freedreno?  ( gallium )
-   video_cards_intel?  ( || ( classic gallium ) )
+   video_cards_intel?  ( || ( classic ) )
video_cards_i915?   ( || ( classic gallium ) )
video_cards_i965?   ( classic )
video_cards_ilo?( gallium )
@@ -87,7 +79,7 @@ REQUIRED_USE=
${PYTHON_REQUIRED_USE}
 
 
-LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.56
+LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.57
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND=
@@ -186,12 +178,7 @@ EGIT_CHECKOUT_DIR=${S}
 QA_EXECSTACK=usr/lib*/libGL.so*
 QA_WX_LOAD=usr/lib*/libGL.so*
 
-# Think about: ggi, fbcon, no-X configs
-
 pkg_setup() {
-   # workaround toc-issue wrt #386545
-   use ppc64  append-flags -mminimal-toc
-
# 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
@@ -201,25 +188,10 @@ pkg_setup() {
python-any-r1_pkg_setup
 }
 
-src_unpack() {
-   default
-   [[ $PV = * ]]  git-r3_src_unpack
-}
-
 src_prepare() {
-   # apply patches
-   if [[ ${PV} != *  -n ${SRC_PATCHES} ]]; then
-   EPATCH_FORCE=yes \
-   EPATCH_SOURCE=${WORKDIR}/patches \
-   EPATCH_SUFFIX=patch \
-   epatch
-   fi
-
# fix for hardened pax_kernel, bug 240956
[[ ${PV} != * ]]  epatch ${FILESDIR}/glx_ro_text_segm.patch
 
-   base_src_prepare
-
eautoreconf
 }
 
@@ -227,10 +199,10 @@ multilib_src_configure() {
local myconf
 
if use classic; then
-   # Configurable DRI drivers
+   # Configurable DRI drivers
driver_enable swrast
 
-   # Intel code
+   # Intel code
driver_enable video_cards_i915 i915
driver_enable video_cards_i965 i965
if ! use video_cards_i915  \
@@ -308,7 +280,8 @@ multilib_src_configure() {
# build fails with BSD indent, bug #428112
use userland_GNU || export INDENT=cat
 
-   ECONF_SOURCE=${S} econf \
+   ECONF_SOURCE=${S} \
+   econf \
--enable-dri \
--enable-glx \
--enable-shared-glapi \
@@ -441,15 +414,7 @@ pkg_postinst() {
elog enabled. Please see patents.txt for an explanation.
fi
 
-   local using_radeon r_flag
-   for r_flag in ${RADEON_CARDS}; do
-   if use video_cards_${r_flag}; then
-   using_radeon=1
-   break
-   fi
-   done
-
-   if [[ ${using_radeon} = 1 ]]  ! has_version media-libs/libtxc_dxtn; 
then
+   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 

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

2015-02-17 Thread Matt Turner
commit: 3d8574a4ba9bb74a92308d2b831d2a92926be53f
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Tue Feb 17 22:13:02 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Tue Feb 17 22:13:02 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3d8574a4

media-libs/mesa: Remove Solaris hack.

Doesn't seem to be needed.

---
 media-libs/mesa/mesa-.ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index c2a3007..32d1b48 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -218,11 +218,6 @@ src_prepare() {
# fix for hardened pax_kernel, bug 240956
[[ ${PV} != * ]]  epatch ${FILESDIR}/glx_ro_text_segm.patch
 
-   # Solaris needs some recent POSIX stuff in our case
-   if [[ ${CHOST} == *-solaris* ]] ; then
-   sed -i -e s/-DSVR4/-D_POSIX_C_SOURCE=200112L/ configure.ac || 
die
-   fi
-
base_src_prepare
 
eautoreconf



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

2015-02-17 Thread Matt Turner
commit: 39a856b98d242d88136bf3b784188d73db3ad5b5
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Tue Feb 17 22:18:45 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Tue Feb 17 22:18:45 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=39a856b9

media-libs/mesa: Remove unnecessary copy_sources.

---
 media-libs/mesa/mesa-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 32d1b48..9596cb8 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -221,7 +221,6 @@ src_prepare() {
base_src_prepare
 
eautoreconf
-   multilib_copy_sources
 }
 
 multilib_src_configure() {
@@ -309,7 +308,7 @@ multilib_src_configure() {
# build fails with BSD indent, bug #428112
use userland_GNU || export INDENT=cat
 
-   econf \
+   ECONF_SOURCE=${S} econf \
--enable-dri \
--enable-glx \
--enable-shared-glapi \



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

2015-02-08 Thread Chí-Thanh Christopher Nguyễn
commit: 74a19077a22147ae336134ddd5c7c026d3154938
Author: Chi-Thanh Christopher Nguyen chithanh AT gentoo DOT org
AuthorDate: Sun Feb  8 19:14:37 2015 +
Commit: Chí-Thanh Christopher Nguyễn chithanh AT gentoo DOT org
CommitDate: Sun Feb  8 19:14:37 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=74a19077

media-libs/mesa: squash some inconsequential differences between overlay and 
g-x86

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 media-libs/mesa/metadata.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 2656e3e..46aac69 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -54,7 +54,7 @@ IUSE=${IUSE_VIDEO_CARDS}
+udev vaapi vdpau wayland xvmc xa kernel_FreeBSD
 
 REQUIRED_USE=
-   d3d9? ( gallium dri3 )
+   d3d9?   ( dri3 gallium )
llvm?   ( gallium )
opencl? (
gallium

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 625b06b..e127975 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -5,9 +5,9 @@
 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='egl'Enable EGL support./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='gbm'Enable the Graphics Buffer Manager for EGL on 
KMS./flag
flag name='gles1'Enable GLESv1 support./flag



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

2015-02-08 Thread Matt Turner
commit: 77edff05035b8ba783a86772ed0b8e8742050840
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Mon Feb  9 03:06:15 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Mon Feb  9 03:06:15 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=77edff05

media-libs/mesa: Explicitly disable shader-cache.

It doesn't actually do anything yet.

---
 media-libs/mesa/mesa-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 46aac69..c2a3007 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -318,6 +318,7 @@ multilib_src_configure() {
--enable-dri \
--enable-glx \
--enable-shared-glapi \
+   --disable-shader-cache \
$(use_enable !bindist texture-float) \
$(use_enable d3d9 nine) \
$(use_enable debug) \



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

2015-02-03 Thread Matt Turner
commit: 899630c4acc2264e1a24d089a2ed37fd65d12c73
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Tue Feb  3 21:48:42 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Tue Feb  3 21:48:42 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=899630c4

media-libs/mesa: Add video_cards_r300? ( llvm ) to REQUIRED_USE.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=538086

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 2656e3e..3005cbf 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -80,7 +80,7 @@ REQUIRED_USE=
video_cards_radeon? ( || ( classic gallium ) )
video_cards_r100?   ( classic )
video_cards_r200?   ( classic )
-   video_cards_r300?   ( gallium )
+   video_cards_r300?   ( gallium llvm )
video_cards_r600?   ( gallium )
video_cards_radeonsi?   ( gallium llvm )
video_cards_vmware? ( gallium )



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

2015-01-13 Thread Matt Turner
commit: 526f7f7592485e75d56d604b22934df1c48367ad
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Tue Jan 13 22:44:44 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Tue Jan 13 22:44:44 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=526f7f75

media-libs/mesa: Add DEPEND on =dev-python/mako-0.7.3.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536486

---
 media-libs/mesa/mesa-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index fa55174..8dfaa3e 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -164,6 +164,7 @@ DEPEND=${RDEPEND}
)
sys-devel/bison
sys-devel/flex
+   =dev-python/mako-0.7.3
sys-devel/gettext
virtual/pkgconfig
=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]



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

2015-01-13 Thread Matt Turner
commit: d1cc1d06f404f9fef6844a61843d5004ca4d9e47
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Tue Jan 13 22:37:46 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Tue Jan 13 22:37:46 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d1cc1d06

media-libs/mesa: Drop usage of --with-opencl-libdir.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536458

---
 media-libs/mesa/mesa-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 3d88dd8..2938ef6 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -289,7 +289,6 @@ multilib_src_configure() {
if use opencl; then
myconf+=
$(use_enable opencl)
-   
--with-opencl-libdir=${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa
--with-clang-libdir=${EPREFIX}/usr/lib

fi



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

2015-01-13 Thread Matt Turner
commit: d9655833cfe566b7a3cd53841942e86ac3a80048
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Tue Jan 13 22:40:45 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Tue Jan 13 22:40:45 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d9655833

media-libs/mesa: Require libelf for USE=opencl.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536456

---
 media-libs/mesa/mesa-.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 2938ef6..fa55174 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -127,6 +127,10 @@ RDEPEND=
opencl? (
app-admin/eselect-opencl
dev-libs/libclc
+   || (
+   
=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+   
=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+   )
)
openmax? ( =media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( =x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )



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

2015-01-12 Thread Matt Turner
commit: 8600f437b69d409827666d21a246b10e3e944796
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Mon Jan 12 18:34:18 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Mon Jan 12 18:34:18 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8600f437

media-libs/mesa: Sync with main tree.

---
 media-libs/mesa/mesa-.ebuild | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index dffd922..3d88dd8 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -51,13 +51,14 @@ done
 IUSE=${IUSE_VIDEO_CARDS}
bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+nptl opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux
-   vaapi vdpau wayland xvmc xa kernel_FreeBSD
+   +udev vaapi vdpau wayland xvmc xa kernel_FreeBSD
 
 REQUIRED_USE=
d3d9? ( gallium dri3 )
llvm?   ( gallium )
opencl? (
gallium
+   llvm
video_cards_r600? ( r600-llvm-compiler )
video_cards_radeon? ( r600-llvm-compiler )
video_cards_radeonsi? ( r600-llvm-compiler )
@@ -96,6 +97,7 @@ RDEPEND=
classic? ( app-admin/eselect-mesa )
gallium? ( app-admin/eselect-mesa )
=app-admin/eselect-opengl-1.3.0
+   udev? ( kernel_linux? ( =virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
gbm? ( =virtual/libudev-215:=[${MULTILIB_USEDEP}] )
dri3? ( =virtual/libudev-215:=[${MULTILIB_USEDEP}] )
@@ -120,7 +122,7 @@ RDEPEND=

=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
) )
)
-   =sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
+   =sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
)
opencl? (
app-admin/eselect-opencl
@@ -152,8 +154,8 @@ DEPEND=${RDEPEND}
video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
)
opencl? (
-   =sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
-   =sys-devel/clang-3.3:=[${MULTILIB_USEDEP}]
+   =sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+   =sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
=sys-devel/gcc-4.6
)
sys-devel/bison
@@ -322,6 +324,7 @@ multilib_src_configure() {
$(use_enable gles2) \
$(use_enable nptl glx-tls) \
$(use_enable osmesa) \
+   $(use_enable !udev sysfs) \
--enable-llvm-shared-libs \
--with-dri-drivers=${DRI_DRIVERS} \
--with-gallium-drivers=${GALLIUM_DRIVERS} \



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

2014-11-21 Thread David Heidelberger
commit: 99dc82f53e80b660f4d8afdb506b3b970e45a72d
Author: David Heidelberg david AT ixit DOT cz
AuthorDate: Fri Nov 21 13:55:24 2014 +
Commit: David Heidelberger d.okias AT gmail DOT com
CommitDate: Fri Nov 21 13:55:24 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=99dc82f5

media-libs/mesa: drop openvg support

configure: error: Cannot enable OpenVG, because egl_gallium has been removed and
  OpenVG hasn't been integrated into standard libEGL yet

Signed-off-by: David Heidelberg david AT ixit.cz

---
 media-libs/mesa/mesa-.ebuild | 4 +---
 media-libs/mesa/metadata.xml | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index e9f0800..4120974 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -50,13 +50,12 @@ done
 
 IUSE=${IUSE_VIDEO_CARDS}
bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-   +nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler 
selinux
+   +nptl opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux
vaapi vdpau wayland xvmc xa kernel_FreeBSD
 
 REQUIRED_USE=
d3d9? ( gallium dri3 )
llvm?   ( gallium )
-   openvg? ( egl gallium )
opencl? (
gallium
video_cards_r600? ( r600-llvm-compiler )
@@ -258,7 +257,6 @@ multilib_src_configure() {
myconf+=
$(use_enable d3d9 nine)
$(use_enable llvm gallium-llvm)
-   $(use_enable openvg)
$(use_enable openmax omx)
$(use_enable r600-llvm-compiler)
$(use_enable vaapi va)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 69cb2f1..625b06b 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -15,7 +15,6 @@
flag name='llvm'Enable LLVM backend for Gallium3D./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='openvg'Enable the OpenVG 2D acceleration API for 
Gallium3D./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



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

2014-11-18 Thread David Heidelberger
commit: 112a49ddd3db092446c8243ea7f43c8669d735b6
Author: David Heidelberg david AT ixit DOT cz
AuthorDate: Tue Nov 18 12:21:16 2014 +
Commit: David Heidelberger d.okias AT gmail DOT com
CommitDate: Tue Nov 18 12:21:16 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=112a49dd

media-libs/mesa: allow building Direct 3D9 API

For more informations check https://wiki.ixit.cz/d3d9 .

Signed-off-by: David Heidelberg david AT ixit.cz

---
 media-libs/mesa/mesa-.ebuild | 7 +--
 media-libs/mesa/metadata.xml | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index ddc957c..e9f0800 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -49,11 +49,12 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE=${IUSE_VIDEO_CARDS}
-   bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
-   opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
+   bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+   +nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler 
selinux
vaapi vdpau wayland xvmc xa kernel_FreeBSD
 
 REQUIRED_USE=
+   d3d9? ( gallium dri3 )
llvm?   ( gallium )
openvg? ( egl gallium )
opencl? (
@@ -255,6 +256,7 @@ multilib_src_configure() {
 
if use gallium; then
myconf+=
+   $(use_enable d3d9 nine)
$(use_enable llvm gallium-llvm)
$(use_enable openvg)
$(use_enable openmax omx)
@@ -313,6 +315,7 @@ multilib_src_configure() {
--enable-glx \
--enable-shared-glapi \
$(use_enable !bindist texture-float) \
+   $(use_enable d3d9 nine) \
$(use_enable debug) \
$(use_enable dri3) \
$(use_enable egl) \

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index c8634ec..69cb2f1 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -6,6 +6,7 @@
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='egl'Enable EGL support./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='gallium'Build drivers based on Gallium3D, the new 
architecture for 3D graphics drivers./flag
flag name='gbm'Enable the Graphics Buffer Manager for EGL on 
KMS./flag



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

2014-11-15 Thread David Heidelberger
commit: 56b56e170d4b19773ab07ff0d4c79ea48f355530
Author: David Heidelberg david AT ixit DOT cz
AuthorDate: Sat Nov 15 17:24:51 2014 +
Commit: David Heidelberger d.okias AT gmail DOT com
CommitDate: Sat Nov 15 17:24:51 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=56b56e17

media-libs/mesa: remove gallium-egl from ebuild

Removed by commit c46c551c56f78c6bf9e63524c89478695fc4f525

Fixes QA warning.

Signed-off-by: David Heidelberg david AT ixit.cz

---
 media-libs/mesa/mesa-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index f56daac..ddc957c 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -257,7 +257,6 @@ multilib_src_configure() {
myconf+=
$(use_enable llvm gallium-llvm)
$(use_enable openvg)
-   $(use_enable openvg gallium-egl)
$(use_enable openmax omx)
$(use_enable r600-llvm-compiler)
$(use_enable vaapi va)



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

2014-10-01 Thread David Heidelberger
commit: 8c336a81a7dfd556a2130aeee1f076dcd7a203bf
Author: David Heidelberger david.heidelberger AT ixit DOT cz
AuthorDate: Wed Oct  1 23:53:43 2014 +
Commit: David Heidelberger d.okias AT gmail DOT com
CommitDate: Wed Oct  1 23:54:23 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8c336a81

media-libs/mesa: drop r300 llvm patch, not building anymore

if you're interested, please rebase patch and readd these lines

Signed-off-by: David Heidelberger david.heidelberger AT ixit.cz

---
 media-libs/mesa/mesa-.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 83f9a27..5ce4546 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -205,9 +205,6 @@ src_prepare() {
epatch
fi
 
-   # relax the requirement that r300 must have llvm, bug 380303
-   epatch ${FILESDIR}/${P}-dont-require-llvm-for-r300.patch
-
# fix for hardened pax_kernel, bug 240956
[[ ${PV} != * ]]  epatch ${FILESDIR}/glx_ro_text_segm.patch
 



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

2014-10-01 Thread David Heidelberger
commit: 92adf010eea88ffde8cc8fb7544578dc5405e47b
Author: Mike Lothian mike AT fireburn DOT co DOT uk
AuthorDate: Wed Oct  1 23:59:35 2014 +
Commit: David Heidelberger d.okias AT gmail DOT com
CommitDate: Thu Oct  2 00:00:52 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=92adf010

media-libs/mesa: add VA-API support and fix VDPAU dep on gallium

Signed-off-by: David Heidelberger david.heidelberger AT ixit.cz

---
 media-libs/mesa/mesa-.ebuild | 6 +-
 media-libs/mesa/metadata.xml | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 5ce4546..f56daac 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -51,7 +51,7 @@ done
 IUSE=${IUSE_VIDEO_CARDS}
bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
-   vdpau wayland xvmc xa kernel_FreeBSD
+   vaapi vdpau wayland xvmc xa kernel_FreeBSD
 
 REQUIRED_USE=
llvm?   ( gallium )
@@ -66,6 +66,8 @@ REQUIRED_USE=
gles1?  ( egl )
gles2?  ( egl )
r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 
video_cards_radeonsi video_cards_radeon ) )
+   vaapi? ( gallium )
+   vdpau? ( gallium )
wayland? ( egl gbm )
xa?  ( gallium )
video_cards_freedreno?  ( gallium )
@@ -125,6 +127,7 @@ RDEPEND=
dev-libs/libclc
)
openmax? ( =media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+   vaapi? ( =x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
vdpau? ( =x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
wayland? ( =dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
xvmc? ( =x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
@@ -257,6 +260,7 @@ multilib_src_configure() {
$(use_enable openvg gallium-egl)
$(use_enable openmax omx)
$(use_enable r600-llvm-compiler)
+   $(use_enable vaapi va)
$(use_enable vdpau)
$(use_enable xa)
$(use_enable xvmc)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 0a42e68..c8634ec 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -19,6 +19,7 @@
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='r600-llvm-compiler'Build the LLVM based r600 shader 
compiler./flag
+   flag name='vaapi'Enable the VAAPI acceleration interface for the 
Gallium3D Video Layer./flag
flag name='vdpau'Enable the VDPAU acceleration interface for the 
Gallium3D Video Layer./flag
flag name='wayland'Enable support for dev-libs/wayland/flag
flag name='xa'Enable the XA (X Acceleration) API for Gallium3D./flag



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

2014-09-16 Thread Chi-Thanh Christopher Nguyen
commit: b6088041c6e1e42e14aa00c3f7325729b57549ce
Author: Chi-Thanh Christopher Nguyen chithanh AT gentoo DOT org
AuthorDate: Tue Sep 16 17:30:48 2014 +
Commit: Chi-Thanh Christopher Nguyen chithanh AT cs DOT tu-berlin 
DOT de
CommitDate: Tue Sep 16 17:30:48 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b6088041

media-libs/mesa: sync IUSE defaults with portage.

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 3ffe004..83f9a27 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -49,7 +49,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE=${IUSE_VIDEO_CARDS}
-   bindist +classic debug +dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
+   bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
vdpau wayland xvmc xa kernel_FreeBSD
 



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

2014-08-20 Thread Michał Górny
commit: a6cbdcee9c4bbb52d0ad726804b2c1775e8feb50
Author: Nikoli nikoli AT gmx DOT us
AuthorDate: Sun Aug 17 17:24:49 2014 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Sun Aug 17 17:24:49 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a6cbdcee

media-libs/mesa: rebuild is required when llvm is updated

https://bugs.gentoo.org/510774 by Alexander Tsoy alexander AT tsoy.me

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 3eeaf19..9ce1752 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -118,7 +118,7 @@ RDEPEND=
=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
) )
)
-   =sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
+   =sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
)
opencl? (
app-admin/eselect-opencl



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

2014-08-19 Thread Michał Górny
commit: c7615e09741a6539552c2edc52e01bedd65b0df7
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Sun Aug  3 08:06:22 2014 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Sun Aug  3 08:06:22 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c7615e09

media-libs/mesa: Switch to virtual/libudev.

Package-Manager: portage-2.2.10

---
 media-libs/mesa/mesa-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 3d1ed05..885b938 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -95,8 +95,8 @@ RDEPEND=
gallium? ( app-admin/eselect-mesa )
=app-admin/eselect-opengl-1.2.7
dev-libs/expat[${MULTILIB_USEDEP}]
-   gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-   dri3? ( virtual/udev[${MULTILIB_USEDEP}] )
+   gbm? ( virtual/libudev[${MULTILIB_USEDEP}] )
+   dri3? ( virtual/libudev[${MULTILIB_USEDEP}] )
=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
x11-libs/libXdamage[${MULTILIB_USEDEP}]



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

2014-08-19 Thread Matt Turner
commit: 5f17ed867325149856cdf18df8ed0ee4b1511be2
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Mon Aug 11 03:58:55 2014 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Mon Aug 11 03:58:55 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5f17ed86

media-libs/mesa: Bump libdrm dependency to 2.4.56.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519384

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 09c3192..3eeaf19 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -84,7 +84,7 @@ REQUIRED_USE=
${PYTHON_REQUIRED_USE}
 
 
-LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.54
+LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.56
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND=



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

2014-08-17 Thread Nikoli
commit: a6cbdcee9c4bbb52d0ad726804b2c1775e8feb50
Author: Nikoli nikoli AT gmx DOT us
AuthorDate: Sun Aug 17 17:24:49 2014 +
Commit: Nikoli nikoli AT lavabit DOT com
CommitDate: Sun Aug 17 17:24:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a6cbdcee

media-libs/mesa: rebuild is required when llvm is updated

https://bugs.gentoo.org/510774 by Alexander Tsoy alexander AT tsoy.me

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 3eeaf19..9ce1752 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -118,7 +118,7 @@ RDEPEND=
=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
) )
)
-   =sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
+   =sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
)
opencl? (
app-admin/eselect-opencl



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

2014-08-11 Thread Matt Turner
commit: 5f17ed867325149856cdf18df8ed0ee4b1511be2
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Mon Aug 11 03:58:55 2014 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Mon Aug 11 03:58:55 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5f17ed86

media-libs/mesa: Bump libdrm dependency to 2.4.56.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519384

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 09c3192..3eeaf19 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -84,7 +84,7 @@ REQUIRED_USE=
${PYTHON_REQUIRED_USE}
 
 
-LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.54
+LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.56
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND=



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

2014-08-03 Thread Michał Górny
commit: c7615e09741a6539552c2edc52e01bedd65b0df7
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Sun Aug  3 08:06:22 2014 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Sun Aug  3 08:06:22 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c7615e09

media-libs/mesa: Switch to virtual/libudev.

Package-Manager: portage-2.2.10

---
 media-libs/mesa/mesa-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 3d1ed05..885b938 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -95,8 +95,8 @@ RDEPEND=
gallium? ( app-admin/eselect-mesa )
=app-admin/eselect-opengl-1.2.7
dev-libs/expat[${MULTILIB_USEDEP}]
-   gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-   dri3? ( virtual/udev[${MULTILIB_USEDEP}] )
+   gbm? ( virtual/libudev[${MULTILIB_USEDEP}] )
+   dri3? ( virtual/libudev[${MULTILIB_USEDEP}] )
=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
x11-libs/libXdamage[${MULTILIB_USEDEP}]



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

2014-06-14 Thread Nikoli
commit: 59d46d2a5035bbf15276f913ef88896781f9be84
Author: Nikoli nikoli AT gmx DOT us
AuthorDate: Sat Jun 14 06:26:30 2014 +
Commit: Nikoli nikoli AT lavabit DOT com
CommitDate: Sat Jun 14 06:26:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=59d46d2a

media-libs/mesa: enable dri3 by default

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 70aa961..3d1ed05 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -49,7 +49,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE=${IUSE_VIDEO_CARDS}
-   bindist +classic debug dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
+   bindist +classic debug +dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
vdpau wayland xvmc xa kernel_FreeBSD
 



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

2014-06-14 Thread Nikoli
commit: 10c2c5f6080cdb4a8932add26c668e3859f4f135
Author: Nikoli nikoli AT gmx DOT us
AuthorDate: Sat Jun 14 06:25:12 2014 +
Commit: Nikoli nikoli AT lavabit DOT com
CommitDate: Sat Jun 14 06:25:12 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=10c2c5f6

media-libs/mesa: do not disable asm for amd64

bug #512208, thanks to Magnus Granberg for the patch

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 965bb55..70aa961 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -300,6 +300,11 @@ multilib_src_configure() {

fi
 
+   # on abi_x86_32 hardened we need to have asm disable  
+   if [[ ${ABI} == x86* ]]  use pic; then
+   myconf+= --disable-asm
+   fi
+
# build fails with BSD indent, bug #428112
use userland_GNU || export INDENT=cat
 
@@ -316,7 +321,6 @@ multilib_src_configure() {
$(use_enable gles2) \
$(use_enable nptl glx-tls) \
$(use_enable osmesa) \
-   $(use_enable !pic asm) \
--enable-llvm-shared-libs \
--with-dri-drivers=${DRI_DRIVERS} \
--with-gallium-drivers=${GALLIUM_DRIVERS} \



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

2014-05-27 Thread Chi-Thanh Christopher Nguyen
commit: 6eb2c35a78f5dee16bb28199dfdb4c978fa2ce64
Author: Chi-Thanh Christopher Nguyen chithanh AT gentoo DOT org
AuthorDate: Tue May 27 14:51:26 2014 +
Commit: Chi-Thanh Christopher Nguyen chithanh AT cs DOT tu-berlin 
DOT de
CommitDate: Tue May 27 14:51:26 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6eb2c35a

media-libs/mesa: perform registration of OpenMAX drivers

---
 media-libs/mesa/mesa-.ebuild | 21 +
 1 file changed, 21 insertions(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 2ebdb37..195c212 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -398,6 +398,12 @@ multilib_src_install() {
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() {
@@ -446,6 +452,15 @@ pkg_postinst() {
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
@@ -467,6 +482,12 @@ pkg_postinst() {
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



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

2014-05-27 Thread Chi-Thanh Christopher Nguyen
commit: 1acc553e0c96b2adc2465d6c1693ee4e1d6eccb8
Author: Chi-Thanh Christopher Nguyen chithanh AT gentoo DOT org
AuthorDate: Tue May 27 15:08:54 2014 +
Commit: Chi-Thanh Christopher Nguyen chithanh AT cs DOT tu-berlin 
DOT de
CommitDate: Tue May 27 15:08:54 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1acc553e

media-libs/mesa: Fix quoting to silence repoman.

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 195c212..8630de8 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -484,7 +484,7 @@ pkg_postinst() {
 
 pkg_prerm() {
if use openmax; then
-   rm ${EPREFIX}/usr/share/mesa/xdg/.omxregister
+   rm ${EPREFIX}/usr/share/mesa/xdg/.omxregister
fi
 }
 



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

2014-05-27 Thread Chi-Thanh Christopher Nguyen
commit: 115ae24399ccc564529db5b4936eb1520386298e
Author: Chi-Thanh Christopher Nguyen chithanh AT gentoo DOT org
AuthorDate: Tue May 27 15:09:20 2014 +
Commit: Chi-Thanh Christopher Nguyen chithanh AT cs DOT tu-berlin 
DOT de
CommitDate: Tue May 27 15:09:20 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=115ae243

media-libs/mesa: Drop llvm radeon backend requirement for opencl.

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 8630de8..965bb55 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -149,7 +149,7 @@ DEPEND=${RDEPEND}
video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
)
opencl? (
-   
=sys-devel/llvm-3.3-r3[video_cards_radeon,${MULTILIB_USEDEP}]
+   =sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
=sys-devel/gcc-4.6
)



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

2014-05-14 Thread Chi-Thanh Christopher Nguyen
commit: 29791aed2dedabef85f90f69254365535c0ee503
Author: Chi-Thanh Christopher Nguyen chithanh AT gentoo DOT org
AuthorDate: Wed May 14 16:04:29 2014 +
Commit: Chi-Thanh Christopher Nguyen chithanh AT cs DOT tu-berlin 
DOT de
CommitDate: Wed May 14 16:04:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=29791aed

media-libs/mesa: raise libdrm dependency, group gettext dependency with other 
sys-devel/ packages

---
 media-libs/mesa/mesa-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index a767726..2ebdb37 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -84,7 +84,7 @@ REQUIRED_USE=
${PYTHON_REQUIRED_USE}
 
 
-LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.53
+LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.54
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND=
@@ -155,6 +155,7 @@ DEPEND=${RDEPEND}
)
sys-devel/bison
sys-devel/flex
+   sys-devel/gettext
virtual/pkgconfig
=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
dri3? (
@@ -165,7 +166,6 @@ DEPEND=${RDEPEND}
=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
x11-proto/xf86driproto[${MULTILIB_USEDEP}]
x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-   sys-devel/gettext
 
 
 S=${WORKDIR}/${MY_P}



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

2014-05-10 Thread Nikoli
commit: 4a6f2dd063e438eaa9f3c2594ba9d5893f4b6980
Author: Nikoli nikoli AT gmx DOT us
AuthorDate: Sat May 10 09:07:07 2014 +
Commit: Nikoli nikoli AT lavabit DOT com
CommitDate: Sat May 10 09:07:07 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4a6f2dd0

media-libs/mesa: fix runnings tests in hardened

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 79f3c4e..835d0f8 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -14,7 +14,7 @@ fi
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit base autotools multilib multilib-minimal flag-o-matic \
-   python-any-r1 toolchain-funcs ${GIT_ECLASS}
+   python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
 
 OPENGL_DIR=xorg-x11
 
@@ -413,6 +413,13 @@ multilib_src_install_all() {
 }
 
 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
 }
 



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

2014-05-10 Thread Nikoli
commit: 985c1612d39f789ae9c6c5b76947189fd8a03777
Author: Nikoli nikoli AT gmx DOT us
AuthorDate: Sat May 10 09:09:49 2014 +
Commit: Nikoli nikoli AT lavabit DOT com
CommitDate: Sat May 10 09:09:49 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=985c1612

media-libs/mesa: add missing dep

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 835d0f8..a767726 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -165,6 +165,7 @@ DEPEND=${RDEPEND}
=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
x11-proto/xf86driproto[${MULTILIB_USEDEP}]
x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+   sys-devel/gettext
 
 
 S=${WORKDIR}/${MY_P}



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

2014-04-29 Thread Michał Górny
commit: f863272741009daa32847b1e47abadd3e1bd353d
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Tue Apr 29 17:31:04 2014 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Tue Apr 29 17:31:04 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f8632727

media-libs/mesa: Re-add Python dependency that was mistakenly removed along 
with libxml2.

Package-Manager: portage-2.2.10

---
 media-libs/mesa/mesa-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index b69778f..79f3c4e 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -143,6 +143,7 @@ for card in ${RADEON_CARDS}; do
 done
 
 DEPEND=${RDEPEND}
+   ${PYTHON_DEPS}
llvm? (
r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )



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

2014-04-13 Thread Chi-Thanh Christopher Nguyen
commit: 42c00333273e2062730f153528db701f69521977
Author: Chi-Thanh Christopher Nguyen chithanh AT gentoo DOT org
AuthorDate: Sun Apr 13 19:02:15 2014 +
Commit: Chi-Thanh Christopher Nguyen chithanh AT cs DOT tu-berlin 
DOT de
CommitDate: Sun Apr 13 19:02:15 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=42c00333

media-libs/mesa-: raise libdrm dependency

---
 media-libs/mesa/mesa-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 0095919..b69778f 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -84,7 +84,7 @@ REQUIRED_USE=
${PYTHON_REQUIRED_USE}
 
 
-LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.52
+LIBDRM_DEPSTRING==x11-libs/libdrm-2.4.53
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND=



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

2014-04-10 Thread Michał Górny
commit: f22a1a83ef83e70582340e16dfc2c484c08280da
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Thu Apr 10 17:17:31 2014 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Thu Apr 10 17:17:31 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f22a1a83

media-libs/mesa: Require llvm-3.3-r3 (for new llvm-config path + bug #506180). 
Always use shared libs to avoid the issues related to static linking (e.g. bug 
#481316).

Package-Manager: portage-2.2.10

---
 media-libs/mesa/mesa-.ebuild | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index d9f27a3..0095919 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -50,8 +50,8 @@ done
 
 IUSE=${IUSE_VIDEO_CARDS}
bindist +classic debug dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
-   +llvm-shared-libs opencl openvg osmesa pax_kernel openmax pic
-   r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD
+   opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
+   vdpau wayland xvmc xa kernel_FreeBSD
 
 REQUIRED_USE=
llvm?   ( gallium )
@@ -118,7 +118,7 @@ RDEPEND=
dev-libs/libelf[${MULTILIB_USEDEP}]
) )
)
-   llvm-shared-libs? ( =sys-devel/llvm-2.9[${MULTILIB_USEDEP}] )
+   =sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
)
opencl? (
app-admin/eselect-opencl
@@ -144,12 +144,11 @@ done
 
 DEPEND=${RDEPEND}
llvm? (
-   =sys-devel/llvm-2.9[${MULTILIB_USEDEP}]
r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
)
opencl? (
-   
=sys-devel/llvm-3.3-r1[video_cards_radeon,${MULTILIB_USEDEP}]
+   
=sys-devel/llvm-3.3-r3[video_cards_radeon,${MULTILIB_USEDEP}]
=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
=sys-devel/gcc-4.6
)
@@ -302,10 +301,6 @@ multilib_src_configure() {
# build fails with BSD indent, bug #428112
use userland_GNU || export INDENT=cat
 
-   if ! multilib_is_native_abi; then
-   myconf+=LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}
-   fi
-
econf \
--enable-dri \
--enable-glx \
@@ -320,7 +315,7 @@ multilib_src_configure() {
$(use_enable nptl glx-tls) \
$(use_enable osmesa) \
$(use_enable !pic asm) \
-   $(use_enable llvm-shared-libs) \
+   --enable-llvm-shared-libs \
--with-dri-drivers=${DRI_DRIVERS} \
--with-gallium-drivers=${GALLIUM_DRIVERS} \
PYTHON2=${PYTHON} \



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

2014-03-27 Thread Matt Turner
commit: d25cf62e7b0306afba5a9020f4c14c0c7bde2951
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Thu Mar 27 18:49:48 2014 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Thu Mar 27 18:49:48 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d25cf62e

media-libs/mesa: Drop libxml2 dependency.

Replaced upstream in 2de70fe23 with python's built-in ElementTree.

---
 media-libs/mesa/mesa-.ebuild | 5 -
 1 file changed, 5 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index a5f8fc0..d9f27a3 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -165,13 +165,8 @@ DEPEND=${RDEPEND}
=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
x11-proto/xf86driproto[${MULTILIB_USEDEP}]
x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-   $(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
 
 
-python_check_deps() {
-   has_version --host-root dev-libs/libxml2[python,${PYTHON_USEDEP}]
-}
-
 S=${WORKDIR}/${MY_P}
 EGIT_CHECKOUT_DIR=${S}
 



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

2014-03-13 Thread Matt Turner
commit: 8bacae5526950f160bd95f0b54a7979d89af2343
Author: Matt Turner mattst88 AT gmail DOT com
AuthorDate: Thu Mar 13 23:24:33 2014 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Thu Mar 13 23:24:33 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8bacae55

media-libs/mesa: Add DRI3 USE flag, bug #504356.

---
 media-libs/mesa/mesa-.ebuild | 10 +++---
 media-libs/mesa/metadata.xml |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-.ebuild b/media-libs/mesa/mesa-.ebuild
index 03f7a43..a5f8fc0 100644
--- a/media-libs/mesa/mesa-.ebuild
+++ b/media-libs/mesa/mesa-.ebuild
@@ -49,7 +49,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE=${IUSE_VIDEO_CARDS}
-   bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
+   bindist +classic debug dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
+llvm-shared-libs opencl openvg osmesa pax_kernel openmax pic
r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD
 
@@ -96,6 +96,7 @@ RDEPEND=
=app-admin/eselect-opengl-1.2.7
dev-libs/expat[${MULTILIB_USEDEP}]
gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
+   dri3? ( virtual/udev[${MULTILIB_USEDEP}] )
=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
x11-libs/libXdamage[${MULTILIB_USEDEP}]
@@ -156,8 +157,10 @@ DEPEND=${RDEPEND}
sys-devel/flex
virtual/pkgconfig
=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
-   =x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
-   =x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
+   dri3? (
+   =x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
+   =x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
+   )
=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
x11-proto/xf86driproto[${MULTILIB_USEDEP}]
@@ -314,6 +317,7 @@ multilib_src_configure() {
--enable-shared-glapi \
$(use_enable !bindist texture-float) \
$(use_enable debug) \
+   $(use_enable dri3) \
$(use_enable egl) \
$(use_enable gbm) \
$(use_enable gles1) \

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 73570a9..0a42e68 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -6,6 +6,7 @@
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='egl'Enable EGL support./flag
+   flag name='dri3'Enable DRI3 support./flag
flag name='gallium'Build drivers based on Gallium3D, the new 
architecture for 3D graphics drivers./flag
flag name='gbm'Enable the Graphics Buffer Manager for EGL on 
KMS./flag
flag name='gles1'Enable GLESv1 support./flag