Fix building on x32, bug #420629.

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

5 files changed, 63 insertions, 14 deletions

diff --git a/x11-libs/libXxf86dga/ChangeLog b/x11-libs/libXxf86dga/ChangeLog
index 60a4719b028c..9d1fdbdd3c38 100644
--- a/x11-libs/libXxf86dga/ChangeLog
+++ b/x11-libs/libXxf86dga/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libXxf86dga
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/ChangeLog,v 1.64 2012/05/09 13:21:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/ChangeLog,v 1.65 2012/06/12 13:11:44 chithanh Exp $
+
+  12 Jun 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/libXxf86dga-1.1.3-x32-off_t-cast.patch,
+  +files/libXxf86dga-1.1.3-x32-stdint-include.patch, libXxf86dga-1.1.3.ebuild:
+  Fix building on x32, bug #420629.
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> libXxf86dga-1.1.3.ebuild:
   keyword ~amd64-fbsd
diff --git a/x11-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
index 63c2f0855b73..1d7cf214708a 100644
--- a/x11-libs/libXxf86dga/Manifest
+++ b/x11-libs/libXxf86dga/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libXxf86dga-1.1.3-x32-off_t-cast.patch 837 RMD160 6e84383e6e838a1d7e64bbf4d2f12282a8ea8323 SHA1 7ecbc54828fa373080b74ec4abd9a53b5c8e43c1 SHA256 4a85f4bff8f5ba9bbf14ebc5832d94cb22bae177881f6ed04c047764c835f862
+AUX libXxf86dga-1.1.3-x32-stdint-include.patch 656 RMD160 aa66c7d77ef1e41ea1bd94ea7f5edff67dec0229 SHA1 099812a125602ee59f4d6e8a6758e0f767ac68eb SHA256 8ba2b6a42aab63d9cad815b200ca1d1b1e1e18e0629a638e4e22e399bf073b5e
 DIST libXxf86dga-1.1.2.tar.bz2 270013 RMD160 cc4f084a2ef551180538b768dff93452380e3b4a SHA1 333a9f5c61eba896f420969561606551174645cd SHA256 1ba652f562ce3fb3fef092ce5485eb7ef15b521124c901977b56d6f324605a06
 DIST libXxf86dga-1.1.3.tar.bz2 290347 RMD160 7075d6db6fa256e9ee54de5b78a2a9ad685481ac SHA1 5af5d7d2f239b31035ae5b9d3e3718c833af8b56 SHA256 551fa374dbef0f977de1f35d005fa9ffe92b7a87e82dbe62d6a4640f5b0b4994
 EBUILD libXxf86dga-1.1.2.ebuild 581 RMD160 38195234e1a422fd56b37b9bf8e03d25aad1141e SHA1 58b7c214af49df3bc4f10abbc4ae5f3934dfa4a4 SHA256 6233babb285dcd356158717e3dec3bbf5bfaa53074050196ee23b6463f8f1502
-EBUILD libXxf86dga-1.1.3.ebuild 603 RMD160 145e110c479102d8a6f5c150f1d4809ba6691f7a SHA1 25187df896fcd989a5cb3bcd9f7e9fd4aa8a08bf SHA256 d53bc4398afaaad5c98133c45d2a241ad4ee983bbbf4cefc9c6e0c0a91a1cc08
-MISC ChangeLog 7495 RMD160 09036536d28023bb25cfcfb83ea41a7c2951dfc0 SHA1 20b75ef39ab982b8537e47d02f2289e4f8cb78c5 SHA256 875ef2bbcc5f1741b2172071513338c67bbb7b64fa1b9447f8d8bfde5787ec24
+EBUILD libXxf86dga-1.1.3.ebuild 728 RMD160 677a29ea732d74ec5d1be8ff44989e5466610f98 SHA1 4f8b0161c7e62b9a43e9cf30b32ba7a9182ea556 SHA256 542742c033f013bacb871b604c1b352bae409351e994c9e2d7df65cd424436f1
+MISC ChangeLog 7729 RMD160 7b1c9262f77252a831877d688f34b1b9d1d35e06 SHA1 a20617c387ae821ee747f357cf4765b9d7b45a92 SHA256 0392a230cc3ca0edfd4849384d3bbbd764d246645d286669adff2aae2ac369f4
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+qb2gACgkQvFcC4BYPU0qxiwCfapTEd8ehuKgChsWDy2sM9LAt
-WVYAn3stWSfUi6qDFtsxH7eQKuG21jYa
-=2oxa
------END PGP SIGNATURE-----
diff --git a/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-off_t-cast.patch b/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-off_t-cast.patch
new file mode 100644
index 000000000000..1e53985ed740
--- /dev/null
+++ b/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-off_t-cast.patch
@@ -0,0 +1,24 @@
+From 56b5a5887349e9d0e1d28da157fe6441ca691f56 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu, 08 Mar 2012 19:49:36 +0000
+Subject: Build fix when sizeof(off_t) > sizeof(void *)
+
+https://trac.macports.org/ticket/33532
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
+index e81b486..32f455b 100644
+--- a/src/XF86DGA2.c
++++ b/src/XF86DGA2.c
+@@ -928,7 +928,7 @@ DGAMapPhysical(
+     if ((pMap->fd = open(name, O_RDWR)) < 0)
+ 	return False;
+     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
+-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
++			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
+     if (pMap->virtual == (void *)-1)
+ 	return False;
+     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-stdint-include.patch b/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-stdint-include.patch
new file mode 100644
index 000000000000..bcc0db595eb7
--- /dev/null
+++ b/x11-libs/libXxf86dga/files/libXxf86dga-1.1.3-x32-stdint-include.patch
@@ -0,0 +1,23 @@
+From d4f89f7f42484963575b4c7d2fa694051e111e76 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Fri, 09 Mar 2012 10:48:14 +0000
+Subject: Include <stdint.h> for uintptr_t
+
+Found-by: Tinderbox
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+---
+diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
+index 32f455b..964de18 100644
+--- a/src/XF86DGA2.c
++++ b/src/XF86DGA2.c
+@@ -21,6 +21,7 @@ Copyright (c) 1995,1996  The XFree86 Project, Inc
+ #include <X11/extensions/extutil.h>
+ #include <stdio.h>
+ 
++#include <stdint.h>
+ 
+ /* If you change this, change the Bases[] array below as well */
+ #define MAX_HEADS 16
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
index cc98024c7af2..0ca1e3933646 100644
--- a/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild,v 1.2 2012/05/09 13:21:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86dga/libXxf86dga-1.1.3.ebuild,v 1.3 2012/06/12 13:11:44 chithanh Exp $
 
 EAPI=4
 inherit xorg-2
@@ -16,3 +16,8 @@ RDEPEND="x11-libs/libX11
 	x11-proto/xproto
 	>=x11-proto/xf86dgaproto-2.0.99.2"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/libXxf86dga-1.1.3-x32-off_t-cast.patch
+	"${FILESDIR}"/libXxf86dga-1.1.3-x32-stdint-include.patch
+)