diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/alsa/alsa-state/fic-gta01/gsmhandset.state | 64 | ||||
-rw-r--r-- | packages/gsm/libgsmd_svn.bb | 1 | ||||
-rw-r--r-- | packages/matchbox-keyboard/files/fic-gta01-font-size.patch | 13 | ||||
-rw-r--r-- | packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb | 4 | ||||
-rw-r--r-- | packages/python/python-pyqt_4.3.bb (renamed from packages/python/python-pyqt_4.2.bb) | 19 | ||||
-rw-r--r-- | packages/python/python24-pyqt2_3.13.bb | 2 | ||||
-rw-r--r-- | packages/python/python24-pyqwt2_3.10.bb | 2 | ||||
-rw-r--r-- | packages/sip/sip-native_4.7.bb (renamed from packages/sip/sip4-native_4.4.5.bb) | 4 | ||||
-rw-r--r-- | packages/sip/sip3-native_3.10.1 (renamed from packages/sip/sip-native_3.10.1.bb) | 0 | ||||
-rw-r--r-- | packages/sip/sip3-native_4.0.1.bb (renamed from packages/sip/sip-native_4.0.1.bb) | 0 |
10 files changed, 70 insertions, 39 deletions
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state index a83141fcbb..f7fb55ccd1 100644 --- a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state +++ b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state @@ -16,8 +16,8 @@ state.neo1973 { comment.range '0 - 255' iface MIXER name 'ADC Capture Volume' - value.0 195 - value.1 195 + value.0 0 + value.1 0 } control.3 { comment.access 'read write' @@ -46,7 +46,7 @@ state.neo1973 { comment.range '0 - 127' iface MIXER name 'Mono Playback Volume' - value 121 + value 111 } control.6 { comment.access 'read write' @@ -55,8 +55,8 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Bypass Playback Volume' - value.0 2 - value.1 2 + value.0 5 + value.1 5 } control.7 { comment.access 'read write' @@ -65,8 +65,8 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Sidetone Playback Volume' - value.0 2 - value.1 2 + value.0 1 + value.1 1 } control.8 { comment.access 'read write' @@ -103,7 +103,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Mono Bypass Playback Volume' - value 2 + value 5 } control.12 { comment.access 'read write' @@ -112,7 +112,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Mono Sidetone Playback Volume' - value 2 + value 6 } control.13 { comment.access 'read write' @@ -121,7 +121,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Mono Voice Playback Volume' - value 2 + value 6 } control.14 { comment.access 'read write' @@ -159,7 +159,7 @@ state.neo1973 { comment.access 'read write' comment.type INTEGER comment.count 1 - comment.range '0 - 7' + comment.range '0 - 15' iface MIXER name 'Bass Volume' value 0 @@ -168,7 +168,7 @@ state.neo1973 { comment.access 'read write' comment.type INTEGER comment.count 1 - comment.range '0 - 7' + comment.range '0 - 15' iface MIXER name 'Treble Volume' value 7 @@ -190,8 +190,8 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Sidetone Capture Volume' - value.0 2 - value.1 2 + value.0 0 + value.1 0 } control.21 { comment.access 'read write' @@ -200,7 +200,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'Voice Sidetone Capture Volume' - value 2 + value 0 } control.22 { comment.access 'read write' @@ -209,8 +209,8 @@ state.neo1973 { comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 24 - value.1 24 + value.0 0 + value.1 0 } control.23 { comment.access 'read write' @@ -227,8 +227,8 @@ state.neo1973 { comment.count 2 iface MIXER name 'Capture Switch' - value.0 true - value.1 true + value.0 false + value.1 false } control.25 { comment.access 'read write' @@ -250,7 +250,7 @@ state.neo1973 { comment.item.1 Voice iface MIXER name 'Capture Filter Cut-off' - value HiFi + value Voice } control.27 { comment.access 'read write' @@ -267,7 +267,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'ALC Capture Target Volume' - value 3 + value 5 } control.29 { comment.access 'read write' @@ -276,7 +276,7 @@ state.neo1973 { comment.range '0 - 7' iface MIXER name 'ALC Capture Max Volume' - value 1 + value 7 } control.30 { comment.access 'read write' @@ -288,7 +288,7 @@ state.neo1973 { comment.item.3 Stereo iface MIXER name 'ALC Capture Function' - value Stereo + value Off } control.31 { comment.access 'read write' @@ -305,7 +305,7 @@ state.neo1973 { comment.range '0 - 15' iface MIXER name 'ALC Capture Hold Time' - value 7 + value 15 } control.33 { comment.access 'read write' @@ -323,7 +323,7 @@ state.neo1973 { comment.range '0 - 15' iface MIXER name 'ALC Capture Attack Time' - value 2 + value 5 } control.35 { comment.access 'read write' @@ -447,7 +447,7 @@ state.neo1973 { comment.item.1 Inverted iface MIXER name 'Playback Phase' - value 'Non Inverted' + value Inverted } control.48 { comment.access 'read write' @@ -570,7 +570,7 @@ state.neo1973 { comment.count 1 iface MIXER name 'ALC Mixer Mic2 Capture Switch' - value true + value false } control.60 { comment.access 'read write' @@ -598,7 +598,7 @@ state.neo1973 { comment.item.3 'Right PGA' iface MIXER name 'Mic Sidetone Mux' - value 'Left PGA' + value 'Mic 2' } control.63 { comment.access 'read write' @@ -815,7 +815,7 @@ state.neo1973 { comment.range '0 - 31' iface MIXER name 'Amp Left Playback Volume' - value 31 + value 26 } control.87 { comment.access 'read write' @@ -824,7 +824,7 @@ state.neo1973 { comment.range '0 - 31' iface MIXER name 'Amp Right Playback Volume' - value 31 + value 0 } control.88 { comment.access 'read write' @@ -833,7 +833,7 @@ state.neo1973 { comment.range '0 - 31' iface MIXER name 'Amp Mono Playback Volume' - value 0 + value 9 } control.89 { comment.access 'read write' @@ -895,6 +895,6 @@ state.neo1973 { comment.count 1 iface MIXER name 'Amp Earpiece 6dB Playback Switch' - value true + value false } } diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index ba7c07a603..c715092b8d 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -46,6 +46,7 @@ FILES_gsmd-plugins = "" FILES_gsmd-plugin-machine-generic = "${libdir}/gsmd/libgsmd-machine_generic.so*" FILES_gsmd-plugin-machine-tihtc = "${libdir}/gsmd/libgsmd-machine_tihtc.so*" FILES_gsmd-plugin-vendor-qc = "${libdir}/gsmd/libgsmd-vendor_qc.so*" +FILES_gsmd-plugin-vendor-bcm = "${libdir}/gsmd/libgsmd-vendor_bcm.so*" FILES_gsmd-plugin-vendor-ti = "${libdir}/gsmd/libgsmd-vendor_ti.so*" FILES_gsmd-plugin-vendor-tihtc = "${libdir}/gsmd/libgsmd-vendor_tihtc.so*" diff --git a/packages/matchbox-keyboard/files/fic-gta01-font-size.patch b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch new file mode 100644 index 0000000000..3a09ac5bc2 --- /dev/null +++ b/packages/matchbox-keyboard/files/fic-gta01-font-size.patch @@ -0,0 +1,13 @@ +Index: matchbox-keyboard/src/matchbox-keyboard.c +=================================================================== +--- matchbox-keyboard.orig/src/matchbox-keyboard.c 2007-08-19 17:26:59.000000000 +0200 ++++ matchbox-keyboard/src/matchbox-keyboard.c 2007-08-19 17:27:06.000000000 +0200 +@@ -52,7 +52,7 @@ + kb->row_spacing = 5; + + kb->font_family = strdup("sans"); +- kb->font_pt_size = 5; ++ kb->font_pt_size = 3; + kb->font_variant = strdup("bold"); + + for (i = 1; i < argc; i++) diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 4f59b646dc..a97ed96d50 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -6,11 +6,13 @@ RPROVIDES = matchbox-keyboard #DEFAULT_PREFERENCE = "-1" SECTION = "x11" PV = "0.0+svn${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ file://80matchboxkeyboard" +SRC_URI_append_fic-gta01 = " file://fic-gta01-font-size.patch;patch=1" + S = "${WORKDIR}/matchbox-keyboard" inherit autotools pkgconfig gettext diff --git a/packages/python/python-pyqt_4.2.bb b/packages/python/python-pyqt_4.3.bb index 64a9a71f68..c867598b4f 100644 --- a/packages/python/python-pyqt_4.2.bb +++ b/packages/python/python-pyqt_4.3.bb @@ -10,14 +10,29 @@ PR = "ml0" SRC_URI = "http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ file://cross-compile.patch;patch=1" + +BROKEN = "1" +# Something really fishy wrt. to arm/mips/etc. double vs. qreal. May even be a problem in Qt headers itself. +# Symptons: +#| sipQtCoreQTimeLine.cpp:136: error: conflicting return type specified for 'virtual double sipQTimeLine::valueForTime(int) const' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qtimeline.h:92: error: overriding 'virtual qreal QTimeLine::valueForTime(int) const' +# And: +#| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getRect(PyObject*, PyObject*)': +#| sipQtCoreQRectF.cpp:1182: error: no matching function for call to 'QRectF::getRect(double*, double*, double*, double*)' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:725: note: candidates are: void QRectF::getRect(qreal*, qreal*, qreal*, qreal*) const +#| sipQtCoreQRectF.cpp: In function 'PyObject* meth_QRectF_getCoords(PyObject*, PyObject*)': +#| sipQtCoreQRectF.cpp:1237: error: no matching function for call to 'QRectF::getCoords(double*, double*, double*, double*)' +#| /home/pkg/oe/fic-gta01/tmp/staging/arm-angstrom-linux-gnueabi/qt4/include/QtCore/qrect.h:741: note: candidates are: void QRectF::getCoords(qreal*, qreal*, qreal*, qreal*) const +#| make[1]: *** [sipQtCoreQRectF.o] Error 1 + S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit qmake qt4x11 sip4 distutils-base +inherit qmake qt4x11 sip distutils-base PARALLEL_MAKE = "" QMAKE_PROFILES = "pyqt.pro" -EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_2 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" +EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0 -xVendorID -xPyQt_SessionManager -xPyQt_Accessibility" EXTRA_OEMAKE = " MAKEFLAGS= " SIP_MODULES = "QtCore QtGui QtNetwork QtSql QtSvg QtXml" diff --git a/packages/python/python24-pyqt2_3.13.bb b/packages/python/python24-pyqt2_3.13.bb index 2c9916b366..04493857dc 100644 --- a/packages/python/python24-pyqt2_3.13.bb +++ b/packages/python/python24-pyqt2_3.13.bb @@ -14,7 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \ file://features" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" -inherit palmtop sip distutils-base +inherit palmtop sip3 distutils-base QMAKE_PROFILES = "pyqt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" diff --git a/packages/python/python24-pyqwt2_3.10.bb b/packages/python/python24-pyqwt2_3.10.bb index d78bba7e8a..28f4080c45 100644 --- a/packages/python/python24-pyqwt2_3.10.bb +++ b/packages/python/python24-pyqwt2_3.10.bb @@ -13,7 +13,7 @@ SRC_URI = "http://www.vanille.de/mirror/PyQwt-20040118.tar.gz \ file://features" S = "${WORKDIR}/PyQwt-20040118" -inherit palmtop sip distutils-base +inherit palmtop sip3 distutils-base QMAKE_PROFILES = "pyqwt.pro" EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1" diff --git a/packages/sip/sip4-native_4.4.5.bb b/packages/sip/sip-native_4.7.bb index 3f83e6e792..08cdae4ead 100644 --- a/packages/sip/sip4-native_4.4.5.bb +++ b/packages/sip/sip-native_4.7.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SIP is a C++/Python Wrapper Generator" -SECTION = "base" +SECTION = "devel" HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip" AUTHOR = "Phil Thompson" PRIORITY = "optional" @@ -8,7 +8,7 @@ LICENSE = "GPL" SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz" S = "${WORKDIR}/sip-${PV}/sipgen" -inherit qmake native +inherit qmake qt4x11 native EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console" diff --git a/packages/sip/sip-native_3.10.1.bb b/packages/sip/sip3-native_3.10.1 index 3702799319..3702799319 100644 --- a/packages/sip/sip-native_3.10.1.bb +++ b/packages/sip/sip3-native_3.10.1 diff --git a/packages/sip/sip-native_4.0.1.bb b/packages/sip/sip3-native_4.0.1.bb index e833a31871..e833a31871 100644 --- a/packages/sip/sip-native_4.0.1.bb +++ b/packages/sip/sip3-native_4.0.1.bb |