diff options
author | Koen Kooi <koen@openembedded.org> | 2007-01-13 13:07:55 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2007-01-13 13:07:55 +0000 |
commit | 8b2b49338648be69c6cefb68358e934101cd489f (patch) | |
tree | 998fa71312ad58ef3e42383a7bf2447448daebc1 /packages | |
parent | 523046e1f5dfe45d8f88c589254e300ea3c891e8 (diff) | |
parent | 81ee85ebd08f54a51f746e23ef88f8c59d074470 (diff) |
merge of '91b2ffc800916b90a5871806e605e65d6b2806d2'
and 'af92592c9cfb22c3fe7c7dc2280bb03043a3a22f'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/esound/esound-gpe_20070109.bb | 2 | ||||
-rw-r--r-- | packages/flac/flac_1.1.2.bb | 3 | ||||
-rw-r--r-- | packages/qte/qte-2.3.10/c700-hardware.patch | 83 | ||||
-rw-r--r-- | packages/qte/qte-2.3.10/simpad.patch | 60 | ||||
-rw-r--r-- | packages/qte/qte-common_2.3.10.inc | 6 | ||||
-rw-r--r-- | packages/qte/qte-mt_2.3.10.bb | 2 | ||||
-rw-r--r-- | packages/qte/qte_2.3.10.bb | 2 |
7 files changed, 9 insertions, 149 deletions
diff --git a/packages/esound/esound-gpe_20070109.bb b/packages/esound/esound-gpe_20070109.bb index 790462f5e8..0cf1e5bc23 100644 --- a/packages/esound/esound-gpe_20070109.bb +++ b/packages/esound/esound-gpe_20070109.bb @@ -7,7 +7,7 @@ PROVIDES += "esound" RPROVIDES += "esound" SRCDATE = "${PV}" -SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk;module=extra/esound;rev=8935 \ +SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=esound;rev=8935 \ file://audiofile-please.patch;patch=1 \ file://configure.patch;patch=1" diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb index cdd96bbf2d..85ffc9beb9 100644 --- a/packages/flac/flac_1.1.2.bb +++ b/packages/flac/flac_1.1.2.bb @@ -31,6 +31,9 @@ do_configure () { install -d ${S}/m4 install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ autotools_do_configure + # removes '-read-only-relocs' which is enabled for PowerPC builds. + # It makes the build fail, other archs are not affected. Fixes #1775. + sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile } do_stage () { diff --git a/packages/qte/qte-2.3.10/c700-hardware.patch b/packages/qte/qte-2.3.10/c700-hardware.patch index 5527ab4a88..fa4bd25f37 100644 --- a/packages/qte/qte-2.3.10/c700-hardware.patch +++ b/packages/qte/qte-2.3.10/c700-hardware.patch @@ -3,26 +3,6 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- 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; - static const char *defaultMouse = --#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) -+#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) - "TPanel" - #elif defined(QT_KEYPAD_MODE) - "None" -@@ -3308,7 +3308,7 @@ - void QWSServer::screenSaverSleep() - { - qt_screen->blank(TRUE); --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLC700) - d->screensavertimer->stop(); - #else - if ( screensaverinterval ) { --- 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 @@ @@ -45,66 +25,3 @@ #endif #ifndef QT_QWS_TP_SAMPLE_SIZE -@@ -592,7 +605,7 @@ - sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); - notify(fd); - } --#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) - char fn[] = "/dev/ttyS?"; - for (int ch='0'; ch<='3'; ch++) { - fn[9] = ch; -@@ -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) - # ifdef QT_QWS_IPAQ_RAW - if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1284,7 +1297,7 @@ - qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); - return; - } --#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - //# ifdef QT_QWS_SL5XXX_TSRAW - # if 0 - if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1310,7 +1323,7 @@ - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#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 (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1318,7 +1331,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#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(!qt_screen) - return; - -@@ -1337,7 +1350,7 @@ - uchar *mb = mouseBuf+idx; - data = (TS_EVENT *) mb; - if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) { --#ifdef QT_QWS_SL5XXX -+#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - samples[currSample] = QPoint( 1000 - data->x, data->y ); - #else - samples[currSample] = QPoint( data->x, data->y ); -@@ -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) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/packages/qte/qte-2.3.10/simpad.patch b/packages/qte/qte-2.3.10/simpad.patch index bdca2e79a0..8a728ef74a 100644 --- a/packages/qte/qte-2.3.10/simpad.patch +++ b/packages/qte/qte-2.3.10/simpad.patch @@ -74,39 +74,6 @@ #ifdef QT_QWS_SL5XXX #include <asm/sharp_char.h> #endif -@@ -165,9 +220,9 @@ - current = 0; - } - -- void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d; -+ void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d; - if ( p > 0 ) repeatperiod=p;} -- void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay; -+ void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay; - if (p) *p=repeatperiod; } - - void stop() -@@ -551,9 +606,9 @@ - - void doKey(uchar scancode); - -- -+ - void restoreLeds(); -- -+ - private: - bool shift; - bool alt; -@@ -809,7 +864,7 @@ - - #if !defined(QT_QWS_SL5XXX) - if (code == 224 --#if defined(QT_QWS_IPAQ) -+#if defined(QT_QWS_IPAQ) - && !ipaq_return_pressed - #endif - ) { @@ -1775,9 +1830,11 @@ } else { type = spec; @@ -371,30 +338,3 @@ #endif QSocketNotifier *mouseNotifier; -@@ -1323,7 +1330,7 @@ - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#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) || defined(QT_QWS_SIMPAD) - if (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1331,7 +1338,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#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) || defined(QT_QWS_SIMPAD) - if(!qt_screen) - return; - -@@ -2013,7 +2020,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) || defined(QT_QWS_SLC700) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 247b428a4e..29b94db2b1 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -104,8 +104,8 @@ EXTRA_OEMAKE = "-e" # add device flags here # EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" -EXTRA_DEFINES_a780 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX" -EXTRA_DEFINES_e680 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX" +EXTRA_DEFINES_a780 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_e680 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h1910 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h1940 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h2200 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" @@ -135,7 +135,7 @@ EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_ EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" +EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SL6000" EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" # diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 4db61bb646..5548007e42 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r7" +PR = "r8" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index c789358f2a..44db311bff 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r47" +PR = "r48" |