diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/linux/linux-2.6.27/boc01/013-090209-lcd.patch (renamed from packages/linux/linux-2.6.27/boc01/013-090116-lcd.patch) | 2 | ||||
-rw-r--r-- | packages/linux/linux-2.6.27/boc01/014-090209-pm-wakeup.patch (renamed from packages/linux/linux-2.6.27/boc01/014-090115-pm-wakeup.patch) | 20 | ||||
-rw-r--r-- | packages/linux/linux_2.6.27.bb | 6 | ||||
-rw-r--r-- | packages/python/python-coherence_svn.bb | 4 | ||||
-rw-r--r-- | packages/python/python_2.6.1.bb | 7 | ||||
-rw-r--r-- | packages/vala/files/expose-bytesarray-struct.patch | 18 | ||||
-rw-r--r-- | packages/vala/vala-native_0.5.6.bb | 2 | ||||
-rw-r--r-- | packages/vala/vala.inc | 11 | ||||
-rw-r--r-- | packages/vala/vala_0.5.6.bb | 2 |
9 files changed, 47 insertions, 25 deletions
diff --git a/packages/linux/linux-2.6.27/boc01/013-090116-lcd.patch b/packages/linux/linux-2.6.27/boc01/013-090209-lcd.patch index 46a7534d2f..c867e2cf3a 100644 --- a/packages/linux/linux-2.6.27/boc01/013-090116-lcd.patch +++ b/packages/linux/linux-2.6.27/boc01/013-090209-lcd.patch @@ -160,7 +160,7 @@ Index: linux-2.6.27/drivers/video/nt7506fb.c +#define LCD_NPAGES (LCD_HEIGHT/8) /* LCD pages of 8 vertical pixels */ + +#define DEFAULT_CONTRAST 20 -+#define DEFAULT_FPS 5 ++#define DEFAULT_FPS 10 + +static struct resource *lcd_mem = NULL; +static void * _lcd_io = NULL; diff --git a/packages/linux/linux-2.6.27/boc01/014-090115-pm-wakeup.patch b/packages/linux/linux-2.6.27/boc01/014-090209-pm-wakeup.patch index 536a788ffc..3acbf40c32 100644 --- a/packages/linux/linux-2.6.27/boc01/014-090115-pm-wakeup.patch +++ b/packages/linux/linux-2.6.27/boc01/014-090209-pm-wakeup.patch @@ -1,8 +1,8 @@ Index: linux-2.6.27/arch/powerpc/platforms/83xx/Kconfig =================================================================== ---- linux-2.6.27.orig/arch/powerpc/platforms/83xx/Kconfig -+++ linux-2.6.27/arch/powerpc/platforms/83xx/Kconfig -@@ -104,6 +104,13 @@ config ASP834x +--- linux-2.6.27.orig/arch/powerpc/platforms/83xx/Kconfig 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/arch/powerpc/platforms/83xx/Kconfig 2009-01-23 10:54:03.000000000 +0100 +@@ -104,6 +104,13 @@ endif @@ -18,17 +18,17 @@ Index: linux-2.6.27/arch/powerpc/platforms/83xx/Kconfig bool Index: linux-2.6.27/arch/powerpc/platforms/83xx/Makefile =================================================================== ---- linux-2.6.27.orig/arch/powerpc/platforms/83xx/Makefile -+++ linux-2.6.27/arch/powerpc/platforms/83xx/Makefile -@@ -14,3 +14,4 @@ obj-$(CONFIG_MPC837x_MDS) += mpc837x_mds +--- linux-2.6.27.orig/arch/powerpc/platforms/83xx/Makefile 2008-10-10 00:13:53.000000000 +0200 ++++ linux-2.6.27/arch/powerpc/platforms/83xx/Makefile 2009-01-23 10:54:03.000000000 +0100 +@@ -14,3 +14,4 @@ obj-$(CONFIG_SBC834x) += sbc834x.o obj-$(CONFIG_MPC837x_RDB) += mpc837x_rdb.o obj-$(CONFIG_ASP834x) += asp834x.o +obj-$(CONFIG_WAKEUP_IT) += wakeup-it.o Index: linux-2.6.27/arch/powerpc/platforms/83xx/wakeup-it.c =================================================================== ---- /dev/null -+++ linux-2.6.27/arch/powerpc/platforms/83xx/wakeup-it.c +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.27/arch/powerpc/platforms/83xx/wakeup-it.c 2009-01-23 10:49:09.000000000 +0100 @@ -0,0 +1,163 @@ +/* + * This support a driver to be used as a wakeup source on the MPC8313. @@ -77,8 +77,8 @@ Index: linux-2.6.27/arch/powerpc/platforms/83xx/wakeup-it.c +{ + //printk(KERN_INFO "===== WAKEUP INTERRUPT %d !!\n", irq); + -+ if ( suspend ) -+ kernel_restart(NULL); ++// if ( suspend ) ++// kernel_restart(NULL); + return IRQ_HANDLED ; +} + diff --git a/packages/linux/linux_2.6.27.bb b/packages/linux/linux_2.6.27.bb index 7da406a0d3..4b094bf48c 100644 --- a/packages/linux/linux_2.6.27.bb +++ b/packages/linux/linux_2.6.27.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r3" +PR = "r4" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" @@ -21,8 +21,8 @@ SRC_URI_append_boc01 = "\ file://010-090112-mii.patch;patch=1 \ file://011-090115-gpio.patch;patch=1 \ file://012-090115-cy3218-btns.patch;patch=1 \ - file://013-090116-lcd.patch;patch=1 \ - file://014-090115-pm-wakeup.patch;patch=1 \ + file://013-090209-lcd.patch;patch=1 \ + file://014-090209-pm-wakeup.patch;patch=1 \ " SRC_URI_append_progear = "file://progear-bl.patch;patch=1\ diff --git a/packages/python/python-coherence_svn.bb b/packages/python/python-coherence_svn.bb index 831e3a5ba6..e6f5fafb53 100644 --- a/packages/python/python-coherence_svn.bb +++ b/packages/python/python-coherence_svn.bb @@ -3,7 +3,7 @@ SECTION = "devel/python" LICENSE = "MIT" HOMEPAGE = "http://coherence.beebits.net/wiki" -PR = "r5" +PR = "r6" PV = "0.6.0+svnr${SRCREV}" inherit setuptools @@ -14,6 +14,6 @@ S = "${WORKDIR}/Coherence" FILES_${PN} += "${datadir}" RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \ python-configobj python-twisted python-twisted-core python-misc python-zopeinterface \ - zope python-modules python-pygobject python-gdata" + zope python-modules python-pygobject python-gdata python-inotify" diff --git a/packages/python/python_2.6.1.bb b/packages/python/python_2.6.1.bb index 8c3f3544a8..ae9f8ee725 100644 --- a/packages/python/python_2.6.1.bb +++ b/packages/python/python_2.6.1.bb @@ -1,7 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "ml2" +PR = "ml3" SRC_URI = "\ http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ @@ -27,6 +27,11 @@ S = "${WORKDIR}/Python-${PV}" inherit autotools +# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources +#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :( +TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__" +TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__" + # # copy config.h and an appropriate Makefile for distutils.sysconfig # which laters uses the information out of these to compile extensions diff --git a/packages/vala/files/expose-bytesarray-struct.patch b/packages/vala/files/expose-bytesarray-struct.patch new file mode 100644 index 0000000000..ea01208967 --- /dev/null +++ b/packages/vala/files/expose-bytesarray-struct.patch @@ -0,0 +1,18 @@ +# +# Necessary to actually use BytesArray. +# Signed-Off: Michael 'Mickey' Lauer <mlauer@vanille-media.de> +# +Index: vala/vapi/glib-2.0.vapi +=================================================================== +--- vala/vapi/glib-2.0.vapi (Revision 2422) ++++ vala/vapi/glib-2.0.vapi (Arbeitskopie) +@@ -3044,6 +3044,9 @@ + public void sort (CompareFunc compare_func); + public void sort_with_data (CompareDataFunc compare_func); + public void set_size (uint length); ++ ++ public uint len; ++ public uint8[] data; + } + + /* N-ary Trees */ diff --git a/packages/vala/vala-native_0.5.6.bb b/packages/vala/vala-native_0.5.6.bb index 8feab501b4..84ed8359c4 100644 --- a/packages/vala/vala-native_0.5.6.bb +++ b/packages/vala/vala-native_0.5.6.bb @@ -1,5 +1,5 @@ require vala_${PV}.bb -PR = "r0" +PR = "r1" inherit native DEPENDS = "glib-2.0-native" diff --git a/packages/vala/vala.inc b/packages/vala/vala.inc index efe2900e28..c6f5aebbef 100644 --- a/packages/vala/vala.inc +++ b/packages/vala/vala.inc @@ -7,15 +7,14 @@ LICENSE = "LGPL" MAJV = "${@bb.data.getVar('PV',d,1)[:3]}" -SRC_URI = "http://download.gnome.org/sources/vala/${MAJV}/vala-${PV}.tar.bz2" +SRC_URI = "\ + http://download.gnome.org/sources/vala/${MAJV}/vala-${PV}.tar.bz2 \ + file://expose-bytesarray-struct.patch;patch=1 \ +" S = "${WORKDIR}/vala-${PV}" -inherit autotools lib_package +inherit autotools autotools_stage lib_package EXTRA_OECONF = "--enable-vapigen" -do_stage() { - autotools_stage_all -} - FILES_${PN}-doc += ${datadir}/devhelp diff --git a/packages/vala/vala_0.5.6.bb b/packages/vala/vala_0.5.6.bb index 8775f1a407..f6ee943617 100644 --- a/packages/vala/vala_0.5.6.bb +++ b/packages/vala/vala_0.5.6.bb @@ -1,2 +1,2 @@ require vala.inc -PR = "r0" +PR = "r1" |