[oe-commits] org.oe.dev merge of '1ece995451ce1a3da5c2124442977354e1e6a143'

pfalcon commit openembedded-commits at lists.openembedded.org
Tue Jul 17 22:43:59 UTC 2007 

merge of '1ece995451ce1a3da5c2124442977354e1e6a143'
     and '519a89f1a79b55264782142c46e74ce09c0926c4'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 00d41f081f30bcac8a8430efc5e722f474a6aca5
ViewMTN: http://monotone.openembedded.org/revision.psp?id=00d41f081f30bcac8a8430efc5e722f474a6aca5
Files:
1
conf/machine/asus730.conf
conf/machine/aximx50v.conf
conf/machine/include/palm.conf
conf/machine/palmld.conf
conf/machine/palmtt.conf
conf/machine/palmtx.conf
conf/machine/palmz72.conf
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
packages/webkit/webkit/WebKit.pri
Diffs:

#
# mt diff -r1ece995451ce1a3da5c2124442977354e1e6a143 -r00d41f081f30bcac8a8430efc5e722f474a6aca5
#
# 
# 
# patch "conf/machine/asus730.conf"
#  from [b9e3bb64f4aa2bf24d37ce83bb710e4b79902b4c]
#    to [69e2646849af8289e44ffe373f9695c42d09b026]
# 
# patch "conf/machine/aximx50v.conf"
#  from [33500ac21e3eec54a88e254a099a20c60938f06f]
#    to [f40fc22d026193222d822b7418de0028265b5000]
# 
# patch "conf/machine/include/palm.conf"
#  from [67ba46a49721b82b7690b3214c3a2d5451076c5b]
#    to [a32a7efd0b14ab2ca61bcb26d18444c5d97a6811]
# 
# patch "conf/machine/palmld.conf"
#  from [36ef525ef87ccfbc617c0404c26bd3a750a58c1b]
#    to [c75733b268f0ce8ecaf2561319e45d09e23ede02]
# 
# patch "conf/machine/palmtt.conf"
#  from [0ecea4712771171597361de10c5217453886918b]
#    to [b4a69289be08bca3ad9e95e165f1bae4fa8c7b60]
# 
# patch "conf/machine/palmtx.conf"
#  from [62107e3db846dc2f8067bbca79d8050d6ccb4e4c]
#    to [7b01875a26f5fa407501b3e1f67a25b6045a478f]
# 
# patch "conf/machine/palmz72.conf"
#  from [f8f02a6034be32bbfc14040044cb67824df105b5]
#    to [b6c8c8a6c80d1533b4c0a62cbb309dc2a84bdf41]
# 
============================================================
--- conf/machine/asus730.conf	b9e3bb64f4aa2bf24d37ce83bb710e4b79902b4c
+++ conf/machine/asus730.conf	69e2646849af8289e44ffe373f9695c42d09b026
@@ -16,7 +16,9 @@ VOLATILE_STORAGE_SIZE = "64"
 
 ROOT_FLASH_SIZE = "64"
 VOLATILE_STORAGE_SIZE = "64"
-GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 #
============================================================
--- conf/machine/aximx50v.conf	33500ac21e3eec54a88e254a099a20c60938f06f
+++ conf/machine/aximx50v.conf	f40fc22d026193222d822b7418de0028265b5000
@@ -1,7 +1,9 @@ require conf/machine/aximx50.conf
 #@TYPE: Machine
 #@NAME: Axim x50v/x51v
 #@DESCRIPTION: Machine configuration for the Dell Axim x50v/x51v with a pxa27x CPU
 
 require conf/machine/aximx50.conf
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
-GUI_MACHINE_CLASS = "bigscreen"
============================================================
--- conf/machine/include/palm.conf	67ba46a49721b82b7690b3214c3a2d5451076c5b
+++ conf/machine/include/palm.conf	a32a7efd0b14ab2ca61bcb26d18444c5d97a6811
@@ -7,8 +7,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "bigscreen"
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
 
============================================================
--- conf/machine/palmld.conf	36ef525ef87ccfbc617c0404c26bd3a750a58c1b
+++ conf/machine/palmld.conf	c75733b268f0ce8ecaf2561319e45d09e23ede02
@@ -6,6 +6,9 @@ ROOT_FLASH_SIZE = "100"
 
 ROOT_FLASH_SIZE = "100"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
 
 
============================================================
--- conf/machine/palmtt.conf	0ecea4712771171597361de10c5217453886918b
+++ conf/machine/palmtt.conf	b4a69289be08bca3ad9e95e165f1bae4fa8c7b60
@@ -5,9 +5,12 @@ PACKAGE_EXTRA_ARCHS = "armv5te"
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv5te"
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-palm-omap1"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
============================================================
--- conf/machine/palmtx.conf	62107e3db846dc2f8067bbca79d8050d6ccb4e4c
+++ conf/machine/palmtx.conf	7b01875a26f5fa407501b3e1f67a25b6045a478f
@@ -1,17 +1,18 @@ require conf/machine/include/palm.conf
 #@TYPE: Machine
 #@NAME: Palm TX
 #@DESCRIPTION: Machine configuration for the Palm TX
 
 require conf/machine/include/palm.conf
 
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 MACHINE_FEATURES += "pcmcia wifi"
 
 ROOT_FLASH_SIZE = "100"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "bigscreen"
-
 MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \
                            kernel-module-pxapwm-bl \
                            kernel-module-wm97xx-ts \
============================================================
--- conf/machine/palmz72.conf	f8f02a6034be32bbfc14040044cb67824df105b5
+++ conf/machine/palmz72.conf	b6c8c8a6c80d1533b4c0a62cbb309dc2a84bdf41
@@ -5,11 +5,12 @@ ROOT_FLASH_SIZE = "100"
 require conf/machine/include/palm.conf
 
 ROOT_FLASH_SIZE = "100"
+MACHINE_GUI_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-GUI_MACHINE_CLASS = "bigscreen"
-
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-thumb.conf
 


#
# mt diff -r519a89f1a79b55264782142c46e74ce09c0926c4 -r00d41f081f30bcac8a8430efc5e722f474a6aca5
#
# 
# 
# 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]
# 
# patch "packages/webkit/webkit/WebKit.pri"
#  from [66a2198f6e713621703e637cb558322feb4153e5]
#    to [7f89130236b19b36013eb4b046d00719507e4f12]
# 
============================================================
--- 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}"
 
============================================================
--- packages/webkit/webkit/WebKit.pri	66a2198f6e713621703e637cb558322feb4153e5
+++ packages/webkit/webkit/WebKit.pri	7f89130236b19b36013eb4b046d00719507e4f12
@@ -1,7 +1,10 @@
 # Include file to make it easy to include WebKit into Qt projects
 
 
-isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+isEmpty(OUTPUT_DIR) {
+    CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
+    CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+}
 
 !gdk-port:CONFIG += qt-port
 qt-port:DEFINES += BUILDING_QT__=1
@@ -32,6 +35,7 @@ INCLUDEPATH += \
     $$BASE_DIR/JavaScriptCore/bindings \
     $$BASE_DIR/JavaScriptCore/bindings/c \
     $$BASE_DIR/JavaScriptCore/wtf \
+    $$BASE_DIR/JavaScriptCore/ForwardingHeaders \
     $$BASE_DIR/WebCore \
     $$BASE_DIR/WebCore/ForwardingHeaders \
     $$BASE_DIR/WebCore/platform \

More information about the Openembedded-commits mailing list