From 533a47283d1754365a7fd644e6d680fc4b33731e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Marchesin?= <marcheu@chromium.org>
Date: Wed, 25 Jan 2012 18:04:32 -0800
Subject: [PATCH] Upgrade to libdrm 2.4.30.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.

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>
---
 ...drm-2.4.23-solaris.patch => libdrm-2.4.28-solaris.patch} | 2 +-
 .../libdrm/{libdrm-2.4.27.ebuild => libdrm-2.4.30.ebuild}   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename sdk_container/src/third_party/portage-stable/x11-libs/libdrm/files/{libdrm-2.4.23-solaris.patch => libdrm-2.4.28-solaris.patch} (98%)
 rename sdk_container/src/third_party/portage-stable/x11-libs/libdrm/{libdrm-2.4.27.ebuild => libdrm-2.4.30.ebuild} (86%)

diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch b/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
similarity index 98%
rename from sdk_container/src/third_party/portage-stable/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
rename to sdk_container/src/third_party/portage-stable/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
index 5c148a41f5..0311a001a0 100644
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/files/libdrm-2.4.23-solaris.patch
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
@@ -76,7 +76,7 @@ Index: libdrm-2.4.23/xf86drm.c
 +#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/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.27.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.30.ebuild
similarity index 86%
rename from sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.27.ebuild
rename to sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.30.ebuild
index 54d043dde7..e02dba4326 100644
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libdrm/libdrm-2.4.27.ebuild
+++ b/sdk_container/src/third_party/portage-stable/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 @@ DEPEND="${RDEPEND}
 	>=x11-libs/libpciaccess-0.10"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.23-solaris.patch
+	"${FILESDIR}"/${PN}-2.4.28-solaris.patch
 )
 
 pkg_setup() {