Add support for intel cards, by emil karlson <jkarlson@cc.hut.fi>, bug #325035...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog
index 2b0c906028bdec64b695bf352da19415e1a7c24b..8570c3e19af910e5ab9861db02df0cfade0eeb2b 100644 (file)
--- a/x11-libs/libva/ChangeLog
+++ b/x11-libs/libva/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libva
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.3 2010/06/22 08:51:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.4 2010/06/22 12:31:30 aballier Exp $
+
+  22 Jun 2010; Alexis Ballier <aballier@gentoo.org> libva-0.31.0_p13.ebuild,
+  metadata.xml:
+  Add support for intel cards, by emil karlson <jkarlson@cc.hut.fi>, bug
+  #325035, add him as proxy for the intel driver; add commented out parts
+  for ati support
 
   22 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
   libva-0.31.0_p13.ebuild:

diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 5a69db8deadb811b49b57e2083bcf1d48cf1aae3..2a6614d48f6dd8aaef87b8abd2dde21b048af6f9 100644 (file)
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX libva-dont-install-tests.patch 1788 RMD160 809e40dfe12a44d5275d03a5c05219184883eede SHA1 9c6f3ceb678bfb5429977223611ab03db72f22fc SHA256 f12d72a4007b2c7eb6f18be852eda7f4ebfbcb320317281b35bf5473336f5973
 DIST libva_0.31.0-1+sds13.tar.gz 749297 RMD160 beed1dcc8b68bca7c77499a5978ffffe5ada1238 SHA1 11c47b6bb39cd5dd0ac7785856e152893b9fc400 SHA256 6a9ea019562bcc13bb947a368a501f558d65a3e54707e54a99828aea79c2e408
-EBUILD libva-0.31.0_p13.ebuild 1505 RMD160 bfab4a231580b3f66e786d36a041b8a3262e6e18 SHA1 abf919ebb7864d6b97f20a834dd0ccd0c2021278 SHA256 0ad8e8cf3a8caeccabb5b20bd60dc8aed322346e17ce80e766ebce5aca2403a5
-MISC ChangeLog 727 RMD160 2122005d0d0c0d49a010d9927938f263f8946536 SHA1 4a93f4d57d810b0cb71c20336ae8112cf36828aa SHA256 115e3a4568842c09231c85ca5bbc5651f94d7f80e8b306d923df624c842ee806
-MISC metadata.xml 258 RMD160 0750e8362fdf26b22ab44eb9682be7ecdbe6945f SHA1 9505000e1ceefaffc3d07ca2fea3fd85c8f55208 SHA256 13c30fd8849ab7b29d8f14b9131823845f6ec9e1c0f71d8e6c72ffc2cad0fc96
+EBUILD libva-0.31.0_p13.ebuild 1502 RMD160 fd26cbe1ab4d683073410ef0057cb1004cb15ade SHA1 7347b55c339c9316ab29b73e90a5ff29e8517226 SHA256 bc25a0a3b4bb11c21eb990cb755a5b32944f5795ed16dc773e3c14c0eee0be44
+MISC ChangeLog 989 RMD160 e6a9c4c17dcab9422119816d157662e2a724fbd5 SHA1 ab695c044ce83cda96fd76dfb3427dd7a929ead2 SHA256 d99d460c88e6b339ed18a94985651b66f5c089bca0300d70116e611c8958704e
+MISC metadata.xml 462 RMD160 e1fe1b49e84d6e1cb91aaef94d33c8b7e0fc95a1 SHA1 9a5a176987f3707e45b5e007001f9e0a6fca5b4c SHA256 3ae5e5a8839c98889d25a304c7fb4297a1bc9738bad3a2a33e6261be13ffd77c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwgecYACgkQNQqtfCuFneOOxwCgjxPBy+mpuqyGi/VJl56auzEk
-j2kAnjbNbmnn/dnBcQGxOF9OetHZFdBJ
-=1NTX
+iEYEARECAAYFAkwgrSgACgkQvFcC4BYPU0qcMACeIUXqohRvLndAsLx4bxirj7EJ
+UWkAn0Dy1SKCwq1Anm9udE5miyY+bQK1
+=gKOz
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/libva/libva-0.31.0_p13.ebuild b/x11-libs/libva/libva-0.31.0_p13.ebuild
index 953d9a066a28ffdee4aa0155f7f4086c2d948580..d43c29aebf523d19f579a459adca3f7d7fc74612 100644 (file)
--- a/x11-libs/libva/libva-0.31.0_p13.ebuild
+++ b/x11-libs/libva/libva-0.31.0_p13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-0.31.0_p13.ebuild,v 1.3 2010/06/22 08:51:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-0.31.0_p13.ebuild,v 1.4 2010/06/22 12:31:30 aballier Exp $
 
 EAPI="2"
 inherit eutils autotools
@@ -18,12 +18,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
-VIDEO_CARDS="dummy nvidia" # intel
+VIDEO_CARDS="dummy nvidia intel" # fglrx
 for x in ${VIDEO_CARDS}; do
        IUSE+=" video_cards_${x}"
 done
 
 RDEPEND=">=x11-libs/libdrm-2.4
+       video_cards_intel? ( >=x11-libs/libdrm-2.4.21 )
        x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXfixes
@@ -31,8 +32,8 @@ RDEPEND=">=x11-libs/libdrm-2.4
 
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
-# video_cards_intel? gen4asm
 PDEPEND="video_cards_nvidia? ( x11-libs/vdpau-video )"
+       #video_cards_fglrx? ( x11-libs/xvba-video )
 
 S=${WORKDIR}/${MY_P}
 
@@ -46,10 +47,8 @@ src_prepare() {
 src_configure() {
        econf \
        $(use_enable video_cards_dummy dummy-driver) \
-       --disable-i965-driver \
+       $(use_enable video_cards_intel i965-driver) \
        $(use_enable opengl glx)
-       # $(use_enable video_cards_intel i965-driver): someone please test it and
-       # add the missing bits
 }
 
 src_install() {

diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
index 5c913a45f55c51f96e2fc33a4553f5a0506733c4..efc34d700c296a364fba80f46c342fe21067a74e 100644 (file)
--- a/x11-libs/libva/metadata.xml
+++ b/x11-libs/libva/metadata.xml
@@ -6,4 +6,10 @@
     <email>aballier@gentoo.org</email>
     <name>Alexis Ballier</name>
   </maintainer>
+  <maintainer>
+       <email>jkarlson@cc.hut.fi</email>
+       <name>Emil Karlson</name>
+       <description>Proxy maintainer for the intel driver. Please CC on bugs
+               concerning intel cards.</description>
+  </maintainer>
 </pkgmetadata>