summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini12
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--packages/freesmartphone/fso-abyss/om-gta01/abyss.conf11
-rw-r--r--packages/freesmartphone/fso-abyss/om-gta02/abyss.conf11
-rw-r--r--packages/freesmartphone/fso-abyss_git.bb2
-rw-r--r--packages/gstreamer/gst-plugins-base_0.10.22.bb (renamed from packages/gstreamer/gst-plugins-base_0.10.17.bb)2
-rw-r--r--packages/gstreamer/gst-plugins-good_0.10.13.bb (renamed from packages/gstreamer/gst-plugins-good_0.10.7.bb)1
-rw-r--r--packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch27
-rw-r--r--packages/gstreamer/gst-plugins-ugly_0.10.10.bb (renamed from packages/gstreamer/gst-plugins-ugly_0.10.7.bb)1
-rw-r--r--packages/gstreamer/gstreamer_0.10.22.bb (renamed from packages/gstreamer/gstreamer_0.10.21.bb)2
-rw-r--r--packages/linux/linux-msm7xxxx_git.bb15
11 files changed, 51 insertions, 35 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a3309b2e39..43d0059636 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -8814,6 +8814,10 @@ sha256=aa3d5ce29232ee5b24b6c032194ac1fc757309ea50ac850c0db46e45ab0a78ff
md5=0e0cd485311502ad1c0c028148e3186a
sha256=673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93
+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.22.tar.bz2]
+md5=5d0f1e07f8f6db564971b50f75261e8a
+sha256=184c5aed03ebfe38a276fc03cb7d8685d9a6da5a48bf6a0565c83e11a29cd5f9
+
[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2]
md5=2b5958fb0baaf8d1b4eae18f7b13d49b
sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac
@@ -8834,6 +8838,10 @@ sha256=623e187f87037a690b5d0beef5991b3f2a58bb5058fad8c75329f48f0b07da4b
md5=79b086c2dc0e07ae0c8ddc91512bab3a
sha256=05323f065080e3df5f5c9cadceca977598ba106b3eebf2bbec46099becf796b1
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.13.tar.bz2]
+md5=27f27151ccefad1157c9eaa322e14ac4
+sha256=dfffb80ef01b8fee9af3576311e65b60c378d9985099dea532be090ede54ebaa
+
[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2]
md5=03d3d0b5f19014fe0065234a3ea65ee6
sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
@@ -8930,6 +8938,10 @@ sha256=c839c3872510890bdbdfb43a79fd8b5646f3b9164b637127fb550351dc147eba
md5=7bad90af3fd81a1535363cf85359125c
sha256=94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3
+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.22.tar.bz2]
+md5=35dd8598837af4074753afe5b59e8ef2
+sha256=61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e
+
[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2]
md5=263a7800ecf44d0f38d0cbc80bce65ff
sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1a6656b69c..4f87639586 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -57,7 +57,7 @@ SRCREV_pn-flashrom ?= "3682"
SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
-SRCREV_pn-fso-abyss ?= "49af81918362739fbf2e72b7b703fdc78989875e"
+SRCREV_pn-fso-abyss ?= "1af4f7914c84e050b3b409634c5e7ef70d5d6544"
SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
diff --git a/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf b/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf
index 2ff579d730..67da210396 100644
--- a/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf
+++ b/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf
@@ -1,16 +1,15 @@
[omuxerd]
-# set to 1, when the first AllocChannel request opens a session
autoopen = 1
-# set to 1, when the last ReleaseChannel closes the session
autoclose = 1
-# set to 1, when closing the session should close the program
autoexit = 1
[session]
-# set 0 for 07.10 basic multiplexing, 1 for advanced
mode = 1
-# set maximum 07.10 frame size
framesize = 98
-# configure modem port
port = /dev/ttySAC0
speed = 115200
+
+[device]
+wakeup_threshold = 6
+wakeup_waitms = 200
+
diff --git a/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf b/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf
index 2ff579d730..67da210396 100644
--- a/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf
+++ b/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf
@@ -1,16 +1,15 @@
[omuxerd]
-# set to 1, when the first AllocChannel request opens a session
autoopen = 1
-# set to 1, when the last ReleaseChannel closes the session
autoclose = 1
-# set to 1, when closing the session should close the program
autoexit = 1
[session]
-# set 0 for 07.10 basic multiplexing, 1 for advanced
mode = 1
-# set maximum 07.10 frame size
framesize = 98
-# configure modem port
port = /dev/ttySAC0
speed = 115200
+
+[device]
+wakeup_threshold = 6
+wakeup_waitms = 200
+
diff --git a/packages/freesmartphone/fso-abyss_git.bb b/packages/freesmartphone/fso-abyss_git.bb
index 3cfff7dc9a..20f68c0ad0 100644
--- a/packages/freesmartphone/fso-abyss_git.bb
+++ b/packages/freesmartphone/fso-abyss_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
SECTION = "console/network"
DEPENDS = "vala-native dbus dbus-glib libgsm0710"
LICENSE = "GPL"
-PV = "0.3.0+gitr${SRCREV}"
+PV = "0.3.1+gitr${SRCREV}"
PR = "r0"
SRC_URI = "\
diff --git a/packages/gstreamer/gst-plugins-base_0.10.17.bb b/packages/gstreamer/gst-plugins-base_0.10.22.bb
index 0a1f17fcd8..4d6f71e3d0 100644
--- a/packages/gstreamer/gst-plugins-base_0.10.17.bb
+++ b/packages/gstreamer/gst-plugins-base_0.10.22.bb
@@ -8,5 +8,3 @@ PROVIDES += "gst-plugins"
# a missing alsa plugin
DEPENDS += "alsa-lib libsm virtual/libx11 freetype gnome-vfs libxv"
-PR = "r5"
-
diff --git a/packages/gstreamer/gst-plugins-good_0.10.7.bb b/packages/gstreamer/gst-plugins-good_0.10.13.bb
index 7b7c3d71bb..d9f0349101 100644
--- a/packages/gstreamer/gst-plugins-good_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-good_0.10.13.bb
@@ -1,5 +1,4 @@
require gst-plugins.inc
-PR = "r5"
inherit gconf
diff --git a/packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch b/packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch
index 1d1eb83484..c766a5b916 100644
--- a/packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch
+++ b/packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch
@@ -1,6 +1,7 @@
---- gst-plugins-ugly-0.10.6/ext/mad/gstmad.c.orig 2007-06-13 11:21:25.000000000 +0200
-+++ gst-plugins-ugly-0.10.6/ext/mad/gstmad.c 2007-09-16 22:45:04.000000000 +0200
-@@ -119,8 +119,8 @@
+diff -urN gst-plugins-ugly-0.10.10.orig/ext/mad/gstmad.c gst-plugins-ugly-0.10.10/ext/mad/gstmad.c
+--- gst-plugins-ugly-0.10.10.orig/ext/mad/gstmad.c 2008-11-08 15:48:46.000000000 +0100
++++ gst-plugins-ugly-0.10.10/ext/mad/gstmad.c 2009-02-20 02:24:20.000000000 +0100
+@@ -65,8 +65,8 @@
GST_STATIC_CAPS ("audio/x-raw-int, "
"endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", "
"signed = (boolean) true, "
@@ -11,16 +12,16 @@
"rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, "
"channels = (int) [ 1, 2 ]")
);
-@@ -458,7 +458,7 @@
+@@ -407,7 +407,7 @@
mad = GST_MAD (GST_PAD_PARENT (pad));
-- bytes_per_sample = MAD_NCHANNELS (&mad->frame.header) * 4;
-+ bytes_per_sample = MAD_NCHANNELS (&mad->frame.header) << 1;
+- bytes_per_sample = mad->channels * 4;
++ bytes_per_sample = mad->channels << 1;
switch (src_format) {
case GST_FORMAT_BYTES:
-@@ -870,13 +870,11 @@
+@@ -832,13 +832,11 @@
return res;
}
@@ -36,7 +37,7 @@
/* clip */
if (sample >= MAD_F_ONE)
-@@ -884,13 +882,8 @@
+@@ -846,13 +844,8 @@
else if (sample < -MAD_F_ONE)
sample = -MAD_F_ONE;
@@ -51,7 +52,7 @@
}
/* do we need this function? */
-@@ -1277,8 +1270,8 @@
+@@ -1263,8 +1256,8 @@
caps = gst_caps_new_simple ("audio/x-raw-int",
"endianness", G_TYPE_INT, G_BYTE_ORDER,
"signed", G_TYPE_BOOLEAN, TRUE,
@@ -62,7 +63,7 @@
"rate", G_TYPE_INT, rate, "channels", G_TYPE_INT, nchannels, NULL);
gst_pad_set_caps (mad->srcpad, caps);
-@@ -1576,7 +1569,7 @@
+@@ -1581,7 +1574,7 @@
to skip and send the remaining pcm samples */
GstBuffer *outbuffer = NULL;
@@ -71,7 +72,7 @@
mad_fixed_t const *left_ch, *right_ch;
if (mad->need_newsegment) {
-@@ -1594,7 +1587,7 @@
+@@ -1612,7 +1605,7 @@
/* will attach the caps to the buffer */
result =
gst_pad_alloc_buffer_and_set_caps (mad->srcpad, 0,
@@ -80,7 +81,7 @@
&outbuffer);
if (result != GST_FLOW_OK) {
/* Head for the exit, dropping samples as we go */
-@@ -1607,7 +1600,7 @@
+@@ -1625,7 +1618,7 @@
left_ch = mad->synth.pcm.samples[0];
right_ch = mad->synth.pcm.samples[1];
@@ -89,7 +90,7 @@
GST_DEBUG ("mad out timestamp %" GST_TIME_FORMAT,
GST_TIME_ARGS (time_offset));
-@@ -1621,14 +1614,14 @@
+@@ -1640,14 +1633,14 @@
gint count = nsamples;
while (count--) {
diff --git a/packages/gstreamer/gst-plugins-ugly_0.10.7.bb b/packages/gstreamer/gst-plugins-ugly_0.10.10.bb
index 380a520234..062404179e 100644
--- a/packages/gstreamer/gst-plugins-ugly_0.10.7.bb
+++ b/packages/gstreamer/gst-plugins-ugly_0.10.10.bb
@@ -1,5 +1,4 @@
require gst-plugins.inc
-PR = "r2"
DEPENDS += "gst-plugins-base mpeg2dec libsidplay"
diff --git a/packages/gstreamer/gstreamer_0.10.21.bb b/packages/gstreamer/gstreamer_0.10.22.bb
index a873629425..906aa239ac 100644
--- a/packages/gstreamer/gstreamer_0.10.21.bb
+++ b/packages/gstreamer/gstreamer_0.10.22.bb
@@ -4,5 +4,3 @@ do_configure_prepend() {
sed -i -e s:docs::g Makefile.am
}
-SRC_URI += "file://po-makefile-fix.patch;patch=1 \
- "
diff --git a/packages/linux/linux-msm7xxxx_git.bb b/packages/linux/linux-msm7xxxx_git.bb
index 38895adfdd..c0d2617346 100644
--- a/packages/linux/linux-msm7xxxx_git.bb
+++ b/packages/linux/linux-msm7xxxx_git.bb
@@ -3,20 +3,23 @@ require linux.inc
PV = "2.6.25+${PR}+gitr${SRCREV}"
PV_htckaiser = "2.6.24+${PR}+gitr${SRCREV}"
PV_htcpolaris = "2.6.24+${PR}+gitr${SRCREV}"
+PV_htcraphael = "2.6.27+${PR}+gitr${SRCREV}"
+PV_htcdiamond = "2.6.27+${PR}+gitr${SRCREV}"
PR = "r4"
COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcraphael|htcdiamond|htcvogue|htctitan"
SRCREV_htckaiser = "1082670ccae30e6592311cc9dee93ba978382a25"
SRCREV_htcpolaris = "1082670ccae30e6592311cc9dee93ba978382a25"
-SRCREV_htcraphael = "1a4d3e8a1c7174931409017252a36ceceb10174e"
-SRCREV_htcdiamond = "1a4d3e8a1c7174931409017252a36ceceb10174e"
+SRCREV_htcraphael = "05e144ae16c252bd8f4d0e53faf14c58a74d8c0f"
+SRCREV_htcdiamond = "05e144ae16c252bd8f4d0e53faf14c58a74d8c0f"
SRCREV_htcvogue = "8cfc6730b38091c908b2df3b906a3a54f27e1bb2"
SRCREV_htctitan = "8cfc6730b38091c908b2df3b906a3a54f27e1bb2"
SRC_BRANCH = "htc-msm-2.6.25"
SRC_BRANCH_htckaiser = "htc-msm"
SRC_BRANCH_htcpolaris = "htc-msm"
+SRC_BRANCH_htcraphael = "htc-msm-2.6.27"
SRC_BRANCH_htcvogue = "htc-vogue"
SRC_BRANCH_htctitan = "htc-vogue"
@@ -25,3 +28,11 @@ SRC_URI = "\
file://defconfig \
"
S = "${WORKDIR}/git"
+
+do_configure_prepend_htcraphael() {
+ install -m 0644 arch/arm/configs/${MACHINE}_defconfig ${WORKDIR}/defconfig
+}
+
+do_configure_prepend_htcdiamond() {
+ install -m 0644 arch/arm/configs/${MACHINE}_defconfig ${WORKDIR}/defconfig
+}