diff options
22 files changed, 427 insertions, 121 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 501eefb50b..608114cb22 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -448,23 +448,33 @@ python base_eventhandler() { from bb.event import Handled, NotHandled, getName import os + messages = {} + messages["Succeeded"] = "completed" + messages["Started"] = "started" + messages["Failed"] = "failed" + name = getName(e) - if name in ["PkgSucceeded"]: - note("package %s: build completed" % e.pkg) - if name in ["PkgStarted"]: - note("package %s: build %s" % (e.pkg, name[3:].lower())) - elif name in ["PkgFailed"]: - error("package %s: build %s" % (e.pkg, name[3:].lower())) - elif name in ["TaskStarted"]: - note("package %s: task %s %s" % (data.expand(data.getVar("PF", e.data), e.data), e.task, name[4:].lower())) - elif name in ["TaskSucceeded"]: - note("package %s: task %s completed" % (data.expand(data.getVar("PF", e.data), e.data), e.task)) - elif name in ["TaskFailed"]: - error("package %s: task %s %s" % (data.expand(data.getVar("PF", e.data), e.data), e.task, name[4:].lower())) - elif name in ["UnsatisfiedDep"]: - note("package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())) - elif name in ["BuildStarted", "BuildCompleted"]: - note("build %s %s" % (e.name, name[5:].lower())) + msg = "" + if name.startswith("Pkg"): + msg += "package %s: " % data.getVar("P", e.data, 1) + msg += messages.get(name[3:]) or name[3:] + elif name.startswith("Task"): + msg += "package %s: task %s: " % (data.getVar("PF", e.data, 1), e.task) + msg += messages.get(name[4:]) or name[4:] + elif name.startswith("Build"): + msg += "build %s: " % e.name + msg += messages.get(name[5:]) or name[5:] + elif name == "UnsatisfiedDep": + msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower()) + note(msg) + if not data in e.__dict__: + return NotHandled + + log = data.getVar("EVENTLOG", e.data, 1) + if log: + logfile = file(log, "a") + logfile.write("%s\n" % msg) + logfile.close() return NotHandled } diff --git a/conf/bitbake.conf b/conf/bitbake.conf index a8c73120fd..5fa8bb0d38 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -239,6 +239,9 @@ export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ # Which flags to leave by strip-flags() in bin/build/oebuild.sh ? ALLOWED_FLAGS = "-O -mcpu -march -pipe" +# Pass parallel make options to the compile task only +EXTRA_OEMAKE_prepend_task_do_compile = "${PARALLEL_MAKE} " + ################################################################## # Optimization flags. ################################################################## diff --git a/conf/local.conf.sample b/conf/local.conf.sample index cb2b367db5..35ec6e8d50 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -97,6 +97,12 @@ IMAGE_FSTYPES = "jffs2 tar" # SELECTED_OPTIMIZATION = "${PROFILE_OPTIMIZATION}" # LDFLAGS =+ "-pg" +# Uncomment this to enable parallel make. +# This allows make to spawn mutliple processes to take advantage of multiple +# processors. Useful on SMP machines. This may break some packages - we're +# in the process of marking these so let us know if you find any. +# PARALLEL_MAKE = "-j 4" + # Uncomment this if you want BitBake to emit the log if a build fails. BBINCLUDELOGS = "yes" diff --git a/packages/gettext/gettext_0.14.1.bb b/packages/gettext/gettext_0.14.1.bb index e69de29bb2..9e2222aa0e 100644 --- a/packages/gettext/gettext_0.14.1.bb +++ b/packages/gettext/gettext_0.14.1.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "The GNU internationalization library." +HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" +SECTION = "libs" +LICENSE = "GPL" +PR = "r3" +PROVIDES = "virtual/libintl" + +SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ + file://gettext-vpath.patch;patch=1;pnum=1 \ + file://fixchicken.patch;patch=1;pnum=1" + +PARALLEL_MAKE = "" + +inherit autotools + +EXTRA_OECONF += "--without-lisp" +acpaths = '-I ${S}/autoconf-lib-link/m4/ \ + -I ${S}/gettext-runtime/m4 \ + -I ${S}/gettext-tools/m4' + +do_configure_prepend() { + rm -f ${S}/config/m4/libtool.m4 + install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/ +} + +do_stage () { + autotools_stage_includes + oe_libinstall -so -C gettext-tools/lib libgettextlib ${STAGING_LIBDIR}/ + oe_libinstall -so -C gettext-tools/src libgettextpo ${STAGING_LIBDIR}/ + oe_libinstall -so -C gettext-tools/src libgettextsrc ${STAGING_LIBDIR}/ + oe_libinstall -so -C gettext-tools/intl libintl ${STAGING_LIBDIR}/ + oe_libinstall -so -C gettext-runtime/lib libasprintf ${STAGING_LIBDIR}/ +} diff --git a/packages/libopie/libopie2_1.1.8.bb b/packages/libopie/libopie2_1.1.8.bb index f48ef36f2e..a4d0ed203a 100644 --- a/packages/libopie/libopie2_1.1.8.bb +++ b/packages/libopie/libopie2_1.1.8.bb @@ -15,6 +15,8 @@ S = "${WORKDIR}/libopie2" inherit opie +PARALLEL_MAKE = "" + #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 1e59ed4e4f..bb2623bbab 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -15,6 +15,8 @@ S = "${WORKDIR}/libopie2" inherit opie +PARALLEL_MAKE = "" + #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ diff --git a/packages/openswan/openswan_2.2.0.bb b/packages/openswan/openswan_2.2.0.bb index c7822863cd..110cc12b6e 100644 --- a/packages/openswan/openswan_2.2.0.bb +++ b/packages/openswan/openswan_2.2.0.bb @@ -13,6 +13,7 @@ SRC_URI = "http://www.openswan.org/code/openswan-${PV}.tar.gz \ file://openswan-2.2.0-gentoo.patch;patch=1" S = "${WORKDIR}/openswan-${PV}" +PARALLEL_MAKE = "" EXTRA_OEMAKE = "DESTDIR=${D} \ USERCOMPILE="${CFLAGS}" \ FINALCONFDIR=${sysconfdir}/ipsec \ diff --git a/packages/opie-networksettings/opie-networksettings_1.1.8.bb b/packages/opie-networksettings/opie-networksettings_1.1.8.bb index e69de29bb2..3d0f34dbb7 100644 --- a/packages/opie-networksettings/opie-networksettings_1.1.8.bb +++ b/packages/opie-networksettings/opie-networksettings_1.1.8.bb @@ -0,0 +1,51 @@ +DESCRIPTION = "Opie Network Settings" +SECTION = "opie/settings" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin" +APPNAME = "networksettings" +PR = "r0" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/root" +S = "${WORKDIR}/${APPNAME}" + +inherit opie + +PARALLEL_MAKE = "" + +EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}" + +do_install() { + # Create dir for changedns and the opie-kppp peer + install -d ${D}/${bindir}/ + install -d ${D}/${sysconfdir}/ + install -d ${D}/${sysconfdir}/ppp/ + install -d ${D}/${sysconfdir}/ppp/peers/ + + install -d ${D}/${palmtopdir}/pics/${APPNAME}/ + install -d ${D}/${palmtopdir}/pics/Network/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/ + install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/ + install -d ${D}/${palmtopdir}/lib/ + oe_libinstall -so libinterfaces ${D}${palmtopdir}/lib + install -d ${D}/${palmtopdir}/plugins/networksettings/ + for plugin in kppp wlan + do + install lib$plugin.so ${D}/${palmtopdir}/plugins/networksettings/ + done + + # install changedns script + install -m 0755 ${WORKDIR}/root/usr/bin/changedns ${D}${bindir}/ + install -m 0644 ${WORKDIR}/root/etc/ppp/peers/opie-kppp ${D}${sysconfdir}/ppp/peers +} + +PACKAGES =+ "opie-networksettings-pppplugin opie-networksettings-wlanplugin" +FILES_${PN} += " ${bindir}/changedns " +FILES_opie-networksettings-pppplugin = "${palmtopdir}/plugins/networksettings/libkppp.so ${sysconfdir}/ppp/peers/opie-kppp" +FILES_opie-networksettings-wlanplugin = "${palmtopdir}/plugins/networksettings/libwlan.so" + diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb index f2ce6400fc..0b60290b45 100644 --- a/packages/opie-networksettings/opie-networksettings_cvs.bb +++ b/packages/opie-networksettings/opie-networksettings_cvs.bb @@ -16,6 +16,8 @@ S = "${WORKDIR}/${APPNAME}" inherit opie +PARALLEL_MAKE = "" + EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}" do_install() { diff --git a/packages/qte/qte-2.3.9-snapshot/beagle.patch b/packages/qte/qte-2.3.9-snapshot/beagle.patch index e69de29bb2..eeb31c3b98 100644 --- a/packages/qte/qte-2.3.9-snapshot/beagle.patch +++ b/packages/qte/qte-2.3.9-snapshot/beagle.patch @@ -0,0 +1,32 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~beagle ++++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp +@@ -138,7 +138,7 @@ + #include <asm/sharp_char.h> + #endif + +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) ++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_BEAGLE) + #define QT_QWS_AUTOREPEAT_MANUALLY + #endif + +@@ -492,9 +492,15 @@ + #endif + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 90 ++#ifdef QT_QWS_BEAGLE ++ { Qt::Key_F13, 0xffff , 0xffff , 0xffff }, // lightning ++ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // Wheel Up ++ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // Wheel Down ++#else + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, ++#endif + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, + { Qt::Key_Enter, 13 , 13 , 0xffff }, diff --git a/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch b/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch index b9a1011c13..5527ab4a88 100644 --- a/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch +++ b/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch @@ -3,8 +3,8 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- qt-2.3.9-snapshot-20050101/src/kernel/qwindowsystem_qws.cpp~c700-hardware.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qwindowsystem_qws.cpp +--- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~c700-hardware ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp @@ -178,7 +178,7 @@ static QRect maxwindow_rect; extern Q_EXPORT QRect qt_maxWindowRect; @@ -23,9 +23,9 @@ d->screensavertimer->stop(); #else if ( screensaverinterval ) { ---- qt-2.3.9-snapshot-20050101/src/kernel/qwsmouse_qws.cpp~c700-hardware.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qwsmouse_qws.cpp -@@ -95,6 +95,19 @@ +--- qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp~c700-hardware ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp +@@ -87,6 +87,19 @@ #define QT_QWS_TP_PRESSURE_THRESHOLD 500 #define QT_QWS_TP_MOVE_LIMIT 50 #define QT_QWS_TP_JITTER_LIMIT 2 @@ -45,7 +45,7 @@ #endif #ifndef QT_QWS_TP_SAMPLE_SIZE -@@ -600,7 +613,7 @@ +@@ -592,7 +605,7 @@ sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); notify(fd); } @@ -54,21 +54,16 @@ char fn[] = "/dev/ttyS?"; for (int ch='0'; ch<='3'; ch++) { fn[9] = ch; -@@ -1493,11 +1506,11 @@ - - - QTPanelHandlerPrivate::QTPanelHandlerPrivate( MouseProtocol, QString dev ) -- : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), -+ : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), +@@ -1274,7 +1287,7 @@ numSamples(0), skipCount(0) { Q_UNUSED(dev); -#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700 ) ++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) #if defined(QT_QWS_IPAQ) # ifdef QT_QWS_IPAQ_RAW if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1507,7 +1520,7 @@ +@@ -1284,7 +1297,7 @@ qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); return; } @@ -77,7 +72,7 @@ //# ifdef QT_QWS_SL5XXX_TSRAW # if 0 if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1533,7 +1546,7 @@ +@@ -1310,7 +1323,7 @@ QTPanelHandlerPrivate::~QTPanelHandlerPrivate() { @@ -86,7 +81,7 @@ if (mouseFD >= 0) close(mouseFD); #endif -@@ -1541,7 +1554,7 @@ +@@ -1318,7 +1331,7 @@ void QTPanelHandlerPrivate::readMouseData() { @@ -95,7 +90,7 @@ if(!qt_screen) return; -@@ -1560,7 +1573,7 @@ +@@ -1337,7 +1350,7 @@ uchar *mb = mouseBuf+idx; data = (TS_EVENT *) mb; if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) { @@ -104,32 +99,8 @@ samples[currSample] = QPoint( 1000 - data->x, data->y ); #else samples[currSample] = QPoint( data->x, data->y ); -@@ -1574,12 +1587,12 @@ - mousePos = QPoint( 0, 0 ); - QPoint totalMousePos = oldTotalMousePos; - totalMousePos += samples[currSample]; -- if(numSamples >= samples.count()) -+ if(numSamples >= samples.count()) - totalMousePos -= samples[lastSample]; - - mousePos = totalMousePos / (sampleCount - 1); - --# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) -+# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) || defined(QT_QWS_SLC700_RAW) - mousePos = transform( mousePos ); - # endif - if(!waspressed) -@@ -1604,7 +1617,7 @@ - - // save recuring information - currSample++; -- if (numSamples >= samples.count()) -+ if (numSamples >= samples.count()) - lastSample++; - oldTotalMousePos = totalMousePos; - } else { -@@ -1963,7 +1976,7 @@ - handler = new QTSLibHandler(); +@@ -1997,7 +2010,7 @@ + handler = new QTSLibHandlerPrivate(); #elif defined(QT_QWS_YOPY) handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); -#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) diff --git a/packages/qte/qte-2.3.9-snapshot/devfs.patch b/packages/qte/qte-2.3.9-snapshot/devfs.patch index e69de29bb2..27ea4239c7 100644 --- a/packages/qte/qte-2.3.9-snapshot/devfs.patch +++ b/packages/qte/qte-2.3.9-snapshot/devfs.patch @@ -0,0 +1,163 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.9-snapshot-20050114/configure~devfs ++++ qt-2.3.9-snapshot-20050114/configure +@@ -412,6 +412,9 @@ + -visibility-hidden) + VISIBILITY=YES + ;; ++ -devfs) ++ DEVFS=yes ++ ;; + -no-g++-exceptions) + GPLUSPLUS_EXCEPTIONS=no + ;; +@@ -1302,6 +1305,8 @@ + -visibility-hidden . Use -fvisibility=hidden as default. This requires GCC 4.0 + or a special patched GCC to support the visibility attribute + ++ -devfs ............. Use devfs /dev paths. ++ + -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ + compiler by using the -fno-exceptions flag. + +@@ -1374,6 +1379,10 @@ + then + QT_CXX="${QT_CXX} -DGCC_SUPPORTS_VISIBILITY -fvisibility=hidden" + fi ++if [ "x$DEVFS" = "xyes" ] ++then ++ QT_CXX="${QT_CXX} -DQT_QWS_DEVFS" ++fi + if [ "x$THREAD" = "xyes" ] + then + cat >src-mt.mk <<EOF +--- qt-2.3.9-snapshot-20050114/src/kernel/qgfxlinuxfb_qws.cpp~devfs ++++ qt-2.3.9-snapshot-20050114/src/kernel/qgfxlinuxfb_qws.cpp +@@ -101,11 +101,19 @@ + bool QLinuxFbScreen::connect( const QString &displaySpec ) + { + // Check for explicitly specified device ++#ifdef QT_QWS_DEVFS ++ QRegExp r( "/dev/fb/[0-9]+" ); ++#else + QRegExp r( "/dev/fb[0-9]+" ); ++#endif + int len; + int m = r.match( displaySpec, 0, &len ); + ++#ifdef QT_QWS_DEVFS ++ QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb/0"); ++#else + QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb0"); ++#endif + + fd=open( dev.latin1(), O_RDWR ); + if (fd<0) { +@@ -121,14 +129,22 @@ + + /* Get fixed screen information */ + if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { ++#ifdef QT_QWS_DEVFS ++ perror("reading /dev/fb/0"); ++#else + perror("reading /dev/fb0"); ++#endif + qWarning("Error reading fixed information"); + return FALSE; + } + + /* Get variable screen information */ + if (ioctl(fd, FBIOGET_VSCREENINFO, &vinfo)) { ++#ifdef QT_QWS_DEVFS ++ perror("reading /dev/fb/0"); ++#else + perror("reading /dev/fb0"); ++#endif + qWarning("Error reading variable information"); + return FALSE; + } +@@ -165,7 +181,11 @@ + data += dataoffset; + + if ((int)data == -1) { +- perror("mapping /dev/fb0"); ++#ifdef QT_QWS_DEVFS ++ perror("reading /dev/fb/0"); ++#else ++ perror("reading /dev/fb0"); ++#endif + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; + } +@@ -229,7 +249,11 @@ + + static void writeTerm(const char* termctl, int sizeof_termctl) + { ++#ifdef QT_QWS_DEVFS ++ const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0}; ++#else + const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0}; ++#endif + const char** dev=tt; + while (*dev) { + int tty=::open(*dev,O_WRONLY); +@@ -792,7 +816,11 @@ + fb_var_screeninfo vinfo; + + if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { ++#ifdef QT_QWS_DEVFS ++ perror("reading /dev/fb/0"); ++#else + perror("reading /dev/fb0"); ++#endif + qFatal("Error reading fixed information"); + } + +--- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~devfs ++++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp +@@ -1192,7 +1192,11 @@ + + QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) + { ++#ifdef QT_QWS_DEVFS ++ kbdFD=open(device.isEmpty() ? "/dev/vc/1" : device.latin1(), O_RDWR | O_NDELAY, 0); ++#else + kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); ++#endif + + if ( kbdFD >= 0 ) { + QSocketNotifier *notifier; +--- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~devfs ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp +@@ -836,7 +836,11 @@ + void openDevice() + { + if ( !sn ) { ++#ifdef QT_QWS_DEVFS ++ int fd = ::open("/dev/sound/dsp",O_RDWR); ++#else + int fd = ::open("/dev/dsp",O_RDWR); ++#endif + if ( fd < 0 ) { + // For debugging purposes - defined QT_NO_SOUND if you + // don't have sound hardware! +--- qt-2.3.9-snapshot-20050114/src/kernel/qsoundqss_qws.cpp~devfs ++++ qt-2.3.9-snapshot-20050114/src/kernel/qsoundqss_qws.cpp +@@ -1088,7 +1088,12 @@ + // Don't block open right away. + // + bool openOkay = false; +- if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) { ++#ifdef QT_QWS_DEVFS ++ if ((fd = ::open("/dev/sound/dsp", O_WRONLY|O_NONBLOCK)) != -1) ++#else ++ if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) ++#endif ++ { + int flags = fcntl(fd, F_GETFL); + flags &= ~O_NONBLOCK; + openOkay = (fcntl(fd, F_SETFL, flags) == 0); diff --git a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch b/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch index e69de29bb2..0fabd78fac 100644 --- a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch +++ b/packages/qte/qte-2.3.9-snapshot/kernel-keymap-corgi.patch @@ -0,0 +1,23 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~kernel-keymap-corgi ++++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp +@@ -410,6 +410,15 @@ + { 0x20ac, 0xffff , 0x20ac , 0x20ac }, // 73 Euro sign + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 74 + { Qt::Key_F32, 0xffff , 0xffff , 0xffff }, // 75 Sync ++ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 76 ++ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 77 ++ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 78 ++ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 79 ++ { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 7a ++ { Qt::Key_Return, 0xffff , 0xffff , 0xffff }, // 7b ++ { Qt::Key_Escape, 0xffff , 0xffff , 0xffff }, // 7c ++ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 7d ++ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 7e + { 0, 0xffff , 0xffff , 0xffff } + }; + #else diff --git a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch b/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch index 09cbcc4938..ca445f4d1d 100644 --- a/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch +++ b/packages/qte/qte-2.3.9-snapshot/kernel-keymap-tosa.patch @@ -3,9 +3,9 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- qt-2.3.9-snapshot-20050101/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa.patch -+++ qt-2.3.9-snapshot-20050101/src/kernel/qkeyboard_qws.cpp -@@ -301,14 +301,24 @@ +--- qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp~kernel-keymap-tosa ++++ qt-2.3.9-snapshot-20050114/src/kernel/qkeyboard_qws.cpp +@@ -355,14 +355,24 @@ { Qt::Key_CapsLock, 0xffff , 0xffff , 0xffff }, // 3c 60 { Qt::Key_At, '@' , 's' , 'S'-64 }, // 3d { Qt::Key_Question, '?' , '?' , 0xffff }, // 3e @@ -30,7 +30,7 @@ { Qt::Key_Semicolon, ';' , ';' , 0xffff }, // 47 { Qt::Key_QuoteDbl, '\"' , '\"' , 0xffff }, // 48 { Qt::Key_Colon, ':' , ':' , 0xffff }, // 49 -@@ -518,6 +528,32 @@ +@@ -572,6 +582,32 @@ static const int keyMSize = sizeof(keyM)/sizeof(QWSServer::KeyMap)-1; static QIntDict<QWSServer::KeyMap> *overrideMap = 0; @@ -63,7 +63,7 @@ /*! Changes the mapping of the keyboard; adding the scancode to Unicode mappings from \a map. The server takes over ownership of \a map -@@ -828,6 +864,15 @@ +@@ -882,6 +918,15 @@ int keypad = 0; #ifndef QT_QWS_USE_KEYCODES diff --git a/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch b/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch index 449b5ae9ca..ccdebb0c40 100644 --- a/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch +++ b/packages/qte/qte-2.3.9-snapshot/qt-visibility.patch @@ -3,11 +3,11 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- qt-2.3.9-snapshot-20041212/configure~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/configure +--- qt-2.3.9-snapshot-20050114/configure~qt-visibility ++++ qt-2.3.9-snapshot-20050114/configure @@ -409,6 +409,9 @@ -tslib) - TSLIB=YES + TSLIB=yes ;; + -visibility-hidden) + VISIBILITY=YES @@ -16,8 +16,8 @@ GPLUSPLUS_EXCEPTIONS=no ;; @@ -1296,6 +1299,9 @@ - -tslib ............. Use the TSLib (touchscreen access library) mouse handler - by default, instead of the normal device default. + -tslib ............. Enable TSlib (touchscreen library) mouse handler. + See http://arm.linux.org.uk + -visibility-hidden . Use -fvisibility=hidden as default. This requires GCC 4.0 + or a special patched GCC to support the visibility attribute @@ -25,21 +25,20 @@ -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ compiler by using the -fno-exceptions flag. -@@ -1366,6 +1372,11 @@ +@@ -1364,6 +1370,10 @@ + QT_CXX="${QT_CXX} -DQT_QWS_TSLIB" QT_LIBS="${QT_LIBS} -lts" fi - +if [ "x$VISIBILITY=" = "xyes" ] +then + QT_CXX="${QT_CXX} -DGCC_SUPPORTS_VISIBILITY -fvisibility=hidden" +fi -+ if [ "x$THREAD" = "xyes" ] then cat >src-mt.mk <<EOF ---- qt-2.3.9-snapshot-20041212/src/tools/qglobal.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/tools/qglobal.h -@@ -504,6 +504,12 @@ +--- qt-2.3.9-snapshot-20050114/src/tools/qglobal.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/tools/qglobal.h +@@ -503,6 +503,12 @@ #undef QT_DLL #endif @@ -52,8 +51,8 @@ #ifndef Q_EXPORT #define Q_EXPORT #endif ---- qt-2.3.9-snapshot-20041212/src/widgets/qscrollview.cpp~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/widgets/qscrollview.cpp +--- qt-2.3.9-snapshot-20050114/src/widgets/qscrollview.cpp~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/widgets/qscrollview.cpp @@ -696,7 +696,7 @@ The surrounding environment (or application, if there is no environment, may set this. Requires Qt >= 2.3.8. @@ -63,8 +62,8 @@ /*! Updates scrollbars - all possibilities considered. You should never ---- qt-2.3.9-snapshot-20041212/src/Makefile.in~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/Makefile.in +--- qt-2.3.9-snapshot-20050114/src/Makefile.in~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/Makefile.in @@ -641,7 +641,7 @@ network/qsocket.h \ network/qsocketdevice.h @@ -74,8 +73,8 @@ $(MOC) -o allmoc.cpp allmoc.h perl -pi -e 's{"allmoc.h"}{"kernel/qt.h"}' allmoc.cpp rm allmoc.h ---- qt-2.3.9-snapshot-20041212/src/kernel/qcopchannel_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qcopchannel_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qcopchannel_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qcopchannel_qws.h @@ -42,7 +42,7 @@ class QCopChannelPrivate; class QWSClient; @@ -85,8 +84,8 @@ { Q_OBJECT public: ---- qt-2.3.9-snapshot-20041212/src/kernel/qfontmanager_qws.cpp~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qfontmanager_qws.cpp +--- qt-2.3.9-snapshot-20050114/src/kernel/qfontmanager_qws.cpp~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qfontmanager_qws.cpp @@ -68,7 +68,7 @@ return r; } @@ -96,8 +95,8 @@ /*! \class QFontManager qfontmanager_qws.h ---- qt-2.3.9-snapshot-20041212/src/kernel/qgfx_qws.cpp~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qgfx_qws.cpp +--- qt-2.3.9-snapshot-20050114/src/kernel/qgfx_qws.cpp~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qgfx_qws.cpp @@ -38,10 +38,10 @@ #include <stdlib.h> @@ -112,8 +111,8 @@ extern bool qws_screen_is_interlaced; //### hack, from qapplication_qws.cpp ---- qt-2.3.9-snapshot-20041212/src/kernel/qwindowsystem_qws.cpp~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwindowsystem_qws.cpp +--- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp @@ -89,7 +89,7 @@ extern void qt_setMaxWindowRect(const QRect& r); @@ -123,8 +122,8 @@ #define MOUSE 0 #define KEY 1 ---- qt-2.3.9-snapshot-20041212/src/kernel/qwsdecoration_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsdecoration_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwsdecoration_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwsdecoration_qws.h @@ -41,7 +41,7 @@ /* Implements decoration styles @@ -134,8 +133,8 @@ { public: QWSDecoration() {} ---- qt-2.3.9-snapshot-20041212/src/kernel/qwindowsystem_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwindowsystem_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.h @@ -67,7 +67,7 @@ struct QWSWindowData; @@ -193,8 +192,8 @@ { Q_OBJECT public: ---- qt-2.3.9-snapshot-20041212/src/kernel/qwsdefaultdecoration_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsdefaultdecoration_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwsdefaultdecoration_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwsdefaultdecoration_qws.h @@ -44,7 +44,7 @@ @@ -204,8 +203,8 @@ { public: QWSDefaultDecoration(); ---- qt-2.3.9-snapshot-20041212/src/kernel/qwscommand_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwscommand_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwscommand_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwscommand_qws.h @@ -47,8 +47,8 @@ * *********************************************************************/ @@ -226,8 +225,8 @@ { // ctor - dtor QWSProtocolItem( int t, int len, char *ptr ) : type( t ), ---- qt-2.3.9-snapshot-20041212/src/kernel/qfont_qws.cpp~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qfont_qws.cpp +--- qt-2.3.9-snapshot-20050114/src/kernel/qfont_qws.cpp~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qfont_qws.cpp @@ -152,7 +152,7 @@ static QFontCache *fontCache = 0; // cache of loaded fonts static QFontDict *fontDict = 0; // dict of all loaded fonts @@ -237,8 +236,8 @@ { QFontDictIt it( *fontDict ); while ( it.current() ) { ---- qt-2.3.9-snapshot-20041212/src/kernel/qwscursor_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwscursor_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwscursor_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwscursor_qws.h @@ -37,7 +37,7 @@ #include <qimage.h> #endif // QT_H @@ -248,8 +247,8 @@ { public: QWSCursor() {} ---- qt-2.3.9-snapshot-20041212/src/kernel/qwsevent_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsevent_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwsevent_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwsevent_qws.h @@ -40,7 +40,7 @@ struct QWSMouseEvent; @@ -394,8 +393,8 @@ QWSIMEvent() : QWSEvent( IMEvent, sizeof( simpleData ), (char*)&simpleData ) { } ---- qt-2.3.9-snapshot-20041212/src/kernel/qwsmanager_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsmanager_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwsmanager_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmanager_qws.h @@ -48,7 +48,7 @@ class QWSButton; class QWSManager; @@ -405,8 +404,8 @@ { Q_OBJECT ---- qt-2.3.9-snapshot-20041212/src/kernel/qwsmouse_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsmouse_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.h @@ -38,7 +38,7 @@ #include <qpointarray.h> #endif // QT_H @@ -425,8 +424,8 @@ Q_OBJECT public: QWSMouseHandler(); ---- qt-2.3.9-snapshot-20041212/src/kernel/qwsproperty_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qwsproperty_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qwsproperty_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwsproperty_qws.h @@ -47,7 +47,7 @@ class QWSPropertyManagerData; @@ -436,8 +435,8 @@ { public: enum Mode { ---- qt-2.3.9-snapshot-20041212/src/kernel/qlayoutengine.cpp~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041212/src/kernel/qlayoutengine.cpp +--- qt-2.3.9-snapshot-20050114/src/kernel/qlayoutengine.cpp~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qlayoutengine.cpp @@ -70,7 +70,7 @@ pos and space give the interval (relative to parentWidget topLeft.) */ @@ -447,8 +446,8 @@ int space, int spacer ) { typedef int fixed; ---- qt-2.3.9-snapshot-20041229/src/kernel/qfontmanager_qws.h~qt-visibility.patch -+++ qt-2.3.9-snapshot-20041229/src/kernel/qfontmanager_qws.h +--- qt-2.3.9-snapshot-20050114/src/kernel/qfontmanager_qws.h~qt-visibility ++++ qt-2.3.9-snapshot-20050114/src/kernel/qfontmanager_qws.h @@ -84,7 +84,7 @@ // e.g. Truetype Times, 10 point. There's only one of these though; // we want to share generated glyphs diff --git a/packages/qte/qte-2.3.9-snapshot/tslib.patch b/packages/qte/qte-2.3.9-snapshot/tslib.patch index e69de29bb2..fdbb5d868f 100644 --- a/packages/qte/qte-2.3.9-snapshot/tslib.patch +++ b/packages/qte/qte-2.3.9-snapshot/tslib.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp~tslib ++++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp +@@ -1836,8 +1836,8 @@ + * we're in raw mode and do some easy median + * search. + */ +- // if ( m_raw ) +- // return interpolateSample(); ++ if ( m_raw ) ++ return interpolateSample(); + + static struct ts_sample sample; + static int ret; diff --git a/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb b/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb deleted file mode 100644 index bc6292b45c..0000000000 --- a/packages/qte/qte-for-opie_2.3.9-snapshot-20050103.bb +++ /dev/null @@ -1,9 +0,0 @@ -SECTION = "opie/base" -include qte_2.3.9-snapshot.bb - -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-2.3.9-snapshot" - -DESCRIPTION = "Qt/Embedded w/ Opie Patches version ${PV}" - -SRC_URI += "file://opie.patch;patch=1 \ - file://qiconview-speed.patch;patch=1 " diff --git a/packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch b/packages/qte/qte-for-opie_2.3.9-snapshot-20050114.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qte-2.3.9-snapshot/fix-mouse-release.patch +++ b/packages/qte/qte-for-opie_2.3.9-snapshot-20050114.bb diff --git a/packages/qte/qte_2.3.9-snapshot.bb b/packages/qte/qte_2.3.9-snapshot.bb index cc02168b91..f40de2be37 100644 --- a/packages/qte/qte_2.3.9-snapshot.bb +++ b/packages/qte/qte_2.3.9-snapshot.bb @@ -18,7 +18,6 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/snapshots/qt-embedded-${PV}.tar.gz \ file://encoding.patch;patch=1 \ file://fix-qgfxraster.patch;patch=1 \ file://qt-visibility.patch;patch=1 \ - file://fix-mouse-release.patch;patch=1 \ file://update-qtfontdir \ file://sharp_char.h \ file://switches.h " diff --git a/packages/uicmoc/uicmoc-native-2.3.7/fix-makefile.patch b/packages/uicmoc/uicmoc-native-2.3.9-snapshot-20050114/fix-makefile.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc-native-2.3.7/fix-makefile.patch +++ b/packages/uicmoc/uicmoc-native-2.3.9-snapshot-20050114/fix-makefile.patch diff --git a/packages/uicmoc/uicmoc-native-2.3.7/gcc3_4.patch b/packages/uicmoc/uicmoc-native-2.3.9-snapshot-20050114/gcc3_4.patch index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc-native-2.3.7/gcc3_4.patch +++ b/packages/uicmoc/uicmoc-native-2.3.9-snapshot-20050114/gcc3_4.patch diff --git a/packages/uicmoc/uicmoc-native_2.3.7.bb b/packages/uicmoc/uicmoc-native_2.3.9-snapshot-20050114.bb index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc-native_2.3.7.bb +++ b/packages/uicmoc/uicmoc-native_2.3.9-snapshot-20050114.bb |