diff options
author | Michael Krelin <hacker@klever.net> | 2007-07-17 12:52:46 +0000 |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-17 12:52:46 +0000 |
commit | f71dc72e069699ebbf544adecc0eafaf1bf5d12d (patch) | |
tree | 74b9e183470018d2e1f75b377e0d3572a42b6caf | |
parent | 9746952dbb562c4d4b013795e3afbcc5116a3f4f (diff) | |
parent | 32f84db1b6b0284b81c221b9f2f050faec737a10 (diff) |
merge of '2c989e7a8173d51a40c417152f5997ab57099663'
and 'e09ef5f5a677602e791414d3d06ac799a01ee404'
-rw-r--r-- | packages/libsdl/files/kernel-asm-page.patch | 13 | ||||
-rw-r--r-- | packages/libsdl/libsdl-native_1.2.11.bb | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/packages/libsdl/files/kernel-asm-page.patch b/packages/libsdl/files/kernel-asm-page.patch new file mode 100644 index 0000000000..42bceadfdc --- /dev/null +++ b/packages/libsdl/files/kernel-asm-page.patch @@ -0,0 +1,13 @@ +diff --git a/src/video/Xext/Xxf86dga/XF86DGA.c b/src/video/Xext/Xxf86dga/XF86DGA.c +index 4e3d662..de38a3c 100644 +--- a/src/video/Xext/Xxf86dga/XF86DGA.c ++++ b/src/video/Xext/Xxf86dga/XF86DGA.c +@@ -18,7 +18,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc + #define HAS_MMAP_ANON + #include <sys/types.h> + #include <sys/mman.h> +-#include <asm/page.h> /* PAGE_SIZE */ ++#include <unistd.h> + #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */ + #define HAS_GETPAGESIZE + #endif /* linux */ diff --git a/packages/libsdl/libsdl-native_1.2.11.bb b/packages/libsdl/libsdl-native_1.2.11.bb index 3c3f17d1d2..d75eec53e8 100644 --- a/packages/libsdl/libsdl-native_1.2.11.bb +++ b/packages/libsdl/libsdl-native_1.2.11.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Simple DirectMedia Layer - native Edition" HOMEPAGE = "http://www.libsdl.org" SECTION = "libs" LICENSE = "LGPL" -PR = "r1" +PR = "r2" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ - file://acinclude.m4" + file://acinclude.m4 \ + file://kernel-asm-page.patch;patch=1 " S = "${WORKDIR}/SDL-${PV}" inherit autotools binconfig pkgconfig native |