libxxf86dga: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
src/XF86DGA2.c | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 5165027a19d139195cb799d3d801e44f156a5bc3
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jun 30 20:44:27 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 966dc6e..7da34b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxxf86dga (2:1.1.3-2) unstable; urgency=low
+
+ * Pull build fix from upstream for BSD (closes: #671047)
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 30 Jun 2012 20:44:15 +0200
+
libxxf86dga (2:1.1.3-1) unstable; urgency=low
* New upstream release.
commit d4f89f7f42484963575b4c7d2fa694051e111e76
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 9 02:48:14 2012 -0800
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
commit 56b5a5887349e9d0e1d28da157fe6441ca691f56
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Mar 8 11:49:36 2012 -0800
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);
Reply to: