Upgrade to libdrm 2.4.30.
This is going to be necessary next time we upgrade mesa, this is also
necessary to work with mesa git against the Chrome OS tree.
BUG=chromium-os:23571
TEST=manual:gfx regression checklist
Change-Id: Ibe38a048d40ad0c36040cb1d18eac5534d4d8f9c
Reviewed-on: https://gerrit.chromium.org/gerrit/14844
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Stuart Abercrombie <sabercrombie@chromium.org>
(cherry picked from commit ebada83c0e8222b22280f86d0cf7fc7d17508132)
Reviewed-on: https://gerrit.chromium.org/gerrit/15614
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Sam Leffler <sleffler@chromium.org>
diff --git a/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
similarity index 98%
rename from x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
rename to x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
index 5c148a4..0311a00 100644
--- a/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
+++ b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
@@ -76,7 +76,7 @@
+#ifdef __sun
+ map.handle = handle;
+#else
- map.handle = (void *)handle;
+ map.handle = (void *)(uintptr_t)handle;
+#endif
if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
diff --git a/x11-libs/libdrm/libdrm-2.4.27.ebuild b/x11-libs/libdrm/libdrm-2.4.30.ebuild
similarity index 85%
rename from x11-libs/libdrm/libdrm-2.4.27.ebuild
rename to x11-libs/libdrm/libdrm-2.4.30.ebuild
index 54d043d..e02dba4 100644
--- a/x11-libs/libdrm/libdrm-2.4.27.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.27.ebuild,v 1.2 2011/10/30 05:18:43 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.30.ebuild,v 1.1 2012/01/07 20:47:41 chithanh Exp $
EAPI=4
inherit xorg-2
@@ -30,7 +30,7 @@
>=x11-libs/libpciaccess-0.10"
PATCHES=(
- "${FILESDIR}"/${PN}-2.4.23-solaris.patch
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
)
pkg_setup() {
