Backport some fixes from upstream to support building without asm/page.h #169388 by merwan kashouty.

Package-Manager: portage-2.1.2-r14

5 files changed, 89 insertions, 47 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 1447d96ff5d6..e65dc91e0a7a 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.122 2007/02/13 14:24:10 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.123 2007/03/05 16:47:11 vapier Exp $
+
+  05 Mar 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/libsdl-1.2.11-fbcon-page-header.patch,
+  -files/libsdl-1.2.11-linux-headers.patch, libsdl-1.2.11-r1.ebuild:
+  Backport some fixes from upstream to support building without asm/page.h
+  #169388 by merwan kashouty.
 
   13 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   libsdl-1.2.11-r1.ebuild:
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 92be26651a0d..1f7e5dc5b1e3 100644
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -61,6 +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-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
@@ -69,10 +73,6 @@ AUX libsdl-1.2.11-libcaca.patch 17046 RMD160 b06396c3ebf3b6d8dc5b11080b3f0295a06
 MD5 67b4fcd3cdd7d3e806c957d7452cf6d0 files/libsdl-1.2.11-libcaca.patch 17046
 RMD160 b06396c3ebf3b6d8dc5b11080b3f0295a06bff67 files/libsdl-1.2.11-libcaca.patch 17046
 SHA256 5833a12a3f6fd3fe2b95ccd830d7a16a08c5cc25aeb0f68839cc1bd3e1d17105 files/libsdl-1.2.11-libcaca.patch 17046
-AUX libsdl-1.2.11-linux-headers.patch 669 RMD160 8cf7e2ba988bc2c9d2b13939319445b64a4688c0 SHA1 d07e28e18861d0df7699c53c87c440d10b1d56e9 SHA256 730bc6634df44d535cc0c2916160679ca02a1258f408eb77cb9c2d730ed66bdd
-MD5 1135df6eead2541de25096bed2392857 files/libsdl-1.2.11-linux-headers.patch 669
-RMD160 8cf7e2ba988bc2c9d2b13939319445b64a4688c0 files/libsdl-1.2.11-linux-headers.patch 669
-SHA256 730bc6634df44d535cc0c2916160679ca02a1258f408eb77cb9c2d730ed66bdd files/libsdl-1.2.11-linux-headers.patch 669
 AUX libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch 448 RMD160 a2bf6975aaada6920913b3232c58d5b2b2aa22fe SHA1 5a377ac2231c7b180797053f838b6ec2a5037c3a SHA256 3c571f5740093d2db2e8397d676c6d6f229fa856c0d15a1f23a0a12331d5883b
 MD5 c2b0aa8ea5c72ceda6ff565036240136 files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch 448
 RMD160 a2bf6975aaada6920913b3232c58d5b2b2aa22fe files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch 448
@@ -153,10 +153,10 @@ DIST SDL-1.2.11.tar.gz 2796407 RMD160 91dc8877224415a4ba59e1de57c31861e550d644 S
 DIST SDL-1.2.7.tar.gz 2470936 RMD160 2e19851fca8dac81c8d07cb39b8757aa54093023 SHA1 1a840c50668f230df9e9163ef1a282d9f3355383 SHA256 f5708b3909261df2043859e771601a5ec973197b2c59d18c6649c1096b5151bd
 DIST SDL-1.2.8.tar.gz 2602449 RMD160 91aa02f6b52792b3ec7f5478bcaebda1542980dc SHA1 26f2104a60a28914b809d3cb77d5790bfdfd024c SHA256 6508abb6068df597896da4e926606bb80c0b03ebfb8cf0017471fdb41307125a
 DIST SDL-1.2.9.tar.gz 2688179 RMD160 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7 SHA1 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1 SHA256 d5a168968051536641ab5a3ba5fc234383511c77a8bc5ceb8bed619bdd42e5f9
-EBUILD libsdl-1.2.11-r1.ebuild 4844 RMD160 90a09689059d82b765c198fcc5b89642f74a223b SHA1 8e2bd4da8ed689b2047b95774f2ff927644c58ce SHA256 d4a6df8e633ef4a9803f4d1f2e401c3245892126eb08bca2f23a475e82de41f6
-MD5 8c4a372e5474592a08d258cae253890d libsdl-1.2.11-r1.ebuild 4844
-RMD160 90a09689059d82b765c198fcc5b89642f74a223b libsdl-1.2.11-r1.ebuild 4844
-SHA256 d4a6df8e633ef4a9803f4d1f2e401c3245892126eb08bca2f23a475e82de41f6 libsdl-1.2.11-r1.ebuild 4844
+EBUILD libsdl-1.2.11-r1.ebuild 4854 RMD160 551ab2619fee7605e71adb3b5707ac8682a89cb7 SHA1 c3d094f76957c413cc90f90e7ab86c2b0ca0e353 SHA256 42d7f41445917f4b9c590b5de84f0d5d7cdc781955c870eed24a4b9fffe27268
+MD5 42c41407f17482804e169ecf322f1ee9 libsdl-1.2.11-r1.ebuild 4854
+RMD160 551ab2619fee7605e71adb3b5707ac8682a89cb7 libsdl-1.2.11-r1.ebuild 4854
+SHA256 42d7f41445917f4b9c590b5de84f0d5d7cdc781955c870eed24a4b9fffe27268 libsdl-1.2.11-r1.ebuild 4854
 EBUILD libsdl-1.2.11.ebuild 4727 RMD160 a18528554133f449b2d164a36db8453bb33d2ab3 SHA1 8010bede62802c4421abcca6a2415cf24daeca3e SHA256 d6f3a7b31ad60c92a23fb2a3a9da6c500ff79284e111b4e9d1c42ec9cb92e83a
 MD5 e08031f25ce36ec7c2e2e0d6db92f0c4 libsdl-1.2.11.ebuild 4727
 RMD160 a18528554133f449b2d164a36db8453bb33d2ab3 libsdl-1.2.11.ebuild 4727
@@ -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 19196 RMD160 c9e3d3a27ba108f19136e92070b22c6683fbe66e SHA1 ca2b32cf5adda9817f63a4f2064d36d63c585032 SHA256 63e61adde468a212da79f3be55a831a65a2b0e77640389aeb071ad0dbecedf52
-MD5 232bd9b0245ff73b7c05b8b5763f80c4 ChangeLog 19196
-RMD160 c9e3d3a27ba108f19136e92070b22c6683fbe66e ChangeLog 19196
-SHA256 63e61adde468a212da79f3be55a831a65a2b0e77640389aeb071ad0dbecedf52 ChangeLog 19196
+MISC ChangeLog 19467 RMD160 f06818e1ba4596f5bbe0a7082267a9829c16e972 SHA1 4b2913724c4e865c11edd17e6825beede32c68c4 SHA256 874db7e80692fe720b27fb40bc81d1a2efebefa348cd43c0217108422579f9bc
+MD5 5b4876b1a17027fd4ba040227fa1a159 ChangeLog 19467
+RMD160 f06818e1ba4596f5bbe0a7082267a9829c16e972 ChangeLog 19467
+SHA256 874db7e80692fe720b27fb40bc81d1a2efebefa348cd43c0217108422579f9bc ChangeLog 19467
 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 v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF0coRKRy60XGEcJIRAk/JAJ4o5BszVTS++4+L3y92/dfZPF1ceACeKRDU
-H473XLVx4wSfociBXXWZPfI=
-=ncvO
+iD8DBQFF7Emd8bi6rjpTunYRArPfAJ9jxf3NfI6BYCX61ihGy8tCwgxtZQCffb5O
+XjFaOoHbat41MZX0SrTjGFQ=
+=Rprv
 -----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
new file mode 100644
index 000000000000..00675cb47def
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch
@@ -0,0 +1,64 @@
+Backport from current libsdl svn so we can work with newer kernel headers
+
+http://bugs.gentoo.org/159923
+http://bugs.gentoo.org/169388
+
+--- configure.in
++++ configure.in
+@@ -807,6 +807,7 @@
+         ])
+         AC_MSG_RESULT($video_fbcon)
+         if test x$video_fbcon = xyes; then
++            AC_CHECK_FUNCS(getpagesize)
+             AC_DEFINE(SDL_VIDEO_DRIVER_FBCON)
+             SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c"
+             have_video=yes
+--- include/SDL_config.h.in
++++ include/SDL_config.h.in
+@@ -302,4 +302,6 @@
+ #undef SDL_HERMES_BLITTERS
+ #undef SDL_ALTIVEC_BLITTERS
+ 
++#undef HAVE_GETPAGESIZE
++
+ #endif /* _SDL_config_h */
+--- src/video/fbcon/SDL_fbvideo.c
++++ src/video/fbcon/SDL_fbvideo.c
+@@ -29,7 +29,9 @@
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <sys/mman.h>
++#ifndef HAVE_GETPAGESIZE
+ #include <asm/page.h>		/* For definition of PAGE_SIZE */
++#endif
+ #include <linux/vt.h>
+ 
+ #include "SDL_video.h"
+@@ -149,6 +151,18 @@
+                                   struct fb_var_screeninfo *vinfo);
+ static void FB_RestorePalette(_THIS);
+ 
++static int SDL_getpagesize(void)
++{
++#ifdef HAVE_GETPAGESIZE
++    return getpagesize();
++#elif defined(PAGE_SIZE)
++    return PAGE_SIZE;
++#else
++#error Can not determine system page size.
++    return 4096;  /* this is what it USED to be in Linux... */
++#endif
++}
++
+ /* Small wrapper for mmap() so we can play nicely with no-mmu hosts
+  * (non-mmu hosts disallow the MAP_SHARED flag) */
+ 
+@@ -547,7 +561,7 @@
+ 
+ 	/* Memory map the device, compensating for buggy PPC mmap() */
+ 	mapped_offset = (((long)finfo.smem_start) -
+-	                (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
++	                (((long)finfo.smem_start)&~(SDL_getpagesize()-1)));
+ 	mapped_memlen = finfo.smem_len+mapped_offset;
+ 	mapped_mem = do_mmap(NULL, mapped_memlen,
+ 	                  PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-linux-headers.patch b/media-libs/libsdl/files/libsdl-1.2.11-linux-headers.patch
deleted file mode 100644
index 6e7b165f8175..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.11-linux-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://bugs.gentoo.org/159923
-
---- src/video/fbcon/SDL_fbvideo.c
-+++ src/video/fbcon/SDL_fbvideo.c
-@@ -32,6 +32,10 @@
- #include <asm/page.h>		/* For definition of PAGE_SIZE */
- #include <linux/vt.h>
- 
-+#ifndef PAGE_SIZE
-+# define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
-+#endif
-+
- #include "SDL_video.h"
- #include "SDL_mouse.h"
- #include "../SDL_sysvideo.h"
---- src/video/ps2gs/SDL_gsyuv.c
-+++ src/video/ps2gs/SDL_gsyuv.c
-@@ -29,6 +29,10 @@
- #include <sys/mman.h>
- #include <asm/page.h>		/* For definition of PAGE_SIZE */
- 
-+#ifndef PAGE_SIZE
-+# define PAGE_SIZE sysconf(_SC_PAGE_SIZE)
-+#endif
-+
- #include "SDL_video.h"
- #include "SDL_gsyuv_c.h"
- #include "../SDL_yuvfuncs.h"
diff --git a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
index 5d8177e43ca8..517b12384a6e 100644
--- a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.4 2007/02/13 14:24:10 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.5 2007/03/05 16:47:11 vapier Exp $
 
 inherit flag-o-matic toolchain-funcs eutils libtool
 
@@ -75,8 +75,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-sdl-config.patch
 	epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917
 	epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186
-	epatch "${FILESDIR}"/${P}-linux-headers.patch #159923
 	epatch "${FILESDIR}"/${P}-audioConv.patch #151991
+	epatch "${FILESDIR}"/${P}-fbcon-page-header.patch #159923 #169388
 
 	# add yasm-compatible defines to nasm code (hopefully we
 	# can get this killed soonish)