diff options
| author | wiz <wiz@pkgsrc.org> | 2012-06-12 22:31:11 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-06-12 22:31:11 +0000 |
| commit | 89c454e2e3b9e099d5a520278671b8fc388f19b4 (patch) | |
| tree | 1664df1b8b32b7c14069cafde91193b47a26aafd /x11 | |
| parent | bd26262c092ea8282ab3f6babe7b16f83a1375a8 (diff) | |
| download | pkgsrc-89c454e2e3b9e099d5a520278671b8fc388f19b4.tar.gz | |
Replace patch with upstream version. Found by obache.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libXxf86dga/distinfo | 4 | ||||
| -rw-r--r-- | x11/libXxf86dga/patches/patch-src_XF86DGA2.c | 22 |
2 files changed, 18 insertions, 8 deletions
diff --git a/x11/libXxf86dga/distinfo b/x11/libXxf86dga/distinfo index 596b91337f0..4f77a505b49 100644 --- a/x11/libXxf86dga/distinfo +++ b/x11/libXxf86dga/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2012/06/05 22:15:02 wiz Exp $ +$NetBSD: distinfo,v 1.6 2012/06/12 22:31:11 wiz Exp $ SHA1 (libXxf86dga-1.1.3.tar.bz2) = 5af5d7d2f239b31035ae5b9d3e3718c833af8b56 RMD160 (libXxf86dga-1.1.3.tar.bz2) = 7075d6db6fa256e9ee54de5b78a2a9ad685481ac Size (libXxf86dga-1.1.3.tar.bz2) = 290347 bytes -SHA1 (patch-src_XF86DGA2.c) = c4ed9a3e6f8cce2b323796fa8f037dc6416996ed +SHA1 (patch-src_XF86DGA2.c) = 00132ac904c746b0f549faa352976e3dd912b8d4 diff --git a/x11/libXxf86dga/patches/patch-src_XF86DGA2.c b/x11/libXxf86dga/patches/patch-src_XF86DGA2.c index cd6ea08e22d..fd88e4a673f 100644 --- a/x11/libXxf86dga/patches/patch-src_XF86DGA2.c +++ b/x11/libXxf86dga/patches/patch-src_XF86DGA2.c @@ -1,17 +1,27 @@ -$NetBSD: patch-src_XF86DGA2.c,v 1.1 2012/06/05 22:15:03 wiz Exp $ +$NetBSD: patch-src_XF86DGA2.c,v 1.2 2012/06/12 22:31:11 wiz Exp $ -Fix build on DragonFly i386 (and probably others). -From Gustau Pérez i Querol in -http://freebsd.1045724.n5.nabble.com/Xorg-1-12-td5642201.html +From upstream. +First chunk: +http://cgit.freedesktop.org/xorg/lib/libXxf86dga/commit/?id=d4f89f7f42484963575b4c7d2fa694051e111e76 +Second chunk: +http://cgit.freedesktop.org/xorg/lib/libXxf86dga/commit/?id=56b5a5887349e9d0e1d28da157fe6441ca691f56 --- src/XF86DGA2.c.orig 2012-03-08 05:35:46.000000000 +0000 +++ src/XF86DGA2.c -@@ -928,7 +928,7 @@ DGAMapPhysical( +@@ -21,6 +21,7 @@ Copyright (c) 1995,1996 The XFree86 Pro + #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 +@@ -928,7 +929,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)(unsigned long)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); |