[oe-commits] org.oe.dev libsdl-qpe 1.2.9: Fix build issue after recent kernel headers and gcc upgrades.

[pfalcon commit]

libsdl-qpe 1.2.9: Fix build issue after recent kernel headers and gcc upgrades.
* There was two errors - now well-known PAGE_SIZE one, and, apparently, gcc4.1.2 
changed extern "C" rules.
* Fixes #2294.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 8189ef74dcc57287fc2af68825813a90e11f098e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8189ef74dcc57287fc2af68825813a90e11f098e
Files:
1
packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch
packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch
packages/libsdl/libsdl-qpe_1.2.9.bb
Diffs:

#
# mt diff -r78c366f7378d6982a8ac035f7baa1e929b6beba9 -r8189ef74dcc57287fc2af68825813a90e11f098e
#
# 
# 
# add_file "packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch"
#  content [74f56b858c6b415b7662964466fa9c1a53b9803e]
# 
# add_file "packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch"
#  content [fa8f64d731e2a7f3b45d92b28c33d23feac618ed]
# 
# patch "packages/libsdl/libsdl-qpe_1.2.9.bb"
#  from [3a1c954c2812701b497fe67d9ab513546c1b3201]
#    to [1a41fea40fbd70743eb8fd8b3a7946b8d50acc6f]
# 
============================================================
--- packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch	74f56b858c6b415b7662964466fa9c1a53b9803e
+++ packages/libsdl/libsdl-qpe-1.2.9/explicit-extern-C.patch	74f56b858c6b415b7662964466fa9c1a53b9803e
@@ -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;
+ 
============================================================
--- packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch	fa8f64d731e2a7f3b45d92b28c33d23feac618ed
+++ packages/libsdl/libsdl-qpe-1.2.9/no-PAGE_SIZE.patch	fa8f64d731e2a7f3b45d92b28c33d23feac618ed
@@ -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);
============================================================
--- packages/libsdl/libsdl-qpe_1.2.9.bb	3a1c954c2812701b497fe67d9ab513546c1b3201
+++ packages/libsdl/libsdl-qpe_1.2.9.bb	1a41fea40fbd70743eb8fd8b3a7946b8d50acc6f
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 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
 	   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}"