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

["Chi-Thanh Christopher Nguyen" <chithanh@cs.tu-berlin.de>]

commit:     0e16c8a0a8b9ebcd763ac3aae53cb173a278fed2
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 16:28:07 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Sep 12 16:28:07 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0e16c8a0

Merge branch 'master' into opencl

Conflicts:
	media-libs/mesa/mesa-9999.ebuild

Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>


 dev-libs/weston/Manifest                           |    1 +
 dev-libs/weston/metadata.xml                       |   13 +++++++++++++
 dev-libs/weston/weston-0.85.0.ebuild               |    2 +-
 .../{weston-9999.ebuild => weston-0.95.0.ebuild}   |    4 ++--
 dev-libs/weston/weston-9999.ebuild                 |    4 ++--
 media-libs/mesa/mesa-9999.ebuild                   |    9 +++------
 media-libs/mesa/metadata.xml                       |    1 -
 x11-base/xorg-drivers/xorg-drivers-9999.ebuild     |    5 +++--
 x11-drivers/ati-drivers/Manifest                   |    1 +
 x11-drivers/xf86-video-intel/metadata.xml          |    2 ++
 .../xf86-video-intel/xf86-video-intel-9999.ebuild  |   16 ++++++++++------
 11 files changed, 38 insertions(+), 20 deletions(-)

diff --cc media-libs/mesa/mesa-9999.ebuild
index 413c40c,a094a48..7c2cea0
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@@ -46,12 -46,11 +46,11 @@@ for card in ${VIDEO_CARDS}; d
  done
  
  IUSE="${IUSE_VIDEO_CARDS}
- 	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
- 	opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi
- 	vdpau wayland xvmc xa xorg kernel_FreeBSD"
+ 	bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
 -	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
++	opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+ 	wayland xvmc xa xorg kernel_FreeBSD"
  
  REQUIRED_USE="
- 	d3d?    ( gallium )
  	g3dvl?  ( gallium )
  	llvm?   ( gallium )
  	openvg? ( egl gallium )
@@@ -99,11 -97,6 +98,10 @@@ RDEPEND="${EXTERNAL_DEPEND
  	x11-libs/libXext
  	x11-libs/libXxf86vm
  	>=x11-libs/libxcb-1.8.1
- 	d3d? ( app-emulation/wine )
 +	opencl? ( 
 +				app-admin/eselect-opencl
 +				dev-libs/libclc
 +			)
  	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
  	wayland? ( dev-libs/wayland )
  	xorg? (