diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-03-14 00:10:21 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-03-14 00:10:21 +0000 |
| commit | 1bd06bf38491253add39fc7533b58f20bf3b6add (patch) | |
| tree | 2106d3b358b98e52ba30fa6161490dc7e4faf24b /media-libs/libsdl | |
| parent | remove unused xiph license (diff) | |
| download | gentoo-2-1bd06bf38491253add39fc7533b58f20bf3b6add.tar.gz gentoo-2-1bd06bf38491253add39fc7533b58f20bf3b6add.tar.bz2 gentoo-2-1bd06bf38491253add39fc7533b58f20bf3b6add.zip | |
Fix from Ed Catmur to not include asm/page.h in X code #169388.
(Portage version: 2.1.2.2)
Diffstat (limited to 'media-libs/libsdl')
| -rw-r--r-- | media-libs/libsdl/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index e65dc91e0a7a..18c1382480ae 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libsdl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.123 2007/03/05 16:47:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.124 2007/03/14 00:10:21 vapier Exp $ + + 14 Mar 2007; Mike Frysinger <vapier@gentoo.org> + files/libsdl-1.2.11-fbcon-page-header.patch: + Fix from Ed Catmur to not include asm/page.h in X code #169388. 05 Mar 2007; Mike Frysinger <vapier@gentoo.org> +files/libsdl-1.2.11-fbcon-page-header.patch, diff --git a/media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch b/media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch index 00675cb47def..bd5c6adc3fb5 100644 --- a/media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch +++ b/media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch @@ -62,3 +62,15 @@ http://bugs.gentoo.org/169388 mapped_memlen = finfo.smem_len+mapped_offset; mapped_mem = do_mmap(NULL, mapped_memlen, PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); +--- src/video/Xext/Xxf86dga/XF86DGA.c 2007/03/13 23:11:02 1.1 ++++ src/video/Xext/Xxf86dga/XF86DGA.c 2007/03/13 23:15:14 +@@ -18,7 +18,8 @@ Copyright (c) 1995,1996 The XFree86 Pro + #define HAS_MMAP_ANON + #include <sys/types.h> + #include <sys/mman.h> +-#include <asm/page.h> /* PAGE_SIZE */ ++/* kernel header doesn't work with -ansi */ ++/* #include <asm/page.h> */ /* PAGE_SIZE */ + #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */ + #define HAS_GETPAGESIZE + #endif /* linux */ |