[oe-commits] org.oe.dev merge of '33d36c3f90d3f3338d861f53c982c88ecc127201'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Aug 19 18:25:26 UTC 2007
merge of '33d36c3f90d3f3338d861f53c982c88ecc127201'
and '4fe73431c4f4506a83505d3043fbedb9763f1983'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9a3abadc32f5244f0f05da056f0230f5d6ee3a88
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9a3abadc32f5244f0f05da056f0230f5d6ee3a88
Files:
1
classes/sip.bbclass
classes/sip3.bbclass
classes/sip4.bbclass
packages/python/python-pyqt_4.2.bb
packages/python/python-pyqt_4.3.bb
packages/sip/sip-native_3.10.1.bb
packages/sip/sip3-native_3.10.1
packages/sip/sip-native_4.0.1.bb
packages/sip/sip3-native_4.0.1.bb
packages/sip/sip4-native_4.4.5.bb
packages/sip/sip-native_4.7.bb
packages/matchbox-keyboard/files/fic-gta01-font-size.patch
classes/seppuku.bbclass
classes/tinderclient.bbclass
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/gsm/libgsmd_svn.bb
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/python/python24-pyqt2_3.13.bb
packages/python/python24-pyqwt2_3.10.bb
packages/alsa/alsa-plugins_1.0.14.bb
packages/alsa/alsa-lib_1.0.13.bb
Diffs:
#
# mt diff -r33d36c3f90d3f3338d861f53c982c88ecc127201 -r9a3abadc32f5244f0f05da056f0230f5d6ee3a88
#
#
#
# rename "classes/sip.bbclass"
# to "classes/sip3.bbclass"
#
# rename "classes/sip4.bbclass"
# to "classes/sip.bbclass"
#
# rename "packages/python/python-pyqt_4.2.bb"
# to "packages/python/python-pyqt_4.3.bb"
#
# rename "packages/sip/sip-native_3.10.1.bb"
# to "packages/sip/sip3-native_3.10.1"
#
# rename "packages/sip/sip-native_4.0.1.bb"
# to "packages/sip/sip3-native_4.0.1.bb"
#
# rename "packages/sip/sip4-native_4.4.5.bb"
# to "packages/sip/sip-native_4.7.bb"
#
# add_file "packages/matchbox-keyboard/files/fic-gta01-font-size.patch"
# content [7faa8b53d7e6bc3188ea910931137b054c3e77f4]
#
# patch "classes/seppuku.bbclass"
# from [e1ab91e50cadb88343d37fbf46393c050db3ef3a]
# to [a69586a66f285bca06d5d46b92195f56ece0749d]
#
# patch "classes/sip.bbclass"
# from [80b361e9b97e13bf345538986f1b134f607db6ef]
# to [4012d4828567e24b5d46a88b61b5f951b18ae7f3]
#
# patch "classes/sip3.bbclass"
# from [2303d673f36cf2626f007237b4be21bd26581cce]
# to [73a1199d0cd0e38e5322e0047631d476afeb1f4b]
#
# patch "classes/tinderclient.bbclass"
# from [f4be9deca74ad64f1297520693e6105a87f6984f]
# to [dfb5637c7f39403fb14f5bcb72775bc48bab0393]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
# from [231596d55e7fd776cbb2db5bf845997ea39b8f09]
# to [e26913ea8ef767872f2a1bed7529a897a38a0528]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [8f6e0a51dc6a9690a8c44a5d73a3289745b547cf]
# to [6387ca7f099a514f35eed5b601884e71694739b2]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# from [36d86adb332789d1285b9bbce6d99ba323d635ca]
# to [476322a5c5ab168c1157580e33b08f9df5e136bd]
#
# patch "packages/python/python-pyqt_4.3.bb"
# from [1a1326664f9663662d7b770455cc8284beffd27a]
# to [77a66605090e9cc41d463370b73d4eab1a9824a0]
#
# patch "packages/python/python24-pyqt2_3.13.bb"
# from [8e509b0c5adf0ed85de6da3e6f2caf1b87e86b6e]
# to [a86c25cf42602e66a89c20552b8800b315d44ab8]
#
# patch "packages/python/python24-pyqwt2_3.10.bb"
# from [8cad0caa1d225ddbc989c027cf055ef8e7165f0a]
# to [d73c7873c5613b17078902a2de603a34cbb06184]
#
# patch "packages/sip/sip-native_4.7.bb"
# from [d6b14931a1957d3ac285ef26172a73a098ee96c3]
# to [ffb9c2a06301e9a83d6937e2920959e47eda7f25]
#
============================================================
--- packages/matchbox-keyboard/files/fic-gta01-font-size.patch 7faa8b53d7e6bc3188ea910931137b054c3e77f4
+++ packages/matchbox-keyboard/files/fic-gta01-font-size.patch 7faa8b53d7e6bc3188ea910931137b054c3e77f4
@@ -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++)
============================================================
--- classes/seppuku.bbclass e1ab91e50cadb88343d37fbf46393c050db3ef3a
+++ classes/seppuku.bbclass a69586a66f285bca06d5d46b92195f56ece0749d
@@ -129,7 +129,9 @@ def seppuku_find_bug_report(debug_file,
component = urllib.quote(component)
bugname = urllib.quote(bugname)
- result = opener.open("%(query)sproduct=%(product)s&component=%(component)s&short_desc_type=substring&short_desc=%(bugname)s" % vars())
+ file = "%(query)sproduct=%(product)s&component=%(component)s&short_desc_type=substring&short_desc=%(bugname)s" % vars()
+ print >> debug_file, "Trying %s" % file
+ result = opener.open(file)
if result.code != 200:
raise "Can not query the bugzilla at all"
txt = result.read()
@@ -290,7 +292,7 @@ python seppuku_eventhandler() {
if name == "PkgFailed":
if not bb.data.getVar('SEPPUKU_AUTOBUILD', data, True) == "0":
build.exec_task('do_clean', data)
- elif name == "TaskFailed" or name == "NoProvider":
+ elif name == "TaskFailed":
cj = cookielib.CookieJar()
opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
poster = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj),MultipartPostHandler.MultipartPostHandler)
@@ -326,9 +328,6 @@ python seppuku_eventhandler() {
file = open(log_file[0], 'r')
else:
print >> debug_file, "No log file found for the glob"
- #elif name == "NoProvider":
- # bugname = "noprovider for %s " % (event.getItem)
- # text = "Please fix it"
else:
print >> debug_file, "Unknown name '%s'" % name
assert False
============================================================
--- classes/sip4.bbclass 80b361e9b97e13bf345538986f1b134f607db6ef
+++ classes/sip.bbclass 4012d4828567e24b5d46a88b61b5f951b18ae7f3
@@ -1,13 +1,13 @@
# Build Class for Sip based Python Bindings
# (C) Michael 'Mickey' Lauer <mickey at Vanille.de>
#
-DEPENDS =+ "sip4-native"
-RDEPENDS += "python-sip4"
+DEPENDS =+ "sip-native"
+RDEPENDS += "python-sip"
# default stuff, do not uncomment
-# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_1_1"
+# EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0"
-sip4_do_generate() {
+sip_do_generate() {
if [ -z "${SIP_MODULES}" ]; then
MODULES="`ls sip/*mod.sip`"
else
============================================================
--- classes/sip.bbclass 2303d673f36cf2626f007237b4be21bd26581cce
+++ classes/sip3.bbclass 73a1199d0cd0e38e5322e0047631d476afeb1f4b
@@ -7,7 +7,7 @@ DEPENDS =+ "sip-native python-sip"
# default stuff, do not uncomment
# EXTRA_SIPTAGS = "-tWS_QWS -tQtPE_1_6_0 -tQt_2_3_1"
-sip_do_generate() {
+sip3_do_generate() {
if [ -z "${SIP_MODULES}" ]; then
MODULES="`ls sip/*mod.sip`"
else
============================================================
--- classes/tinderclient.bbclass f4be9deca74ad64f1297520693e6105a87f6984f
+++ classes/tinderclient.bbclass dfb5637c7f39403fb14f5bcb72775bc48bab0393
@@ -24,6 +24,7 @@ def tinder_form_data(bound, dict, log):
output = []
# for each key in the dictionary
for name in dict:
+ assert dict[name]
output.append( "--" + bound )
output.append( 'Content-Disposition: form-data; name="%s"' % name )
output.append( "" )
@@ -60,7 +61,7 @@ def tinder_format_http_post(d,status,log
"os" : os.uname()[0],
"os_version" : os.uname()[2],
"compiler" : "gcc",
- "clobber" : data.getVar('TINDER_CLOBBER', d, True),
+ "clobber" : data.getVar('TINDER_CLOBBER', d, True) or "0",
"srcdate" : data.getVar('SRCDATE', d, True),
"PN" : data.getVar('PN', d, True),
"PV" : data.getVar('PV', d, True),
@@ -370,9 +371,9 @@ python tinderclient_eventhandler() {
addhandler tinderclient_eventhandler
python tinderclient_eventhandler() {
from bb import note, error, data
- from bb.event import NotHandled
+ from bb.event import NotHandled, getName
- if e.data is None:
+ if e.data is None or getName(e) == "MsgNote":
return NotHandled
do_tinder_report = data.getVar('TINDER_REPORT', e.data, True)
============================================================
--- packages/alsa/alsa-state/fic-gta01/gsmhandset.state 231596d55e7fd776cbb2db5bf845997ea39b8f09
+++ packages/alsa/alsa-state/fic-gta01/gsmhandset.state e26913ea8ef767872f2a1bed7529a897a38a0528
@@ -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
}
}
============================================================
--- packages/gsm/libgsmd_svn.bb 8f6e0a51dc6a9690a8c44a5d73a3289745b547cf
+++ packages/gsm/libgsmd_svn.bb 6387ca7f099a514f35eed5b601884e71694739b2
@@ -46,6 +46,7 @@ FILES_gsmd-plugin-vendor-qc = "${libdir}
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*"
============================================================
--- packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb 36d86adb332789d1285b9bbce6d99ba323d635ca
+++ packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb 476322a5c5ab168c1157580e33b08f9df5e136bd
@@ -6,11 +6,13 @@ PV = "0.0+svn${SRCDATE}"
#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
============================================================
--- packages/python/python-pyqt_4.2.bb 1a1326664f9663662d7b770455cc8284beffd27a
+++ packages/python/python-pyqt_4.3.bb 77a66605090e9cc41d463370b73d4eab1a9824a0
@@ -10,14 +10,29 @@ SRC_URI = "http://www.riverbankcomputing
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"
============================================================
--- packages/python/python24-pyqt2_3.13.bb 8e509b0c5adf0ed85de6da3e6f2caf1b87e86b6e
+++ packages/python/python24-pyqt2_3.13.bb a86c25cf42602e66a89c20552b8800b315d44ab%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r4fe73431c4f4506a83505d3043fbedb9763f1983 -r9a3abadc32f5244f0f05da056f0230f5d6ee3a88
#
#
#
# add_file "packages/alsa/alsa-plugins_1.0.14.bb"
# content [8f085bb2de8e8094c4500114a767eee8ce9b5612]
#
# patch "packages/alsa/alsa-lib_1.0.13.bb"
# from [1cc7fb5837d3675969799d8e715b42605d72758c]
# to [a683702c03094e9186bfd192d9bbac123c925bee]
#
============================================================
--- packages/alsa/alsa-plugins_1.0.14.bb 8f085bb2de8e8094c4500114a767eee8ce9b5612
+++ packages/alsa/alsa-plugins_1.0.14.bb 8f085bb2de8e8094c4500114a767eee8ce9b5612
@@ -0,0 +1,20 @@
+DESCRIPTION = "ALSA Plugins"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "multimedia/alsa/plugins"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib pulseaudio"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2"
+
+inherit autotools
+
+PACKAGES_DYNAMIC = "libasound-module*"
+
+python populate_packages_prepend() {
+ plugindir = bb.data.expand('${libdir}/alsa-lib/', d)
+ do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' )
+}
+
+FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug"
============================================================
--- packages/alsa/alsa-lib_1.0.13.bb 1cc7fb5837d3675969799d8e715b42605d72758c
+++ packages/alsa/alsa-lib_1.0.13.bb a683702c03094e9186bfd192d9bbac123c925bee
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "Alsa sound library"
HOMEPAGE = "http://www.alsa-project.org"
SECTION = "libs/multimedia"
LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
# configure.in sets -D__arm__ on the command line for any arm system
# (not just those with the ARM instruction set), this should be removed,
More information about the Openembedded-commits
mailing list