diff options
| author |   Holger Freyther <zecke@selfish.org> | 2004-11-06 17:45:22 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2004-11-06 17:45:22 +0000 |
| commit | 45094ef30a517e0b6548b2bca543af11815a3682 (patch) | |
| tree | 82842909f458537df065c041d8e4da1886f7753b /qte | |
| parent | 8226ef633be9bb8bf02fb71fc3763a9d457d1d3f (diff) | |
| download | openembedded-45094ef30a517e0b6548b2bca543af11815a3682.tar.gz | |
Merge bk://openembedded@openembedded.bkbits.net/packages-devel
into handhelds.org:/home/ich/programming/oe/oe-packages-exported
2004/11/06 18:44:50+01:00 handhelds.org!zecke
QtE 2.3.7 patches:
-Change tslib.patch to avoid possible (but unlinkely) sample[-1] access
2004/11/06 18:42:29+01:00 handhelds.org!zecke
-Xine 1.0.0 plugins depended on libxine and libxine1 ( >= libxine_1.0.0-rc6a ).
This is due packages.oeclass tries to find the dependencies on if
extra_depends is None (default), but that doesn't work with shlibdeps which renames
the package from libxine to libxine1 automatically.
BKrev: 418d0db2MtD7v-y2zpmbeWIAqTA-lw
Diffstat (limited to 'qte')
| -rw-r--r-- | qte/qte-2.3.7/tslib.patch | 23 | ||||
| -rw-r--r-- | qte/qte_2.3.7.oe | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/qte/qte-2.3.7/tslib.patch b/qte/qte-2.3.7/tslib.patch index 27f8cb05f4..0475d81052 100644 --- a/qte/qte-2.3.7/tslib.patch +++ b/qte/qte-2.3.7/tslib.patch @@ -35,7 +35,7 @@ //#define QWS_CUSTOMTOUCHPANEL -@@ -1093,6 +1100,220 @@ +@@ -1093,6 +1100,221 @@ return sent; } @@ -58,7 +58,7 @@ + void interpolateSample(); + +private: -+ bool raw; ++ bool raw : 1; +#ifdef QWS_TSLIB + struct tsdev *ts; +#endif @@ -114,6 +114,7 @@ + + delete m_notify; + m_notify = 0; ts = 0; ++ raw = false; +#endif + +} @@ -156,7 +157,6 @@ + { + qDebug( "Could not save calibration: %s", calFile.latin1() ); + } -+ raw = false; +} + +void QTSLibHandler::readMouseData() @@ -200,11 +200,10 @@ + */ +void QTSLibHandler::interpolateSample() { + static struct ts_sample samples[25]; -+ int index = -1; ++ int index = 0; + int ret; + + do { -+ index++; + /* fill only the last sample again */ + if ( index >= 25 ) + index = 24; @@ -217,11 +216,13 @@ + continue; + } + } -+ }while (samples[index].pressure != 0); ++ }while (samples[index++].pressure != 0); + + /* + * index is maximal 25 and we at least one sample + */ ++ if( index >= 25 ) ++ index = 24; + int x, y; + + /* @@ -256,7 +257,7 @@ /* * Handler for /dev/tpanel Linux kernel driver */ -@@ -1235,7 +1456,7 @@ +@@ -1235,7 +1457,7 @@ QTPanelHandlerPrivate::QTPanelHandlerPrivate( MouseProtocol, QString dev ) @@ -265,7 +266,7 @@ numSamples(0), skipCount(0) { #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -@@ -1315,7 +1536,7 @@ +@@ -1315,7 +1537,7 @@ mousePos = QPoint( 0, 0 ); QPoint totalMousePos = oldTotalMousePos; totalMousePos += samples[currSample]; @@ -274,7 +275,7 @@ totalMousePos -= samples[lastSample]; mousePos = totalMousePos / (sampleCount - 1); -@@ -1345,7 +1566,7 @@ +@@ -1345,7 +1567,7 @@ // save recuring information currSample++; @@ -283,7 +284,7 @@ lastSample++; oldTotalMousePos = totalMousePos; } else { -@@ -1658,7 +1879,7 @@ +@@ -1658,7 +1880,7 @@ if ( mouseProto == "USB" && mouseDev.isEmpty() ) mouseDev = "/dev/input/mice"; @@ -292,7 +293,7 @@ MouseProtocol mouseProtocol = Unknown; int idx = 0; -@@ -1689,12 +1910,14 @@ +@@ -1689,12 +1911,14 @@ break; case TPanel: diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe index b8c36d4a64..420790d3ca 100644 --- a/qte/qte_2.3.7.oe +++ b/qte/qte_2.3.7.oe @@ -5,7 +5,7 @@ LICENSE = "GPL/QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" PROVIDES = "virtual/qte virtual/libqte2" -PR = "r19" +PR = "r20" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}.tar.gz \ file://qpe.patch;patch=1 \ |