Version bump.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 171 insertions, 22 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index cd76c8ca0c55..b83e89112d45 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.174 2011/10/30 05:18:43 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.175 2011/12/13 17:39:13 chithanh Exp $
+
+*libdrm-2.4.29 (13 Dec 2011)
+
+  13 Dec 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/libdrm-2.4.28-solaris.patch, +libdrm-2.4.29.ebuild:
+  Version bump.
 
   30 Oct 2011; Matt Turner <mattst88@gentoo.org> libdrm-2.4.22.ebuild,
   libdrm-2.4.23.ebuild, libdrm-2.4.24.ebuild, libdrm-2.4.25.ebuild,
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index b0a45b3b251a..2c02c8c1ffd1 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 2.4.18-0001-datatypes.patch 490 RMD160 2a71e2125e78a705617f5262697d1156f492229e SHA1 2abe750990073d02a8d723c254695ea3324f12d5 SHA256 0a2ae45b9b4d8d2a9decaba3e32d38ba6d60a081dc15a60ca88e84d1157d7669
 AUX libdrm-2.4.23-solaris.patch 3191 RMD160 562eb2f40642112ba419838494173f64969e49f1 SHA1 6d07a6cda05942c593c9d60e2c56b982d565f356 SHA256 1ddfb794d0edf64727af0a423250769b0be3132d55d53374b8ef68e2419478e6
+AUX libdrm-2.4.28-solaris.patch 3202 RMD160 309af61f8356acd5ea4c0f3a80e2a80fe248cbf6 SHA1 edeb3b2a257f793770fe4655cb822c0b7b296c12 SHA256 04440ea802761e27c6f3a39a8bbfba71d707c3b3380885540be2e0f56ef58334
 DIST libdrm-2.4.20.tar.bz2 400812 RMD160 5581c45abfb9cb2bd0b95d4754d7812bb8323e3a SHA1 f1448ac0f1c7a5f74a86d2fb50941fc12dc932db SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9
 DIST libdrm-2.4.22.tar.bz2 399380 RMD160 067562ab8d935c17238717a486a0d120b0c29d79 SHA1 b9ead56fcea883d818dfc744edc96a768ebcf91e SHA256 0bb0e594e4094d9000d80f38e96e8f640b6364f96cfef5b970cf4481443c6b3d
 DIST libdrm-2.4.23.tar.bz2 408276 RMD160 a3ae6aa1f3f94988081446000523dcc1e206cb17 SHA1 9d651d1e394654c02343e3d95c0f8a442a91ac75 SHA256 c0f06d68c3edba7a1ad937f5481a8c287efd4cd368cee66cd9e678b06a911c18
@@ -10,6 +8,7 @@ DIST libdrm-2.4.24.tar.bz2 386696 RMD160 37f0b3f01b2958347a788f3504cbcc53070f9ba
 DIST libdrm-2.4.25.tar.bz2 445388 RMD160 5c3174e53b71de148a64fb51f5235de202786bb2 SHA1 b950f29cd1c4bb9f1c98a926486a47256b0a4194 SHA256 51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f
 DIST libdrm-2.4.26.tar.bz2 448627 RMD160 c7892a9ef0038d2d0192fece9b43ff5b18be4a63 SHA1 e7215e804bbd30e42132d3df874122d2f6a9c929 SHA256 b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc
 DIST libdrm-2.4.27.tar.bz2 491451 RMD160 cc08ca54ba272f1ad34183d0b96d331c5ee024c4 SHA1 f5b40d30a7f2bfa369ab9b3bd9a0aa844a7f1e16 SHA256 ea6b04dd3298e36c7a43aadd5f80f48baeafe4caaabcf78b01dc919c5c757973
+DIST libdrm-2.4.29.tar.bz2 453793 RMD160 4f0bdf07523efd8264221ee42a3cbb973e29acef SHA1 054ca4f6b9145b1bb5192f3cba4dd1835fcc5977 SHA256 e2432dc93e933479132123a1dca382294c30f55bc895bb737b6bdd6f2b8c452e
 EBUILD libdrm-2.4.20-r1.ebuild 1478 RMD160 4bca989bd3b69352782df2f5f131312c1462c548 SHA1 f4852a7f1730138581a9d9f56d8bd720c71f67ab SHA256 713c058bb671f092566529b861e1bb8e3cb0c94a62a0d12fe55ed3b603f05ce6
 EBUILD libdrm-2.4.22.ebuild 1114 RMD160 655a470ca22c600eb5b316cbf64ab35fc2548eae SHA1 e7db6e1cf0ed90e419594e578de50caeb217868a SHA256 ce742f2a2c390e5951f7948a5897d9df28d222c0a98748cc145a5d1d8953b488
 EBUILD libdrm-2.4.23.ebuild 1260 RMD160 87bc258e58f570000fc044a15048f1cb1c24ebc8 SHA1 eaea131cf053e3c3237f9989dda74dceed71e69c SHA256 141f3245e5567f5990bb501607285db7d978d9a13990787ea566831e00ac1428
@@ -17,22 +16,6 @@ EBUILD libdrm-2.4.24.ebuild 1263 RMD160 e34310ecd35105c43982d9713ff30bb797eab8d7
 EBUILD libdrm-2.4.25.ebuild 1338 RMD160 901a8001f0554399345e89115d60f442ab3d5062 SHA1 63e711f4bb927ee26f736a0b065d8d48fc55e405 SHA256 d8803aabcf209b9dc914de82bad87687576a237cb010ffc0853571833e85b450
 EBUILD libdrm-2.4.26.ebuild 1392 RMD160 54a53d503da402e82d642744f9e9b724855f4042 SHA1 894dd31776d5b32d4f20e9691876435944574d49 SHA256 93b14933eebcb354c92cec29268671b7b20162a68575a8b77c129f3bdc011a0d
 EBUILD libdrm-2.4.27.ebuild 1402 RMD160 2fc614b528677cae156356c2bd8cf7c035c6b60d SHA1 ff5a232306a6b390c003b6baf1dd2231ba2d448f SHA256 2e16ca49af09141a47d86c892ed36ff8ae826bdbcec57dff665eb1294cea1a05
-MISC ChangeLog 23681 RMD160 5aa69ac0685d29c10254f8e72dfab61a911c2478 SHA1 cc14c3fbb6e4ed49d1bd680e246c90fd58ab4314 SHA256 5eb749b01a8a7d86871735b7c6ebf24e614c9cf2a8c4ff0362f8d27e37c94858
+EBUILD libdrm-2.4.29.ebuild 1402 RMD160 49cc702319f821d84a18ad83d892542a12f6da93 SHA1 8baeca7ce5760cd922f34f87726b90b2b1668a4b SHA256 aa492c512fe6e43e37dd52ef33e7a60a0b0bc85b9b5947b180c0c7b7efcffb53
+MISC ChangeLog 23858 RMD160 79e721ecc70c9e0fcd2d7ce5ba82348b430d95ac SHA1 0cc3a01d6f0ad171bf88cfda595526dcb4705ba7 SHA256 caa857f61c279c07e080232c80d211875d4f7e69b5c060f61b291e1c2a135a58
 MISC metadata.xml 272 RMD160 2d98b4981a3843af21c5172218e94f4ba6b82ac4 SHA1 74b5bba73e5a48760796f5b566cdf22bd32180d8 SHA256 4c3835edbf1b73ec8a30de26d7db38631dd1ef7782ca160ff8dfe64a767bb771
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJOrN4xAAoJEA/daC2XTKcqXngP/1lKaupfOyYNHM97GuFK8H5k
-67kthd4XaNbSL5vPQbMBdJvqWKubHt8bjOekqrKBaVxxqF63u07TgieIz5YXRMZB
-b5UoJG68EdA31vu9kpdVr0HUUSibPbek4mq7Pm2YVyb58yE6DXVtjJiYxII/oYEM
-Nm84ukLONar8d7u6l51RXWu2qns+qonNC8+PhLoUGMT/35RnQg0Axf5G9azUtpFO
-eAORpnq4L1gc/9KGiR05n44adK2aIuzpaGvPveJ52nRSba/1zOb5+chAgnnpLLq0
-7SHBM8fBa+XyoCZFLk0gz1uJ9xZgpj5LUOZDQs6x12Fy+E4X48vfwS8l5Div16A4
-lswC5jGStb4GCG4aeOBkloWcLvFiAH3oPJPVIOSGB/qcR1W2wJK7gUezTtfR/g93
-3QQifHc9wJ0Dl3VCx8gv+UlPRg/AlA/rrEc68dudNW7Gbdrr/ZV3JGwHEWt8bF4t
-z12r9bWMrhBNnXfhD6G9NFSnCt6dNmJ0pWgKOqoh1OjQlAa4O1KanpmSvDC135TQ
-Vp+5yF7M7Y7wRCOkWScRM8CEU1YyocigrrowdklwNjsWLR/0LCYD2MTzaVOYFfqH
-JqZk7obi/9cE2Dxy45z7cQfGDfzHPQQxOpc49mklfggui+BSjGi6FTlEn/x8XHJk
-lVtAeOvsn4C/YeaWZv8n
-=rJ/+
------END PGP SIGNATURE-----
diff --git a/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
new file mode 100644
index 000000000000..0311a001a0b6
--- /dev/null
+++ b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
@@ -0,0 +1,111 @@
+Index: libdrm-2.4.23/include/drm/drm.h
+===================================================================
+--- libdrm-2.4.23.orig/include/drm/drm.h
++++ libdrm-2.4.23/include/drm/drm.h
+@@ -54,7 +54,11 @@ typedef int32_t  __s32;
+ typedef uint32_t __u32;
+ typedef int64_t  __s64;
+ typedef uint64_t __u64;
++#if defined(__sun)
++typedef unsigned long long drm_handle_t;
++#else
+ typedef unsigned long drm_handle_t;
++#endif
+ 
+ #endif
+ 
+@@ -210,12 +214,22 @@ struct drm_ctx_priv_map {
+  * \sa drmAddMap().
+  */
+ struct drm_map {
++#ifdef __sun
++	unsigned long long offset;
++                               /**< Requested physical address (0 for SAREA)*/
++	unsigned long long handle;
++                               /**< User-space: "Handle" to pass to mmap() */
++                               /**< Kernel-space: kernel-virtual address */
++#else
+ 	unsigned long offset;	 /**< Requested physical address (0 for SAREA)*/
++#endif
+ 	unsigned long size;	 /**< Requested physical size (bytes) */
+ 	enum drm_map_type type;	 /**< Type of memory to map */
+ 	enum drm_map_flags flags;	 /**< Flags */
++#ifndef __sun
+ 	void *handle;		 /**< User-space: "Handle" to pass to mmap() */
+ 				 /**< Kernel-space: kernel-virtual address */
++#endif
+ 	int mtrr;		 /**< MTRR slot used */
+ 	/*   Private data */
+ };
+@@ -379,6 +393,9 @@ struct drm_buf_map {
+ 	void *virtual;		/**< Mmap'd area in user-virtual */
+ #endif
+ 	struct drm_buf_pub *list;	/**< Buffer information */
++#ifdef __sun
++	int fd;
++#endif
+ };
+ 
+ /**
+Index: libdrm-2.4.23/radeon/radeon_bo_gem.c
+===================================================================
+--- libdrm-2.4.23.orig/radeon/radeon_bo_gem.c
++++ libdrm-2.4.23/radeon/radeon_bo_gem.c
+@@ -38,6 +38,13 @@
+ #include <string.h>
+ #include <sys/mman.h>
+ #include <errno.h>
++
++/* On solaris unistd.h and stropts.h are needed for ioctl */
++#ifdef __sun
++#include <unistd.h>
++#include <stropts.h>
++#endif
++
+ #include "xf86drm.h"
+ #include "xf86atomic.h"
+ #include "drm.h"
+Index: libdrm-2.4.23/xf86drm.c
+===================================================================
+--- libdrm-2.4.23.orig/xf86drm.c
++++ libdrm-2.4.23/xf86drm.c
+@@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
+ {
+     drm_map_t map;
+ 
++#ifdef __sun
++    map.handle = handle;
++#else
+     map.handle = (void *)(uintptr_t)handle;
++#endif
+ 
+     if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
+ 	return -errno;
+@@ -1210,6 +1214,9 @@ drmBufMapPtr drmMapBufs(int fd)
+     bufs.count = 0;
+     bufs.list  = NULL;
+     bufs.virtual = NULL;
++#ifdef __sun
++    bufs.fd = fd;
++#endif
+     if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
+ 	return NULL;
+ 
+Index: libdrm-2.4.23/xf86drm.h
+===================================================================
+--- libdrm-2.4.23.orig/xf86drm.h
++++ libdrm-2.4.23/xf86drm.h
+@@ -64,6 +64,13 @@
+ 
+ #endif
+ 
++#if defined(__sun) && !defined(_IOC)
++#define _IOC(dir, group, nr, size)                             \
++    (dir == DRM_IOC_READWRITE ? _IOWRN(group, nr, size) :      \
++      (dir == DRM_IOC_WRITE ? _IOWN(group, nr, size) :         \
++       /* dir == DRM_IOC_READ */  _IORN(group, nr, size) ))
++#endif
++
+ 				/* Defaults, if nothing set in xf86config */
+ #define DRM_DEV_UID	 0
+ #define DRM_DEV_GID	 0
diff --git a/x11-libs/libdrm/libdrm-2.4.29.ebuild b/x11-libs/libdrm/libdrm-2.4.29.ebuild
new file mode 100644
index 000000000000..120ce51950a3
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.29.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.29.ebuild,v 1.1 2011/12/13 17:39:13 chithanh Exp $
+
+EAPI=4
+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 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+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
+	video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
+DEPEND="${RDEPEND}
+	>=x11-libs/libpciaccess-0.10"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.28-solaris.patch
+)
+
+pkg_setup() {
+	XORG_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)
+	)
+
+	use elibc_FreeBSD && XORG_EAUTORECONF=yes
+
+	xorg-2_pkg_setup
+}