Fix from Ed Catmur to not include asm/page.h in X code #169388.

Package-Manager: portage-2.1.2.2

3 files changed, 29 insertions, 13 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/Manifest b/media-libs/libsdl/Manifest
index 1f7e5dc5b1e3..973036654f5f 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -61,10 +61,10 @@ AUX libsdl-1.2.11-audioConv.patch 428 RMD160 0d4092a4c573f95560b9cc10bfdca546d51
 MD5 b4a5108fe1f2fab8203422d8d057e334 files/libsdl-1.2.11-audioConv.patch 428
 RMD160 0d4092a4c573f95560b9cc10bfdca546d5140755 files/libsdl-1.2.11-audioConv.patch 428
 SHA256 c7a9d541334c5d2638b3283fa8a4c9ab91b3c547148a3fb559aaaa48f1074a9f files/libsdl-1.2.11-audioConv.patch 428
-AUX libsdl-1.2.11-fbcon-page-header.patch 1891 RMD160 9a8d43adcf4589b1c931f2db4c2a7aee29928b3d SHA1 2e241f6d69331f5f484f5a981ebd89f556d2aa82 SHA256 1d812f3c6d1db15d6e442c1dbfae78e355e0821668bb75d93fdc772ef13ee35f
-MD5 806d91d58aae32efc94fd63f960b3201 files/libsdl-1.2.11-fbcon-page-header.patch 1891
-RMD160 9a8d43adcf4589b1c931f2db4c2a7aee29928b3d files/libsdl-1.2.11-fbcon-page-header.patch 1891
-SHA256 1d812f3c6d1db15d6e442c1dbfae78e355e0821668bb75d93fdc772ef13ee35f files/libsdl-1.2.11-fbcon-page-header.patch 1891
+AUX libsdl-1.2.11-fbcon-page-header.patch 2387 RMD160 2a6ef67a0b7f3371f8a673495c432b16edcb54e2 SHA1 28a9d15b9db3cb07b97f836e3bcdfc0bd558d711 SHA256 d5cadbd594588e6116d334ebd3e90c2aee85ed52e0afdf4502a1453194356347
+MD5 dca2d4b16dc25669f2155633126b765d files/libsdl-1.2.11-fbcon-page-header.patch 2387
+RMD160 2a6ef67a0b7f3371f8a673495c432b16edcb54e2 files/libsdl-1.2.11-fbcon-page-header.patch 2387
+SHA256 d5cadbd594588e6116d334ebd3e90c2aee85ed52e0afdf4502a1453194356347 files/libsdl-1.2.11-fbcon-page-header.patch 2387
 AUX libsdl-1.2.11-libcaca-new-api.patch 18314 RMD160 5b7d739492294e1053453e20293e2c9c7bdde195 SHA1 ce4a7d301b5a4c3b8b57056b8f7c4c5528dcf019 SHA256 93ca84b1fffd696053942d110ef1092c002c71762bbdffe0af8c22c0576c6402
 MD5 4f06a4e42f9153d678a8da4cdffd5c7f files/libsdl-1.2.11-libcaca-new-api.patch 18314
 RMD160 5b7d739492294e1053453e20293e2c9c7bdde195 files/libsdl-1.2.11-libcaca-new-api.patch 18314
@@ -177,10 +177,10 @@ EBUILD libsdl-1.2.9.ebuild 4643 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c
 MD5 62041b7bb258830e75ef4464d7124598 libsdl-1.2.9.ebuild 4643
 RMD160 aac01c7a3f935649f1d64a166c3892ca62b9282c libsdl-1.2.9.ebuild 4643
 SHA256 2aa67035dea53f4f861205e03998be56b93980af0783b3cfd1b8c886f2cee74c libsdl-1.2.9.ebuild 4643
-MISC ChangeLog 19467 RMD160 f06818e1ba4596f5bbe0a7082267a9829c16e972 SHA1 4b2913724c4e865c11edd17e6825beede32c68c4 SHA256 874db7e80692fe720b27fb40bc81d1a2efebefa348cd43c0217108422579f9bc
-MD5 5b4876b1a17027fd4ba040227fa1a159 ChangeLog 19467
-RMD160 f06818e1ba4596f5bbe0a7082267a9829c16e972 ChangeLog 19467
-SHA256 874db7e80692fe720b27fb40bc81d1a2efebefa348cd43c0217108422579f9bc ChangeLog 19467
+MISC ChangeLog 19631 RMD160 ab3d13a23022ba54345ba29eb421b31f6bd51f68 SHA1 3ed6249ed16e776d91676bcf2312f5402a6c7ced SHA256 d8e6a0e70d6c4a31e8f20bc52c88c252f7da4ed2b750e92e6076e9e4ff6587dd
+MD5 c3691266e3e0085d48378c5abcdcddda ChangeLog 19631
+RMD160 ab3d13a23022ba54345ba29eb421b31f6bd51f68 ChangeLog 19631
+SHA256 d8e6a0e70d6c4a31e8f20bc52c88c252f7da4ed2b750e92e6076e9e4ff6587dd ChangeLog 19631
 MISC metadata.xml 974 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f SHA1 8f8471103d29e564169640539c3a2a6a7de5b8c7 SHA256 e575130f8fd4925956581f5d4230469e915b1a8d63269cc0aa3510f3a4743b9b
 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974
 RMD160 61d8f32b069dc30e7b853b25d1d73020f73cda8f metadata.xml 974
@@ -204,9 +204,9 @@ MD5 9a82f7d6f977d33cf4798db219567aff files/digest-libsdl-1.2.9-r1 232
 RMD160 7ee7dbb3ace160e63a7dc79446fa4ce633e9d1b8 files/digest-libsdl-1.2.9-r1 232
 SHA256 8e70be29548aa63e313575f311c63363981a0fb40b69b689a923fd9b80fbeea7 files/digest-libsdl-1.2.9-r1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF7Emd8bi6rjpTunYRArPfAJ9jxf3NfI6BYCX61ihGy8tCwgxtZQCffb5O
-XjFaOoHbat41MZX0SrTjGFQ=
-=Rprv
+iD8DBQFF9z138bi6rjpTunYRAqqjAJ0Usk5HRiot2E64rAQrNVFXpnNpuACeLUxH
+Y31Z2yXO7AQuvxdoBvBk7AU=
+=PQAo
 -----END PGP SIGNATURE-----
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 */