Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/02 03:11:17+01:00 vanille.de!mickeyl
Merge bk://oe-devel.bkbits.net/openembedded
into allanon.vanille.de:/local/pkg/oe/packages

2005/01/02 03:11:06+01:00 vanille.de!mickeyl
upgrade qte 2.3.9 snap to today and refresh the patches

2005/01/02 03:00:21+01:00 handhelds.org!CoreDump
ipkg-collateral: Add tosa destinations

BKrev: 41d75f0aGaBGLbG1pd8eoUFPe9eYXg

1 files changed, 139 insertions, 0 deletions

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 e69de29bb2..b9a1011c13 100644
--- a/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch
+++ b/packages/qte/qte-2.3.9-snapshot/c700-hardware.patch
@@ -0,0 +1,139 @@
+
+#
+# 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
+@@ -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-20050101/src/kernel/qwsmouse_qws.cpp~c700-hardware.patch
++++ qt-2.3.9-snapshot-20050101/src/kernel/qwsmouse_qws.cpp
+@@ -95,6 +95,19 @@
+ #define QT_QWS_TP_PRESSURE_THRESHOLD 500
+ #define QT_QWS_TP_MOVE_LIMIT 50
+ #define QT_QWS_TP_JITTER_LIMIT 2
++#elif defined(QT_QWS_SLC700)
++#define QT_QWS_SLC700_RAW
++typedef struct {
++       unsigned short pressure;
++       unsigned short x;
++       unsigned short y;
++      unsigned short millisecs;
++} TS_EVENT;
++#define QT_QWS_TP_SAMPLE_SIZE 10
++#define QT_QWS_TP_MINIMUM_SAMPLES 4
++#define QT_QWS_TP_PRESSURE_THRESHOLD 500
++#define QT_QWS_TP_MOVE_LIMIT 50
++#define QT_QWS_TP_JITTER_LIMIT 2
+ #endif
+ 
+ #ifndef QT_QWS_TP_SAMPLE_SIZE
+@@ -600,7 +613,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;
+@@ -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),
+     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) {
+@@ -1507,7 +1520,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) {
+@@ -1533,7 +1546,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
+@@ -1541,7 +1554,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;
+ 
+@@ -1560,7 +1573,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 );
+@@ -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();
+ #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 );