summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <bluelightning@bluelightning.org>2008-10-08 19:07:08 +0000
committerPaul Eggleton <bluelightning@bluelightning.org>2008-10-08 19:07:08 +0000
commitbfc178f2ca021d618aa5bfa225c13bd4269c1e33 (patch)
treed44628cdd697bb41748e8b5e58adf6e81afed81f
parent7924bb1416f9cab4ae68630e2ac971ed2699330e (diff)
parent8a3e21cc84fb3fc6c661089156287b82099eede5 (diff)
merge of '88676b03209e4a8147b6f9ab4d6f5c66d0132128'
and 'bcae381ccf0226faafe756ae8699c9b1623bf951'
-rw-r--r--classes/base.bbclass2
-rw-r--r--classes/java.bbclass26
-rw-r--r--conf/checksums.ini6
-rw-r--r--conf/distro/chinook-compat.conf2
-rw-r--r--conf/distro/include/sane-srcrevs.inc28
-rw-r--r--packages/e17/e-wm_svn.bb3
-rw-r--r--packages/freesmartphone/frameworkd_git.bb5
-rw-r--r--packages/freesmartphone/mickeydbus_git.bb8
-rw-r--r--packages/freesmartphone/mickeyterm_git.bb7
-rw-r--r--packages/freesmartphone/zhone_git.bb10
-rw-r--r--packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb11
-rw-r--r--packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb10
-rw-r--r--packages/gpe-sketchbook/gpe-sketchbook_svn.bb24
-rw-r--r--packages/linux/linux-omap/dvb-fix-dma.diff60
-rw-r--r--packages/linux/linux-omap_git.bb3
-rw-r--r--packages/miglayout/miglayout_3.0.3.bb34
-rw-r--r--packages/python/python-native_2.5.1.bb4
-rw-r--r--packages/swt/files/Makefile4
-rw-r--r--packages/swt/files/swt-hildon.patch50
-rw-r--r--packages/swt/swt-gtk.inc2
-rw-r--r--packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb7
-rw-r--r--packages/swt/swt3.4-gtk-hildon_3.4.bb (renamed from packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb)4
-rw-r--r--packages/swt/swt3.4-gtk_3.3+3.4M3.bb15
-rw-r--r--packages/swt/swt3.4-gtk_3.4.bb (renamed from packages/swt/swt3.4-gtk_3.3+3.4M5.bb)6
-rw-r--r--packages/totem/totem-pl-parser_2.24.1.bb15
-rw-r--r--packages/totem/totem_2.24.2.bb70
-rw-r--r--packages/ttf-fonts/ttf-liberation_0.2.bb2
27 files changed, 296 insertions, 122 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index ac73e909f8..1a7ef4f143 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -636,7 +636,7 @@ def oe_unpack_file(file, data, url = None):
cmd = 'gzip -dc %s > %s' % (file, efile)
elif file.endswith('.bz2'):
cmd = 'bzip2 -dc %s > %s' % (file, efile)
- elif file.endswith('.zip'):
+ elif file.endswith('.zip') or file.endswith('.jar'):
cmd = 'unzip -q -o'
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
if 'dos' in parm:
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 11a2bf5c0c..620dae79fb 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -70,19 +70,27 @@ oe_jarinstall() {
oe_makeclasspath() {
# Purpose: Generate a classpath variable from the given Jar file names
- # where the ".jar" has been omitted.
+ # where the ".jar" has been omitted. The string is stored in the script
+ # variable whose name is given in the first argument to this function.
#
- # oe_makeclasspath foo baz bar
- # Prints ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
- #
- # oe_makeclasspath -s foo baz bar
- # Prints ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
+ # oe_makeclasspath cp foo baz bar
+ # Stores ${datadir_java}/foo.jar:${datadir_java}/baz.jar:${datadir_java}/bar.jar
+ # in variable "cp".
#
+ # oe_makeclasspath bootcp -s foo baz bar
+ # Stores ${STAGING_DATADIR_JAVA}/foo.jar:${STAGING_DATADIR_JAVA}/baz.jar:${STAGING_DATADIR_JAVA}/bar.jar
+ # in variable "bootcp".
+ #
# Provide the -s at the beginning otherwise strange things happen.
- #
+ # If -s is given the function checks whether the requested jar file exists
+ # and exits with an error message if it cannot be found.
+ #
dir=${datadir_java}
classpath=
delimiter=
+ retval=$1
+
+ shift
while [ "$#" -gt 0 ]; do
case "$1" in
@@ -95,7 +103,7 @@ oe_makeclasspath() {
*)
file=$dir/$1.jar
- if [ ! -f $file ]; then
+ if [ -z "$dir" -a ! -f $file ]; then
oefatal "oe_makeclasspath: Jar file for '$1' not found at $file"
fi
@@ -106,7 +114,7 @@ oe_makeclasspath() {
shift
done
- echo $classpath
+ eval $retval="$classpath"
}
# Creates a simple wrapper script for your Java program.
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 99bc7bae3b..872e6720dc 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13306,9 +13306,9 @@ sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
md5=e1f1af8c2add8310d0bbcddc9af523b8
sha256=dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
-[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip]
-md5=9473375f7615814025a5b66ee6a8400d
-sha256=b9eaecd9edc58291c5b2c0d8de6a1ce0677b442d63edccd52dd3080da0bc55dc
+[http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip]
+md5=b6bf01aa408377f2fe5f617a4dea1876
+sha256=c913105c740fe9cbbf7ab49f663acf5640b812995c2f9c716294f6b44a3185c4
[http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-2.2.9.tar.bz2]
md5=45e9e89775613b0afb732fbc11c73d26
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index b9d882d5d6..ff6aa1f6a3 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -185,7 +185,7 @@ PREFERRED_PROVIDER_classpath = "classpath"
PREFERRED_VERSION_classpath = "0.97.2"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
-PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
+PREFERRED_VERSION_swt3.4-gtk-hildon = "3.4"
# Does not compile with the CodeSourcery compiler .. :(
#PREFERRED_VERSION_kaffe = "1.1.8+cvs20080120"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 16753863b5..811c20e945 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -43,13 +43,14 @@ SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-elf2flt ?= "1786"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-frameworkd ?= "86a660108f988f5611cc796d33911cca8836004e"
+SRCREV_pn-frameworkd ?= "5a292ced8330ace191d66fc1b655e921fa442fdf"
SRCREV_pn-fso-gpsd ?= "fd1cd578d6ba9fa13aadceb59a9b46345108583b"
SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "9721"
SRCREV_pn-gpe-contacts ?= "9312"
+SRCREV_pn-gpe-sketchbook ?= "9547"
SRCREV_pn-gsm0710muxd ?= "3ff86b129640b647ccba3d86eb243d864671b039"
SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
SRCREV_pn-gtkhtml2 ?= "1158"
@@ -80,8 +81,8 @@ SRCREV_pn-lightmediascanner ?= "68"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "968c41d0c32099d78927849a71e2ef3143cc05e7"
-SRCREV_pn-linux-openmoko-devel ?= "e20ce2bd6fc6e711eed58a580ae117cb574abe96"
+SRCREV_pn-linux-openmoko ?= "bc2caff9cdef8a16297a2cb196306f88fa5ea2c2"
+SRCREV_pn-linux-openmoko-devel ?= "8119fb41bf9cfd12964fa5e987ff6dbaf5729f75"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
@@ -90,8 +91,8 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
-SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a"
+SRCREV_pn-mickeydbus ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a"
+SRCREV_pn-mickeyterm ?= "19de58bbe1c80a547be35f86d315ac78a75cea2a"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mplayer ?= "27659"
@@ -178,7 +179,7 @@ SRCREV_pn-sphyrna-python ?= "45"
SRCREV_pn-starling ?= "9574"
SRCREV_pn-tichy ?= "168"
SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
+SRCREV_pn-u-boot-openmoko ?= "414367bf5b65942947dd5d569c27d2a8e8e5e562"
SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
SRCREV_pn-usbpath ?= "3172"
SRCREV_pn-usbpath-native ?= "3172"
@@ -190,12 +191,12 @@ SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7"
-SRCREV_pn-zhone ?= "11392b1d2ee3a0622dc324e1805699e4301249c4"
+SRCREV_pn-zhone ?= "2cccdc592d10c15509d974dfbba493e95a776530"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCREV ?= "36204"
+EFL_SRCREV ?= "36520"
SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
SRCREV_pn-edb ?= "${EFL_SRCREV}"
SRCREV_pn-eet-native ?= "${EFL_SRCREV}"
@@ -239,8 +240,7 @@ SRCREV_pn-python-etk ?= "${EFL_SRCREV}"
# Enlightenment Applications
SRCREV_pn-edje-editor ?= "${EFL_SRCREV}"
-#SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
-SRCREV_pn-edje-player ?= "36296"
+SRCREV_pn-edje-player ?= "${EFL_SRCREV}"
SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}"
SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
@@ -254,6 +254,12 @@ SRCREV_pn-e-utils ?= "${EFL_SRCREV}"
SRCREV_pn-e-wm ?= "${EFL_SRCREV}"
SRCREV_pn-enna ?= "${EFL_SRCREV}"
SRCREV_pn-exquisite ?= "${EFL_SRCREV}"
+SRCREV_pn-exquisite-theme-illume ?= "${EFL_SRCREV}"
SRCREV_pn-rage ?= "${EFL_SRCREV}"
-
SRCREV_pn-illume ?= "${EFL_SRCREV}"
+SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}"
+
+# Enlightenment ST
+SRCREV_pn-alarm ?= "${EFL_SRCREV}"
+SRCREV_pn-waker ?= "${EFL_SRCREV}"
+SRCREV_pn-elementary ?= "${EFL_SRCREV}"
diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb
index 46ade701a3..e16cad051d 100644
--- a/packages/e17/e-wm_svn.bb
+++ b/packages/e17/e-wm_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
DEPENDS = "eet evas ecore edje efreet edbus"
LICENSE = "MIT BSD"
PV = "0.16.999.043+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
inherit e update-alternatives
@@ -10,7 +10,6 @@ RDEPENDS += "shared-mime-info mime-support"
SRC_URI = "\
svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
- file://disable-e-cursor.patch;patch=1 \
file://enlightenment_start.oe \
file://applications.menu \
"
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index 74ec3615a9..63da1dffa2 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al."
SECTION = "console/network"
DEPENDS = "python-cython-native python-pyrex-native"
LICENSE = "GPL"
-PV = "0.8.2+${PR}-gitr${SRCREV}"
-PR = "r2"
+PV = "0.8.3+${PR}-gitr${SRCREV}"
+PR = "r0"
inherit distutils update-rc.d
@@ -26,6 +26,7 @@ do_install_append() {
RDEPENDS_${PN} += "\
python-dbus \
python-datetime \
+ python-pprint \
python-pygobject \
python-pyrtc \
python-pyserial \
diff --git a/packages/freesmartphone/mickeydbus_git.bb b/packages/freesmartphone/mickeydbus_git.bb
index cbd90e5030..648cc48f91 100644
--- a/packages/freesmartphone/mickeydbus_git.bb
+++ b/packages/freesmartphone/mickeydbus_git.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's DBus introspection and calling Program"
AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
SECTION = "console/network"
LICENSE = "GPLv2"
-PV = "0.9.0+gitr${SRCREV}"
-PR = "r0"
+PV = "0.9.1+gitr${SRCREV}"
+PR = "r1"
SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
@@ -15,4 +15,8 @@ do_install() {
RDEPENDS_${PN} = "\
python-dbus \
+ python-pprint \
"
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/freesmartphone/mickeyterm_git.bb b/packages/freesmartphone/mickeyterm_git.bb
index 243354cc91..0ecc8bbbea 100644
--- a/packages/freesmartphone/mickeyterm_git.bb
+++ b/packages/freesmartphone/mickeyterm_git.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Mickey's Terminal Program"
AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
SECTION = "console/network"
LICENSE = "GPLv2"
-PV = "2.9.0+gitr${SRCREV}"
-PR = "r0"
+PV = "2.9.1+gitr${SRCREV}"
+PR = "r1"
SRC_URI = "${FREESMARTPHONE_GIT}/python-helpers.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
@@ -23,3 +23,6 @@ RRECOMMENDS_${PN} += "\
gsm0710muxd \
python-dbus \
"
+
+PACKAGE_ARCH_${PN} = "all"
+
diff --git a/packages/freesmartphone/zhone_git.bb b/packages/freesmartphone/zhone_git.bb
index 1bd275d7e7..d8c678ce59 100644
--- a/packages/freesmartphone/zhone_git.bb
+++ b/packages/freesmartphone/zhone_git.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "Zhone: Zen Phone"
LICENSE = "GPL"
SECTION = "x11"
DEPENDS = "edje-native python-pyrex-native python-cython-native"
-RDEPENDS = "task-python-efl python-textutils python-dbus python-pycairo"
PV = "0.0.0+${PR}-gitr${SRCREV}"
-PR = "r9"
+PR = "r10"
SRC_URI = "${FREESMARTPHONE_GIT}/zhone.git;protocol=git;branch=master \
file://80zhone"
@@ -18,3 +17,10 @@ do_install_append() {
}
FILES_${PN} += "${datadir} ${sysconfdir}"
+
+RDEPENDS = "\
+ task-python-efl \
+ python-textutils \
+ python-dbus \
+ python-pycairo \
+"
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
index b4878406de..b04cfc39bf 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.8.bb
@@ -1,15 +1,10 @@
+DEPENDS = "libgpewidget sqlite"
LICENSE = "GPL"
-PR = "r4"
-
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-SECTION = "gpe"
-PRIORITY = "optional"
DESCRIPTION = "A GPE notebook to sketch your notes"
export CVSBUILD = "no"
+inherit gpe pkgconfig
+
CFLAGS +="-D_GNU_SOURCE"
SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
index 60bb1b3d76..488e32f55b 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_0.2.9.bb
@@ -1,14 +1,10 @@
+DEPENDS = "libgpewidget sqlite"
LICENSE = "GPL"
-
-inherit gpe pkgconfig
-
-DEPENDS = "libgpewidget"
-SECTION = "gpe"
-SECTION = "gpe"
-PRIORITY = "optional"
DESCRIPTION = "A GPE notebook to sketch your notes"
export CVSBUILD = "no"
+inherit gpe pkgconfig
+
CFLAGS +="-D_GNU_SOURCE"
SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz"
diff --git a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
index 8884746136..929d622a51 100644
--- a/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
+++ b/packages/gpe-sketchbook/gpe-sketchbook_svn.bb
@@ -1,18 +1,23 @@
DESCRIPTION = "A GPE notebook to sketch your notes"
SECTION = "gpe"
-SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "libgpewidget"
-PV = "0.2.9+svn-${SRCDATE}"
+DEPENDS = "libgpewidget sqlite"
+PV = "0.2.9+svnr${SRCREV}"
-inherit pkgconfig autotools
+DEFAULT_PREFERENCE = "-1"
-SRC_URI = "${GPE_SVN} \
- file://svn-build.patch;patch=1"
+inherit pkgconfig autotools
+SRC_URI = "\
+ ${GPE_SVN} \
+ file://svn-build.patch;patch=1 \
+"
S = "${WORKDIR}/${PN}"
+export CVSBUILD = "no"
+CFLAGS += "-D_GNU_SOURCE"
+
do_compile () {
oe_runmake PREFIX=${prefix}
oe_runmake all-desktop PREFIX=${prefix}
@@ -23,10 +28,3 @@ do_install () {
FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
FILES_${PN} += " ${datadir}/gpe/pixmaps"
-
-export CVSBUILD = "no"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-DEFAULT_PREFERENCE = "-1"
-
diff --git a/packages/linux/linux-omap/dvb-fix-dma.diff b/packages/linux/linux-omap/dvb-fix-dma.diff
new file mode 100644
index 0000000000..e05473fc7f
--- /dev/null
+++ b/packages/linux/linux-omap/dvb-fix-dma.diff
@@ -0,0 +1,60 @@
+Hi,
+I post this patch that fixes a kernel crash that happens when using a dvb
+usb stick on a mips platform and I think even on other platforms on which
+the dma access in not cache-coherent.
+
+The problem's origin is that, inside the method usb_bulk_urb_init of file
+drivers/media/dvb/dvb-usb/usb-urb.c, stream->urb_list[i]->transfer_buffer
+points to a memory area that has been allocated to be dma-coherent but
+stream->urb_list[i]->transfer_flags doesn't include the
+URB_NO_TRANSFER_DMA_MAP flag and stream->urb_list[i]->transfer_dma is not
+set.
+When later on the stream->urb_list[i]->transfer_buffer pointer is used
+inside function usb_hcd_submit_urb of file drivers/usb/core/hcd.c since the
+flag URB_NO_TRANSFER_DMA_MAP is not set the urb->transfer_buffer pointer is
+passed to the dma_map_single function that since the address is dma-coherent
+returns a wrong tranfer_dma address that later on leads to the kernel crash.
+
+The problem is solved by setting the URB_NO_TRANSFER_DMA_MAP flag and the
+stream->urb_list[i]->transfer_dma address.
+
+Perhaps to be more safe the URB_NO_TRANSFER_DMA_MAP flag can be set only
+if stream->urb_list[i]->transfer_dma != 0.
+
+I don't know if half of the fault can be of the dma_map_single function that
+should anyway returns a valid address both for a not dma-coherent and a
+dma-coherent address.
+
+Just to be clear:
+I've done this patch to solve my problem and I tested it only on a mips
+platform
+but I think it should not cause any problems on other platforms.
+I posted it here to help someone else that can have my same problem and to
+point it out
+to the mantainer of this part of code.
+You can use it at your own risk and I'm not resposible in any way for any
+problem or
+damage that it can cause.
+I'm available to discuss about it
+
+Bye
+
+Michele Scorcia
+
+--------------------
+
+
+
+
+--- /tmp/usb-urb.c 2008-10-08 09:53:23.000000000 +0200
++++ git/drivers/media/dvb/dvb-usb/usb-urb.c 2008-10-08 09:54:16.000000000 +0200
+@@ -152,7 +152,8 @@
+ stream->props.u.bulk.buffersize,
+ usb_urb_complete, stream);
+
+- stream->urb_list[i]->transfer_flags = 0;
++ stream->urb_list[i]->transfer_flags = URB_NO_TRANSFER_DMA_MAP;
++ stream->urb_list[i]->transfer_dma = stream->dma_addr[i];
+ stream->urbs_initialized++;
+ }
+ return 0;
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index 290d90084b..a81cec89aa 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55"
PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}"
-PR = "r12"
+PR = "r13"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -34,6 +34,7 @@ SRC_URI_append = " \
file://musb-fix-multiple-bulk-transfers.diff;patch=1 \
file://mru-256MB.diff;patch=1 \
file://musb-fix-endpoints.diff;patch=1 \
+ file://dvb-fix-dma.diff;patch=1 \
"
diff --git a/packages/miglayout/miglayout_3.0.3.bb b/packages/miglayout/miglayout_3.0.3.bb
new file mode 100644
index 0000000000..2450a7e01f
--- /dev/null
+++ b/packages/miglayout/miglayout_3.0.3.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Flexible layout classes for Swing and SWT"
+LICENSE = "BSD"
+
+AUTHOR = "Mikael Grev"
+HOMEPAGE = "http://www.migcalendar.com/miglayout"
+
+SRC_URI = "http://www.migcalendar.com/${PN}/versions/${P}.zip"
+
+S = "${WORKDIR}"
+
+inherit java-library
+
+DEPENDS = "unzip-native fastjar-native classpath swt3.4-gtk"
+
+do_unpackpost() {
+ find -name "*.jar" -exec rm {} \;
+
+ mkdir sources
+ unzip miglayout-src.zip -d sources
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+ oe_makeclasspath cp -s swt
+
+ javac \
+ -source 5.0 -sourcepath sources -cp $cp \
+ -d build \
+ `find sources -name "*.java" -and -not -wholename "*demo*"` \
+
+ fastjar -C build -c -f ${JARFILENAME} .
+}
+
diff --git a/packages/python/python-native_2.5.1.bb b/packages/python/python-native_2.5.1.bb
index d43cb520cb..be8fc35a5a 100644
--- a/packages/python/python-native_2.5.1.bb
+++ b/packages/python/python-native_2.5.1.bb
@@ -26,8 +26,8 @@ exec_prefix = "${STAGING_DIR_NATIVE}/${layout_exec_prefix}"
EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc \
--without-cxx --with-signal-module --with-wctype-functions"
-EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR} \
- STAGING_INCDIR=${STAGING_INCDIR}'
+EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS="" STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE} \
+ STAGING_INCDIR=${STAGING_INCDIR_NATIVE}'
do_stage_append() {
install -m 0755 Parser/pgen ${STAGING_BINDIR_NATIVE}/
diff --git a/packages/swt/files/Makefile b/packages/swt/files/Makefile
index 2eb3557cdd..4835f1410d 100644
--- a/packages/swt/files/Makefile
+++ b/packages/swt/files/Makefile
@@ -5,8 +5,8 @@ CLEANFILES=*.files *.jar *.so* *-stamp
RELEASE=OE_SWT_RELEASE
SONAME_VERSION=OE_SWT_API_VERSION
-GCJ=gcj
-JAR=gjar
+GCJ=false
+JAR=fastjar
JAVAC=javac -classpath .
LDCONFIG=/sbin/ldconfig
LN_S=ln -s
diff --git a/packages/swt/files/swt-hildon.patch b/packages/swt/files/swt-hildon.patch
index 5f095e08fc..90ceb1ee0e 100644
--- a/packages/swt/files/swt-hildon.patch
+++ b/packages/swt/files/swt-hildon.patch
@@ -1,7 +1,7 @@
-Index: swt/swt-source/make_linux.mak
+Index: swt-source/make_linux.mak
===================================================================
---- swt.orig/swt-source/make_linux.mak 2007-06-20 12:01:22.000000000 +0200
-+++ swt/swt-source/make_linux.mak 2008-02-14 11:32:49.000000000 +0100
+--- swt-source.orig/make_linux.mak 2007-06-20 12:01:22.000000000 +0200
++++ swt-source/make_linux.mak 2008-10-08 01:36:56.000000000 +0200
@@ -45,8 +45,8 @@
CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
@@ -31,10 +31,10 @@ Index: swt/swt-source/make_linux.mak
-fPIC \
${SWT_PTR_CFLAGS}
LIBS = -shared -fPIC
-Index: swt/swt-source/os.c
+Index: swt-source/os.c
===================================================================
---- swt.orig/swt-source/os.c 2007-10-30 16:24:28.000000000 +0100
-+++ swt/swt-source/os.c 2008-02-14 09:32:49.000000000 +0100
+--- swt-source.orig/os.c 2008-06-05 13:31:52.000000000 +0200
++++ swt-source/os.c 2008-10-08 01:36:56.000000000 +0200
@@ -17,6 +17,9 @@
#include "os_structs.h"
#include "os_stats.h"
@@ -45,7 +45,7 @@ Index: swt/swt-source/os.c
#define OS_NATIVE(func) Java_org_eclipse_swt_internal_gtk_OS_##func
#ifndef NO_Call
-@@ -7015,9 +7018,18 @@
+@@ -7133,9 +7136,18 @@
JNIEXPORT void JNICALL OS_NATIVE(_1gtk_1container_1add)
(JNIEnv *env, jclass that, jint arg0, jint arg1)
{
@@ -66,7 +66,7 @@ Index: swt/swt-source/os.c
}
#endif
-@@ -9121,9 +9133,12 @@
+@@ -9375,9 +9387,12 @@
JNIEXPORT jint JNICALL OS_NATIVE(_1gtk_1menu_1bar_1new)
(JNIEnv *env, jclass that)
{
@@ -80,7 +80,7 @@ Index: swt/swt-source/os.c
OS_NATIVE_EXIT(env, that, _1gtk_1menu_1bar_1new_FUNC);
return rc;
}
-@@ -15464,8 +15479,23 @@
+@@ -15849,8 +15864,23 @@
(JNIEnv *env, jclass that, jint arg0)
{
jint rc = 0;
@@ -105,11 +105,11 @@ Index: swt/swt-source/os.c
OS_NATIVE_EXIT(env, that, _1gtk_1window_1new_FUNC);
return rc;
}
-Index: swt/swt-source/org/eclipse/swt/widgets/Menu.java
+Index: swt-source/org/eclipse/swt/widgets/Menu.java
===================================================================
---- swt.orig/swt-source/org/eclipse/swt/widgets/Menu.java 2007-05-31 18:03:50.000000000 +0200
-+++ swt/swt-source/org/eclipse/swt/widgets/Menu.java 2008-02-14 09:05:04.000000000 +0100
-@@ -259,9 +259,17 @@
+--- swt-source.orig/org/eclipse/swt/widgets/Menu.java 2008-06-05 13:31:08.000000000 +0200
++++ swt-source/org/eclipse/swt/widgets/Menu.java 2008-10-08 01:36:56.000000000 +0200
+@@ -287,9 +287,17 @@
if ((style & SWT.BAR) != 0) {
handle = OS.gtk_menu_bar_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
@@ -127,11 +127,11 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Menu.java
} else {
handle = OS.gtk_menu_new ();
if (handle == 0) error (SWT.ERROR_NO_HANDLES);
-Index: swt/swt-source/org/eclipse/swt/internal/gtk/OS.java
+Index: swt-source/org/eclipse/swt/internal/gtk/OS.java
===================================================================
---- swt.orig/swt-source/org/eclipse/swt/internal/gtk/OS.java 2007-10-30 16:06:36.000000000 +0100
-+++ swt/swt-source/org/eclipse/swt/internal/gtk/OS.java 2008-02-14 09:05:04.000000000 +0100
-@@ -471,6 +471,11 @@
+--- swt-source.orig/org/eclipse/swt/internal/gtk/OS.java 2008-06-05 13:32:08.000000000 +0200
++++ swt-source/org/eclipse/swt/internal/gtk/OS.java 2008-10-08 01:36:56.000000000 +0200
+@@ -473,6 +473,11 @@
public static final byte[] window_state_event = ascii("window-state-event");
/** Properties */
@@ -143,11 +143,11 @@ Index: swt/swt-source/org/eclipse/swt/internal/gtk/OS.java
public static final byte[] active = ascii("active");
public static final byte[] background_gdk = ascii("background-gdk");
public static final byte[] button_relief = ascii("button-relief");
-Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
+Index: swt-source/org/eclipse/swt/widgets/Shell.java
===================================================================
---- swt.orig/swt-source/org/eclipse/swt/widgets/Shell.java 2007-11-01 11:31:12.000000000 +0100
-+++ swt/swt-source/org/eclipse/swt/widgets/Shell.java 2008-02-14 10:51:37.000000000 +0100
-@@ -1028,6 +1028,14 @@
+--- swt-source.orig/org/eclipse/swt/widgets/Shell.java 2008-06-05 13:31:10.000000000 +0200
++++ swt-source/org/eclipse/swt/widgets/Shell.java 2008-10-08 01:36:56.000000000 +0200
+@@ -1067,6 +1067,14 @@
int /*long*/ gtk_size_allocate (int /*long*/ widget, int /*long*/ allocation) {
int width = OS.GTK_WIDGET_WIDTH (shellHandle);
int height = OS.GTK_WIDGET_HEIGHT (shellHandle);
@@ -162,7 +162,7 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
if (!resized || oldWidth != width || oldHeight != height) {
oldWidth = width;
oldHeight = height;
-@@ -1384,14 +1392,53 @@
+@@ -1472,14 +1480,53 @@
if ((state & FOREIGN_HANDLE) != 0) return;
Monitor monitor = getMonitor ();
Rectangle rect = monitor.getClientArea ();
@@ -216,10 +216,10 @@ Index: swt/swt-source/org/eclipse/swt/widgets/Shell.java
public void setMaximized (boolean maximized) {
checkWidget();
super.setMaximized (maximized);
-Index: swt/swt-source/os_custom.c
+Index: swt-source/os_custom.c
===================================================================
---- swt.orig/swt-source/os_custom.c 2007-05-31 18:04:22.000000000 +0200
-+++ swt/swt-source/os_custom.c 2008-02-14 13:55:49.000000000 +0100
+--- swt-source.orig/os_custom.c 2008-06-05 13:31:50.000000000 +0200
++++ swt-source/os_custom.c 2008-10-08 01:36:56.000000000 +0200
@@ -13,6 +13,8 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc
index 0bdaaab932..a5e62b7155 100644
--- a/packages/swt/swt-gtk.inc
+++ b/packages/swt/swt-gtk.inc
@@ -3,7 +3,7 @@ LICENSE = "CPL MPL LGPL"
inherit java-library
-DEPENDS = "classpath-tools-native cairo gtk+ atk libxtst"
+DEPENDS = "fastjar-native cairo gtk+ atk libxtst"
S = "${WORKDIR}/swt-source"
diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
deleted file mode 100644
index 9a74844f59..0000000000
--- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require swt3.4-gtk_${PV}.bb
-
-PR = "r1"
-
-DEPENDS += "libhildon libhildonfm"
-
-SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2"
diff --git a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk-hildon_3.4.bb
index 7033d0c854..667e516fa0 100644
--- a/packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
+++ b/packages/swt/swt3.4-gtk-hildon_3.4.bb
@@ -1,7 +1,7 @@
require swt3.4-gtk_${PV}.bb
-PR = "r3"
+PR = "r0"
DEPENDS += "libhildon libhildonfm"
-SRC_URI += "file://swt-hildon.patch;patch=1;pnum=2"
+SRC_URI += "file://swt-hildon.patch;patch=1"
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
deleted file mode 100644
index eda136b329..0000000000
--- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require swt-gtk.inc
-
-PR = "r1"
-
-SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \
- file://Makefile \
- file://make_linux-fix.patch;patch=1"
-
-# A number which is used by SWT to mark the shared libraries.
-SWTVERSION = "3416"
-SWT_API_VERSION = "3.4"
-
-PROVIDES = "swt3.4-gtk"
-
-RCONFLICTS = "libswt3.3-gtk-java"
diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb b/packages/swt/swt3.4-gtk_3.4.bb
index 4cdd7c0f94..b6eafcad8c 100644
--- a/packages/swt/swt3.4-gtk_3.3+3.4M5.bb
+++ b/packages/swt/swt3.4-gtk_3.4.bb
@@ -1,12 +1,12 @@
require swt-gtk.inc
-PR = "r1"
+PR = "r0"
-SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M5-200802071530/swt-3.4M5-gtk-linux-x86.zip \
+SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/swt-3.4-gtk-linux-x86.zip \
file://Makefile"
# A number which is used by SWT to mark the shared libraries.
-SWTVERSION = "3428"
+SWTVERSION = "3448"
SWT_API_VERSION = "3.4"
PROVIDES = "swt3.4-gtk"
diff --git a/packages/totem/totem-pl-parser_2.24.1.bb b/packages/totem/totem-pl-parser_2.24.1.bb
new file mode 100644
index 0000000000..7f3cd861e9
--- /dev/null
+++ b/packages/totem/totem-pl-parser_2.24.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Playlist parser for Totem, a GTK2 based media player"
+HOMEPAGE = "http://www.gnome.org/projects/totem/"
+LICENSE = "GPL"
+
+DEPENDS = "eds-dbus"
+
+inherit gnome
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+ autotools_stage_all
+}
+
+
diff --git a/packages/totem/totem_2.24.2.bb b/packages/totem/totem_2.24.2.bb
new file mode 100644
index 0000000000..a0de5705cf
--- /dev/null
+++ b/packages/totem/totem_2.24.2.bb
@@ -0,0 +1,70 @@
+# totem OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "A GTK2 based media player"
+HOMEPAGE = "http://www.gnome.org/projects/totem/"
+LICENSE = "GPL"
+
+DEPENDS = " totem-pl-parser gtk+ dbus bluez-libs libglade gconf libxml2 gst-ffmpeg gst-plugins-bad gst-plugins-base"
+RDEPENDS_${PN} += "iso-codes"
+RRECOMMENDS_${PN} += "gst-plugin-playbin \
+ gst-plugin-gconfelements \
+ gst-plugin-decodebin \
+ gst-plugin-decodebin2 \
+ gst-ffmpeg \
+ gst-plugin-audioresample \
+ gst-plugin-ximagesink \
+ gst-plugin-xvimagesink \
+ gst-plugin-alsa \
+ gst-plugin-avi \
+ gst-plugin-ffmpegcolorspace \
+ gst-plugin-flvdemux \
+ gst-plugin-nuvdemux \
+ gst-plugin-videoscale \
+ gst-plugin-a52dec \
+ gst-plugin-mpegaudioparse \
+ gst-plugin-ossaudio \
+ gst-plugin-pulse \
+ gst-plugin-autodetect \
+ "
+
+inherit gnome
+
+SRC_URI += "file://gst-detect.diff;patch=1"
+
+EXTRA_OECONF=" --disable-schemas-install \
+ --enable-gtk \
+ --disable-iso-codes \
+ --disable-debug \
+ --enable-gstreamer \
+ --enable-browser-plugins \
+ --disable-run-in-source-tree \
+ --disable-python \
+ --disable-vala \
+ --with-dbus \
+ "
+
+do_configure_prepend() {
+ sed -i -e s:help::g ${S}/Makefile.am
+}
+
+PACKAGES += "totem-plugin-bemused totem-plugin-gromit totem-plugin-lirc totem-plugin-media-player-keys totem-plugin-mythtv totem-plugin-ontop totem-plugin-properties totem-plugin-screensaver totem-plugin-skipto totem-plugin-thumbnail totem-plugin-youtube totem-browser-plugin-dbg totem-browser-plugin"
+
+FILES_totem-plugin-bemused += "${libdir}/totem/plugins/bemused/*"
+FILES_totem-plugin-gromit += "${libdir}/totem/plugins/gromit/*"
+FILES_totem-plugin-lirc += "${libdir}/totem/plugins/lirc/*"
+FILES_totem-plugin-media-player-keys += "${libdir}/totem/plugins/media-player-keys/*"
+FILES_totem-plugin-mythtv += "${libdir}/totem/plugins/mythtv/*"
+FILES_totem-plugin-ontop += "${libdir}/totem/plugins/ontop/*"
+FILES_totem-plugin-properties += "${libdir}/totem/plugins/properties/*"
+FILES_totem-plugin-screensaver += "${libdir}/totem/plugins/screensaver/*"
+FILES_totem-plugin-skipto += "${libdir}/totem/plugins/skipto/*"
+FILES_totem-plugin-thumbnail += "${libdir}/totem/plugins/thumbnail/*"
+FILES_totem-plugin-youtube += "${libdir}/totem/plugins/youtube/*"
+
+FILES_${PN} = "${bindir}/* ${sysconfdir} ${libdir}/lib*.so.* ${libexecdir} ${datadir}/icons ${datadir}/totem ${datadir}/applications"
+FILES_${PN}-dbg += "${libdir}/totem/plugins/*/.debug"
+FILES_${PN}-dev += "${libdir}/totem/plugins/*/*a"
+FILES_totem-browser-plugin-dbg += "${libdir}/mozilla/plugins/.debug"
+FILES_totem-browser-plugin += "${libdir}/mozilla/plugins/"
diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb
index 95e33daff3..c9737152da 100644
--- a/packages/ttf-fonts/ttf-liberation_0.2.bb
+++ b/packages/ttf-fonts/ttf-liberation_0.2.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "https://www.redhat.com/promo/fonts/"
LICENSE = "Liberation"
PR = "r3"
-SRC_URI = "http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz"
+SRC_URI = "http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz"
S = "${WORKDIR}/liberation-fonts-${PV}"
PACKAGES = "${PN}-dbg ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif"