[oe-commits] org.oe.dev merge of '49e39c42b944dda8eed607394e1849029b9f527f'
freyther commit
openembedded-commits at lists.openembedded.org
Wed Dec 26 12:20:01 UTC 2007
merge of '49e39c42b944dda8eed607394e1849029b9f527f'
and 'fbf7570478d5954f66dbaa425a8b6b1c8c1b862c'
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: e523e8071d3fe835cfd277ef7adf62c2822468c2
ViewMTN: http://monotone.openembedded.org/revision/info/e523e8071d3fe835cfd277ef7adf62c2822468c2
Files:
1
packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig
packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig
packages/linux/linux-dht-walnut-2.6.20/dht-walnut
packages/ipaq-sleep/files/unbreak.patch
packages/zaurusd/files/alsa-6000x-default.state.patch
packages/atftp/atftp_0.7.bb
packages/git/git.inc
packages/gsm/files/default
packages/gsm/gsmd.inc
packages/initscripts/initscripts-1.0/functions
packages/initscripts/initscripts_1.0.bb
packages/ipaq-sleep/ipaq-sleep_0.9.bb
packages/linux/linux-dht-walnut_2.6.20.bb
packages/psplash/files/psplash-init
packages/psplash/psplash_svn.bb
packages/zaurusd/zaurusd_svn.bb
packages/qmake/qmake2-native-2.10a
packages/qmake/qmake2-native
packages/qmake/qmake2-native_2.10a.bb
packages/qmake/qmake2-native.inc
packages/qt/qt4-x11-free-4.1.2
packages/qt4/qt4-x11-free-4.1.2
packages/qt/qt4-x11-free-4.3.2
packages/qt4/qt4-x11-free-4.3.3
packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch
packages/qt4/files/0001-cross-compile.patch
packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch
packages/qt4/files/0003-no-tools.patch
packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch
packages/qt4/files/0005-fix-mkspecs.patch
packages/qt/qt4-x11-free_4.1.2.bb
packages/qt4/qt4-x11-free_4.1.2.bb
packages/qt/qt4-x11-free_4.3.2.bb
packages/qt4/qt4-x11-free_4.3.3.bb
packages/qt/qt4_arch.inc
packages/qt4/qt4_arch.inc
packages/qte/qtopia-core
packages/qt4/qtopia-core
packages/qte/qtopia-core_4.2.0.bb
packages/qt4/qtopia-core_4.2.0.bb
packages/qte/qtopia-core_4.3.2.bb
packages/qt4/qtopia-core_4.3.3.bb
packages/uicmoc/uicmoc4-native_4.3.2.bb
packages/uicmoc/uicmoc4-native_4.3.3.bb
packages/qt4
packages/qt4/files
packages/qt4/qtopia-core-4.3.3
packages/qmake/qmake2-native/qt-config.patch
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_configuration.inc
packages/qt4/qt_depends.inc
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core/0004-no-qmake.patch
packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch
packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch
packages/qt4/qtopia-core.inc
classes/qmake2.bbclass
classes/qtopia4core.bbclass
classes/xilinx-bsp.bbclass
conf/checksums.ini
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/busybox/busybox_1.00.bb
packages/gallery/gallery_1.5.5.bb
packages/glibc/eglibc-package.bbclass
packages/glibc/glibc-package.bbclass
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-efika_2.6.20.bb
packages/linux/linux-efika_2.6.21+git.bb
packages/linux/linux-magicbox_2.6.18.6.bb
packages/linux/linux-magicbox_2.6.19.2.bb
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-sequoia_2.6.21.bb
packages/meta/external-toolchain.bb
packages/openmoko2/openmoko-sample2_svn.bb
packages/qmake/qmake2-native/0001-fix-mkspecs.patch
packages/uicmoc/uicmoc4-native.inc
Diffs:
#
# mt diff -r49e39c42b944dda8eed607394e1849029b9f527f -re523e8071d3fe835cfd277ef7adf62c2822468c2
#
#
#
# rename "packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig"
# to "packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig"
#
# add_dir "packages/linux/linux-dht-walnut-2.6.20/dht-walnut"
#
# add_file "packages/ipaq-sleep/files/unbreak.patch"
# content [320b4e1a81767a29f3e18bde0dbf5f2f698f1265]
#
# add_file "packages/zaurusd/files/alsa-6000x-default.state.patch"
# content [2940f776646d13eb005ea2b593a31b403c0de924]
#
# patch "packages/atftp/atftp_0.7.bb"
# from [bc8e9ca417e90b03c579a94ea2b6f6c954580332]
# to [c5fce0610998cec09dbf6339dbeb61a2ac193a42]
#
# patch "packages/git/git.inc"
# from [ce7e34b4dd8490461c6e668e1fc0f228df6a0f62]
# to [3453fcb16ca1b5323af9d9ede90cd878559c2ddb]
#
# patch "packages/gsm/files/default"
# from [fff8f5a5e6aa3b4c82a98e13da7f097b7ee15b91]
# to [2c9ff75946e58892430cb9cee5cb6e6a16739d7c]
#
# patch "packages/gsm/gsmd.inc"
# from [47a99ec93ca96658be70db56cfe0b8ef57b36875]
# to [9ddb79e73fa5344cdebd3d8fd96e8acc67ea81f0]
#
# patch "packages/initscripts/initscripts-1.0/functions"
# from [cdb873e9c652d090c2e40fa96d5fd2db86db5413]
# to [b93cf58a6991d27bc069277c77cad150e8dc7dbe]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [1b188ef14b2f1a5999174606f8b5ac18ec979467]
# to [5b015b91512e978190564024638f1a0bbb5cf876]
#
# patch "packages/ipaq-sleep/ipaq-sleep_0.9.bb"
# from [d62b49ddfee5d742b7c6aa2b274ac7a4c3d33f4e]
# to [4aa7b78bb2cb9579426c105ba5c3072ceddc3b29]
#
# patch "packages/linux/linux-dht-walnut_2.6.20.bb"
# from [0c179ddf00c01ed7abb520e96d914fffa789a83b]
# to [032566f5149e9d714c6631ead6e1db18ccb1dc26]
#
# patch "packages/psplash/files/psplash-init"
# from [920674c4b9876275351f49712ab0fa731a6ca7a9]
# to [3482232dc7507af93bf74c94d86bd4f75c1bf2a3]
#
# patch "packages/psplash/psplash_svn.bb"
# from [4e90d427d5ad257ee0faf49f0e087779364df998]
# to [b698aff22a0110395efea1fa894814aa903d798e]
#
# patch "packages/zaurusd/zaurusd_svn.bb"
# from [1d13c932ce4f3b43ef8ad3c05abb7f9e95de0566]
# to [251ee639b9428fa73f9f1acc8c9a5945caeb9204]
#
============================================================
--- packages/ipaq-sleep/files/unbreak.patch 320b4e1a81767a29f3e18bde0dbf5f2f698f1265
+++ packages/ipaq-sleep/files/unbreak.patch 320b4e1a81767a29f3e18bde0dbf5f2f698f1265
@@ -0,0 +1,184 @@
+--- a/ipaq-sleep.c.org 2006-01-20 19:43:14.000000000 +0200
++++ a/ipaq-sleep.c 2007-12-26 06:26:32.000000000 +0200
+@@ -27,14 +27,14 @@
+ #include <X11/Xlib.h>
+ #include <X11/extensions/scrnsaver.h>
+
+-#undef DEBUG
++#define DEBUG
+
+ int irqs[MAX_IRQS]; /* irqs to examine have a value of 1 */
+ long v, irq_count[MAX_IRQS]; /* holds previous counters of the irq's */
+ int sleep_idle=3 * 60; /* in seconds */
+ int dim_idle=1 * 60; /* in seconds */
+ int daemonize=1;
+-int sleep_time = DEFAULT_SLEEP_TIME;
++int sleep_time = 1; //DEFAULT_SLEEP_TIME;
+ int cpu=1;
+ int apm=1;
+ int dimming=1;
+@@ -57,6 +57,7 @@
+ Window root; /* The root window (which holds MIT_SCREEN_SAVER
+ info). */
+ XScreenSaverInfo *info; /* The MIT_SCREEN_SAVER info object. */
++int xfd = -1;
+
+ int init() {
+ int first_event, first_error;
+@@ -69,6 +70,8 @@
+ else {
+ XScreenSaverQueryExtension(dpy, &first_event, &first_error);
+ root = DefaultRootWindow(dpy);
++ XSelectInput(dpy, root, KeyPressMask | KeyReleaseMask | PointerMotionMask);
++ xfd = ConnectionNumber(dpy);
+ info = XScreenSaverAllocInfo();
+ #ifdef DEBUG
+ if (debug)
+@@ -108,7 +111,7 @@
+ if (fgets (buf, 32, input))
+ {
+ if (!strncmp (buf, "on ", 3))
+- r = atoi (buf + 4);
++ r = atoi (buf + 3);
+ else
+ r = -1;
+ }
+@@ -189,7 +192,7 @@
+ if (strcmp(func, Lflag)==0) {
+ dim_level=atoi(value);
+ #ifdef DEBUG
+- if (debug) fprintf(dgfp, "dim_idle=%d\n", dim_idle);
++ if (debug) fprintf(dgfp, "dim_level=%d\n", dim_idle);
+ #endif
+ }
+ if (strcmp(func, aflag)==0) {
+@@ -282,6 +285,12 @@
+ dimming=0;
+ }
+ }
++ if (strcmp(func, Lflag)==0) {
++ dim_level=atoi(value);
++#ifdef DEBUG
++ if (debug) fprintf(dgfp, "dim_level=%d\n", dim_idle);
++#endif
++ }
+ if (strcmp(func, aflag)==0) {
+ apm=atoi(value);
+ #ifdef DEBUG
+@@ -487,8 +496,11 @@
+ return(1);
+ }
+
++ if (info.ac_line_status == AC_LINE_STATUS_UNKNOWN || info.battery_status == BATTERY_STATUS_UNKNOWN)
++ return(0);
++
+ #ifdef DEBUG
+- if (debug) fprintf(dgfp,"You are NOT on external power. Its all good.....\n");
++ if (debug) fprintf(dgfp,"You are NOT on external power. Line status: %d, battery status: %d.\n", info.ac_line_status, info.battery_status);
+ #endif
+ runtime = info.battery_time;
+ if (apm && runtime >= 0 && runtime < battery_level)
+@@ -587,12 +599,17 @@
+
+ }
+
++/* X idle status checked every sleep_time,
++ other boring and expensive stuff - sleep_time * CYCLE_INTERLEAVE */
++#define CYCLE_INTERLEAVE 10
++
+ /* Keep checking the interrupts. As long as there is activity, do nothing. */
+ void main_loop (void) {
+- int activity, i, total_unused=0, apm_active=0, old_apm=0;
++ int activity, i, apm_active=0, old_apm=0, last_active = time(NULL);
+ int dimmed=0, current_bl=32;
+ int newIdle, oldIdle, lastIdle, oldTime, newTime;
+ char iline[64];
++ int cycle = 0;
+
+ Time idleTime; /* milliseconds */
+ FILE *f;
+@@ -656,6 +673,9 @@
+ if (dimming && !dimmed && !apm_active) {
+ if ((newIdle-oldIdle)>=dim_idle) {
+ current_bl = read_backlight ();
++#ifdef DEBUG
++ if (debug) fprintf(dgfp, "Dim timeout. Current bl value=%d, setting to=%d\n", current_bl, dim_level);
++#endif
+ set_backlight (dim_level);
+ dimmed=1;
+ }
+@@ -664,6 +684,11 @@
+ lastIdle=newIdle;
+
+ }
++
++ cycle++;
++ cycle %= CYCLE_INTERLEAVE;
++ if (cycle)
++ goto sleep;
+
+ apm_active=check_apm();
+ if (apm_active) {
+@@ -698,17 +723,15 @@
+ }
+
+ if (activity) {
+- total_unused = 0;
++ last_active = time(NULL);
+ }
+ else {
+- total_unused += sleep_time;
+- if (total_unused >= sleep_idle && sleeping) {
++ if (time(NULL) - last_active >= sleep_idle && sleeping) {
+
+ if (check_cpu() || check_PID() || probe_IRQs()) {
+ #ifdef DEBUG
+ if (debug) fprintf(dgfp,"You cannot sleep at this time! Not going to sleep....\n");
+ #endif
+- total_unused=0;
+ oldIdle=newIdle;
+ }
+ else {
+@@ -718,24 +741,37 @@
+ do_sleep ();
+ set_backlight (current_bl);
+ dimmed=0;
+- total_unused=0;
++ last_active = time(NULL);
+ }
+ }
+
+ }
+
++sleep:
+ #ifdef DEBUG
+ if (debug) fflush(dgfp);
+ #endif
+- sleep(sleep_time);
++ {
++ struct timeval tv;
++ fd_set readset;
++ FD_ZERO(&readset);
++ if (xfd != -1)
++ FD_SET(xfd, &readset);
++ tv.tv_sec = 1;
++ tv.tv_usec = 0;
++#ifdef DEBUG
++ if (debug) fprintf(dgfp, "select=%d, tv_sec=%d, tv_usec=%d\n", select(xfd+1, &readset, NULL, NULL, &tv), tv.tv_sec, tv.tv_usec);
++#endif
++ }
++
+
+ newTime=time(NULL);
+- if (oldTime && newTime-sleep_time > oldTime +1) {
++ if (oldTime && newTime-sleep_time > oldTime +2) {
+ #ifdef DEBUG
+ if (debug)
+- fprintf(stderr, "%i sec sleep; resetting timer and resetting dimmer...", (int)(newTime - oldTime));
++ fprintf(dgfp, "%i sec sleep, apparently, was suspended; resetting timer and resetting dimmer...", (int)(newTime - oldTime));
+ #endif
+- total_unused=0;
++ last_active = time(NULL);
+
+ query_idle(&idleTime);
+ lastIdle=oldIdle=(int)idleTime;
============================================================
--- packages/zaurusd/files/alsa-6000x-default.state.patch 2940f776646d13eb005ea2b593a31b403c0de924
+++ packages/zaurusd/files/alsa-6000x-default.state.patch 2940f776646d13eb005ea2b593a31b403c0de924
@@ -0,0 +1,750 @@
+--- zaurusd/config/alsa/6000x-default.state.old 2007-12-22 04:31:38.000000000 -0600
++++ zaurusd/config/alsa/6000x-default.state 2007-12-26 00:06:02.000000000 -0600
+@@ -37,13 +37,23 @@ state.Tosa {
+ }
+ control.5 {
+ comment.access 'read write'
++ comment.type INTEGER
++ comment.count 2
++ comment.range '0 - 31'
++ iface MIXER
++ name 'PCM Playback Volume'
++ value.0 23
++ value.1 23
++ }
++ control.6 {
++ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value true
+ }
+- control.6 {
++ control.7 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -51,7 +61,7 @@ state.Tosa {
+ name 'Speaker Playback Invert Switch'
+ value true
+ }
+- control.7 {
++ control.8 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -59,7 +69,7 @@ state.Tosa {
+ name 'Headphone Playback ZC Switch'
+ value true
+ }
+- control.8 {
++ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -67,7 +77,7 @@ state.Tosa {
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+- control.9 {
++ control.10 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -76,7 +86,7 @@ state.Tosa {
+ name 'Mono Playback Volume'
+ value 0
+ }
+- control.10 {
++ control.11 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -85,16 +95,16 @@ state.Tosa {
+ name 'ALC Target Volume'
+ value 11
+ }
+- control.11 {
++ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Hold Time'
+- value 0
++ value 2
+ }
+- control.12 {
++ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -103,7 +113,7 @@ state.Tosa {
+ name 'ALC Decay Time'
+ value 3
+ }
+- control.13 {
++ control.14 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -112,7 +122,7 @@ state.Tosa {
+ name 'ALC Attack Time'
+ value 2
+ }
+- control.14 {
++ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+@@ -124,7 +134,7 @@ state.Tosa {
+ name 'ALC Function'
+ value None
+ }
+- control.15 {
++ control.16 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -133,7 +143,7 @@ state.Tosa {
+ name 'ALC Max Volume'
+ value 7
+ }
+- control.16 {
++ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -142,7 +152,7 @@ state.Tosa {
+ name 'ALC ZC Timeout'
+ value 0
+ }
+- control.17 {
++ control.18 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -150,7 +160,7 @@ state.Tosa {
+ name 'ALC ZC Switch'
+ value false
+ }
+- control.18 {
++ control.19 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -158,7 +168,7 @@ state.Tosa {
+ name 'ALC NG Switch'
+ value false
+ }
+- control.19 {
++ control.20 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+@@ -168,7 +178,7 @@ state.Tosa {
+ name 'ALC NG Type'
+ value 'Constant Gain'
+ }
+- control.20 {
++ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -177,16 +187,16 @@ state.Tosa {
+ name 'ALC NG Threshold'
+ value 31
+ }
+- control.21 {
++ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mic Headphone Volume'
+- value 3
++ value 7
+ }
+- control.22 {
++ control.23 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -195,7 +205,7 @@ state.Tosa {
+ name 'ALC Headphone Volume'
+ value 5
+ }
+- control.23 {
++ control.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -203,7 +213,7 @@ state.Tosa {
+ name 'Out3 Switch'
+ value false
+ }
+- control.24 {
++ control.25 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -211,7 +221,7 @@ state.Tosa {
+ name 'Out3 ZC Switch'
+ value true
+ }
+- control.25 {
++ control.26 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -220,7 +230,7 @@ state.Tosa {
+ name 'Out3 Volume'
+ value 0
+ }
+- control.26 {
++ control.27 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -229,7 +239,7 @@ state.Tosa {
+ name 'PCBeep Bypass Headphone Volume'
+ value 0
+ }
+- control.27 {
++ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -238,7 +248,7 @@ state.Tosa {
+ name 'PCBeep Bypass Speaker Volume'
+ value 0
+ }
+- control.28 {
++ control.29 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -247,16 +257,16 @@ state.Tosa {
+ name 'PCBeep Bypass Phone Volume'
+ value 0
+ }
+- control.29 {
++ control.30 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Aux Playback Headphone Volume'
+- value 6
++ value 5
+ }
+- control.30 {
++ control.31 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -265,7 +275,7 @@ state.Tosa {
+ name 'Aux Playback Speaker Volume'
+ value 0
+ }
+- control.31 {
++ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -274,7 +284,7 @@ state.Tosa {
+ name 'Aux Playback Phone Volume'
+ value 0
+ }
+- control.32 {
++ control.33 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -283,7 +293,7 @@ state.Tosa {
+ name 'Phone Volume'
+ value 0
+ }
+- control.33 {
++ control.34 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+@@ -293,7 +303,7 @@ state.Tosa {
+ value.0 23
+ value.1 23
+ }
+- control.34 {
++ control.35 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -301,7 +311,7 @@ state.Tosa {
+ name 'Capture 20dB Boost Switch'
+ value true
+ }
+- control.35 {
++ control.36 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -309,7 +319,7 @@ state.Tosa {
+ name 'Capture to Phone 20dB Boost Switch'
+ value true
+ }
+- control.36 {
++ control.37 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -317,7 +327,7 @@ state.Tosa {
+ name '3D Upper Cut-off Switch'
+ value false
+ }
+- control.37 {
++ control.38 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -325,7 +335,7 @@ state.Tosa {
+ name '3D Lower Cut-off Switch'
+ value false
+ }
+- control.38 {
++ control.39 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -334,7 +344,7 @@ state.Tosa {
+ name '3D Playback Volume'
+ value 0
+ }
+- control.39 {
++ control.40 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+@@ -344,7 +354,7 @@ state.Tosa {
+ name 'Bass Control'
+ value 'Adaptive Boost'
+ }
+- control.40 {
++ control.41 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -352,7 +362,7 @@ state.Tosa {
+ name 'Bass Cut-off Switch'
+ value true
+ }
+- control.41 {
++ control.42 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -360,7 +370,7 @@ state.Tosa {
+ name 'Tone Cut-off Switch'
+ value false
+ }
+- control.42 {
++ control.43 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -368,7 +378,7 @@ state.Tosa {
+ name 'Playback Attenuate (-6dB) Switch'
+ value false
+ }
+- control.43 {
++ control.44 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -377,7 +387,7 @@ state.Tosa {
+ name 'Bass Volume'
+ value 8
+ }
+- control.44 {
++ control.45 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+@@ -386,7 +396,7 @@ state.Tosa {
+ name 'Treble Volume'
+ value 5
+ }
+- control.45 {
++ control.46 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+@@ -394,7 +404,7 @@ state.Tosa {
+ name 'Capture ADC Switch'
+ value false
+ }
+- control.46 {
++ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 2
+@@ -405,17 +415,17 @@ state.Tosa {
+ value.0 '+0.75dB Steps'
+ value.1 '+0.75dB Steps'
+ %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rfbf7570478d5954f66dbaa425a8b6b1c8c1b862c -re523e8071d3fe835cfd277ef7adf62c2822468c2
#
#
#
# rename "packages/qmake/qmake2-native-2.10a"
# to "packages/qmake/qmake2-native"
#
# rename "packages/qmake/qmake2-native_2.10a.bb"
# to "packages/qmake/qmake2-native.inc"
#
# rename "packages/qt/qt4-x11-free-4.1.2"
# to "packages/qt4/qt4-x11-free-4.1.2"
#
# rename "packages/qt/qt4-x11-free-4.3.2"
# to "packages/qt4/qt4-x11-free-4.3.3"
#
# rename "packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch"
# to "packages/qt4/files/0001-cross-compile.patch"
#
# rename "packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch"
# to "packages/qt4/files/0003-no-tools.patch"
#
# rename "packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch"
# to "packages/qt4/files/0005-fix-mkspecs.patch"
#
# rename "packages/qt/qt4-x11-free_4.1.2.bb"
# to "packages/qt4/qt4-x11-free_4.1.2.bb"
#
# rename "packages/qt/qt4-x11-free_4.3.2.bb"
# to "packages/qt4/qt4-x11-free_4.3.3.bb"
#
# rename "packages/qt/qt4_arch.inc"
# to "packages/qt4/qt4_arch.inc"
#
# rename "packages/qte/qtopia-core"
# to "packages/qt4/qtopia-core"
#
# rename "packages/qte/qtopia-core_4.2.0.bb"
# to "packages/qt4/qtopia-core_4.2.0.bb"
#
# rename "packages/qte/qtopia-core_4.3.2.bb"
# to "packages/qt4/qtopia-core_4.3.3.bb"
#
# rename "packages/uicmoc/uicmoc4-native_4.3.2.bb"
# to "packages/uicmoc/uicmoc4-native_4.3.3.bb"
#
# add_dir "packages/qt4"
#
# add_dir "packages/qt4/files"
#
# add_dir "packages/qt4/qtopia-core-4.3.3"
#
# add_file "packages/qmake/qmake2-native/qt-config.patch"
# content [ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c]
#
# add_file "packages/qmake/qmake2-native_2.10a.bb"
# content [87d12872c36ccf6797ad38776a929652d95a4850]
#
# add_file "packages/qt4/qt4-x11-free.inc"
# content [4999377acbce5c192356f465789adc625e3135f3]
#
# add_file "packages/qt4/qt_configuration.inc"
# content [5abde732116982782ed3a94ede56bf274012fc1f]
#
# add_file "packages/qt4/qt_depends.inc"
# content [2fd4202201d2ae2c8c52f8b9c4ac142e55516259]
#
# add_file "packages/qt4/qt_packaging.inc"
# content [6c277ec158a91be79bb7e6484f8610fdc85e729c]
#
# add_file "packages/qt4/qt_staging.inc"
# content [426479a75ece31757e047679175820b2fdf3fcfb]
#
# add_file "packages/qt4/qtopia-core/0004-no-qmake.patch"
# content [3161380072937eb18db9e2b0e7ab732d8a1ad0e8]
#
# add_file "packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch"
# content [3570223a649acdeb59d0a0d14207bea417a9c8b5]
#
# add_file "packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch"
# content [a1b4e6415d9a946ffd9c11915b871187c76f8245]
#
# add_file "packages/qt4/qtopia-core.inc"
# content [c772ab48d1d0aed43a6f098861d9c762e9dd4f32]
#
# patch "classes/qmake2.bbclass"
# from [4720a6ca5e41a1786e98f6876c83791801e04a1a]
# to [e469f74476f5cd684b559146bbd4e808de9dcadb]
#
# patch "classes/qtopia4core.bbclass"
# from [f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21]
# to [7dbc3f0dec99238640767e983264960e4a286e1b]
#
# patch "classes/xilinx-bsp.bbclass"
# from [1c5ead4afe4f57431d3f3a5a8c80bdaf34afa9b8]
# to [e8c7ed63687307cb104b234a6c0f4b060974c982]
#
# patch "conf/checksums.ini"
# from [ce22da057e8b56ac8825b7a043b4fa7cc3f86027]
# to [8b808b2bc16a048f0af0417d52948e7da22f97ca]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [d7c8eafeaf5307c4c7714a1560e880c30c9dec32]
# to [782e80b0f3b3076866c7a3507276ad9f24f91bc4]
#
# patch "packages/busybox/busybox_1.00.bb"
# from [a4331e926e10003bf120d6d761b2d94e554c6ab9]
# to [cbf5fd6adad4719d56db281aafea88d874e63772]
#
# patch "packages/gallery/gallery_1.5.5.bb"
# from [08012e9bbaba0586c7721ce8bf77b816de83ebd2]
# to [733e15213ab5e6ec1bd791438af67af63d5ec35c]
#
# patch "packages/glibc/eglibc-package.bbclass"
# from [8f51cdb2c68ef10a8cc444bb9c80b76e1b529a8e]
# to [707f3f7fec8dba48bff09a80fe93f4d753d0ae20]
#
# patch "packages/glibc/glibc-package.bbclass"
# from [87de7a00ded18ae91f844d05b3fb78dd64e0fd7b]
# to [f4791b3fa7f4d093f75d3e760b405eca7feae357]
#
# patch "packages/linux/linux-dht-walnut_2.6.20.bb"
# from [e5816104c0cc5c15e529f5e0d60970d176df3b7c]
# to [032566f5149e9d714c6631ead6e1db18ccb1dc26]
#
# patch "packages/linux/linux-efika_2.6.20.20.bb"
# from [02bf23057848f530f4bb9b387634af8ca51c55f3]
# to [01117a66cc290abe28c789551dafbdaadaf2e6df]
#
# patch "packages/linux/linux-efika_2.6.20.bb"
# from [3d646a13d61ed36e48613a5d62ae4c153c42616e]
# to [26eb3e8b2f654dac6975e04c0e7c078417623da6]
#
# patch "packages/linux/linux-efika_2.6.21+git.bb"
# from [b07652616db0ca693ab942e5d21576b84f04e3e9]
# to [1d96763c1bba903c9753ae5d85530485bea1668d]
#
# patch "packages/linux/linux-magicbox_2.6.18.6.bb"
# from [2863c6191e6edd688014663327d3b35bfd47e9ea]
# to [9929bed5a862613d7d6d47cab1dbbed6605b127d]
#
# patch "packages/linux/linux-magicbox_2.6.19.2.bb"
# from [b03c2ca7543c5914973b54ef5b3ea159fbef77ed]
# to [f40feb36483f15f528a68ff787da7d1a1dc83f38]
#
# patch "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
# from [607a3ec1212c49a8bec07ab6a9220e1868f31e6d]
# to [1627e847f526fa7073747ec037b61f626f96352f]
#
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
# from [9199fb7885a068659ab66b6897c7dcf1f94cf3c4]
# to [5030af659ba81e0fd39cabcfe458111ae1646763]
#
# patch "packages/linux/linux-sequoia_2.6.21.bb"
# from [91ba088cf6b7afc424eda939be7afb1dd6223594]
# to [5dc8ca7fe3e92accabff7e6dc3d9d28540f8839b]
#
# patch "packages/meta/external-toolchain.bb"
# from [32574844f3d4c4554cb6e4193123ab1c001b9046]
# to [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
#
# patch "packages/openmoko2/openmoko-sample2_svn.bb"
# from [8dfb2ad71843cf6a80cb46f17623565dbd5a95fa]
# to [f81b348bfe4ffd0c3a27b9c3042e6e2945ea3971]
#
# patch "packages/qmake/qmake2-native/0001-fix-mkspecs.patch"
# from [922f4e6417cdecfd244c36a59d7ff67bb3e7578c]
# to [d5283fc24b925190ca90f56511934f3fd132ea17]
#
# patch "packages/qmake/qmake2-native.inc"
# from [d941635b01c58764ba76d411ea57f1b33b4d22eb]
# to [d58b0ef825d0f6d7d1a0103da1b2ec0e903de4b2]
#
# patch "packages/qt4/files/0005-fix-mkspecs.patch"
# from [4ac628818045f6790dafb35be445cd3989de25c2]
# to [d5283fc24b925190ca90f56511934f3fd132ea17]
#
# patch "packages/qt4/qt4-x11-free_4.3.3.bb"
# from [b7e59e0489502bdfca8e0b0220da5df284fb0995]
# to [cc8872a380445d2c8344bc46ac50b6ba36513594]
#
# patch "packages/qt4/qt4_arch.inc"
# from [43091f9af06d057e17db4730361caf8d5fc177c6]
# to [66bd102114f50fe3120367af2f65157b737db929]
#
# patch "packages/qt4/qtopia-core_4.2.0.bb"
# from [003bf319b5866af6b727725457754c7f73345f6d]
# to [36b4cc98d0151feaf001a4f9c673771698efee04]
#
# patch "packages/qt4/qtopia-core_4.3.3.bb"
# from [132f2ff144e5483dcf628cf56459ce7b81f52b0f]
# to [79b0ab4f4981a89ecb7eecc8556f7d53c2e6d671]
#
# patch "packages/uicmoc/uicmoc4-native.inc"
# from [00e140a2db2c4a7280faaacf41cf19e10afd1b52]
# to [6886688b3df896b25e7d22c296b444e6c7704bd2]
#
============================================================
--- packages/qmake/qmake2-native/qt-config.patch ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c
+++ packages/qmake/qmake2-native/qt-config.patch ffca4aa5d3ae8c6e3e9c1d699382d3079a770c7c
@@ -0,0 +1,27 @@
+Allow to set a qt.conf from the outside using the environment. This allows
+to inject new prefixes and other paths into qmake. This is needed when using
+the same qmake binary to build qt/x11 and qt/embedded
+
+Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp 2007-12-25 00:55:32.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp 2007-12-25 01:20:18.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include "qpointer.h"
+ #ifdef QT_BUILD_QMAKE
+ extern QString qmake_libraryInfoFile();
++#include <stdlib.h>
+ #else
+ # include "qcoreapplication.h"
+ #endif
+@@ -107,6 +108,10 @@
+ #ifdef QT_BUILD_QMAKE
+ if(!QFile::exists(qtconfig))
+ qtconfig = qmake_libraryInfoFile();
++ if (!QFile::exists(qtconfig)) {
++ QByteArray config = getenv("QT_CONF_PATH");
++ qtconfig = config;
++ }
+ #else
+ if (!QFile::exists(qtconfig) && QCoreApplication::instance()) {
+ #ifdef Q_OS_MAC
============================================================
--- packages/qmake/qmake2-native_2.10a.bb 87d12872c36ccf6797ad38776a929652d95a4850
+++ packages/qmake/qmake2-native_2.10a.bb 87d12872c36ccf6797ad38776a929652d95a4850
@@ -0,0 +1,2 @@
+QTVERSION="4.3.3"
+require ${PN}.inc
============================================================
--- packages/qt4/qt4-x11-free.inc 4999377acbce5c192356f465789adc625e3135f3
+++ packages/qt4/qt4-x11-free.inc 4999377acbce5c192356f465789adc625e3135f3
@@ -0,0 +1,28 @@
+DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "GPL QPL"
+DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
+PROVIDES = "qt4x11"
+PR = "r7"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+ file://0001-cross-compile.patch;patch=1 \
+ file://0003-no-tools.patch;patch=1 \
+ file://0004-no-qmake.patch;patch=1 \
+ file://0005-fix-mkspecs.patch;patch=1"
+S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
+
+
+QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
+QT_BASE_NAME = "qt4"
+QT_BASE_LIB = "libqt"
+QT_LIBRARY_NAME = "Qt"
+QT_DIR_NAME = "qt4"
+require qt_depends.inc
+require qt_configuration.inc
+require qt_packaging.inc
+require qt_staging.inc
+
+inherit qt4x11
============================================================
--- packages/qt4/qt_configuration.inc 5abde732116982782ed3a94ede56bf274012fc1f
+++ packages/qt4/qt_configuration.inc 5abde732116982782ed3a94ede56bf274012fc1f
@@ -0,0 +1,82 @@
+require qt4_arch.inc
+QT_ARCH := "${@qt_arch(d)}"
+QT_ENDIAN = "${@qt_endian(d)}"
+
+QT_CONFIG_FLAGS = "-release -no-cups -no-accessibility -reduce-relocations \
+ -shared -no-nas-sound -no-sm -no-nis \
+ -qt-gif -system-libjpeg -system-libpng -system-zlib \
+ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
+ -no-pch -qdbus -stl -glib"
+
+EXTRA_OEMAKE = "-e"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \
+ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+ AR="${TARGET_PREFIX}ar cqs" \
+ MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"'
+
+export QT_CONF_PATH="${WORKDIR}/qt.conf"
+
+do_configure() {
+ unset QMAKESPEC
+ unset QTDIR
+ ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
+ ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++
+
+ echo "[Paths]" > $QT_CONF_PATH
+ echo "Prefix=${prefix}" >> $QT_CONF_PATH
+ echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Libraries=${libdir}" >> $QT_CONF_PATH
+ echo "Binaries=${bindir}" >> $QT_CONF_PATH
+ echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH
+ echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH
+ echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH
+ echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH
+ echo "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH
+
+ echo yes | ./configure -v \
+ -prefix ${prefix} \
+ -bindir ${bindir} \
+ -libdir ${libdir} \
+ -datadir ${datadir}/${QT_DIR_NAME} \
+ -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \
+ -docdir ${docdir}/${QT_DIR_NAME} \
+ -headerdir ${includedir}/${QT_DIR_NAME} \
+ -plugindir ${libdir}/${QT_DIR_NAME}/plugins \
+ -translationdir ${datadir}/${QT_DIR_NAME}/translations \
+ -examplesdir ${bindir}/${QT_DIR_NAME}/examples \
+ -demosdir ${bindir}/${QT_DIR_NAME}/demos \
+ -platform ${TARGET_OS}-oe-g++ \
+ -xplatform ${TARGET_OS}-oe-g++ \
+ -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \
+ -crossarch ${QT_ARCH} \
+ ${QT_CONFIG_FLAGS} -fast \
+ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \
+ -I${STAGING_INCDIR}/freetype2
+}
+
+do_compile() {
+ unset CFLAGS CXXFLAGS
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
+
+ oe_runmake ${EXTRA_ENV}
+}
+
+#
+# Fixup some pkgconfig files
+# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc
+# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic
+#
+# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl
+#
+do_compile_append() {
+ cd ${S}/lib/pkgconfig
+ sed -i s#"-L${S}/lib"##g *.pc
+ sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc
+ sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc
+}
============================================================
--- packages/qt4/qt_depends.inc 2fd4202201d2ae2c8c52f8b9c4ac142e55516259
+++ packages/qt4/qt_depends.inc 2fd4202201d2ae2c8c52f8b9c4ac142e55516259
@@ -0,0 +1,3 @@
+inherit pkgconfig qmake_base
+
+DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0"
============================================================
--- packages/qt4/qt_packaging.inc 6c277ec158a91be79bb7e6484f8610fdc85e729c
+++ packages/qt4/qt_packaging.inc 6c277ec158a91be79bb7e6484f8610fdc85e729c
@@ -0,0 +1,153 @@
+NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \
+ ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \
+ ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \
+ ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \
+ ${QT_BASE_LIB}dbus4 ${QT_BASE_LIB}opengl4 \
+ ${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \
+ ${QT_BASE_NAME}-designer \
+ ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \
+ ${QT_BASE_NAME}-linguist \
+ ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \
+ ${QT_BASE_NAME}-plugins-accessible \
+ ${QT_BASE_NAME}-plugins-codecs \
+ ${QT_BASE_NAME}-plugins-designer \
+ ${QT_BASE_NAME}-plugins-imageformats \
+ ${QT_BASE_NAME}-plugins-sqldrivers \
+ ${QT_BASE_NAME}-plugins-inputmethods \
+ ${QT_BASE_NAME}-plugins-iconengines \
+ ${QT_BASE_NAME}-fonts "
+
+DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \
+ ${QT_BASE_LIB}gui4-dev \
+ ${QT_BASE_LIB}network4-dev \
+ ${QT_BASE_LIB}sql4-dev \
+ ${QT_BASE_LIB}svg4-dev \
+ ${QT_BASE_LIB}test4-dev \
+ ${QT_BASE_LIB}xml4-dev \
+ ${QT_BASE_LIB}designer4-dev \
+ ${QT_BASE_LIB}designercomponents4-dev \
+ ${QT_BASE_LIB}3support4-dev \%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list