diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-05-25 09:01:29 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-05-25 09:01:29 +0000 |
| commit | b5861b703edbf936d8e181e524e20fd856b356a7 (patch) | |
| tree | be3d35c02b9a7f334e6603042590d730037a225d | |
| parent | 9601e1907e1f69bcb43c630082b5d2262926a380 (diff) | |
| parent | a2e65dd07aec97398476b35e86bc6ad4530eb6d7 (diff) | |
merge of '3fe173adf79372b5e29f63215a462e3f7cfdff08'
and 'ceff31fcddbcbfcc34f98821f69f52fdce03e812'
| -rw-r--r-- | packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch | 22 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch | 11 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-qpe_1.2.9.bb | 4 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6_2.6.21-hh4.bb (renamed from packages/linux/linux-handhelds-2.6_2.6.21-hh2.bb) | 0 |
4 files changed, 36 insertions, 1 deletions
diff --git a/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch b/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch new file mode 100644 index 0000000000..3dd44bea27 --- /dev/null +++ b/packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch @@ -0,0 +1,22 @@ +--- SDL-1.2.9-orig/src/video/SDL_sysvideo.h.org 2005-04-17 10:40:41.000000000 +0000 ++++ SDL-1.2.9-orig/src/video/SDL_sysvideo.h 2007-05-25 07:34:38.000000000 +0000 +@@ -332,6 +332,9 @@ + SDL_VideoDevice *(*create)(int devindex); + } VideoBootStrap; + ++#ifdef __cplusplus ++extern "C" { ++#endif + #ifdef ENABLE_X11 + extern VideoBootStrap X11_bootstrap; + #endif +@@ -417,6 +420,9 @@ + #ifdef ENABLE_RISCOS + extern VideoBootStrap RISCOS_bootstrap; + #endif ++#ifdef __cplusplus ++}; ++#endif + /* This is the current video device */ + extern SDL_VideoDevice *current_video; + diff --git a/packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch b/packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch new file mode 100644 index 0000000000..856aaf2472 --- /dev/null +++ b/packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch @@ -0,0 +1,11 @@ +--- SDL-1.2.9-orig/src/video/qtopia/SDL_sysvideo.cc.org 2007-05-25 07:07:32.000000000 +0000 ++++ SDL-1.2.9-orig/src/video/qtopia/SDL_sysvideo.cc 2007-05-25 07:24:48.000000000 +0000 +@@ -809,7 +809,7 @@ + current->pitch = finfo.line_length; + current->flags = (SDL_FULLSCREEN|SDL_HWSURFACE); + mapped_offset = (((long)finfo.smem_start) - +- (((long)finfo.smem_start)&~(PAGE_SIZE-1))); ++ (((long)finfo.smem_start)&~(getpagesize()-1))); + mapped_memlen = finfo.smem_len+mapped_offset; + if(console_fd >0 ) { + mapped_mem = mmap(NULL, mapped_memlen,PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); diff --git a/packages/libsdl/libsdl-qpe_1.2.9.bb b/packages/libsdl/libsdl-qpe_1.2.9.bb index eaca6b88aa..2fbf66b5d8 100644 --- a/packages/libsdl/libsdl-qpe_1.2.9.bb +++ b/packages/libsdl/libsdl-qpe_1.2.9.bb @@ -6,7 +6,7 @@ PROVIDES = "virtual/libsdl" LICENSE = "LGPL" # NOTE: make sure to keep PR in sync with libsdl-x11 -PR = "r0" +PR = "r1" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://agawa-piro-mickey-1.2.9.patch;patch=1 \ @@ -16,6 +16,8 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://ipaq-1.2.9.patch;patch=1 \ file://SDL-Akita-1.2.9.patch;patch=1 \ file://fixlibs-1.2.9.patch;patch=1 \ + file://no-PAGE_SIZE.patch;patch=1 \ + file://explicit-extern-C.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/SDL-${PV}" diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh2.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh4.bb index b34d4630a0..b34d4630a0 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh2.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh4.bb |