diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2009-10-13 17:30:38 +0400 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2009-10-13 17:30:38 +0400 |
| commit | c9d89f888ec69245c56358b454f37cffd8bb87ac (patch) | |
| tree | 10d3aefa0fc1c74baeccbc456ce16e0d42816f17 /recipes/libsdl/files/libsdl-1.2.11-pagesize.patch | |
| parent | 43653cf44fc541bd55cb094392444a7faa7bb3be (diff) | |
| parent | 925dea6086bd5f7479eda0226f32bcd46ba025a1 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/libsdl/files/libsdl-1.2.11-pagesize.patch')
| -rwxr-xr-x | recipes/libsdl/files/libsdl-1.2.11-pagesize.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/recipes/libsdl/files/libsdl-1.2.11-pagesize.patch b/recipes/libsdl/files/libsdl-1.2.11-pagesize.patch new file mode 100755 index 0000000000..1d606d1af9 --- /dev/null +++ b/recipes/libsdl/files/libsdl-1.2.11-pagesize.patch @@ -0,0 +1,44 @@ +From Mandriva. Realigned for Gentoo by Peter Alfredsen + +Index: SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c +=================================================================== +--- SDL-1.2.11.orig/src/video/fbcon/SDL_fbvideo.c ++++ SDL-1.2.11/src/video/fbcon/SDL_fbvideo.c +@@ -29,7 +29,6 @@ + #include <unistd.h> + #include <sys/ioctl.h> + #include <sys/mman.h> +-#include <asm/page.h> /* For definition of PAGE_SIZE */ + #include <linux/vt.h> + + #include "SDL_video.h" +@@ -547,7 +546,7 @@ static int FB_VideoInit(_THIS, SDL_Pixel + + /* Memory map the device, compensating for buggy PPC mmap() */ + mapped_offset = (((long)finfo.smem_start) - +- (((long)finfo.smem_start)&~(getpagesize()-1))); ++ (((long)finfo.smem_start)&~((int)sysconf(_SC_PAGE_SIZE)-1))); + mapped_memlen = finfo.smem_len+mapped_offset; + mapped_mem = do_mmap(NULL, mapped_memlen, + PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); +Index: SDL-1.2.11/src/video/ps2gs/SDL_gsyuv.c +=================================================================== +--- SDL-1.2.11.orig/src/video/ps2gs/SDL_gsyuv.c ++++ SDL-1.2.11/src/video/ps2gs/SDL_gsyuv.c +@@ -27,7 +27,6 @@ + #include <unistd.h> + #include <sys/ioctl.h> + #include <sys/mman.h> +-#include <asm/page.h> /* For definition of PAGE_SIZE */ + + #include "SDL_video.h" + #include "SDL_gsyuv_c.h" +@@ -180,7 +179,7 @@ SDL_Overlay *GS_CreateYUVOverlay(_THIS, + + /* Allocate a DMA area for pixel conversion */ + bpp = this->screen->format->BytesPerPixel; +- map_offset = (mapped_len + (PAGE_SIZE - 1)) & ~(PAGE_SIZE - 1); ++ map_offset = (mapped_len + ((int)sysconf(_SC_PAGE_SIZE) - 1)) & ~((int)sysconf(_SC_PAGE_SIZE) - 1); + hwdata->dma_len = hwdata->macroblocks * (16 * 16 + 8 * 8 + 8 * 8) + + width * height * bpp + + hwdata->macroblocks * (16 * sizeof(long long)) + |