diff options
33 files changed, 478 insertions, 48 deletions
diff --git a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb index 39004cbb7b..44bdd9b04f 100644 --- a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb +++ b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb @@ -1,19 +1,25 @@ -DESCRIPTION = "framebuffer VNC server keyboard events module" -SECTION = "kernel" +DESCRIPTION = "Framebuffer VNC server keyboard events module" +SECTION = "kernel/module" LICENSE = "GPL" +PR = "r1" SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \ file://libvncs0.6.patch;patch=1 \ file://paths.patch;patch=1 \ - file://kernelinclude.patch;patch=1" + file://kernelinclude.patch;patch=1 \ + file://ipaq.patch;patch=1" S = "${WORKDIR}/fbvncserver-${PV}" inherit module -EXTRA_OEMAKE = "KERNEL_INCLUDES=-I${STAGING_KERNEL_DIR}/include zaurus_kbdsim.o" +FBVNCSERVER_SYSTEM = "zaurus" +FBVNCSERVER_SYSTEM_h3600 = "ipaq" +FBVNCSERVER_SYSTEM_h3900 = "ipaq" + +EXTRA_OEMAKE = "KERNEL_INCLUDES=-I${STAGING_KERNEL_DIR}/include ${FBVNCSERVER_SYSTEM}_kbdsim.o" do_install () { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc - install -m 0644 zaurus_kbdsim.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc/ + install -m 0644 ${FBVNCSERVER_SYSTEM}_kbdsim.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc/kbdsim.o } diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb index fd2a1e6138..66b7349df7 100644 --- a/packages/fbvncserver/fbvncserver_0.9.4.bb +++ b/packages/fbvncserver/fbvncserver_0.9.4.bb @@ -1,18 +1,24 @@ -DESCRIPTION = "framebuffer VNC server" +DESCRIPTION = "Framebuffer VNC server" LICENSE = "GPL" SECTION = "console/utils" -DEPENDS = "libvncserver jpeg zlib" +#DEPENDS = "libvncserver jpeg zlib" +# using older version due of error with libvncserver-0.7.1 +# fbvncserver.c:577: error: structure has no member named `rfbAlwaysShared' +# fbvncserver.c:602: error: structure has no member named `rfbClientHead' +DEPENDS = "libvncserver-0.6 jpeg zlib" RDEPENDS = "fbvncserver-kmodule libvncserver-storepasswd libvncserver-javaapplet" -PR = "r1" +PR = "r2" SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \ file://libvncs0.6.patch;patch=1 \ file://paths.patch;patch=1 \ file://kernelinclude.patch;patch=1 \ file://buildfix.patch;patch=1 \ - file://zaurus_panel.jpg \ + file://ipaq.patch;patch=1 \ file://init" +S = "${WORKDIR}/fbvncserver-${PV}" + export INCLUDES = "-I${STAGING_INCDIR}" export LIBS = "-L${STAGING_LIBDIR} -lpthread" @@ -25,18 +31,25 @@ inherit update-rc.d INITSCRIPT_NAME = "fbvncinput" INITSCRIPT_PARAMS = "defaults 97" +FBVNCSERVER_SYSTEM = "zaurus" +FBVNCSERVER_SYSTEM_h3600 = "ipaq" +FBVNCSERVER_SYSTEM_h3900 = "ipaq" + do_compile () { - oe_runmake zaurus_fbvncserver zaurus_tssimd + oe_runmake ${FBVNCSERVER_SYSTEM}_fbvncserver ${FBVNCSERVER_SYSTEM}_tssimd } do_install () { install -d ${D}${bindir} - install -m 0755 zaurus_fbvncserver ${D}${bindir}/fbvncserver - install -m 0755 zaurus_tssimd ${D}${bindir}/tssimd + install -m 0755 ${FBVNCSERVER_SYSTEM}_fbvncserver ${D}${bindir}/fbvncserver + install -m 0755 ${FBVNCSERVER_SYSTEM}_tssimd ${D}${bindir}/tssimd install -d ${D}${datadir}/fbvncserver - install -m 0644 ${WORKDIR}/zaurus_panel.jpg ${D}${datadir}/fbvncserver/ + install -m 0644 ${FBVNCSERVER_SYSTEM}_panel.jpg ${D}${datadir}/fbvncserver/ install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/fbvncinput } + +FILES_${PN} += " /usr/share/fbvncserver/*.jpg" + diff --git a/packages/fbvncserver/files/zaurus_panel.jpg b/packages/fbvncserver/files/zaurus_panel.jpg Binary files differdeleted file mode 100644 index cb8543f1db..0000000000 --- a/packages/fbvncserver/files/zaurus_panel.jpg +++ /dev/null diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb new file mode 100644 index 0000000000..d385068c59 --- /dev/null +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" +PR = "r0" +DESCRIPTION = "GNOME library for reading .desktop files" +inherit gnome + +DEPENDS = "gnome-common libgnomeui" + +EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" + +do_configure_prepend () { + cp ${STAGING_DIR}/${HOST_SYS}/share/gnome-common/data/omf.make ${S} +} + +do_stage () { + install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/ +# install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/ + install -m 0644 libgnome-desktop/libgnome/gnome-desktop-item.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/ +# install -m 0644 libgnome-desktop/libgnomeui/gnome-ditem-edit.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/ +# install -m 0644 libgnome-desktop/libgnomeui/gnome-hint.h ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/ + oe_libinstall -C libgnome-desktop/.libs -so libgnome-desktop-2 ${STAGING_LIBDIR} + + +} diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty b/packages/hostap/hostap-modules-0.3.9/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/.mtn2git_empty +++ b/packages/hostap/hostap-modules-0.3.9/.mtn2git_empty diff --git a/packages/hostap/hostap-modules-0.3.9/Makefile.patch b/packages/hostap/hostap-modules-0.3.9/Makefile.patch new file mode 100644 index 0000000000..2fc5e9ed4b --- /dev/null +++ b/packages/hostap/hostap-modules-0.3.9/Makefile.patch @@ -0,0 +1,11 @@ +--- hostap-driver-0.2.4/Makefile.old 2004-07-31 10:35:50.000000000 +0100 ++++ hostap-driver-0.2.4/Makefile 2004-07-31 10:35:56.000000000 +0100 +@@ -51,7 +51,7 @@ + + VERFILE := $(KERNEL_PATH)/include/linux/version.h + KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \ +- then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \ ++ then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \ + else uname -r; fi) + KERNELVER := $(shell echo "$(KERNELRELEASE)" | \ + sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/") diff --git a/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch b/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch new file mode 100644 index 0000000000..c29cc8d2c9 --- /dev/null +++ b/packages/hostap/hostap-modules-0.3.9/hostap-utsname.patch @@ -0,0 +1,77 @@ +diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap.c hostap-driver-0.3.7/driver/modules/hostap.c +--- hostap-driver-0.3.7.orig/driver/modules/hostap.c 2005-07-25 09:14:01.995965088 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap.c 2005-07-25 09:13:22.301999488 +0000 +@@ -25,6 +25,7 @@ + #include <linux/if_arp.h> + #include <linux/delay.h> + #include <linux/random.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else +diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c +--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:14:01.996964936 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:13:22.302999336 +0000 +@@ -19,6 +19,7 @@ + #include <linux/netdevice.h> + #include <linux/if_ether.h> + #include <linux/if_arp.h> ++#include <linux/utsname.h> + #include <asm/string.h> + + #include "hostap_crypt.h" +diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c +--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:14:01.996964936 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:13:22.302999336 +0000 +@@ -19,6 +19,7 @@ + #include <linux/netdevice.h> + #include <linux/if_ether.h> + #include <linux/if_arp.h> ++#include <linux/utsname.h> + #include <asm/string.h> + + #include "hostap_crypt.h" +diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c +--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c 2005-07-25 09:14:01.996964936 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c 2005-07-25 09:13:22.302999336 +0000 +@@ -15,6 +15,7 @@ + #include <linux/init.h> + #include <linux/slab.h> + #include <linux/random.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else +diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c hostap-driver-0.3.7/driver/modules/hostap_cs.c +--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-07-25 09:14:01.997964784 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-07-25 09:13:22.302999336 +0000 +@@ -12,6 +12,7 @@ + #include <linux/timer.h> + #include <linux/skbuff.h> + #include <linux/netdevice.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else +diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c hostap-driver-0.3.7/driver/modules/hostap_pci.c +--- hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c 2005-07-25 09:14:01.997964784 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_pci.c 2005-07-25 09:13:22.303999184 +0000 +@@ -11,6 +11,7 @@ + #include <linux/if.h> + #include <linux/skbuff.h> + #include <linux/netdevice.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else +diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c hostap-driver-0.3.7/driver/modules/hostap_plx.c +--- hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c 2005-07-25 09:14:01.997964784 +0000 ++++ hostap-driver-0.3.7/driver/modules/hostap_plx.c 2005-07-25 09:13:22.303999184 +0000 +@@ -14,6 +14,7 @@ + #include <linux/if.h> + #include <linux/skbuff.h> + #include <linux/netdevice.h> ++#include <linux/utsname.h> + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) + #include <linux/tqueue.h> + #else diff --git a/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch b/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch new file mode 100644 index 0000000000..b139ef38f1 --- /dev/null +++ b/packages/hostap/hostap-modules-0.3.9/ipaq_compat.patch @@ -0,0 +1,11 @@ +--- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old 2005-04-17 09:12:38.304421464 +0100 ++++ hostap-driver-0.3.7/driver/modules/hostap_compat.h 2005-04-17 09:13:04.413452288 +0100 +@@ -5,7 +5,7 @@ + #define NEW_MODULE_CODE + #endif + +-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD) + + #define HOSTAP_QUEUE struct tq_struct + diff --git a/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff b/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff new file mode 100644 index 0000000000..c2d6662d69 --- /dev/null +++ b/packages/hostap/hostap-modules-0.3.9/mtx_compat.diff @@ -0,0 +1,20 @@ +--- driver/modules/hostap_compat.h.orig 2004-08-09 16:16:48.359929856 +0200 ++++ driver/modules/hostap_compat.h 2004-08-09 16:17:12.383277752 +0200 +@@ -13,7 +13,7 @@ + MOD_INC_USE_COUNT; \ + if (schedule_task((q)) == 0) \ + MOD_DEC_USE_COUNT; +- ++/* + static inline void flush_scheduled_work(void) + { + flush_scheduled_tasks(); +@@ -27,7 +27,7 @@ + tq->routine = routine; + tq->data = data; + } +- ++*/ + #else /* kernel < 2.5.44 */ + + #define HOSTAP_QUEUE struct work_struct diff --git a/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff new file mode 100644 index 0000000000..e979b72d93 --- /dev/null +++ b/packages/hostap/hostap-modules-0.3.9/mtx_hostap_deferred_irq.diff @@ -0,0 +1,81 @@ +--- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100 ++++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100 +@@ -50,6 +50,13 @@ + }; + + ++#define DEFERRED_IRQ_INITIALIZATION ++ ++#ifdef DEFERRED_IRQ_INITIALIZATION ++struct net_device *devb[MAX_PARM_DEVICES]; ++#endif ++ ++ + #ifdef PRISM2_IO_DEBUG + + static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v) +@@ -280,6 +287,10 @@ + + pci_set_drvdata(pdev, dev); + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++ printk("%s: deferred initialization of IRQs\n", dev_info); ++ devb[cards_found-1] = dev; ++#else + if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name, + dev)) { + printk(KERN_WARNING "%s: request_irq failed\n", dev->name); +@@ -295,7 +306,7 @@ + + printk(KERN_INFO "%s: Intersil Prism2.5 PCI: " + "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq); +- ++#endif + return hostap_hw_ready(dev); + + fail: +@@ -399,18 +410,43 @@ + }; + + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++static void deferred_init(int num_devices) ++{ ++ int n; ++ for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++) ++ { ++ if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name, ++ devb[n])) { ++ printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name); ++ } ++ if (prism2_hw_config(devb[n], 1)) { ++ printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name) ++; ++ } ++ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]-> ++irq); ++ } ++} ++#endif ++ + static int __init init_prism2_pci(void) + { + printk(KERN_INFO "%s: %s\n", dev_info, version); + + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) +- if (pci_register_driver(&prism2_pci_drv_id) <= 0) { ++ int n; ++ if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) { + printk("hostap_pci: No devices found, driver not " + "installed.\n"); + pci_unregister_driver(&prism2_pci_drv_id); + return -ENODEV; + } + ++#ifdef DEFERRED_IRQ_INITIALIZATION ++ deferred_init(n); ++#endif ++ + return 0; + #else + return pci_register_driver(&prism2_pci_drv_id); diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb new file mode 100644 index 0000000000..81091bf2d8 --- /dev/null +++ b/packages/hostap/hostap-modules_0.3.9.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" +SECTION = "kernel/modules" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +PR = "r2" + +SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ + file://hostap_cs.conf \ + file://Makefile.patch;patch=1 \ + file://hostap-utsname.patch;patch=1" +SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ + file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" +SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 " + +S = "${WORKDIR}/hostap-driver-${PV}" + +inherit module + +# Hack Alert :D +ARCH_mipsel = "mips" +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" + +NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ + ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ + ${D}${sysconfdir}/pcmcia + for i in ${NET_MODULES} + do + install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ + done + install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ + install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf + cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf +} + +PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" +FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" +FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" +FILES_hostap-modules = "/lib/modules/" +RDEPENDS_hostap-modules-cs = "hostap-modules" +RDEPENDS_hostap-modules-pci = "hostap-modules" diff --git a/packages/intltool/intltool-native_0.31.bb b/packages/intltool/intltool-native_0.31.bb new file mode 100644 index 0000000000..f200d26dd1 --- /dev/null +++ b/packages/intltool/intltool-native_0.31.bb @@ -0,0 +1,4 @@ +SECTION = "devel" +include intltool_${PV}.bb +inherit native +DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool_0.31.bb b/packages/intltool/intltool_0.31.bb new file mode 100644 index 0000000000..1fdc1bef20 --- /dev/null +++ b/packages/intltool/intltool_0.31.bb @@ -0,0 +1,13 @@ +SECTION = "devel" +DESCRIPTION = "Utility scripts for internationalizing XML" +MAINTAINER = "Phil Blundell <pb@handhelds.org>" +LICENSE = "GPL" + +SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" +S = "${WORKDIR}/intltool-${PV}" + +inherit autotools pkgconfig + +do_stage() { + install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/.mtn2git_empty diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-elpp-stuff.patch index 85d07191b9..85d07191b9 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-elpp-stuff.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-elpp-stuff.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-oz-release-string.patch index 22a6fd3943..22a6fd3943 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/add-oz-release-string.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/add-oz-release-string.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-c7x0 index b993f2ac26..b993f2ac26 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-c7x0 diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-collie index 9f51b61169..9f51b61169 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-collie diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-ipaq-pxa-2.6 index 8b41380784..8b41380784 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-ipaq-pxa-2.6 +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-ipaq-pxa-2.6 diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-poodle index 42a851dd5f..42a851dd5f 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-poodle diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-spitz index ed5010d5c8..ed5010d5c8 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-spitz diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-tosa index c7eba4a337..c7eba4a337 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/defconfig-tosa diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/dtl1_cs-add-socket-revE.patch index a2dbce3325..a2dbce3325 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/dtl1_cs-add-socket-revE.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/dtl1_cs-add-socket-revE.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/pxa-serial-hack.patch index ee761b75ad..ee761b75ad 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc3-mm3/pxa-serial-hack.patch +++ b/packages/linux/linux-openzaurus-2.6.13-rc4-mm1/pxa-serial-hack.patch diff --git a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb index 7e7df86702..9df141ed44 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc3-mm3.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc4-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r1" +PR = "r0" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -19,44 +19,48 @@ BASRC = "http://www.orca.cx/zaurus/patches" # ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \ # ${RPSRC}/rmk_devbuff-r0.patch;patch=1 \ +# ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \ +# ${RPSRC}/w100_core-r1.patch;patch=1 \ +# ${RPSRC}/w100_corgi-r1.patch;patch=1 \ +# ${RPSRC}/corgikbd_compilefix-r0.patch;patch=1 \ +# ${RPSRC}/corgikbd_pm-r0.patch;patch=1 \ +# ${RPSRC}/corgikbd_tidyup-r0.patch;patch=1 \ +# ${RPSRC}/corgikbd_switch-r0.patch;patch=1 \ +# ${RPSRC}/corgikbd_temphack-r0.patch;patch=1 \ +# ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \ +# ${RPSRC}/mmc_sd-r5.patch;patch=1 \ # Patches submitted upstream are towards top of this list SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc3.bz2;patch=1 \ - ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc3/2.6.13-rc3-mm3/2.6.13-rc3-mm3.bz2;patch=1 \ - ${RPSRC}/2.6.13-rc3-mm3_fix-r0.patch;patch=1 \ - ${RPSRC}/reverse_pagefault-r0.patch;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc4.bz2;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc4/2.6.13-rc4-mm1/2.6.13-rc4-mm1.bz2;patch=1 \ + ${RPSRC}/reverse_pagefault-r1.patch;patch=1 \ ${RPSRC}/preempt_nwfpe-r2.patch;patch=1 \ ${RPSRC}/oprofile_typo-r0.patch;patch=1 \ - ${RPSRC}/corgi_tspmu-r2.patch;patch=1 \ - ${RPSRC}/w100_core-r1.patch;patch=1 \ - ${RPSRC}/w100_corgi-r1.patch;patch=1 \ - ${RPSRC}/corgikbd_compilefix-r0.patch;patch=1 \ - ${RPSRC}/corgikbd_pm-r0.patch;patch=1 \ - ${RPSRC}/corgikbd_tidyup-r0.patch;patch=1 \ - ${RPSRC}/corgikbd_switch-r0.patch;patch=1 \ - ${RPSRC}/corgikbd_temphack-r0.patch;patch=1 \ + ${RPSRC}/mmc_bytefix-r0.patch;patch=1 \ + ${RPSRC}/mmc_pxa_roswitch-r0.patch;patch=1 \ + ${RPSRC}/mmc_corgi_roswitch-r0.patch;patch=1 \ + ${RPSRC}/corgi_base_extras1-r4.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ ${RPSRC}/pxa_irda-r2.patch;patch=1 \ ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \ ${RPSRC}/input_power-r2.patch;patch=1 \ ${RPSRC}/corgi_irda-r2.patch;patch=1 \ - ${RPSRC}/corgi_base_extras1-r3.patch;patch=1 \ + ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/corgi_power-r24.patch;patch=1 \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ - ${RPSRC}/mmc_sd-r5.patch;patch=1 \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ ${RPSRC}/corgi_snd-r8.patch;patch=1 \ ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_base-r19.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_bl-r1.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \ - ${RPSRC}/ipaq/pxa_keys-r1.patch;patch=1 \ + ${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \ ${RPSRC}/ipaq/tsc2101-r7.patch;patch=1 \ - ${RPSRC}/ipaq/hx2750_test1-r1.patch;patch=1 \ + ${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \ ${DOSRC}/tosa-detection-r0.patch;patch=1 \ ${BASRC}/spitz-detection-r0.patch;patch=1 \ ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ @@ -70,6 +74,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-udc-r3.patch;patch=1 \ ${DOSRC}/tosa-irda-r2.patch;patch=1 \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ + ${DOSRC}/tosa-2.6.13-r2.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ file://add-oz-release-string.patch;patch=1 \ diff --git a/packages/opie-reader/opie-reader.inc b/packages/opie-reader/opie-reader.inc index b3f130595e..d581a9674d 100644 --- a/packages/opie-reader/opie-reader.inc +++ b/packages/opie-reader/opie-reader.inc @@ -6,7 +6,6 @@ LICENSE = "GPL" APPNAME = "opie-reader" APPTYPE = "binary" - S = "${WORKDIR}/opie-reader" EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}" @@ -14,18 +13,19 @@ PARALLEL_MAKE = "" inherit opie -# FILES bin/opie-reader apps/Applications/opie-reader.desktop pics/opie-reader/* do_install() { - install -d ${D}${palmtopdir}/pics/${APPNAME}/ \ - ${D}${palmtopdir}/lib/ \ - ${D}${palmtopdir}/plugins/reader/data/ \ - ${D}${palmtopdir}/plugins/reader/filters/ \ - ${D}${palmtopdir}/plugins/reader/codecs/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ + install -d ${D}${palmtopdir}/pics/${APPNAME}/ + install -d ${D}${palmtopdir}/lib/ + install -d ${D}${palmtopdir}/plugins/reader/data/ + install -d ${D}${palmtopdir}/plugins/reader/filters/ + install -d ${D}${palmtopdir}/plugins/reader/support/ + install -d ${D}${palmtopdir}/plugins/reader/outcodecs/ + install -d ${D}${palmtopdir}/plugins/reader/codecs/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ for f in libAportis libCHM libPlucker libReb libWeasel libiSilo libppms libArriereGo do - oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/plugins/reader/codecs/ + install -m 644 ${S}/$f.so ${D}${palmtopdir}/plugins/reader/codecs/ done for f in libreader_codec libreader_pdb libreader_pluckerbase pluckerdecompress @@ -33,12 +33,12 @@ do_install() { oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/lib/ done - oe_libinstall -so -C ${S}/ libHTMLfilter ${D}${palmtopdir}/plugins/reader/filters/ - oe_libinstall -so -C ${S}/ libpluckerdecompress ${D}${palmtopdir}/plugins/reader/support/ + install -m 644 ${S}/libHTMLfilter.so ${D}${palmtopdir}/plugins/reader/filters/ + install -m 644 ${S}/libpluckerdecompress.so ${D}${palmtopdir}/plugins/reader/support/ for f in libflitecmd libflitedyn libflitedyn16 do - oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/plugins/reader/outcodecs + install -m 644 ${S}/$f.so ${D}${palmtopdir}/plugins/reader/outcodecs done install -m 0644 ${S}/HTMLentities ${D}${palmtopdir}/plugins/reader/data/ diff --git a/packages/opie-reader/opie-reader_1.2.0.bb b/packages/opie-reader/opie-reader_1.2.0.bb index 388975f7e0..67833fa5f6 100644 --- a/packages/opie-reader/opie-reader_1.2.0.bb +++ b/packages/opie-reader/opie-reader_1.2.0.bb @@ -1,7 +1,6 @@ include ${PN}.inc - - -PR = "r0" + +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb index 14790ba78e..66c0bd71ac 100644 --- a/packages/opie-reader/opie-reader_cvs.bb +++ b/packages/opie-reader/opie-reader_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r0" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ ${HANDHELDS_CVS};module=opie/pics \ @@ -10,3 +10,26 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/opie-reader \ DEPENDS += " flite " EXTRA_QMAKEVARS_POST += " SUBDIRS+=FliteDyn SUBDIRS+=FliteDyn16 " +python populate_packages_prepend () { + print "opie-reader:", bb.data.getVar( 'RDEPENDS_opie-reader', d ) + plugindir = bb.data.expand('${palmtopdir}/plugins/reader', d) + for dir, type in [ ( 'codecs', 'codec' ), ( 'filters', 'filter' ), ( 'outcodecs', 'output' ) ]: + dir = plugindir + '/' + dir + do_split_packages(d, dir, + '^lib(.*)\.so$', 'opie-reader-' + type + '-%s', + 'Opie reader %s ' + type, + prepend=True) + + # input codes are small and should be installed together with opie-reader, + # flite output pulls in libflite and thus should only be installed if + # really wanted by the user + suggests=[] + recommends=[] + for package in bb.data.getVar('PACKAGES', d).split(): + if 'flite' in package: + suggests.append(package) + else: + recommends.append(package) + bb.data.setVar('RRECOMMENDS_opie-reader', " ".join( recommends ), d) + bb.data.setVar('RSUGGESTS_opie-reader', " ".join( suggests ), d) +} diff --git a/packages/pine/pine_4.63.bb b/packages/pine/pine_4.63.bb index edb7446eab..d5e1522905 100644 --- a/packages/pine/pine_4.63.bb +++ b/packages/pine/pine_4.63.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Pine(R) - a Program for Internet News & Email" SECTION = "console/network" LICENSE = "Pine" -DEPENDS = "ncurses" +DEPENDS = "ncurses openssl" RDEPENDS_pine = "pico" HOMEPAGE = "http://www.washington.edu/pine/" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" diff --git a/packages/xev/.mtn2git_empty b/packages/xev/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xev/.mtn2git_empty diff --git a/packages/xev/files/.mtn2git_empty b/packages/xev/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xev/files/.mtn2git_empty diff --git a/packages/xev/files/diet-x11.patch b/packages/xev/files/diet-x11.patch new file mode 100644 index 0000000000..7e93f160a5 --- /dev/null +++ b/packages/xev/files/diet-x11.patch @@ -0,0 +1,74 @@ +--- xev/xev.c 2004-02-06 11:00:37.000000000 -0800 ++++ xev/xev.new.c 2005-08-04 15:40:36.000000000 -0700 +@@ -149,7 +149,7 @@ + nbytes = XLookupString (e, str, 256, &ks, NULL); + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + do { + nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); + buf[nmbbytes] = '\0'; +@@ -159,7 +159,7 @@ + buf = realloc (buf, bsize); + } + } while (status == XBufferOverflow); +- } ++ }*/ + + if (ks == NoSymbol) + ksname = "NoSymbol"; +@@ -189,7 +189,7 @@ + } + + /* not supposed to call XmbLookupString on a key release event */ +- if (e->type == KeyPress && xic) { ++ /*if (e->type == KeyPress && xic) { + printf (" XmbLookupString gives %d bytes: ", nmbbytes); + if (nmbbytes > 0) { + dump (buf, nmbbytes); +@@ -200,7 +200,7 @@ + + printf (" XFilterEvent returns: %s\n", + XFilterEvent (eventp, e->window) ? "True" : "False"); +- } ++ }*/ + } + + static void +@@ -857,7 +857,7 @@ + fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); + } + +- xim = XOpenIM (dpy, NULL, NULL, NULL); ++ /*xim = XOpenIM (dpy, NULL, NULL, NULL); + if (xim == NULL) { + fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); + } +@@ -884,7 +884,7 @@ + } + XFree (xim_styles); + } +- } ++ }*/ + + screen = DefaultScreen (dpy); + +@@ -948,7 +948,7 @@ + printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); + } + +- if (xim && xim_style) { ++ /*if (xim && xim_style) { + xic = XCreateIC (xim, + XNInputStyle, xim_style, + XNClientWindow, w, +@@ -958,7 +958,7 @@ + if (xic == NULL) { + fprintf (stderr, "XCreateIC failed\n"); + } +- } ++ }*/ + + for (done = 0; !done; ) { + XEvent event; diff --git a/packages/xev/xev_cvs.bb b/packages/xev/xev_cvs.bb new file mode 100644 index 0000000000..4d47df9e7a --- /dev/null +++ b/packages/xev/xev_cvs.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "X Event Viewer" +HOMEPAGE = "http://www.xfree86.org/current/xev.1.html" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +SECTION = "x11/utils" +DEPENDS = "x11 xau" +PR = "r0" + +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xapps;module=xev \ + file://diet-x11.patch;patch=1" +S = "${WORKDIR}/xev" + +inherit autotools + +do_compile() { + ${CC} -o xev xev.c -lX11 -lXau -I${STAGING_INCDIR} -L${STAGING_LIBDIR} +} + +do_install() { + install -d ${D}/usr/bin/ + install -m 755 ${PN} ${D}/usr/bin/${PN} +} + +FILES = "/usr/bin/xev" + |
