version bump

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 75 insertions, 9 deletions

diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog
index 30db38224834..e3d065fe3182 100644
--- a/x11-libs/libva-intel-driver/ChangeLog
+++ b/x11-libs/libva-intel-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libva-intel-driver
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.22 2013/06/19 19:44:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.23 2013/06/26 19:06:32 aballier Exp $
+
+*libva-intel-driver-1.2.0 (26 Jun 2013)
+
+  26 Jun 2013; Alexis Ballier <aballier@gentoo.org>
+  +libva-intel-driver-1.2.0.ebuild, libva-intel-driver-9999.ebuild:
+  version bump
 
   19 Jun 2013; Alexis Ballier <aballier@gentoo.org>
   libva-intel-driver-1.0.20.ebuild, libva-intel-driver-9999.ebuild,
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index d2e5f9dede1d..a947db804c0d 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -5,16 +5,18 @@ AUX libm.patch 837 SHA256 22750ea795bcb4423dc584daec6a59c610e78aa4176cf86a7bc7b1
 DIST intel-driver-1.0.17.tar.bz2 289359 SHA256 83bee4de6e156b3a95af3ac41bcb2dbfecbb547444e8ff8ef005dc5ad92e0b3f SHA512 33d2108596ed3562f2db7404b5cbab30a319ca88b905b658d5a619841dbada6a6e69f7f3f7205f3fd0b86afbec1aaa45e1baac2b8740e4cb5bbe81c6c6740447 WHIRLPOOL 79e1663b3dc238f51351d09bd570cfe662294813b645e1dae9a4fb554fa711536f4ef93fbf405080c15abf3cb31bad5df1bcbba32a3a56aaf9521a98a44ac802
 DIST libva-intel-driver-1.0.19.tar.bz2 448951 SHA256 2db68da9f4cea9b726ce2cd7c6246d902085310d83609082e453aa01559ea792 SHA512 a08bd474024869d0b6bd2eca6f039d571f199c1e4037938c2d6c6f7d01ab773bf61c5bf31e6af469280d9baf674f4f0827768b963999280cc1d9285a2ad44b57 WHIRLPOOL 124526b730c8836adaab31712715f531ba26ab8be1e6914a82b94e39d36e3a5f8c8dbd526f00ada44233023554a928f845940628fbcb03f9a0db0dc2c5bc9350
 DIST libva-intel-driver-1.0.20.tar.bz2 768811 SHA256 12fefb661372c053ff26530fae8342f9df63dbe8ab2c548d8d430d994042d4c9 SHA512 bd327ab2b99eba9255d2631f41888dbee0019125a512c47469692372cb11508898afcc38c646264cea51093bfb911b7ca7f35314e3e87b5c8baad9f6b0ffe755 WHIRLPOOL 3fe20f5040082c5a8393a0e7dd902423c8ba3f282ceac605844ae6f6c64295b9944f673b7773fd572ac646cc5bca24d6b3ef007e950e4dcada1880c002790a60
+DIST libva-intel-driver-1.2.0.tar.bz2 857789 SHA256 a6fceaa118fe5d1a6e7382ed30e6684b4059b3fedd79eb53121a80e8016c748c SHA512 f83f82bfbe76a27fd484d46cea36066801f8e09ca2695264c20d892cf81de2808de5648e0dbc407aa95740e500774bd9ca1a191886d8fd70010e828e899a91fd WHIRLPOOL c60d1eb8614458ce3272563b1457e9ca80dc296d4263b3f27be238305bed32268f89cc048654d65eba36b7f43e2a40735f8a8aa0f97a1c03f8e995c7c86fb8fd
 EBUILD libva-intel-driver-1.0.17.ebuild 1250 SHA256 d25b493322e39cd9899cb8feb84e427980e2c3d44993c31d6bc5fcd7695aabcf SHA512 7e19809b286c4631e466f3c879c8c807b9b57753e4e12d9a717e33ee76455f160b8f683e0d2893eb418042d6e1ea40a8538bff89b207c63127cb4147bfecd1b4 WHIRLPOOL d37189f84a7f727a1d24c7a610aeefd04ba5ede136c915572854d2b33f6e5843fb1b853b03554dc7494c9a42391e60b618b30fa74a35570de7eae82a9ce3173c
 EBUILD libva-intel-driver-1.0.19.ebuild 1427 SHA256 c175524ca1c8c573286f57856c39709431902c8f7144a4d95e909197bc3fe389 SHA512 9ee17abe86bc2b9fa4c53587035c2b8b3cae29a516d7e1cd0f4524af81f2dbca9ef7907c542fe0cade970b3c8d8594eb88d5f37151bedddddb12b364b6c04a7e WHIRLPOOL 0ea37a3b0701ce7e97d9550b0408f1c936740da0ab7d6bc7b39b69908a8ae9e1c17093af41d3d7e5ef04ec808e1b6ff9724df70c948a1a3af207d4a28f77132d
 EBUILD libva-intel-driver-1.0.20.ebuild 1440 SHA256 195bfa3211f952a4a63862c9795546368ebe0d297c8610831acf567dc5ba9f63 SHA512 067334f72c58671166eab55b005a23bf3c50ba7593137ad022e4300a8e8c5942b818bde2ec644d4d67a220aaf60fc97f9189898a49f8870ee76432db07d1b2df WHIRLPOOL a060b8b4a0ae73b78fa1a953bc7c006a80cad050d26ade8885223afdfc52471dbebc5e5fae1cf204398fe779e5db489c789d12ddec88e34d3f9bbd56b5f04411
-EBUILD libva-intel-driver-9999.ebuild 1438 SHA256 6335e78351612b4cc2c30c26762689a85830a9099be08f3f3e308b0dbc02101c SHA512 62f4968ae456a752dc6d49e18a1be97cdebb988e3a9c955648264702509a80080d73f2b0ff7707a76946b0bad0d9ec83f440b9dc359c676999efce94b3dd7a2b WHIRLPOOL a18250ced6238389d77a226a83a6cf83c248bda753da81864e4afdb87a85dbb5f89c2d072ccfef1d7826181311578760092dce1d655c01228937b0334cab81f2
-MISC ChangeLog 3650 SHA256 f169cc44bde373774ebdb44f9f4951848177608576be864d86289039fb82b31b SHA512 d77609e353f9b3bef0f7272931306ff3ed611e7e4eb1d3fe1a803687a0e254b12eedb6de3b892bd48d4ec4b5a0ae9799d162636fe3888a243c9e19152f573556 WHIRLPOOL 0b72aecfed60bdf8a7bbfb408851fbd3d07bc483cc842416dcbe2af58c24d679e036e3cf3a472db223d5c4052a41782fcef417de82cd6d6c942375060e1fc979
+EBUILD libva-intel-driver-1.2.0.ebuild 1439 SHA256 954da0e245f18e2fff00695e2ccbb68e778b25191b41e734db1d70b670e52a2e SHA512 8863c301614404a97258e3162a85be2301252d7b9c8bb2d73bd3f86d42084cf777177c32a3017476bd02da9197b482c739ee79a5b76a8afeb540ffa225d2fe90 WHIRLPOOL 3e0b95d39968177475971f076f359d3e57313e920ed384f990c30e4a61e80e248c6b04666f6823748123282549b5913fafb78d7d030988eab18265252199b951
+EBUILD libva-intel-driver-9999.ebuild 1438 SHA256 6b215fcc4daebcbfdf47145755ce215b789d6a4c846782b5be3bd8c4ac8bc652 SHA512 3d2f6744450b2d707b4a260bc13b6a0fdfebdd5dc282ab9124d5015da688d064a72baacbe523c4a7f2aac55d699635971bd8436c6fa44d3141240e102f4e5c4d WHIRLPOOL a20650e0e6c8d6396e51af104c179ff9f7fd57027b21722f08a7cc3745ca1d718b689540b0f0364e96f1522884d0a91cf8b3003314dc8ec4d56daff3e29426c2
+MISC ChangeLog 3827 SHA256 8f4bccd12d862d5b89ffbd3fd81eeb478f716265483d14ba97f1485f88c9498a SHA512 fbdcea81e75d89f85bdf8c0a054cab0622595c35860923a9cbdfd3a9efd9d072ffbe423b836dd5556e401d8268454504c7677c2e1f1e7159cdd6d1eb9b7258b3 WHIRLPOOL 1b45835442a4a2ff0d61aebc9515171b5ddf06b1a1837b4a5772c93d6b02e91cf782ebaa45d47cdfd894f5aaa3b0213c5bb3796e72dc4b666ee67bd5cadfa3e4
 MISC metadata.xml 439 SHA256 231173effb58a792258a25c612af7b0d0db6c866dc4bf6a9c1d1551a5a4a6d5e SHA512 37ce6cd4f7b53bea6748406bb4fd9c402666e516fa5a772a7b0104f403a5cf44ae9421a06091369a760305b2374307b67cba832a52f2e94b901d1f1b641b974c WHIRLPOOL 38a330bd216d214ef6064065c156badd92f4840ce8c7a4d11a1cd226454217d4f6e6545d7bacd7c31825bf5e676dd7a3597d8825795886ca7bcff799ff175dfd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHCChIACgkQvFcC4BYPU0qSawCfV80BGxWxPcB/a2O8VjMrfxAX
-XvIAoLNp9x4z9Fw+Jbc9E1usqm7YK7DB
-=02Bf
+iEYEAREIAAYFAlHLO7kACgkQvFcC4BYPU0oUUQCdF+BtqJ4H7BoFw0Kx+J95sLPE
+gVwAoMOxLB44hDGKLSWqgYv7RN2aGKyd
+=OiW7
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.2.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.0.ebuild
new file mode 100644
index 000000000000..bc0582cf9351
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.2.0.ebuild,v 1.1 2013/06/26 19:06:32 aballier Exp $
+
+EAPI="3"
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SCM=git-2
+	EGIT_BRANCH=master
+	EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+inherit autotools ${SCM} multilib
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+	SRC_URI=""
+	S="${WORKDIR}/${PN}"
+else
+	SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+	KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.2.0[X?,wayland?,drm?]
+	!<x11-libs/libva-1.0.15[video_cards_intel]
+	>=x11-libs/libdrm-2.4.45[video_cards_intel]
+	wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		$(use_enable drm) \
+		$(use_enable wayland) \
+		$(use_enable X x11)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS NEWS README || die
+	find "${D}" -name '*.la' -delete
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 3edd36933ec5..72910bdd610d 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild,v 1.8 2013/06/19 19:44:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild,v 1.9 2013/06/26 19:06:32 aballier Exp $
 
 EAPI="3"
 
@@ -31,9 +31,9 @@ else
 fi
 IUSE="+drm wayland X"
 
-RDEPEND=">=x11-libs/libva-1.1.0[X?,wayland?,drm?]
+RDEPEND=">=x11-libs/libva-1.2.0[X?,wayland?,drm?]
 	!<x11-libs/libva-1.0.15[video_cards_intel]
-	>=x11-libs/libdrm-2.4.23[video_cards_intel]
+	>=x11-libs/libdrm-2.4.45[video_cards_intel]
 	wayland? ( media-libs/mesa[egl] >=dev-libs/wayland-1 )"
 
 DEPEND="${RDEPEND}