Version bump. Fixes bug #317639 and bug #329267.

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

4 files changed, 61 insertions, 3 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 0645432a03ca..04713847aa32 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.130 2010/09/28 13:58:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.131 2010/09/30 03:46:59 chithanh Exp $
+
+*libdrm-2.4.22 (30 Sep 2010)
+
+  30 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +libdrm-2.4.22.ebuild, metadata.xml:
+  Version bump. Fixes bug #317639 and bug #329267.
 
   28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
   libdrm-2.4.20-r1.ebuild:
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index ab58155bd654..b86321d1ec4a 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -2,8 +2,10 @@ AUX 2.4.18-0001-datatypes.patch 490 RMD160 2a71e2125e78a705617f5262697d1156f4922
 DIST libdrm-2.4.18_pre20100211.tar.bz2 178915 RMD160 cb980b09b836420f5c8a7c11ae56fa2bffeae029 SHA1 e495cbb1c414291ebedab3f2c2edc53e7ecc5634 SHA256 3f5007f56013f247594561243d48c26b2c49c60fc43d515f77b025300ae030ab
 DIST libdrm-2.4.20.tar.bz2 400812 RMD160 5581c45abfb9cb2bd0b95d4754d7812bb8323e3a SHA1 f1448ac0f1c7a5f74a86d2fb50941fc12dc932db SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9
 DIST libdrm-2.4.21.tar.bz2 397490 RMD160 364f9e845e8322e0708fd17090601eefa57b077f SHA1 be7754008424a12e01ab0f0da3deb8de13ad2f0c SHA256 4e1b612ba3b6b1deae4a8c14946099283e7a00e48a5ab002eaf4312f5a8ba14b
+DIST libdrm-2.4.22.tar.bz2 399380 RMD160 067562ab8d935c17238717a486a0d120b0c29d79 SHA1 b9ead56fcea883d818dfc744edc96a768ebcf91e SHA256 0bb0e594e4094d9000d80f38e96e8f640b6364f96cfef5b970cf4481443c6b3d
 EBUILD libdrm-2.4.18_pre20100211-r1.ebuild 1398 RMD160 bef0ab058226593f7ad3d6cd67ab958c48ba007f SHA1 f3eb0a979e84bfbfa4f0c04fbfb1a9bef394cb08 SHA256 93d69d648ff5eb13c859030f443446b61f15e3b9c2c4468c15899437ed881d6f
 EBUILD libdrm-2.4.20-r1.ebuild 1475 RMD160 d3dc7322a02e35400003c181878877d79c4b721c SHA1 76cb28786df43b96825e372efada8b8f77d9a51e SHA256 d73f91b8f8508ca44f67634ad33e9dcde62c6455ce8d4ee5629c064318e20c4c
 EBUILD libdrm-2.4.21.ebuild 1327 RMD160 51a2f2afc9c5b3066a594a8a09107d28ec2cf83e SHA1 48a769c355af57019fcf3d2c3827e52fb12bedbf SHA256 3382ee2e74529f15e2fb7fbcd561f5193a63b2f68cdd2816bac84c03108cccaa
-MISC ChangeLog 18014 RMD160 8594bc327470d1a660d8502b9b178858e9896b39 SHA1 de956b7856b3ae9472635f35a5a44870f6615fe0 SHA256 a1b0d0991c9e2efe8cb18870f7b4e00ab70b01154411b9c44679a06de84ebbfd
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
+EBUILD libdrm-2.4.22.ebuild 1349 RMD160 aa986e0af29d04f7a6d82505b84edee21f6cae97 SHA1 eb568a88906a3712c1e69e4dc374ca2e6e89b080 SHA256 8d775a109001cfcee4ee97b2586f53418f0652621d7672a4ca835986060a7867
+MISC ChangeLog 18203 RMD160 6a6046bd9caeae9b6366003a90e940bc70753aba SHA1 da17a22b941ce7683b213bc0148444d390a7b26c SHA256 7fa1d314a92084f1f0f599f65ecd95bc34b761098cc6d00cdcfae6c6995f910f
+MISC metadata.xml 272 RMD160 2d98b4981a3843af21c5172218e94f4ba6b82ac4 SHA1 74b5bba73e5a48760796f5b566cdf22bd32180d8 SHA256 4c3835edbf1b73ec8a30de26d7db38631dd1ef7782ca160ff8dfe64a767bb771
diff --git a/x11-libs/libdrm/libdrm-2.4.22.ebuild b/x11-libs/libdrm/libdrm-2.4.22.ebuild
new file mode 100644
index 000000000000..1bd92570f0d3
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.22.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.22.ebuild,v 1.1 2010/09/30 03:46:59 chithanh Exp $
+
+EAPI=3
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+VIDEO_CARDS="intel nouveau radeon vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} +libkms"
+RESTRICT="test" # see bug #236845
+
+RDEPEND="dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="--enable-udev
+			$(use_enable video_cards_intel intel)
+			$(use_enable video_cards_nouveau nouveau-experimental-api)
+			$(use_enable video_cards_radeon radeon)
+			$(use_enable video_cards_vmware vmwgfx-experimental-api)
+			$(use_enable libkms)"
+
+	xorg-2_pkg_setup
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+
+	ewarn "libdrm's ABI may have changed without change in library name"
+	ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
+	ewarn "your video drivers in x11-drivers/*."
+}
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index 01c4c004e735..c64af1cb4797 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>x11</herd>
+<use>
+<flag name='libkms'>Enable building of libkms, a library for applications to interface with KMS</flag>
+</use>
 </pkgmetadata>