[oe-commits] org.oe.dev merge of '60f2ec6da106ffdd1d5ac217c5babe90afcd7ed1'

[pfalcon commit]

merge of '60f2ec6da106ffdd1d5ac217c5babe90afcd7ed1'
     and 'd38e77f8e1f1342a98a7f8357ef649d8041bea07'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 5062e56ad30e5b4353cfdfc1b17b188f500fc52d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5062e56ad30e5b4353cfdfc1b17b188f500fc52d
Files:
1
packages/linux/linux-handhelds-2.6_2.6.21-hh12.bb
packages/libsdl/files/kernel-asm-page.patch
conf/machine/compulab-pxa270.conf
packages/libsdl/libsdl-native_1.2.11.bb
packages/linphone/linphone_1.6.0.bb
Diffs:

#
# mt diff -r60f2ec6da106ffdd1d5ac217c5babe90afcd7ed1 -r5062e56ad30e5b4353cfdfc1b17b188f500fc52d
#
# 
# 
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh12.bb"
#  content [07839c0797b5ba09b5aae7fcdbb3232965b3f8e3]
# 
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh12.bb	07839c0797b5ba09b5aae7fcdbb3232965b3f8e3
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh12.bb	07839c0797b5ba09b5aae7fcdbb3232965b3f8e3
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc


#
# mt diff -rd38e77f8e1f1342a98a7f8357ef649d8041bea07 -r5062e56ad30e5b4353cfdfc1b17b188f500fc52d
#
# 
# 
# add_file "packages/libsdl/files/kernel-asm-page.patch"
#  content [c330d9173694f5d2da97b4be571622fb8ad8d195]
# 
# patch "conf/machine/compulab-pxa270.conf"
#  from [e1433a559cc7c747740b88df5f017a83d402e34a]
#    to [d9dda180b32b678bbc7dc3203f202d0227bd7798]
# 
# patch "packages/libsdl/libsdl-native_1.2.11.bb"
#  from [e9e581735b9f05b42424cddeb52b17e590296483]
#    to [5e5d90533f76a9b2ce70d129759c139f4c7df596]
# 
# patch "packages/linphone/linphone_1.6.0.bb"
#  from [77c69b1286f82211e37b6d6cde29f8fc492c17c7]
#    to [12fa57bdfc35f887f98bd8c835b566f34d02f011]
# 
============================================================
--- packages/libsdl/files/kernel-asm-page.patch	c330d9173694f5d2da97b4be571622fb8ad8d195
+++ packages/libsdl/files/kernel-asm-page.patch	c330d9173694f5d2da97b4be571622fb8ad8d195
@@ -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 */
============================================================
--- conf/machine/compulab-pxa270.conf	e1433a559cc7c747740b88df5f017a83d402e34a
+++ conf/machine/compulab-pxa270.conf	d9dda180b32b678bbc7dc3203f202d0227bd7798
@@ -21,7 +21,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000 --no-cleanmarkers;\
 	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-	-e 0x20000 -p\
+	-e 0x20000 -p; \
 	cd ${DEPLOY_DIR_IMAGE}; \
 	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
 	ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \
============================================================
--- packages/libsdl/libsdl-native_1.2.11.bb	e9e581735b9f05b42424cddeb52b17e590296483
+++ packages/libsdl/libsdl-native_1.2.11.bb	5e5d90533f76a9b2ce70d129759c139f4c7df596
@@ -1,11 +1,12 @@ LICENSE = "LGPL"
 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
============================================================
--- packages/linphone/linphone_1.6.0.bb	77c69b1286f82211e37b6d6cde29f8fc492c17c7
+++ packages/linphone/linphone_1.6.0.bb	12fa57bdfc35f887f98bd8c835b566f34d02f011
@@ -16,9 +16,9 @@ RDEPENDS_libmediastreamer = "speex libog
 RDEPENDS_libquickstream = "speex libmediastreamer libasound"
 RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
 
-PROVIDES = "linphone linphonec liblinphone"
+PROVIDES += "linphone linphonec liblinphone"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \
            http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1"
@@ -61,9 +61,9 @@ FILES_${PN}-rings = "${datadir}/sounds/l
 FILES_${PN} = "${bindir}/linphone ${datadir}/pixmaps ${datadir}/applications ${datadir}/gnome/apps"
 FILES_${PN}c = "${bindir}/linphonec ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
 FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
-FILES_liblinphone = "${libdir}/liblinphone.so*"
-FILES_libquickstream = "${libdir}/libquickstream.so*"
-FILES_libmediastreamer = "${libdir}/libmediastreamer.so*"
-FILES_libortp = "${libdir}/libortp.so*"
-FILES_${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
+FILES_liblinphone = "${libdir}/liblinphone.so.*"
+FILES_libquickstream = "${libdir}/libquickstream.so.*"
+FILES_libmediastreamer = "${libdir}/libmediastreamer.so.*"
+FILES_libortp = "${libdir}/libortp.so.*"
+FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"