From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-362586-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1QhO9k-0008M4-Cm
	for garchives@archives.gentoo.org; Thu, 14 Jul 2011 15:48:52 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id EEAEE21C036;
	Thu, 14 Jul 2011 15:48:42 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id ACFC421C093
	for <gentoo-commits@lists.gentoo.org>; Thu, 14 Jul 2011 15:48:42 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id F0AC52AC2A0
	for <gentoo-commits@lists.gentoo.org>; Thu, 14 Jul 2011 15:48:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 27FF28003D
	for <gentoo-commits@lists.gentoo.org>; Thu, 14 Jul 2011 15:48:41 +0000 (UTC)
From: "Chi-Thanh Christopher Nguyen" <chithanh@cs.tu-berlin.de>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" <chithanh@cs.tu-berlin.de>
Message-ID: <b4cfa6e759a2912e81b360e1d0fa02c4835ba227.chithead@gentoo>
Subject: [gentoo-commits] proj/x11:master commit in: media-libs/mesa/
X-VCS-Repository: proj/x11
X-VCS-Files: media-libs/mesa/mesa-9999.ebuild media-libs/mesa/metadata.xml
X-VCS-Directories: media-libs/mesa/
X-VCS-Committer: chithead
X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen
X-VCS-Revision: b4cfa6e759a2912e81b360e1d0fa02c4835ba227
Date: Thu, 14 Jul 2011 15:48:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 353899530ea11b7a3b791d376578415d

commit:     b4cfa6e759a2912e81b360e1d0fa02c4835ba227
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 15:48:52 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berli=
n <DOT> de>
CommitDate: Thu Jul 14 15:48:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc=
ommit;h=3Db4cfa6e7

media-libs/mesa: adapt ebuild for configure.ac changes following the pipe=
-video merge.

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

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999=
.ebuild
index 9d21b01..6a8c687 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
=20
 IUSE=3D"${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl +gallium gles +llvm motif +nptl openvg =
pic selinux shared-dricore +shared-glapi wayland kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gles +llvm motif +nptl o=
penvg pic selinux shared-dricore +shared-glapi vaapi vdpau wayland xvmc k=
ernel_FreeBSD"
=20
 LIBDRM_DEPSTRING=3D">=3Dx11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages w=
hich
@@ -76,7 +76,10 @@ RDEPEND=3D"${EXTERNAL_DEPEND}
 	gallium? (
 		llvm? ( >=3Dsys-devel/llvm-2.9 )
 	)
+	vaapi? ( x11-libs/libva )
+	vdpau? ( >=3Dx11-libs/libvdpau-0.4.1 )
 	wayland? ( x11-base/wayland )
+	xvmc? ( x11-libs/libXvMC )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
 "
 for card in ${INTEL_CARDS}; do
@@ -269,12 +272,16 @@ src_configure() {
 		--without-demos \
 		--enable-xcb \
 		$(use_enable debug) \
+		$(use_enable g3dvl) \
 		$(use_enable motif glw) \
 		$(use_enable motif) \
 		$(use_enable nptl glx-tls) \
 		$(use_enable !pic asm) \
 		$(use_enable shared-dricore) \
 		$(use_enable shared-glapi) \
+		$(use_enable vaapi va) \
+		$(use_enable vdpau) \
+		$(use_enable xvmc) \
 		--with-dri-drivers=3D${DRI_DRIVERS} \
 		--with-gallium-drivers=3D${GALLIUM_DRIVERS} \
 		${myconf}

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index d66c89e..d1fd3ca 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -7,11 +7,15 @@
 	<flag name=3D'd3d'>Enable DirectX 10/10.1/11 backend for Gallium3D.</fl=
ag>
 	<flag name=3D'egl'>Enable EGL support for Gallium3D.</flag>
 	<flag name=3D'gallium'>Build drivers based on Gallium3D, the new archit=
ecture for 3D graphics drivers.</flag>
+	<flag name=3D'g3dvl'>Enable video decode acceleration support for Galli=
um3D.</flag>
 	<flag name=3D'gles'>Enable GLES support for Gallium3D.</flag>
 	<flag name=3D'llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name=3D'openvg'>Enable the OpenVG 2D acceleration API</flag>
 	<flag name=3D'pic'>disable optimized assembly code that is not PIC frie=
ndly</flag>
 	<flag name=3D'shared-dricore'>Enable sharing of common code for classic=
 DRI drivers.</flag>
 	<flag name=3D'shared-glapi'>Enable sharing of common code for the OpenG=
L API.</flag>
+	<flag name=3D'vaapi'>Enable the VA-API acceleration interface.</flag>
+	<flag name=3D'vdpau'>Enable the VDPAU acceleration interface.</flag>
+	<flag name=3D'xvmc'>Enable the XvMC acceleration interface.</flag>
 </use>
 </pkgmetadata>