diff options
27 files changed, 415 insertions, 115 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 5659076d7b..e896c50a3b 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1659,6 +1659,7 @@ PREFERRED_VERSION_rfakeap ?= "0.2" PREFERRED_VERSION_rglueap ?= "0.1" PREFERRED_VERSION_rhythmbox ?= "0.8.7" PREFERRED_VERSION_rlpr ?= "2.05" +PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0" PREFERRED_VERSION_rott ?= "1.0" PREFERRED_VERSION_rox-filer ?= "2.5" PREFERRED_VERSION_rp-pppoe ?= "3.8" @@ -2126,7 +2127,7 @@ PREFERRED_VERSION_zmerlin ?= "0.9.1" PREFERRED_VERSION_zope ?= "3.3.1" PREFERRED_VERSION_zrally ?= "0.90" PREFERRED_VERSION_zrev7 ?= "1.0.1" -PREFERRED_VERSION_zroadmap ?= "1.0.12" +PREFERRED_VERSION_zroadmap ?= "1.1.0" PREFERRED_VERSION_zsafe ?= "2.1.3" PREFERRED_VERSION_zsh ?= "4.1.1" PREFERRED_VERSION_zshopi ?= "0.2" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index b3b47093b7..8f82eb4611 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -148,7 +148,6 @@ SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" SRCDATE_yamonenv ?= "20060814" -SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb index 1c78d468d7..1a53c6f78f 100644 --- a/packages/kismet/kismet_2007-10-R1.bb +++ b/packages/kismet/kismet_2007-10-R1.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, an HOMEPAGE = "http://www.kismetwireless.net/" SECTION = "console/network" LICENSE = "GPLv2" -DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2" -PR = "r1" +DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap" +PR = "r2" SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz" diff --git a/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch index 034acc7b8e..9b8434a0bc 100644 --- a/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch +++ b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch @@ -3,8 +3,8 @@ Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-13 01:35:13.049455112 +0300 -@@ -0,0 +1,417 @@ ++++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-14 16:58:47.637707413 +0300 +@@ -0,0 +1,530 @@ +/* + * OHCI HCD(Host Controller Driver) for USB. + * @@ -53,6 +53,14 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +/*-------------------------------------------------------------------------*/ + ++#define MAX_TMIO_USB_PORTS 2 ++static bool default_tmio_ports[MAX_TMIO_USB_PORTS]; ++module_param_array(default_tmio_ports, bool, NULL, 0644); ++MODULE_PARM_DESC(default_tmio_ports, ++ "disable specified TC6393 usb ports (default: all enabled)"); ++ ++/*-------------------------------------------------------------------------*/ ++ +/* + * USB Host Controller Configuration Register + */ @@ -87,8 +95,8 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c +struct { + unsigned gcken:1; /* D0 */ + unsigned ckrnen:1; /* D1 */ -+ unsigned uspw1:1; /* D2 USB Port 1 Power Disable */ -+ unsigned uspw2:1; /* D3 USB Port 2 Power Disable */ ++ unsigned uspw0:1; /* D2 USB Port 1 Power Disable */ ++ unsigned uspw1:1; /* D3 USB Port 2 Power Disable */ + unsigned x00:4; + unsigned pmee:1; /* D8 */ + unsigned x01:6; @@ -100,6 +108,7 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +struct tmio_hcd { + struct tmio_uhccr __iomem *ccr; ++ bool disabled_ports[MAX_TMIO_USB_PORTS]; +}; + +#define hcd_to_tmio(hcd) ((struct tmio_hcd *)(hcd_to_ohci(hcd) + 1)) @@ -107,6 +116,39 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +/*-------------------------------------------------------------------------*/ + ++struct indexed_device_attribute{ ++ struct device_attribute dev_attr; ++ int index; ++}; ++#define to_indexed_dev_attr(_dev_attr) \ ++ container_of(_dev_attr, struct indexed_device_attribute, dev_attr) ++ ++#define INDEXED_ATTR(_name, _mode, _show, _store, _index) \ ++ { .dev_attr = __ATTR(_name ## _index, _mode, _show, _store), \ ++ .index = _index } ++ ++#define INDEXED_DEVICE_ATTR(_name, _mode, _show, _store, _index) \ ++struct indexed_device_attribute dev_attr_##_name ## _index \ ++ = INDEXED_ATTR(_name, _mode, _show, _store, _index) ++ ++/*-------------------------------------------------------------------------*/ ++ ++ ++static void tmio_fill_pm(struct tmio_hcd *tmio, union tmio_uhccr_pm *pm) ++{ ++ pm->raw = 0; ++ ++ pm->pmee = 1; ++ pm->pmes = 1; ++ pm->gcken = 1; ++ pm->ckrnen = 1; ++ ++ if (tmio->disabled_ports[0]) ++ pm->uspw0 = 1; ++ if (tmio->disabled_ports[1]) ++ pm->uspw1 = 1; ++} ++ +static void tmio_stop_hc(struct device *dev) +{ + struct tmio_device *tdev = dev_to_tdev(dev); @@ -117,8 +159,8 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + + pm.gcken = 1; + pm.ckrnen = 1; ++ pm.uspw0 = 1; + pm.uspw1 = 1; -+ pm.uspw2 = 1; + + iowrite8(0, &ccr->intc); + iowrite8(0, &ccr->ilme); @@ -139,10 +181,7 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + union tmio_uhccr_pm pm = {0}; + unsigned long base = hcd->rsrc_start; + -+ pm.pmes = 1; -+ pm.pmee = 1; -+ pm.ckrnen = 1; -+ pm.gcken = 1; ++ tmio_fill_pm(tmio, &pm); + + tdev->ops->clock(dev, 1); + tdev->ops->function(dev, 1); @@ -157,6 +196,54 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + ioread8(&ccr->revid), hcd->rsrc_start, hcd->irq); +} + ++static ssize_t tmio_disabled_port_show(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) ++{ ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct tmio_hcd *tmio = hcd_to_tmio(hcd); ++ int index = to_indexed_dev_attr(attr)->index; ++ return snprintf(buf, PAGE_SIZE, "%c", ++ tmio->disabled_ports[index]? 'Y': 'N'); ++} ++ ++static ssize_t tmio_disabled_port_store(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct tmio_hcd *tmio = hcd_to_tmio(hcd); ++ struct tmio_uhccr __iomem *ccr = tmio->ccr; ++ union tmio_uhccr_pm pm = {0}; ++ int index = to_indexed_dev_attr(attr)->index; ++ ++ if (!count) ++ return -EINVAL; ++ ++ switch (buf[0]) { ++ case 'y': case 'Y': case '1': ++ tmio->disabled_ports[index] = true; ++ break; ++ case 'n': case 'N': case '0': ++ tmio->disabled_ports[index] = false; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ tmio_fill_pm(tmio, &pm); ++ ++ iowrite16(pm.raw, &ccr->pm); ++ ++ return 1; ++} ++ ++ ++static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR, ++ tmio_disabled_port_show, tmio_disabled_port_store, 0); ++static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR, ++ tmio_disabled_port_show, tmio_disabled_port_store, 1); ++ +static int usb_hcd_tmio_probe(const struct hc_driver *driver, + struct device *dev) +{ @@ -195,6 +282,9 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + hcd->rsrc_len = regs->end - regs->start + 1; + + tmio = hcd_to_tmio(hcd); ++ memcpy(tmio->disabled_ports, ++ default_tmio_ports, ++ sizeof(default_tmio_ports)); + + tmio->ccr = ioremap(config->start, config->end - config->start + 1); + if (!tmio->ccr) { @@ -224,11 +314,23 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + ohci = hcd_to_ohci(hcd); + ohci_hcd_init(ohci); + ++ retval = device_create_file(dev, ++ &dev_attr_disabled_usb_port0.dev_attr); ++ retval |= device_create_file(dev, ++ &dev_attr_disabled_usb_port1.dev_attr); ++ ++ if (retval) ++ goto err_create_file; ++ + retval = usb_add_hcd(hcd, irq->start, IRQF_DISABLED); + + if (retval == 0) + return retval; + ++err_create_file: ++ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr); ++ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr); ++ + tmio_stop_hc(dev); + + dmabounce_unregister_dev(dev); @@ -256,6 +358,8 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + struct tmio_hcd *tmio = hcd_to_tmio(hcd); + + usb_remove_hcd(hcd); ++ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr); ++ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr); + tmio_stop_hc(dev); + dmabounce_unregister_dev(dev); + dma_release_declared_memory(dev); @@ -343,13 +447,22 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c +static int ohci_hcd_tmio_drv_probe(struct device *dev) +{ + struct resource *sram = tmio_resource_mem(dev); ++ int retval; + + dev->dma_mask = &dma_mask; + dev->coherent_dma_mask = DMA_32BIT_MASK; + ++ /* FIXME: move dmabounce checkers to tc6393 core? */ + dmabounce_register_checker(tmio_dmabounce_check, sram); + -+ return usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev); ++ retval = usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev); ++ ++ if (retval == 0) ++ return retval; ++ ++ dmabounce_remove_checker(tmio_dmabounce_check, sram); ++ ++ return retval; +} + +static int ohci_hcd_tmio_drv_remove(struct device *dev) @@ -437,7 +550,7 @@ Index: linux-2.6.23/drivers/usb/host/Kconfig Index: linux-2.6.23/drivers/usb/host/ohci-hcd.c =================================================================== --- linux-2.6.23.orig/drivers/usb/host/ohci-hcd.c 2007-11-12 13:46:52.894560883 +0300 -+++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-13 01:03:53.950798640 +0300 ++++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-14 16:44:32.788069355 +0300 @@ -915,6 +915,10 @@ #define PLATFORM_DRIVER usb_hcd_pnx4008_driver #endif diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb index 53625791a7..555712500e 100644 --- a/packages/linux/linux-rp_2.6.23.bb +++ b/packages/linux/linux-rp_2.6.23.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r10" +PR = "r11" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc new file mode 100644 index 0000000000..3754e1580a --- /dev/null +++ b/packages/navit/navit.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "Navit is a car navigation system with routing engine." +LICENSE = "GPL" +DEPENDS = "glib-2.0 gtk+" +RRECOMMENDS = "gpsd speechd flite" + +inherit autotools + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" + +FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" +FILES_${PN}-dev += "${libdir}/${PN}/*/*.so" diff --git a/packages/navit/navit_0.0.1.bb b/packages/navit/navit_0.0.1.bb index 2db71a3e87..f96a04ec16 100644 --- a/packages/navit/navit_0.0.1.bb +++ b/packages/navit/navit_0.0.1.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "Navit is a car navigation system with routing engine." -LICENSE = "GPL" -DEPENDS = "glib-2.0 gtk+" -PR = "r2" +require navit.inc -inherit autotools +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \ file://compile-fix.patch;patch=1" EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float" - -FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" diff --git a/packages/navit/navit_0.0.2.bb b/packages/navit/navit_0.0.2.bb index 25e16b7bbf..794f901db5 100644 --- a/packages/navit/navit_0.0.2.bb +++ b/packages/navit/navit_0.0.2.bb @@ -1,15 +1,7 @@ -DESCRIPTION = "Navit is a car navigation system with routing engine." -LICENSE = "GPL" -DEPENDS = "glib-2.0 gtk+" -PR = "r1" +require navit.inc -inherit autotools +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --disable-samplemap --enable-avoid-unaligned --enable-avoid-float" - -PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" - -FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" -FILES_${PN}-dev += "${libdir}/${PN}/*/*.so" diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb new file mode 100644 index 0000000000..d0c1c553d6 --- /dev/null +++ b/packages/navit/navit_0.0.3.bb @@ -0,0 +1,7 @@ +require navit.inc + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" + +EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb index 8f158d4f79..8b10c908ec 100644 --- a/packages/navit/navit_cvs.bb +++ b/packages/navit/navit_cvs.bb @@ -1,19 +1,13 @@ -DESCRIPTION = "Navit is a car navigation system with routing engine." -LICENSE = "GPL" -DEPENDS = "glib-2.0 gtk+" -PV = "0.0.2+cvs${SRCDATE}" +require navit.inc + +PV = "0.0.3+cvs${SRCDATE}" PR = "r0" -inherit autotools S = "${WORKDIR}/navit" -SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \ - " +SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit" EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" -#--enable-shared EXTRA_AUTORECONF = " -I m4" -FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" - diff --git a/packages/octave/octave_3.0.0.bb b/packages/octave/octave_3.0.0.bb new file mode 100644 index 0000000000..b92a181754 --- /dev/null +++ b/packages/octave/octave_3.0.0.bb @@ -0,0 +1,27 @@ +require octave.inc + +SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ + file://configure.patch;patch=1" + +PR = "r0" + +PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \ + libcruft-dev liboctave-dev liboctinterp-dev \ + libcruft-dbg liboctave-dbg liboctinterp-dbg" + +FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*" +FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so" +FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*" + +FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*" +FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so" +FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*" + +FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*" +FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so" +FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*" + +# octave-oct provides subroutines in .oct file format +FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct" + +FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 74a16c4720..0bb4b1e588 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml0" +PR = "ml1" SRC_URI = "\ http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ @@ -39,13 +39,13 @@ FIX_QREAL = "\ " do_generate_prepend() { - for i in ${FIX_QREAL}; do - sed -i -e s,qreal,float,g sip/$i - done + for i in ${FIX_QREAL}; do + sed -i -e s,qreal,float,g sip/$i + done } do_configure_prepend() { - echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro + echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro } do_stage() { diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/roadmap.desktop.patch index 98d5b06130..98d5b06130 100644 --- a/packages/roadmap/files/qt/roadmap.desktop.patch +++ b/packages/roadmap/files/roadmap.desktop.patch diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty b/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch new file mode 100644 index 0000000000..8f79b5503f --- /dev/null +++ b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch @@ -0,0 +1,11 @@ +--- src/qt/ipkg/zroadgps.desktop.old 2007-12-24 19:35:34.000000000 -0600 ++++ src/qt/ipkg/zroadgps.desktop 2007-12-24 19:37:12.000000000 -0600 +@@ -1,6 +1,7 @@ + [Desktop Entry] + Comment=RoadMap + Exec=roadgps +-Icon=zroadgps ++Icon=roadgps + Type=Application + Name=RoadMapGPS ++Categories=Graphics;Viewer;GTK; diff --git a/packages/roadmap/roadmap-gtk2_1.0.12.bb b/packages/roadmap/roadmap-gtk2_1.0.12.bb new file mode 100644 index 0000000000..e2ce5f2316 --- /dev/null +++ b/packages/roadmap/roadmap-gtk2_1.0.12.bb @@ -0,0 +1,44 @@ +require roadmap.inc + +DEPENDS = "gtk+" +PR = "r0" + +SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ + file://roadmap.desktop.patch;patch=1 \ + file://roadgps.desktop.patch;patch=1 \ + http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \ + file://zroadgps.png " + +S = "${WORKDIR}/roadmap-${PV}/src" + +DESKTOP = "GTK2" +CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ + -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a + cd gtk2 && oe_runmake +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/roadmap + + install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap + install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps + + install -m 0644 icons/*png ${D}${datadir}/pixmaps/ + install -m 0644 roadmap.png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png + + install -m 0644 roadmap.desktop ${D}${datadir}/applications/ + install -m 0644 qt/ipkg/zroadgps.desktop ${D}${datadir}/applications/roadgps.desktop + + install -m 0644 sprites schema preferences ${D}${datadir}/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} + +FILES_${PN} += "${datadir}/roadmap" + diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb new file mode 100644 index 0000000000..f638cf1fdd --- /dev/null +++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb @@ -0,0 +1,46 @@ +require roadmap.inc + +DEPENDS = "agg expat gtk+" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ + file://cross.patch;patch=1;pnum=2 \ + file://roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" + +S = "${WORKDIR}/roadmap-${PV}/src" + +DESKTOP = "GTK2" +POPT = "NO" +AGG = "rgba32" +CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ + -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C gtk2 gtkroadmap gtkroadgps +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/roadmap + + install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap + install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps + + install -m 0644 icons/*png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png + + install -m 0644 roadmap.desktop ${D}${datadir}/applications/ + + install -m 0644 sprites preferences ${D}${datadir}/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} + +FILES_${PN} += "${datadir}/roadmap" + diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index 557c4a1096..2ece0de929 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,22 +1,26 @@ require roadmap.inc -DEPENDS = "expat gtk+" -PV = "1.0.12+cvs${SRCDATE}" -PR = "r1" +DEPENDS = "agg expat gtk+" +PV = "1.1.0+cvs${SRCDATE}" +PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - " + file://zroadgps.png" S = "${WORKDIR}/roadmap/src" -CFLAGS += " -I${S} " - +DESKTOP = "GTK2" +AGG = "rgba32" +CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ + -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " do_compile() { - oe_runmake - oe_runmake gtk2 + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C gtk2 gtkroadmap gtkroadgps } do_install() { @@ -25,11 +29,15 @@ do_install() { install -d ${D}${datadir}/pixmaps install -d ${D}${datadir}/roadmap - install -m 0755 gtk2/gtkroad* ${D}${bindir} + install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap + install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps - install -m 0644 icons/*png ${D}${datadir}/pixmaps + install -m 0644 icons/*png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png + + install -m 0644 roadmap.desktop ${D}${datadir}/applications/ - install -m 0644 sprites preferences ${D}${datadir}/roadmap + install -m 0644 sprites preferences ${D}${datadir}/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ } diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc index 43577badb9..e9598df178 100644 --- a/packages/roadmap/roadmap.inc +++ b/packages/roadmap/roadmap.inc @@ -3,5 +3,6 @@ PRIORITY = "optional" AUTHOR = "Pascal Martin <pascal.martin@iname.com>" HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" LICENSE = "GPL" +RRECOMMENDS = "gpsd flite" PARALLEL_MAKE = "" diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch deleted file mode 100644 index 24fe1c9bdb..0000000000 --- a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> -# - ---- src/qt/qt_main.cc~qt2-fixes-r1.patch -+++ src/qt/qt_main.cc -@@ -137,7 +137,7 @@ - switch (orientation[0]) { - case 't': - case 'T': break; -- -+#ifndef QWS - case 'b': - case 'B': moveDockWindow (toolBar, DockBottom); break; - -@@ -146,7 +146,7 @@ - - case 'r': - case 'R': moveDockWindow (toolBar, DockRight); break; -- -+#endif - default: roadmap_log (ROADMAP_FATAL, - "Invalid toolbar orientation %s", orientation); - } ---- src/qt/Makefile~qt2-fixes-r1.patch -+++ src/qt/Makefile -@@ -19,7 +19,7 @@ - - ifeq ($(DESKTOP),QPE) - CFLAGS += -I$(QTDIR)/include -DQWS -- LIBS += -lqte -lqpe -+ LIBS += -lqpe - INSTALLDIR=$(QTDIR) - endif - diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb index 9a7b73d1a1..c7fc851d0d 100644 --- a/packages/roadmap/zroadmap_1.0.12.bb +++ b/packages/roadmap/zroadmap_1.0.12.bb @@ -4,8 +4,9 @@ PR = "r1" SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ file://qt2-fixes.patch;pnum=2;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap-${PV}/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ @@ -21,13 +22,17 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb index 42184ce62b..bafcc7c27d 100644 --- a/packages/roadmap/zroadmap_1.1.0.bb +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -1,7 +1,7 @@ require zroadmap.inc -DEPENDS += "expat" -PR = "r0" +DEPENDS = "expat" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://cross.patch;patch=1;pnum=2 \ @@ -9,9 +9,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://qt/qt_canvas.patch;patch=1 \ file://qt/qt_main.patch;patch=1 \ file://qt/roadmap_main.patch;patch=1 \ - file://qt/roadmap.desktop.patch;patch=1 \ + file://roadmap.desktop.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap-${PV}/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \ @@ -29,12 +30,16 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb index 5b39faf071..cb81756041 100644 --- a/packages/roadmap/zroadmap_cvs.bb +++ b/packages/roadmap/zroadmap_cvs.bb @@ -1,19 +1,15 @@ require zroadmap.inc -DEPENDS += "expat" -SRCDATE = "20071212" -PV = "1.1.0+cvs-${SRCDATE}" -PR = "r0" +DEPENDS = "expat" +PV = "1.1.0+cvs${SRCDATE}" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ file://qt/qt2-fixes.patch;patch=1 \ - file://qt/qt_canvas.patch;patch=1 \ -#upstream file://qt/qt_main.patch;patch=1 \ - file://qt/roadmap_main.patch;patch=1 \ -#upstream file://qt/roadmap.desktop.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ @@ -31,12 +27,16 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch new file mode 100644 index 0000000000..a935bc57de --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch @@ -0,0 +1,13 @@ +--- xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c.old 2007-12-24 04:54:13.000000000 -0600 ++++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2007-12-25 01:13:27.000000000 -0600 +@@ -357,10 +357,7 @@ fbdevMapFramebuffer (KdScreenInfo *scree + KdMouseMatrix m; + FbdevPriv *priv = screen->card->driver; + +- if (scrpriv->randr != RR_Rotate_0 || priv->Have18Bpp) + scrpriv->shadow = TRUE; +- else +- scrpriv->shadow = FALSE; + + KdComputeMouseMatrix (&m, scrpriv->randr, screen->width, screen->height); + diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 368b421650..4367e40adf 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r21" +PR = "r23" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -29,6 +29,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://03-xglamo-no-vesa.patch;patch=1 \ " +SRC_URI_append_tosa = "file://tosa-fbdev.patch;patch=1" +PACKAGE_ARCH_xserver-kdrive-fbdev_tosa = "${MACHINE_ARCH}" + S = "${WORKDIR}/xorg-server-${PV}" W100_OECONF = "--disable-w100" diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index fb4d6e2584..052560dcc9 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r19" +PR = "r20" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index ed558be941..22d4b3914d 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -39,6 +39,12 @@ # - Unify format of do_flashing()... # - Display ${PR} of zaurus-updater.bb to the user # - Polish HDD installer messages +# +# 2007.12.25 Matthias 'CoreDump' Hentges +# -Add support for installing / updating u-boot + +# Set to "yes" to enable +ENABLE_UBOOT_UPDATER="no" DATAPATH=$1 TMPPATH=/tmp/update @@ -289,6 +295,53 @@ do_flashing() fi } +update_uboot() { + # The flashing part of this function is based on pdaXrom's + # updater.sh + + if test "$ENABLE_UBOOT_UPDATER" != "yes" -o -z "$1" + then + echo "u-boot updates not allowed." + return + fi + + echo "" + echo "Installing u-boot bootloader:" + + DATASIZE=`wc -c $TARGETFILE` + FSIZE=`echo $DATASIZE | cut -d' ' -f1` + + echo -n "* Creating backup ($FSIZE Bytes)..." + if ( nandlogical /dev/mtd1 READ 0 $FSIZE /tmp/sharploader.bin ) > /dev/null 2>&1 + then + echo "Ok" + + echo -n "* Flashing u-boot..." + if ( nandlogical /dev/mtd1 WRITE 0 $FSIZE $1 ) > /dev/null 2>&1 + then + echo "Success" + else + echo "FAILED" + echo "ERROR: Installation of u-boot failed!" + + echo -n "* Trying to restore backup..." + if ( nandlogical /dev/mtd1 WRITE 0 $FSIZE /tmp/sharploader.bin ) > /dev/null 2>&1 + then + echo "Success" + echo "Your old bootloader has been restored" + else + echo "FAILED" + echo "Sorry, it's NAND-Restore time for you =(" + fi + fi + else + echo "FAILED" + echo "Could not create backup, aborting!" + echo "Your bootloader has not been altered in any way." + exit 1 + fi +} + ### Check model ### /sbin/writerominfo MODEL=`cat /proc/deviceinfo/product` @@ -328,7 +381,7 @@ mkdir -p $TMPPATH > /dev/null 2>&1 cd $DATAPATH/ -for TARGETFILE in zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ +for TARGETFILE in u-boot.bin U-BOOT.BIN zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ do if [ ! -e $TARGETFILE ] then @@ -388,10 +441,18 @@ do hdimage1.tgz) if [ $UNPACKED_ROOTFS = 0 ] then - do_rootfs_extraction + do_rootfs_extraction fi ;; - + + u-boot.bin) + if [ FLASHED_UBOOT != 1 ] + then + update_uboot "$TARGETFILE" + FLASHED_UBOOT="1" + fi + ;; + *) ;; esac |