diff options
Diffstat (limited to 'package/x11r7')
3 files changed, 56 insertions, 1 deletions
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch new file mode 100644 index 000000000..23ab1179f --- /dev/null +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch @@ -0,0 +1,27 @@ +Backported from d4f89f7f42484963575b4c7d2fa694051e111e76 + +Signed-off-by: Jesper Baekdahl <jbb@gamblify.com> +--- +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/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch new file mode 100644 index 000000000..f586e2eae --- /dev/null +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch @@ -0,0 +1,28 @@ +Backported from 56b5a5887349e9d0e1d28da157fe6441ca691f56 + +Signed-off-by: Jesper Baekdahl <jbb@gamblify.com> +--- +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/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk index 2bd9ce70c..d57b7947a 100644 --- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXXF86DGA_VERSION = 1.1.2 +XLIB_LIBXXF86DGA_VERSION = 1.1.3 XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86DGA_INSTALL_STAGING = YES |