diff options
308 files changed, 4772 insertions, 3380 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 21feaab6e6..340e5d91f8 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -196,7 +196,7 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,' $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi diff --git a/classes/e.bbclass b/classes/e.bbclass new file mode 100644 index 0000000000..4485d1d847 --- /dev/null +++ b/classes/e.bbclass @@ -0,0 +1,40 @@ +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +HOMEPAGE = "http://www.enlightenment.org" +SECTION = "e/apps" + +inherit autotools pkgconfig binconfig + +do_prepsources () { + make clean distclean || true +} +addtask prepsources after do_fetch before do_unpack + +def binconfig_suffix(d): + import bb + return ["","-native"][bb.data.inherits_class('native', d)] + +export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" +export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" +export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" +export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" +export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" +export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" +export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}" +export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}" +export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" +export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" +export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" +export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" +export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" + +do_compile_prepend() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' +} + +E_CVS = "cvs://anonymous@anoncvs.enlightenment.org:/var/cvs/e" +E_URI = "http://enlightenment.freedesktop.org/files" + +PACKAGES = "${PN} ${PN}-themes" +FILES_${PN} = "${libdir}/lib*.so*" +FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" diff --git a/classes/efl.bbclass b/classes/efl.bbclass index e5968b9aec..9c490284c2 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -1,18 +1,11 @@ -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -HOMEPAGE = "http://www.enlightenment.org" +inherit e + SECTION = "e/libs" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" -SRC_URI = "http://enlightenment.freedesktop.org/files/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "${E_URI}/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit autotools pkgconfig binconfig - -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - INHIBIT_AUTO_STAGE_INCLUDES = "1" INHIBIT_NATIVE_STAGE_INSTALL = "1" @@ -20,29 +13,6 @@ libdirectory = "src/lib" libraries = "lib${SRCNAME}" headers = "${@bb.data.getVar('SRCNAME',d,1).capitalize()}.h" -def binconfig_suffix(d): - import bb - return ["","-native"][bb.data.inherits_class('native', d)] - -export CURL_CONFIG = "${STAGING_BINDIR}/curl-config${@binconfig_suffix(d)}" -export EDB_CONFIG = "${STAGING_BINDIR}/edb-config${@binconfig_suffix(d)}" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config${@binconfig_suffix(d)}" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config${@binconfig_suffix(d)}" -export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config${@binconfig_suffix(d)}" -export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config${@binconfig_suffix(d)}" -export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config${@binconfig_suffix(d)}" -export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config${@binconfig_suffix(d)}" -export EPSILON_CONFIG = "${STAGING_BINDIR}/epsilon-config${@binconfig_suffix(d)}" -export EPEG_CONFIG = "${STAGING_BINDIR}/epeg-config${@binconfig_suffix(d)}" -export ESMART_CONFIG = "${STAGING_BINDIR}/esmart-config${@binconfig_suffix(d)}" -export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(d)}" -export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" - -do_compile_prepend() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' - find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' -} - do_stage_append () { for i in ${libraries} do @@ -73,9 +43,7 @@ do_stage_append () { fi } -PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples " -FILES_${PN} = "${libdir}/lib*.so*" -FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" +PACKAGES = "${PN} ${PN}-themes ${PN}-dev ${PN}-examples" FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a" FILES_${PN}-examples = "${bindir} ${datadir}" diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 471acd4a61..c5f667747c 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -163,6 +163,7 @@ kernel_do_install() { oe_runmake SUBDIRS="scripts/genksyms" fi + install -d ${STAGING_KERNEL_DIR} cp -fR scripts ${STAGING_KERNEL_DIR}/ } diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 3b642e58f7..48a1daf64a 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -304,6 +304,7 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases" GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources" FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/" HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs" +E_CVS = "cvs://anonymous@anoncvs.enlightenment.org:/var/cvs/e" FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs" GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles" APACHE_MIRROR = "http://www.apache.org/dist" @@ -400,4 +401,4 @@ require conf/sanity.conf # Weak variables (usually to retain backwards compatibility) ################################################################## -PCMCIA_MANAGER ?= "pcmcia-cs"
\ No newline at end of file +PCMCIA_MANAGER ?= "pcmcia-cs" diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf index c5c9f6868c..1063356217 100644 --- a/conf/distro/debianslug.conf +++ b/conf/distro/debianslug.conf @@ -87,6 +87,15 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " +DEBIANSLUG_STANDARD_RDEPENDS += "\ +kernel-module-ehci-hcd \ +kernel-module-ohci-hcd \ +kernel-module-uhci-hcd \ +kernel-module-sd-mod \ +kernel-module-usb-storage \ +kernel-module-scsi-mod \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 304cd6dcfa..09f3691b65 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -87,6 +87,15 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " +OPENSLUG_STANDARD_RDEPENDS += "\ +kernel-module-ehci-hcd \ +kernel-module-ohci-hcd \ +kernel-module-uhci-hcd \ +kernel-module-sd-mod \ +kernel-module-usb-storage \ +kernel-module-scsi-mod \ +" + # This documents other file systems which are built but not installed # by default in the flash image. # diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc index 53f363bf3d..c8f246ff69 100644 --- a/conf/distro/preferred-e-versions.inc +++ b/conf/distro/preferred-e-versions.inc @@ -2,29 +2,29 @@ # Specify which versions of E-related libraries and applications to build # -PREFERRED_VERSION_e = "0.16.999.023" -PREFERRED_VERSION_ecore-x11 = "0.9.9.023" -PREFERRED_VERSION_ecore-native = "0.9.9.023" -PREFERRED_VERSION_edb = "1.0.5.005" -PREFERRED_VERSION_edb-native = "1.0.5.005" -PREFERRED_VERSION_edje = "0.5.0.023" -PREFERRED_VERSION_edje-native = "0.5.0.023" -PREFERRED_VERSION_eet = "0.9.10.023" -PREFERRED_VERSION_eet-native = "0.9.10.023" -PREFERRED_VERSION_embryo = "0.9.1.023" -PREFERRED_VERSION_embryo-native = "0.9.1.023" +PREFERRED_VERSION_e = "0.16.999.025" +PREFERRED_VERSION_ecore-x11 = "0.9.9.025" +PREFERRED_VERSION_ecore-native = "0.9.9.025" +PREFERRED_VERSION_edb = "1.0.5.006" +PREFERRED_VERSION_edb-native = "1.0.5.006" +PREFERRED_VERSION_edje = "0.5.0.025" +PREFERRED_VERSION_edje-native = "0.5.0.025" +PREFERRED_VERSION_eet = "0.9.10.025" +PREFERRED_VERSION_eet-native = "0.9.10.025" +PREFERRED_VERSION_embryo = "0.9.1.025" +PREFERRED_VERSION_embryo-native = "0.9.1.025" PREFERRED_VERSION_emotion = "0.0.1.004" PREFERRED_VERSION_emotion-native = "0.0.1.004" -PREFERRED_VERSION_epeg = "0.9.0.005" -PREFERRED_VERSION_epsilon = "0.3.0.005" -PREFERRED_VERSION_esmart-x11 = "0.9.0.005" -PREFERRED_VERSION_evas-x11 = "0.9.9.023" -PREFERRED_VERSION_evas-native = "0.9.9.023" -PREFERRED_VERSION_ewl = "0.0.4.005" -PREFERRED_VERSION_imlib2-x11 = "1.2.1.010" -PREFERRED_VERSION_imlib2-native = "1.2.1.010" -PREFERRED_VERSION_e-wm = "0.16.999.023" -PREFERRED_VERSION_entrance = "0.9.0.005" +PREFERRED_VERSION_epeg = "0.9.0.006" +PREFERRED_VERSION_epsilon = "0.3.0.006" +PREFERRED_VERSION_esmart-x11 = "0.9.0.006" +PREFERRED_VERSION_evas-x11 = "0.9.9.025" +PREFERRED_VERSION_evas-native = "0.9.9.025" +PREFERRED_VERSION_ewl = "0.0.4.006" +PREFERRED_VERSION_imlib2-x11 = "1.2.1.011" +PREFERRED_VERSION_imlib2-native = "1.2.1.011" +PREFERRED_VERSION_e-wm = "0.16.999.025" +PREFERRED_VERSION_entrance = "0.9.0.006" PREFERRED_PROVIDER_virtual/evas = "evas-x11" PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 3ed8549418..b89d5728f7 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -169,7 +169,6 @@ ${PKGDIR}/packages/obexftp/*.bb \ ${PKGDIR}/packages/openjade/*.bb \ ${PKGDIR}/packages/openldap/*.bb \ ${PKGDIR}/packages/openntpd/*.bb \ -${PKGDIR}/packages/openobex-apps/*.bb \ ${PKGDIR}/packages/openobex/*.bb \ ${PKGDIR}/packages/opensp/*.bb \ ${PKGDIR}/packages/openssh/*.bb \ diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index 24ef6e6c33..bb6c6efa6a 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -19,6 +19,16 @@ UCSLUGC_EXTRA_BBFILES ?= "" # prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_ # setting - either may be set in local.conf to override these values. UCSLUGC_EXTRA_RDEPENDS ?= "" + +UCSLUGC_STANDARD_RDEPENDS += "\ +kernel-module-ehci-hcd \ +kernel-module-ohci-hcd \ +kernel-module-uhci-hcd \ +kernel-module-sd-mod \ +kernel-module-usb-storage \ +kernel-module-scsi-mod \ +" + # SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index e961445209..1308340887 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.7-beta" +DISTRO_VERSION = "6.8-beta" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index 885bf40b4f..b1dcd7fe3b 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1,4 +1,43 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" +PCMCIA_MANAGER ?= "pcmciautils" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ +ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" + +# Ethernet modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" +# NFS Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" +# Crypto Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" +# SMB and CRAMFS +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" +# Serial Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs" +# Bluetooth Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ + kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ + kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" +# Infrared Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ + kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" + +# USB Gadget Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ + kernel-module-g-serial kernel-module-g-ether" + +# Wireless Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ + kernel-module-hermes kernel-module-orinoco \ + kernel-module-orinoco-cs kernel-module-spectrum-cs \ + hostap-conf orinoco-conf" + +# Sound Modules +###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" +BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ + kernel-module-snd-pcm \ + kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" + +###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 " diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 7d56cbd3a6..2df0e16792 100644 --- a/packages/altboot/altboot_0.0.0.bb +++ b/packages/altboot/altboot_0.0.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "A text-based bootmanager allowing a Zaurus to boot from SD, CF, USB-Storage and NFS. \ -Tested machines: Collie, Poodle, Akita, Spitz" +Tested machines: Collie, Poodle, Akita, Spitz, C7x0, Tosa, Borzoi" SECTION = "base" PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r26" +PR = "r34" SRC_URI = "file://altboot-menu \ @@ -44,75 +44,6 @@ pkg_postinst() { update-alternatives --install /sbin/init init /sbin/init.altboot 55 } -pkg_postinst_spitz() { - # Note: Spitz support is a royal pain in the ass. - # Since Spitz pivot_roots by default, there is no real way - # a user can install an altboot.ipk into the flash FS. - # So we need to do that manually (*SIGH*) - - # the 2.6 kernel for spitz boots from HDD, no need to copy to flash - if cat /proc/version | awk '{print $3}' | grep -q '^2.6'; then - update-alternatives --install /sbin/init init /sbin/init.altboot 55 - # no need to copy to flash if we're installing to flash already - elif mount | grep ' / ' | grep -q mtdblock; then - update-alternatives --install /sbin/init init /sbin/init.altboot 55 - else - # /l/m only exists on the HDD on spitz - if test -d /lib/modules - then - if [ -e /media/realroot/sbin/init ]; then - ROOT_MOUNT_POINT="/media/realroot" - elif [ -e /media/ROM/sbin/init ]; then - ROOT_MOUNT_POINT="/media/ROM" - fi - if [ ! "$ROOT_MOUNT_POINT" = "" ]; then - ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1` - if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then - mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT - cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc - cp /sbin/init.altboot $ROOT_MOUNT_POINT/sbin - if [ -f $ROOT_MOUNT_POINT/sbin/init ]; then - mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig - fi - ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init - fi - fi - fi - fi -} - pkg_postrm() { update-alternatives --remove init /sbin/init.altboot } - -pkg_postrm_spitz() { - # the 2.6 kernel for spitz boots from HDD, no need to remove from flash - if cat /proc/version | awk '{print $3}' | grep -q '^2.6'; then - update-alternatives --remove init /sbin/init.altboot - # no need to copy to flash if we're removing from flash already - elif mount | grep ' / ' | grep -q mtdblock; then - update-alternatives --remove init /sbin/init.altboot - else - if test -d /lib/modules - then - if [ -e /media/realroot/sbin/init ]; then - ROOT_MOUNT_POINT="/media/realroot" - elif [ -e /media/ROM/sbin/init ]; then - ROOT_MOUNT_POINT="/media/ROM" - fi - if [ ! "$ROOT_MOUNT_POINT" = "" ]; then - ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1` - if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then - mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT - if [ -f $ROOT_MOUNT_POINT/sbin/init.orig ]; then - rm $ROOT_MOUNT_POINT/sbin/init - rm $ROOT_MOUNT_POINT/sbin/init.altboot - mv $ROOT_MOUNT_POINT/sbin/init.orig $ROOT_MOUNT_POINT/sbin/init - else - echo "$ROOT_MOUNT_POINT/sbin/init.orig not found, not uninstalling altboot!" - fi - fi - fi - fi - fi -} diff --git a/packages/altboot/altboot_1.0.6-rc1.bb b/packages/altboot/altboot_1.0.6-rc1.bb new file mode 100644 index 0000000000..bb99fe31e5 --- /dev/null +++ b/packages/altboot/altboot_1.0.6-rc1.bb @@ -0,0 +1,82 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: altboot_1.0.5-rc2.bb +# Date: 21-Feb-06 + +DESCRIPTION = "The altboot bootmanager" +MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" +HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" + +###################################################################################### + +PR = "r0" + +###################################################################################### + +PACKAGE_ARCH = "${MACHINE}" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" + +SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" + +S = "${WORKDIR}/altboot/" + +###################################################################################### + +do_install() { + install -d ${D}/sbin + install -d ${D}/etc/altboot-menu + install -d ${D}/etc/altboot-menu/Advanced + install -d ${D}/etc/altboot.rc + install -d ${D}/usr/share/doc/altboot + + if test -d ${WORKDIR}/altboot/${MACHINE} + then + install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc + else + install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc + fi + + install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc + install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin + + if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/ + then + install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu + else + install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu + fi + + if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/ + then + install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + else + install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + fi + + install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc +} + +###################################################################################### + +do_configure() { + cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_ + mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot +} + +###################################################################################### + +pkg_postinst() { + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +###################################################################################### + +pkg_postrm() { + update-alternatives --remove init /sbin/init.altboot +} + diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg index 69f7c8351b..c9a030b348 100644 --- a/packages/altboot/files/akita/altboot-2.6.cfg +++ b/packages/altboot/files/akita/altboot-2.6.cfg @@ -9,6 +9,7 @@ SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" +ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcblk0p1" SD_KERNEL_MODULE="" diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index 3a41fccf79..e01af7faad 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -20,11 +20,11 @@ run_module() { init_rootfs # Needed for NFS - /etc/init.d/portmap start >/dev/tty1 2>&1 || die "/etc/init.d/portmap start failed!" + /etc/init.d/portmap start >/dev/null 2>&1 || die "/etc/init.d/portmap start failed!" # For some reason NFS mounts hang if /e/i/networking is not run. # For the time beeing I'm too lazy to investigate ;) - /etc/init.d/networking start || die "/etc/init.d/networking start failed!" + /etc/init.d/networking start >/dev/null 2>&1 || die "/etc/init.d/networking start failed!" sleep 2 @@ -91,7 +91,20 @@ run_module() { do stty echo echo -n "Boot NFS root: " - read junk < /dev/tty1 + + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-bootNFS-source.last + then + junk="`cat /etc/.altboot-bootNFS-source.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi + cnt=1 for nfs_mount in $nfs_mounts @@ -99,6 +112,7 @@ run_module() { if test "$junk" = "$cnt" then selection="$nfs_mount" + echo "$junk" > /etc/.altboot-bootNFS-source.last fi let cnt=$cnt+1 done @@ -112,13 +126,22 @@ run_module() { mkdir -p /media/nfsroot || die "mkdir -p /media/nfsroot failed!" echo -n "Mounting NFS root..." + + if ( mount | grep -q "/media/nfsroot" ) + then + echo "/media/nfsroot already used, tying to umount..." + umount /media/image + losetup -d /dev/loop0 + umount /media/nfsroot || die "umount failed!" + fi + mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!" # Use configured resolv.conf in the pivoted rootfs - echo -n "Copying resolv.conf..." + #echo -n "Copying resolv.conf..." #cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED" - check_target "/media/nfsroot" + check_target "/media/nfsroot" bootNFS } diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index c6af50a008..0cc59116ce 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -1,6 +1,7 @@ #! /bin/sh # This function checks for the presence of a real filesystem and loop-images on the target # $1 = folder of rootfs, $2 = runlevel (defaults to 5) +# $2 = name of calling module check_target() { # Check if there is a /sbin/init or /sbin/init.sysvinit on the card if test -x $1/sbin/init -o -x $1/$REAL_INIT @@ -31,11 +32,24 @@ check_target() { while test -z "$ans" do echo -n "Your choice: " - read junk < /dev/tty1 + + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-real-or-loop.last + then + junk="`cat /etc/.altboot-real-or-loop.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi if test "$junk" = 1 -o "$junk" = 2 then ans="$junk" + echo "$junk" > /etc/.altboot-real-or-loop.last fi done @@ -59,21 +73,35 @@ check_target() { fi } +boot_new_rootfs_splash() { +C_RED="\033[37;44m" +C_RESET="\033[0m" + + echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" + echo -e "${C_RED}| |${C_RESET}" + echo -e "${C_RED}| Booting the selected rootfs... |${C_RESET}" + echo -e "${C_RED}| |${C_RESET}" + echo -e "${C_RED}+----------------------------------------------------------+${C_RESET}" + +} + # This function pivot_root's into a real filesystem calling $newrootfs/sbin/init # $1 = The new rootfs pivot_realfs() { - test -z "$2" && RL="5" || RL="$2" + #test -z "$2" && RL="5" || RL="$2" mkdir -p $1/media/ROM || die "mkdir -p $1/media/ROM failed" mount -o remount,ro / >/dev/null 2>&1 + test "$ENABLE_IMAGECONF" = yes && image_conf $1 + do_pivot "$1" "$RL" } # This function loop-mounts an image-file and pivot_root's into it # $1: The new rootfs pivot_image() { - test -z "$2" && RL="5" || RL="$2" + #test -z "$2" && RL="5" || RL="$2" cd $1/$IMAGE_PATH # Check for rootfs images on the card @@ -95,7 +123,18 @@ pivot_image() { while test -z "$IMAGE_NAME" do echo -en "Please choose one of the above: " - read junk < /dev/tty1 + if test "$AUTOBOOT" != "yes" + then + read junk < /dev/tty1 + else + if test -e /etc/.altboot-loopimage.last + then + junk="`cat /etc/.altboot-loopimage.last`" + test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)" + else + read junk < /dev/tty1 + fi + fi x=0 for file in `ls *rootfs.bin` @@ -103,7 +142,8 @@ pivot_image() { let x=$x+1 if test "$x" = "$junk" then - IMAGE_NAME="$file" + IMAGE_NAME="$file" + echo "$junk" > /etc/.altboot-loopimage.last fi done done @@ -111,28 +151,31 @@ pivot_image() { IMAGE_NAME="`ls *rootfs.bin`" test -z "$IMAGE_NAME" && die "No rootfs found (*rootfs.bin) in $1/$IMAGE_PATH" fi - - echo "Using [$IMAGE_NAME]" + + + echo "" mkdir -p /media/image || die "mkdir -p /media/image failed" - echo "Setting up loopback (/dev/loop0) for $IMAGE_NAME" losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME || die "losetup /dev/loop0 $1/$IMAGE_PATH/$IMAGE_NAME failed!" check_fs /dev/loop0 $IMAGE_TYPE - echo -e "\n* * * Booting rootfs image * * *\n" + echo -e "\n* * * Mounting rootfs image * * *\n" # Busybox's "mount" doesn't seem to like "-o loop" for some reason # It works on collie and b0rks on poodle. if [ "$IMAGE_TYPE" = "" ]; then IMAGE_TYPE="auto" fi + # If mount fails it has the tendency to spew out a _lot_ of error messages. # We direct the output to /dev/null so the user can see which step actually failed. mount /dev/loop0 -t $IMAGE_TYPE /media/image >/dev/null 2>&1 || die "mount -t $IMAGE_TYPE /dev/loop0 /media/image failed!" mkdir -p /media/image/media/ROM || die "mkdir -p /media/image/media/ROM failed" + test "$ENABLE_IMAGECONF" = yes && image_conf /media/image + do_pivot /media/image "$RL" } @@ -161,11 +204,11 @@ do_pivot(){ ! test -d "$new_mpt" && mkdir -p "$new_mpt" /bin/busybox mount -o move "$mpt" "$new_mpt" done - + + clear + boot_new_rootfs_splash echo "Calling INIT" - - #read junk - + exec /usr/sbin/chroot . /sbin/init $2 >/dev/tty0 2>&1 else echo "FAILED" @@ -174,6 +217,105 @@ do_pivot(){ } +# $1: Path to mounted rootfs +image_conf(){ + ! test -d "$1" && die "image_conf: [$1] not found / no directory" + + test -e "$1/etc/.image_conf.done" && return + + echo -e "\n\n* * * rootfs configuration * * *\n" + echo -e "This setup lets you reconfigure your new rootfs." + echo "Most probably the rootfs is configured with" + echo "defaults based on a flash installation." + echo "If unsure, go with the defaults by pressing <ENTER>." + echo "" + + if ( cat $1/etc/fstab | grep -v "^#" | grep -q "/home " ) + then + while true + do + echo "Usually your /home directory is located on another flash partition." + echo -n "Do you want me to move /home inside the loop-image? [N|y] " + read junk + + if test "$junk" = "y" -o "$junk" = "Y" + then + cat $1/etc/fstab | sed "/.*\/home.*/s/\/home/\/home.orig/" > $1/etc/fstab_ + mv $1/etc/fstab_ $1/etc/fstab + break + fi + + test "$junk" = "" -o "$junk" = n -o "$junk" = N && break + done + + fi + + echo "" + +# if ( cat $1/etc/fstab | grep -v "^#" | grep -q "/var" ) +# then +# while true +# do +# echo "This is mainly for testing purposes." +# echo -n "Do you want to configure /var as a normal non-tmpfs directory? [N|y] " +# read junk +# +# if test "$junk" = "y" -o "$junk" = "Y" +# then +# cat $1/etc/fstab | sed "/.*\/var.*/s/\(.*\)/#\ \1/" > $1/etc/fstab_ +# mv $1/etc/fstab_ $1/etc/fstab +# break +# fi +# +# test "$junk" = "" -o "$junk" = n -o "$junk" = N && break +# done +# fi + + echo "" + + if ( cat $1/etc/ipkg.conf | grep -q ^lists_dir ) + then + while true + do + echo -e "Wasting RAM is never a good idea.\nOnly say Y if your rootfs is very small in size" + echo -n "Do you want to store ipkg package data in RAM? [N|y] " + read junk + + if test "$junk" = "" -o "$junk" = n -o "$junk" = N + then + cat $1/etc/ipkg.conf | sed "/^lists_dir.*/s/\(.*\)/#\ \1/"> $1/etc/ipkg.conf_ + mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf + break + fi + + test "$junk" = "y" -o "$junk" = "Y" && break + done + fi + + echo "" + + if ( cat $1/etc/ipkg.conf | grep -q "^dest sd" ) + then + while true + do + echo -n "Do you want to keep the SD, CF and /home ipkg install targets? [N|y] " + read junk + + if test "$junk" = "" -o "$junk" = n -o "$junk" = N + then + cat $1/etc/ipkg.conf | sed "/^dest\ \(sd\|cf\|home\).*/s/\(.*\)/#\ \1/" > $1/etc/ipkg.conf_ + mv $1/etc/ipkg.conf_ $1/etc/ipkg.conf + break + fi + + test "$junk" = "y" -o "$junk" = "Y" && break + done + fi + + + touch "$1/etc/.image_conf.done" +} + # This functions configures the master password for altboot if none is set set_password() { mount -o remount,rw / diff --git a/packages/altboot/files/collie/altboot-2.4.cfg b/packages/altboot/files/collie/altboot-2.4.cfg index 9d2560f76b..bc0f9ca054 100644 --- a/packages/altboot/files/collie/altboot-2.4.cfg +++ b/packages/altboot/files/collie/altboot-2.4.cfg @@ -8,7 +8,9 @@ REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" -FSCK_IMAGES="no" +FSCK_IMAGES="yes" +ENABLE_IMAGECONF="yes" + SD_DEVICE="/dev/mmcda1" SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" INIT_RUNLEVEL="5" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 850912f20c..22f3e86e83 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -8,7 +8,7 @@ test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" CURRENT_ENV="`set`" -VERSION="0.0.4" +VERSION="DEVELOPER SNAPSHOT" # Set some defaults in case altboot.cfg is missing REAL_INIT="/sbin/init.sysvinit" @@ -183,6 +183,13 @@ run_timer() { echo -n "." >/dev/tty1 let cnt=$cnt+1 done + + if test "$launch_altboot" != "yes" + then + AUTOBOOT=yes + else + rm -f /etc/.altboot*.last + fi else launch_altboot=yes fi @@ -236,9 +243,13 @@ wait_for_input() { # above to launch the altboot menu. - # This filters an "<ENTER>" from the user as "any key" - ( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 & - sleep 1; kill $! + # Bash throws an ugly error on kill + if ! (readlink /bin/sh | grep -q bash) + then + # This filters an "<ENTER>" from the user as "any key" + ( while :; do read x< /dev/tty0 2>&1; done; ) > /dev/null 2>&1 & + sleep 1; kill $! >/dev/null 2>&1 + fi @@ -272,10 +283,12 @@ wait_for_input() { } # * * * * * * This is the main function * * * * * * - -if test "`runlevel`" != "unknown" -a "$1" != "-force" +# Note: this is positivly ugly. If someone knows a better way to detect wheter +# we are already booted into a runlevel _without_ reading /var and / or using `runlevel` +# PLEASE let me know. +if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force" then - echo "altboot: Using real init [$REAL_INIT] [$*] *" >/dev/tty1 + echo "altboot: Using real init [$REAL_INIT] [$*] [`ps ax|wc -l|tr -d " "`] *" >/dev/tty1 exec $REAL_INIT $* # exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 exit 0 diff --git a/packages/altboot/files/poodle/altboot-2.4.cfg b/packages/altboot/files/poodle/altboot-2.4.cfg index 9d2560f76b..c5bd17050c 100644 --- a/packages/altboot/files/poodle/altboot-2.4.cfg +++ b/packages/altboot/files/poodle/altboot-2.4.cfg @@ -16,5 +16,7 @@ NO_GUI_RL="2" MASTER_PASSWORD="" ASK_PW_ON_BOOT="no" +ENABLE_IMAGECONF="yes" + SD_MOUNTPOINT="/media/card" CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/spitz/altboot-2.4.cfg b/packages/altboot/files/spitz/altboot-2.4.cfg deleted file mode 100644 index 3c8abc9bae..0000000000 --- a/packages/altboot/files/spitz/altboot-2.4.cfg +++ /dev/null @@ -1,36 +0,0 @@ -# -# Handled by /sbin/init.altboot -# Allow booting images from SD, CF or RAM instead of booting -# the ROM. This is currently broken. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext3" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/media/hdd/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" - -HDD3_DEVICE="/dev/hda3" -HDD3_MOUNTPOINT="/media/hdd3" -HDD3_TYPE="vfat" - -SPITZ_HDD_PART="/dev/hda1" -SPITZ_HDD_TYPE="ext3" - diff --git a/packages/altboot/files/borzoi/altboot-2.6.cfg b/packages/altboot/files/spitz/altboot-2.6.cfg index 69f7c8351b..c9a030b348 100644 --- a/packages/altboot/files/borzoi/altboot-2.6.cfg +++ b/packages/altboot/files/spitz/altboot-2.6.cfg @@ -9,6 +9,7 @@ SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" +ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcblk0p1" SD_KERNEL_MODULE="" diff --git a/packages/altboot/files/spitz/altboot-menu/00-Default b/packages/altboot/files/spitz/altboot-menu/00-Default deleted file mode 100644 index 01818262a3..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/00-Default +++ /dev/null @@ -1,54 +0,0 @@ -# !/bin/sh -M_TITLE="Normal Boot" - -# Note for Spitz: The HDD has already been mounted in /media/hdd from -# /etc/altboot.rc/00-Default.sh - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1" - echo "Spitz: Mounting [$SPITZ_HDD_PART] as /media/hdd" - mount -t proc proc /proc || echo "Mounting /proc failed!" - - mount -o remount,rw / - - # Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise - cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!" - - check_fs $SPITZ_HDD_PART $SPITZ_HDD_TYPE - if [ "$SPITZ_HDD_TYPE" = "" ]; then - SPITZ_HDD_TYPE="auto" - fi - - # I've seen busybox die a horrible death on "!"... - if (mount -t $SPITZ_HDD_TYPE $SPITZ_HDD_PART /media/hdd) - then - a=a - else - echo "ERROR: mount -t ext3 $SPITZ_HDD_PART /media/hdd failed!" - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 - fi - - # There are no device files on Spitz yet, requires HDD (bad for testing - # with CF) - for n in 0 1 2 3 4 5 - do - ! test -e /dev/loop$n && mknod /dev/loop$n b 7 $n - done - - # Check for /sbin/init and / or loop-images - check_target "/media/hdd" 5 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/10-noGui b/packages/altboot/files/spitz/altboot-menu/10-noGui deleted file mode 100644 index e4e8b0fe37..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/10-noGui +++ /dev/null @@ -1,47 +0,0 @@ -# !/bin/sh -M_TITLE="Don't launch GUI" - - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1" - echo "Spitz: Mounting [$SPITZ_HDD_PART] as /media/hdd" - mount -t proc proc /proc || echo "Mounting /proc failed!" - - mount -o remount,rw / - - # Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise - cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!" - - # I've seen busybox die a horrible death on "!"... - if (mount -t auto $SPITZ_HDD_PART /media/hdd) - then - a=a - else - echo "ERROR: mount -t ext3 $SPITZ_HDD_PART /media/hdd failed!" - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 - fi - - # There are no device files on Spitz yet, requires HDD (bad for testing - # with CF) - for n in 1 2 3 4 5 - do - ! test -e /dev/loop$n && mknod /dev/loop$n b 7 $n - done - - # Check for /sbin/init and / or loop-images - check_target "/media/hdd" 2 -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/15-bootSD b/packages/altboot/files/spitz/altboot-menu/15-bootSD deleted file mode 100644 index d22316033c..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/15-bootSD +++ /dev/null @@ -1,64 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -M_TITLE="Boot SD card" - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - test -z "$SPITZ_HDD_PART" && SPITZ_HDD_PART="/dev/hda1" - mount -t proc proc /proc || echo "Mounting /proc failed!" - - # Note: Redirecting STDIN & STDOUT is required, cardmg will die otherwise - cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!" - - # I've seen busybox die a horrible death on "!"... - if (mount -t auto $SPITZ_HDD_PART /media/hdd) - then - a=a - else - echo "ERROR: mount -t auto $SPITZ_HDD_PART /media/hdd failed!" - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 - fi - -# echo -n "Generating device files..." >/dev/tty0 -# /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - -# FIXME: generate device-files - - echo -n "Loading SD kernel module..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - - echo -n "Mounting $SD_MOUNTPOINT..." >/dev/tty0 - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/20-bootCF b/packages/altboot/files/spitz/altboot-menu/20-bootCF deleted file mode 100644 index 3f19b4ee48..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/20-bootCF +++ /dev/null @@ -1,49 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - -# FXIME: boot CF on spitz (hdb??) -exit 0 - -M_TITLE="Boot CF card" - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - - - echo -n "Mounting /proc..." >/dev/tty0 - mount /proc >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount /proc failed!" - - /etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - - # Check for a real fs and loop-images. - check_target "$CF_MOUNTPOINT" - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/25-bootHDD3 b/packages/altboot/files/spitz/altboot-menu/25-bootHDD3 deleted file mode 100644 index 4280cdd35c..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/25-bootHDD3 +++ /dev/null @@ -1,80 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -# This file will teach you how to implement your own scripts while using existing altboot -# code. - -# /sbin/init.altboot searches /etc/altboot-menu for scripts. It will only list scripts which -# return a title when run with the "title" parameter. -# Script which do not return a title will never be shown in the boot menu! -# -M_TITLE="Boot from images on HDD3" - -# The "title" parameter is implemented at the end of this script so it will never be reached -# and the script will simply be ignored by altboot. - - -# The die() function aborts the boot if something goes wrong and sets STDIN / STDERR / STDOUT -# correctly. -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - # altboot.func contains re-useable code. If you intend to use check_target (see below) - # you must keep this line. If not, delete it. - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - - # The only thing you'll have to do is get your medium mounted. - # The following lines mount a SD card on 2.4-series kernels on a Zaurus - - ########################################## - - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - #echo -n "Generating device files..." >/dev/tty0 - #/etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - - cardmgr -o < /dev/tty0 > /dev/tty0 2>&1 || echo "cardmgr -o failed!" - - check_fs $HDD3_DEVICE $HDD3_TYPE - - echo -n "Mounting $HDD3_MOUNTPOINT..." >/dev/tty0 - if [ "$HDD3_TYPE" = "" ]; then - HDD3_TYPE="auto" - fi - /bin/mount -t $HDD3_TYPE -o defaults,noatime $HDD3_DEVICE $HDD3_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $HDD3_DEVICE $HDD3_MOUNTPOINT failed" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - ########################################## - - # Once the medium (be it a CF or SD card, or even a NFS drive) is mounted somewhere, - # just call check_target with the mountpoint as parameter. - # check_target searches the medium for a real filesystem and loop-images and - # asks the user what to boot if there are several choices. - - # Check for a real fs and loop-images. - check_target "$HDD3_MOUNTPOINT" >/dev/tty0 - - # Done :) - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac diff --git a/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example b/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example deleted file mode 100644 index 61c0645176..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/99-ownScripts-example +++ /dev/null @@ -1,81 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - - -# This file will teach you how to implement your own scripts while using existing altboot -# code. - -# /sbin/init.altboot searches /etc/altboot-menu for scripts. It will only list scripts which -# return a title when run with the "title" parameter. -# Script which do not return a title will never be shown in the boot menu! -# -M_TITLE="altboot sample" - -# We can use that to deactivate certain scripts: -exit 0 - -# The "title" parameter is implemented at the end of this script so it will never be reached -# and the script will simply be ignored by altboot. - - -# The die() function aborts the boot if something goes wrong and sets STDIN / STDERR / STDOUT -# correctly. -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - # altboot.func contains re-useable code. If you intend to use check_target (see below) - # you must keep this line. If not, delete it. - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - - # The only thing you'll have to do is get your medium mounted. - # The following lines mount a SD card on 2.4-series kernels on a Zaurus - - ########################################## - - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - - - echo -n "Loading SD kernel module..." - /sbin/insmod $SD_KERNEL_MODULE >/dev/null 2>&1 && echo ok || die "insmod failed" - - echo -n "Mounting $SD_MOUNTPOINT..." >/dev/tty0 - /bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT >/dev/null 2>&1 && echo ok >/dev/tty0|| die "/bin/mount -t auto -o defaults,noatime $SD_DEVICE $SD_MOUNTPOINT failed" - - echo "" - - # Give the SD and CF mounting some time. This is a must for SD - sleep 2 - ########################################## - - # Once the medium (be it a CF or SD card, or even a NFS drive) is mounted somewhere, - # just call check_target with the mountpoint as parameter. - # check_target searches the medium for a real filesystem and loop-images and - # asks the user what to boot if there are several choices. - - # Check for a real fs and loop-images. - check_target "$SD_MOUNTPOINT" >/dev/tty0 - - # Done :) - -} - - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS deleted file mode 100644 index 6cac410019..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/Advanced/40-bootNFS +++ /dev/null @@ -1,97 +0,0 @@ -# !/bin/sh -# -# Copyright Matthias Hentges (c) 2005 -# -# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the GPL) - -# FIXME: Make this work - -M_TITLE="Boot from NFS" - -die() { - echo "ERROR: $1" >/dev/tty0 - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 -} - -# This function is activated by init.altboot by calling this script with the "run" option -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - echo -n "Mounting rootfs rw..." >/dev/tty0 - mount -o remount,rw / >/dev/tty0 2>&1 && echo ok >/dev/tty0|| die "mount -o remount,rw / failed" - - echo -n "Generating device files..." >/dev/tty0 - /etc/init.d/devices start && echo ok >/dev/tty0|| die "FAILED" - - echo -n "Mounting /proc..." >/dev/tty0 - mount /proc >/dev/tty0 2>&1 && echo ok >/dev/tty0 || echo failed - - # Needed for NFS - /etc/init.d/portmap start >/dev/tty1 2>&1 || die "/etc/init.d/portmap start failed!" - - # For some reason NFS mounts hang if /e/i/networking is not run. - # For the time beeing I'm to lazy to investigate ;) - /etc/init.d/networking start || die "/etc/init.d/networking start failed!" - - sleep 2 - - # After the PCMCIA service is started, an inserted WLAN card should automatically - # activate itself. - /etc/init.d/pcmcia start || die "/etc/init.d/pcmcia/start failed!" - - # Give WLAN time to login into the network - echo "Waiting for WLAN..." - sleep 8 - - nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`" - nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`" - - if test "` echo "$nfs_mountpoints" |wc -l | tr -d " "`" -gt 1 - then - echo -e "Please select your NFS root:\n" - - cnt=1 - for nfs_mount in $nfs_mountpoints - do - echo -e "\t[$cnt] $nfs_mount" - let cnt=$cnt+1 - done - - echo "" - - while test -z "$selection" - do - echo -n "Boot NFS root: " - read junk < /dev/tty1 - - cnt=1 - for nfs_mount in $nfs_mounts - do - if test "$junk" = "$cnt" - then - selection="$nfs_mount" - fi - let cnt=$cnt+1 - done - - done - else - test -z "$nfs_mounts" && die "No NFS mounts configured in /etc/fstab!" - selection="$nfs_mounts" - fi - - mkdir -p /media/nfsroot || die "mkdir -p /media/nfsroot failed!" - - echo -n "Mounting NFS root..." - mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!" - - check_target "/media/nfsroot" - -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module "$2";; -esac - diff --git a/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh b/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh deleted file mode 100644 index 6db4adaf3a..0000000000 --- a/packages/altboot/files/spitz/altboot-menu/Advanced/55-bin-sh +++ /dev/null @@ -1,23 +0,0 @@ -# !/bin/sh -M_TITLE="init=/bin/sh" - - -run_module() { - - test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" - - test "$ASK_PW_ON_BOOT" != "yes" && verify_master_pw >/dev/tty0 - - echo -e "\nBoot system with 'exec /sbin/init 5'\n" - while true - do - exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1 - echo "WARNING: Shell was killed!" - done -} - -case "$1" in -title) echo "$M_TITLE";; -run) run_module;; -esac - diff --git a/packages/altboot/files/borzoi/.mtn2git_empty b/packages/altboot/files/tosa/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/altboot/files/borzoi/.mtn2git_empty +++ b/packages/altboot/files/tosa/.mtn2git_empty diff --git a/packages/altboot/files/borzoi/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg index 8c404d4768..c463ca0a43 100644 --- a/packages/altboot/files/borzoi/altboot-2.4.cfg +++ b/packages/altboot/files/tosa/altboot-2.4.cfg @@ -9,12 +9,13 @@ SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" +ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" +SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" USB_HOST_AVAILABLE="yes" -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" +USB_STORAGE_MODULES="usb_ohci_tc6393 usb-storage" USB_STORAGE_PARTITION="/dev/sda1" USB_STORAGE_WAIT="4" diff --git a/packages/bash/bash-3.0/bash-3.0-fixes.patch b/packages/bash/bash-3.0/bash-3.0-fixes.patch new file mode 100644 index 0000000000..c2083b67a5 --- /dev/null +++ b/packages/bash/bash-3.0/bash-3.0-fixes.patch @@ -0,0 +1,1604 @@ +diff -urN orig-bash-3.0/bash30-001 bash-3.0/bash30-001 +--- orig-bash-3.0/bash30-001 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-001 2005-02-14 22:33:55.000000000 +0200 +@@ -0,0 +1,164 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-001 ++ ++Bug-Reported-by: Karlheinz Nolte <kn@k-nolte.de> ++Bug-Reference-ID: <20040801200058.GA3311@mars.home.k-nolte.de> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00009.html ++ ++Bug-Description: ++ ++ The following script triggers the segfault. ++ This was found by Costa Tsaousis the author of FireHOL. ++ He wrotes: ++ ++ "I think I have found the bug. The script bellow crashes at the ++ third echo (UNSET). It seems to be a problem of the "unset" BASH ++ function when erasing arrays. It leaves something behind so that if ++ the array just unset is referenced, it produces a segmentation fault. ++ According to the documentation the first and the third expansions ++ should be exactly the same." ++ ++Patch: ++ ++*** ../bash-3.0/arrayfunc.c Fri Dec 19 00:03:09 2003 ++--- arrayfunc.c Sun Aug 1 20:43:00 2004 ++*************** ++*** 612,616 **** ++ ++ free (t); ++! return var; ++ } ++ ++--- 612,616 ---- ++ ++ free (t); ++! return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var; ++ } ++ ++ ++*** ../bash-3.0/subst.c Sun Jul 4 13:56:13 2004 ++--- subst.c Thu Aug 12 13:36:17 2004 ++*************** ++*** 4983,4987 **** ++ return -1; ++ } ++! else if ((v = find_variable (varname)) && array_p (v)) ++ { ++ vtype = VT_ARRAYMEMBER; ++--- 5003,5007 ---- ++ return -1; ++ } ++! else if ((v = find_variable (varname)) && (invisible_p (v) == 0) && array_p (v)) ++ { ++ vtype = VT_ARRAYMEMBER; ++ ++*** ../bash-3.0/variables.c Sun Jul 4 13:57:26 2004 ++--- variables.c Wed Aug 4 15:28:04 2004 ++*************** ++*** 1420,1428 **** ++ ++ # if defined (DEBUGGER) ++! v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, (att_invisible|att_noassign)); ++! v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, (att_invisible|att_noassign)); ++ # endif /* DEBUGGER */ ++! v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, (att_invisible|att_noassign)); ++! v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, (att_invisible|att_noassign)); ++ #endif ++ ++--- 1420,1428 ---- ++ ++ # if defined (DEBUGGER) ++! v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, att_noassign); ++! v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, att_noassign); ++ # endif /* DEBUGGER */ ++! v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, att_noassign); ++! v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, att_noassign); ++ #endif ++ ++*************** ++*** 1600,1604 **** ++ old_var = find_variable (name); ++ if (old_var && local_p (old_var) && old_var->context == variable_context) ++! return (old_var); ++ ++ was_tmpvar = old_var && tempvar_p (old_var); ++--- 1600,1607 ---- ++ old_var = find_variable (name); ++ if (old_var && local_p (old_var) && old_var->context == variable_context) ++! { ++! VUNSETATTR (old_var, att_invisible); ++! return (old_var); ++! } ++ ++ was_tmpvar = old_var && tempvar_p (old_var); ++*** ../bash-3.0/pcomplete.c Thu Jan 8 10:36:17 2004 ++--- pcomplete.c Tue Aug 3 23:15:41 2004 ++*************** ++*** 864,867 **** ++--- 864,869 ---- ++ v = convert_var_to_array (v); ++ v = assign_array_var_from_word_list (v, lwords); +++ +++ VUNSETATTR (v, att_invisible); ++ return v; ++ } ++*************** ++*** 1022,1025 **** ++--- 1024,1029 ---- ++ if (array_p (v) == 0) ++ v = convert_var_to_array (v); +++ +++ VUNSETATTR (v, att_invisible); ++ ++ a = array_cell (v); ++*** ../bash-3.0/array.c Thu May 6 08:24:13 2004 ++--- array.c Wed Aug 25 15:50:42 2004 ++*************** ++*** 452,456 **** ++ array_dispose_element(new); ++ free(element_value(ae)); ++! ae->value = savestring(v); ++ return(0); ++ } else if (element_index(ae) > i) { ++--- 454,458 ---- ++ array_dispose_element(new); ++ free(element_value(ae)); ++! ae->value = v ? savestring(v) : (char *)NULL; ++ return(0); ++ } else if (element_index(ae) > i) { ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 0 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 1 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++*** ../bash-3.0/tests/dbg-support.tests Tue Mar 25 15:33:03 2003 ++--- tests/dbg-support.tests Tue Aug 3 23:09:29 2004 ++*************** ++*** 63,68 **** ++ trap 'print_return_trap $LINENO' RETURN ++ ++! # Funcname is now an array. Vanilla Bash 2.05 doesn't have FUNCNAME array. ++! echo "FUNCNAME" ${FUNCNAME[0]} ++ ++ # We should trace into the below. ++--- 63,68 ---- ++ trap 'print_return_trap $LINENO' RETURN ++ ++! # Funcname is now an array, but you still can't see it outside a function ++! echo "FUNCNAME" ${FUNCNAME[0]:-main} ++ ++ # We should trace into the below. +diff -urN orig-bash-3.0/bash30-002 bash-3.0/bash30-002 +--- orig-bash-3.0/bash30-002 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-002 2005-02-14 22:33:55.000000000 +0200 +@@ -0,0 +1,66 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-002 ++ ++Bug-Reported-by: "Ralf S. Engelschall" <rse@engelschall.com> ++Bug-Reference-ID: <20040728082038.GA31398@engelschall.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00262.html ++ ++Bug-Description: ++ ++After upgrading the OpenPKG "bash" package to 3.0, we had to discover ++that the prompt handling on Bash 3.0 / Readline 5.0 is broken if a ++multiline prompt (a string containing newlines) is used. The effect is ++that on the first input line (where the last line of the prompt is the ++prefix) the input line is wrapped N characters before the last column ++where N seems to be exactly the length (including newlines) of the ++prompt ($PS1) minus the characters on the last line of the prompt. ++ ++Patch: ++ ++*** ../bash-3.0/lib/readline/display.c Thu May 27 22:57:51 2004 ++--- lib/readline/display.c Wed Jul 28 13:48:04 2004 ++*************** ++*** 352,356 **** ++ &prompt_last_invisible, ++ (int *)NULL, ++! (int *)NULL); ++ c = *t; *t = '\0'; ++ /* The portion of the prompt string up to and including the ++--- 352,356 ---- ++ &prompt_last_invisible, ++ (int *)NULL, ++! &prompt_physical_chars); ++ c = *t; *t = '\0'; ++ /* The portion of the prompt string up to and including the ++*************** ++*** 359,363 **** ++ (int *)NULL, ++ &prompt_invis_chars_first_line, ++! &prompt_physical_chars); ++ *t = c; ++ return (prompt_prefix_length); ++--- 359,363 ---- ++ (int *)NULL, ++ &prompt_invis_chars_first_line, ++! (int *)NULL); ++ *t = c; ++ return (prompt_prefix_length); ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 1 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 2 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-003 bash-3.0/bash30-003 +--- orig-bash-3.0/bash30-003 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-003 2005-02-14 22:33:56.000000000 +0200 +@@ -0,0 +1,124 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-003 ++ ++Bug-Reported-by: Egmont Koblinger <egmont@uhulinux.hu> ++Bug-Reference-ID: <Pine.LNX.4.58L0.0407290044500.12603@sziami.cs.bme.hu> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00279.html ++ ++Bug-Description: ++ ++Bash no longer accepts the `trap signum' syntax when in POSIX mode. This ++patch restores a measure of backwards compatibility. ++ ++Patch: ++ ++*** ../bash-3.0/builtins/trap.def Thu May 27 22:26:19 2004 ++--- builtins/trap.def Thu Aug 5 08:55:43 2004 ++*************** ++*** 24,28 **** ++ $BUILTIN trap ++ $FUNCTION trap_builtin ++! $SHORT_DOC trap [-lp] [[arg] signal_spec ...] ++ The command ARG is to be read and executed when the shell receives ++ signal(s) SIGNAL_SPEC. If ARG is absent (and a single SIGNAL_SPEC ++--- 24,28 ---- ++ $BUILTIN trap ++ $FUNCTION trap_builtin ++! $SHORT_DOC trap [-lp] [arg signal_spec ...] ++ The command ARG is to be read and executed when the shell receives ++ signal(s) SIGNAL_SPEC. If ARG is absent (and a single SIGNAL_SPEC ++*************** ++*** 88,92 **** ++ WORD_LIST *list; ++ { ++! int list_signal_names, display, result, opt; ++ ++ list_signal_names = display = 0; ++--- 88,92 ---- ++ WORD_LIST *list; ++ { ++! int list_signal_names, display, result, opt, first_signal; ++ ++ list_signal_names = display = 0; ++*************** ++*** 119,130 **** ++ { ++ char *first_arg; ++! int operation, sig; ++ ++ operation = SET; ++ first_arg = list->word->word; ++ /* When in posix mode, the historical behavior of looking for a ++ missing first argument is disabled. To revert to the original ++ signal handling disposition, use `-' as the first argument. */ ++! if (posixly_correct == 0 && first_arg && *first_arg && ++ (*first_arg != '-' || first_arg[1]) && ++ signal_object_p (first_arg, opt) && list->next == 0) ++--- 119,135 ---- ++ { ++ char *first_arg; ++! int operation, sig, first_signal; ++ ++ operation = SET; ++ first_arg = list->word->word; +++ first_signal = first_arg && *first_arg && all_digits (first_arg) && signal_object_p (first_arg, opt); +++ +++ /* Backwards compatibility */ +++ if (first_signal) +++ operation = REVERT; ++ /* When in posix mode, the historical behavior of looking for a ++ missing first argument is disabled. To revert to the original ++ signal handling disposition, use `-' as the first argument. */ ++! else if (posixly_correct == 0 && first_arg && *first_arg && ++ (*first_arg != '-' || first_arg[1]) && ++ signal_object_p (first_arg, opt) && list->next == 0) ++*** ../bash-3.0/doc/bashref.texi Sat Jun 26 14:26:07 2004 ++--- doc/bashref.texi Fri Aug 27 12:33:46 2004 ++*************** ++*** 5954,5958 **** ++ The @code{trap} builtin doesn't check the first argument for a possible ++ signal specification and revert the signal handling to the original ++! disposition if it is. If users want to reset the handler for a given ++ signal to the original disposition, they should use @samp{-} as the ++ first argument. ++--- 5967,5972 ---- ++ The @code{trap} builtin doesn't check the first argument for a possible ++ signal specification and revert the signal handling to the original ++! disposition if it is, unless that argument consists solely of digits and ++! is a valid signal number. If users want to reset the handler for a given ++ signal to the original disposition, they should use @samp{-} as the ++ first argument. ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 2 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 3 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++*** ../bash-3.0/tests/errors.right Thu May 27 22:26:03 2004 ++--- tests/errors.right Sat Aug 7 22:35:10 2004 ++*************** ++*** 86,90 **** ++ ./errors.tests: line 216: trap: NOSIG: invalid signal specification ++ ./errors.tests: line 219: trap: -s: invalid option ++! trap: usage: trap [-lp] [[arg] signal_spec ...] ++ ./errors.tests: line 225: return: can only `return' from a function or sourced script ++ ./errors.tests: line 229: break: 0: loop count out of range ++--- 86,90 ---- ++ ./errors.tests: line 216: trap: NOSIG: invalid signal specification ++ ./errors.tests: line 219: trap: -s: invalid option ++! trap: usage: trap [-lp] [arg signal_spec ...] ++ ./errors.tests: line 225: return: can only `return' from a function or sourced script ++ ./errors.tests: line 229: break: 0: loop count out of range +diff -urN orig-bash-3.0/bash30-004 bash-3.0/bash30-004 +--- orig-bash-3.0/bash30-004 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-004 2005-02-14 22:33:56.000000000 +0200 +@@ -0,0 +1,145 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-004 ++ ++Bug-Reported-by: Stephane Chazelas <stephane_chazelas@yahoo.fr> ++Bug-Reference-ID: <20040902131957.GC1860@frhdtmp102861.morse.corp.wan> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00291.html ++ ++Bug-Description: ++ ++Calculation of lengths and offsets for parameter string length and substring ++expansion does not correctly account for multibyte characters. ++ ++Patch: ++ ++ *** ../bash-3.0/subst.c Sun Jul 4 13:56:13 2004 ++--- subst.c Thu Aug 12 13:36:17 2004 ++*************** ++*** 4692,4695 **** ++--- 4692,4715 ---- ++ } ++ +++ #if defined (HANDLE_MULTIBYTE) +++ size_t +++ mbstrlen (s) +++ const char *s; +++ { +++ size_t clen, nc; +++ mbstate_t mbs; +++ +++ nc = 0; +++ memset (&mbs, 0, sizeof (mbs)); +++ while ((clen = mbrlen(s, MB_CUR_MAX, &mbs)) != 0 && (MB_INVALIDCH(clen) == 0)) +++ { +++ s += clen; +++ nc++; +++ } +++ return nc; +++ } +++ #endif +++ +++ ++ /* Handle the parameter brace expansion that requires us to return the ++ length of a parameter. */ ++*************** ++*** 4747,4758 **** ++ { ++ t = get_dollar_var_value (arg_index); ++! number = STRLEN (t); ++ FREE (t); ++ } ++ #if defined (ARRAY_VARS) ++! else if ((var = find_variable (name + 1)) && array_p (var)) ++ { ++ t = array_reference (array_cell (var), 0); ++! number = STRLEN (t); ++ } ++ #endif ++--- 4767,4778 ---- ++ { ++ t = get_dollar_var_value (arg_index); ++! number = MB_STRLEN (t); ++ FREE (t); ++ } ++ #if defined (ARRAY_VARS) ++! else if ((var = find_variable (name + 1)) && (invisible_p (var) == 0) && array_p (var)) ++ { ++ t = array_reference (array_cell (var), 0); ++! number = MB_STRLEN (t); ++ } ++ #endif ++*************** ++*** 4767,4771 **** ++ dispose_words (list); ++ ++! number = STRLEN (t); ++ FREE (t); ++ } ++--- 4787,4791 ---- ++ dispose_words (list); ++ ++! number = MB_STRLEN (t); ++ FREE (t); ++ } ++*************** ++*** 4872,4876 **** ++ case VT_VARIABLE: ++ case VT_ARRAYMEMBER: ++! len = strlen (value); ++ break; ++ case VT_POSPARMS: ++--- 4892,4896 ---- ++ case VT_VARIABLE: ++ case VT_ARRAYMEMBER: ++! len = MB_STRLEN (value); ++ break; ++ case VT_POSPARMS: ++*** ../bash-3.0/include/shmbutil.h Mon Apr 19 09:59:42 2004 ++--- include/shmbutil.h Thu Sep 2 15:20:47 2004 ++*************** ++*** 32,35 **** ++--- 32,37 ---- ++ extern size_t xdupmbstowcs __P((wchar_t **, char ***, const char *)); ++ +++ extern size_t mbstrlen __P((const char *)); +++ ++ extern char *xstrchr __P((const char *, int)); ++ ++*************** ++*** 39,42 **** ++--- 41,47 ---- ++ #endif ++ +++ #define MBSLEN(s) (((s) && (s)[0]) ? ((s)[1] ? mbstrlen (s) : 1) : 0) +++ #define MB_STRLEN(s) ((MB_CUR_MAX > 1) ? MBSLEN (s) : STRLEN (s)) +++ ++ #else /* !HANDLE_MULTIBYTE */ ++ ++*************** ++*** 54,57 **** ++--- 59,64 ---- ++ #define MB_NULLWCH(x) (0) ++ #endif +++ +++ #define MB_STRLEN(s) (STRLEN(s)) ++ ++ #endif /* !HANDLE_MULTIBYTE */ ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 3 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 4 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-005 bash-3.0/bash30-005 +--- orig-bash-3.0/bash30-005 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-005 2005-02-14 22:33:57.000000000 +0200 +@@ -0,0 +1,63 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-005 ++ ++Bug-Reported-by: schwab@suse.de ++Bug-Reference-ID: <20040801085535.E83D41DB3FFE9@sykes.suse.de> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00004.html ++ ++Bug-Description: ++ ++Moving upwards in the history (with previous-history) and back again ++clobbers the last history line. ++ ++Patch: ++ ++*** ../bash-3.0/lib/readline/misc.c Wed Jul 7 08:56:32 2004 ++--- lib/readline/misc.c Sat Aug 7 22:38:53 2004 ++*************** ++*** 277,286 **** ++ _rl_saved_line_for_history->data = (char *)rl_undo_list; ++ } ++- else if (STREQ (rl_line_buffer, _rl_saved_line_for_history->line) == 0) ++- { ++- free (_rl_saved_line_for_history->line); ++- _rl_saved_line_for_history->line = savestring (rl_line_buffer); ++- _rl_saved_line_for_history->data = (char *)rl_undo_list; /* XXX possible memleak */ ++- } ++ ++ return 0; ++--- 277,280 ---- ++*** ../bash-3.0/lib/readline/vi_mode.c Tue Jul 13 14:08:27 2004 ++--- lib/readline/vi_mode.c Tue Aug 17 00:12:09 2004 ++*************** ++*** 273,280 **** ++--- 273,282 ---- ++ { ++ case '?': +++ _rl_free_saved_history_line (); ++ rl_noninc_forward_search (count, key); ++ break; ++ ++ case '/': +++ _rl_free_saved_history_line (); ++ rl_noninc_reverse_search (count, key); ++ break; ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 4 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 5 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-006 bash-3.0/bash30-006 +--- orig-bash-3.0/bash30-006 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-006 2005-02-14 22:33:57.000000000 +0200 +@@ -0,0 +1,165 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-006 ++ ++Bug-Reported-by: alexander@skwar.name ++ Tomohiro KUBOTA <debian@tmail.plala.or.jp> ++Bug-Reference-ID: <20040801124721.C69B8A2547A@server.bei.digitalprojects.com> ++ <16688.41450.433668.480445@gargle.gargle.HOWL> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00006.html ++ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=257540 ++ ++Bug-Description: ++ ++Prompts with multibyte characters or invisible characters following a line ++wrap are displayed incorrectly. ++ ++Patch: ++ ++*** ../bash-3.0/lib/readline/display.c Thu May 27 22:57:51 2004 ++--- lib/readline/display.c Mon Aug 30 11:55:02 2004 ++*************** ++*** 202,206 **** ++ { ++ char *r, *ret, *p; ++! int l, rl, last, ignoring, ninvis, invfl, ind, pind, physchars; ++ ++ /* Short-circuit if we can. */ ++--- 202,206 ---- ++ { ++ char *r, *ret, *p; ++! int l, rl, last, ignoring, ninvis, invfl, invflset, ind, pind, physchars; ++ ++ /* Short-circuit if we can. */ ++*************** ++*** 223,226 **** ++--- 223,227 ---- ++ ++ invfl = 0; /* invisible chars in first line of prompt */ +++ invflset = 0; /* we only want to set invfl once */ ++ ++ for (rl = ignoring = last = ninvis = physchars = 0, p = pmt; p && *p; p++) ++*************** ++*** 250,254 **** ++ *r++ = *p++; ++ if (!ignoring) ++! rl += ind - pind; ++ else ++ ninvis += ind - pind; ++--- 251,258 ---- ++ *r++ = *p++; ++ if (!ignoring) ++! { ++! rl += ind - pind; ++! physchars += _rl_col_width (pmt, pind, ind); ++! } ++ else ++ ninvis += ind - pind; ++*************** ++*** 260,273 **** ++ *r++ = *p; ++ if (!ignoring) ++! rl++; /* visible length byte counter */ ++ else ++ ninvis++; /* invisible chars byte counter */ ++ } ++ ++! if (rl >= _rl_screenwidth) ++! invfl = ninvis; ++! ++! if (ignoring == 0) ++! physchars++; ++ } ++ } ++--- 264,280 ---- ++ *r++ = *p; ++ if (!ignoring) ++! { ++! rl++; /* visible length byte counter */ ++! physchars++; ++! } ++ else ++ ninvis++; /* invisible chars byte counter */ ++ } ++ ++! if (invflset == 0 && rl >= _rl_screenwidth) ++! { ++! invfl = ninvis; ++! invflset = 1; ++! } ++ } ++ } ++*************** ++*** 418,422 **** ++ register char *line; ++ int c_pos, inv_botlin, lb_botlin, lb_linenum; ++! int newlines, lpos, temp, modmark; ++ char *prompt_this_line; ++ #if defined (HANDLE_MULTIBYTE) ++--- 425,429 ---- ++ register char *line; ++ int c_pos, inv_botlin, lb_botlin, lb_linenum; ++! int newlines, lpos, temp, modmark, n0, num; ++ char *prompt_this_line; ++ #if defined (HANDLE_MULTIBYTE) ++*************** ++*** 574,577 **** ++--- 581,585 ---- ++ #if defined (HANDLE_MULTIBYTE) ++ memset (_rl_wrapped_line, 0, vis_lbsize); +++ num = 0; ++ #endif ++ ++*************** ++*** 592,596 **** ++--- 600,619 ---- ++ prompts that exceed two physical lines? ++ Additional logic fix from Edward Catmur <ed@catmur.co.uk> */ +++ #if defined (HANDLE_MULTIBYTE) +++ n0 = num; +++ temp = local_prompt ? strlen (local_prompt) : 0; +++ while (num < temp) +++ { +++ if (_rl_col_width (local_prompt, n0, num) > _rl_screenwidth) +++ { +++ num = _rl_find_prev_mbchar (local_prompt, num, MB_FIND_ANY); +++ break; +++ } +++ num++; +++ } +++ temp = num + +++ #else ++ temp = ((newlines + 1) * _rl_screenwidth) + +++ #endif /* !HANDLE_MULTIBYTE */ ++ ((local_prompt_prefix == 0) ? ((newlines == 0) ? prompt_invis_chars_first_line ++ : ((newlines == 1) ? wrap_offset : 0)) ++*************** ++*** 598,602 **** ++--- 621,629 ---- ++ ++ inv_lbreaks[++newlines] = temp; +++ #if defined (HANDLE_MULTIBYTE) +++ lpos -= _rl_col_width (local_prompt, n0, num); +++ #else ++ lpos -= _rl_screenwidth; +++ #endif ++ } ++ ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 5 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 6 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-007 bash-3.0/bash30-007 +--- orig-bash-3.0/bash30-007 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-007 2005-02-14 22:33:58.000000000 +0200 +@@ -0,0 +1,78 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-007 ++ ++Bug-Reported-by: Oliver Kiddle <okiddle@yahoo.co.uk> ++ Tim Waugh <twaugh@redhat.com> ++Bug-Reference-ID: <10454.1091313247@athlon> ++ <20040804100140.GX8175@redhat.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00313.html ++ http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00056.html ++ ++Bug-Description: ++ ++Two bugs: ++ ++How does it decide what characters are allowed. The following really ++looks like a bug to me: ++$ echo {<C4>..D} ++That's accepted and produces output that seems to wrap round to ^A and ++then goes up to D. Note that I'm using an ISO-8859-1 locale. If that ++works at all, it should surely descend. ++ ++This short script: ++ ++var=baz ++echo foo{bar,${var}.} ++echo foo{bar,${var}} ++ ++gives the following output with bash-3.0: ++ ++./test: line 2: foo${var.}: bad substitution ++foobar} foobaz ++ ++Patch: ++ ++*** ../bash-3.0/braces.c Thu Dec 4 11:09:52 2003 ++--- braces.c Wed Aug 4 14:34:33 2004 ++*************** ++*** 341,346 **** ++ if (lhs_t == ST_CHAR) ++ { ++! lhs_v = lhs[0]; ++! rhs_v = rhs[0]; ++ } ++ else ++--- 341,346 ---- ++ if (lhs_t == ST_CHAR) ++ { ++! lhs_v = (unsigned char)lhs[0]; ++! rhs_v = (unsigned char)rhs[0]; ++ } ++ else ++*************** ++*** 403,406 **** ++--- 403,407 ---- ++ pass_next = 1; ++ i++; +++ level++; ++ continue; ++ } ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 6 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 7 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-008 bash-3.0/bash30-008 +--- orig-bash-3.0/bash30-008 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-008 2005-02-14 22:33:58.000000000 +0200 +@@ -0,0 +1,55 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-008 ++ ++Bug-Reported-by: uberlord@rsm.demon.co.uk ++Bug-Reference-ID: <1092327965.4233.1.camel@uberlaptop.ubernet> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00144.html ++ ++Bug-Description: ++ ++> Description: ++> Bash 3 breaks array expansion ++> ++> Repeat-By: ++> #!/bin/bash ++> x=(one two) ++> echo ${x[@]:1} ++> # prints nothing in bash 3 ++> # prints two in bash 2 ++ ++Patch: ++ ++*** ../bash-3.0/subst.c Sun Jul 4 13:56:13 2004 ++--- subst.c Thu Aug 12 13:36:17 2004 ++*************** ++*** 4892,4896 **** ++ *e1p += len; ++ ++! if (*e1p >= len || *e1p < 0) ++ return (-1); ++ ++--- 4912,4916 ---- ++ *e1p += len; ++ ++! if (*e1p > len || *e1p < 0) ++ return (-1); ++ ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 7 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 8 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-009 bash-3.0/bash30-009 +--- orig-bash-3.0/bash30-009 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-009 2005-02-14 22:33:58.000000000 +0200 +@@ -0,0 +1,111 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-009 ++ ++Bug-Reported-by: Tim Waugh <twaugh@redhat.com> ++Bug-Reference-ID: <20040810083805.GT2177@redhat.com> ++Bug-Reference-URL: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=129526b ++ http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00116.html ++ ++Bug-Description: ++ ++--> ++Steps to Reproduce: ++1. Launch a bash shell ++2. Set editing mode to 'vi' with 'set -o vi' ++3. Type any command, but don't hit return ++4. Enter vi-command mode by hitting the escape key ++5. Go to the end of line with the '$' command ++6. Type 'r' to change the last character ++7. Type any character (other than what the character already is) ++ ++The last two characters are inexplicably swapped ++after the last character is changed. ++<-- ++ ++Patch: ++ ++*** ../bash-3.0/lib/readline/vi_mode.c Tue Jul 13 14:08:27 2004 ++--- lib/readline/vi_mode.c Tue Aug 17 00:12:09 2004 ++*************** ++*** 691,695 **** ++ wchar_t wc; ++ char mb[MB_LEN_MAX+1]; ++! int mblen; ++ mbstate_t ps; ++ ++--- 693,697 ---- ++ wchar_t wc; ++ char mb[MB_LEN_MAX+1]; ++! int mblen, p; ++ mbstate_t ps; ++ ++*************** ++*** 714,722 **** ++ if (wc) ++ { ++ mblen = wcrtomb (mb, wc, &ps); ++ if (mblen >= 0) ++ mb[mblen] = '\0'; ++ rl_begin_undo_group (); ++! rl_delete (1, 0); ++ rl_insert_text (mb); ++ rl_end_undo_group (); ++--- 716,727 ---- ++ if (wc) ++ { +++ p = rl_point; ++ mblen = wcrtomb (mb, wc, &ps); ++ if (mblen >= 0) ++ mb[mblen] = '\0'; ++ rl_begin_undo_group (); ++! rl_vi_delete (1, 0); ++! if (rl_point < p) /* Did we retreat at EOL? */ ++! rl_point++; /* XXX - should we advance more than 1 for mbchar? */ ++ rl_insert_text (mb); ++ rl_end_undo_group (); ++*************** ++*** 1311,1320 **** ++ #if defined (HANDLE_MULTIBYTE) ++ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) ++! while (_rl_insert_char (1, c)) ++! { ++! RL_SETSTATE (RL_STATE_MOREINPUT); ++! c = rl_read_key (); ++! RL_UNSETSTATE (RL_STATE_MOREINPUT); ++! } ++ else ++ #endif ++--- 1316,1329 ---- ++ #if defined (HANDLE_MULTIBYTE) ++ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) ++! { ++! if (rl_point < p) /* Did we retreat at EOL? */ ++! rl_point++; ++! while (_rl_insert_char (1, c)) ++! { ++! RL_SETSTATE (RL_STATE_MOREINPUT); ++! c = rl_read_key (); ++! RL_UNSETSTATE (RL_STATE_MOREINPUT); ++! } ++! } ++ else ++ #endif ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 8 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 9 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-010 bash-3.0/bash30-010 +--- orig-bash-3.0/bash30-010 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-010 2005-02-14 22:33:59.000000000 +0200 +@@ -0,0 +1,116 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-010 ++ ++Bug-Reported-by: Samuel Thibault <samuel.thibault@ens-lyon.org> ++Bug-Reference-ID: <E1Bo8Sq-0004u5-00@bouh> ++Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=261142 ++ ++Bug-Description: ++ ++When trying to auto-complete ~/../``/, I just get: ++malloc: bashline.c:1340: assertion botched ++free: start and end chunk sizes differ ++last command: kill -9 %2 ++Stopping myself... ++ ++ ++Patch: ++ ++*** ../bash-3.0/bashline.c Mon Jul 5 23:22:12 2004 ++--- bashline.c Thu Sep 2 16:00:12 2004 ++*************** ++*** 101,104 **** ++--- 101,105 ---- ++ ++ /* Helper functions for Readline. */ +++ static int bash_directory_expansion __P((char **)); ++ static int bash_directory_completion_hook __P((char **)); ++ static int filename_completion_ignore __P((char **)); ++*************** ++*** 293,297 **** ++ at = strchr (rl_completer_word_break_characters, '@'); ++ if ((at == 0 && on_or_off == 0) || (at != 0 && on_or_off != 0)) ++! return; ++ ++ /* We have something to do. Do it. */ ++--- 294,298 ---- ++ at = strchr (rl_completer_word_break_characters, '@'); ++ if ((at == 0 && on_or_off == 0) || (at != 0 && on_or_off != 0)) ++! return old_value; ++ ++ /* We have something to do. Do it. */ ++*************** ++*** 1407,1414 **** ++ if (*hint_text == '~') ++ { ++! int l, tl, vl; ++ vl = strlen (val); ++ tl = strlen (hint_text); ++ l = vl - hint_len; /* # of chars added */ ++ temp = (char *)xmalloc (l + 2 + tl); ++ strcpy (temp, hint_text); ++--- 1408,1424 ---- ++ if (*hint_text == '~') ++ { ++! int l, tl, vl, dl; ++! char *rd; ++ vl = strlen (val); ++ tl = strlen (hint_text); +++ #if 0 ++ l = vl - hint_len; /* # of chars added */ +++ #else +++ rd = savestring (filename_hint); +++ bash_directory_expansion (&rd); +++ dl = strlen (rd); +++ l = vl - dl; /* # of chars added */ +++ free (rd); +++ #endif ++ temp = (char *)xmalloc (l + 2 + tl); ++ strcpy (temp, hint_text); ++*************** ++*** 2188,2191 **** ++--- 2198,2222 ---- ++ } ++ +++ /* Simulate the expansions that will be performed by +++ rl_filename_completion_function. This must be called with the address of +++ a pointer to malloc'd memory. */ +++ static int +++ bash_directory_expansion (dirname) +++ char **dirname; +++ { +++ char *d; +++ +++ d = savestring (*dirname); +++ +++ if (rl_directory_rewrite_hook) +++ (*rl_directory_rewrite_hook) (&d); +++ +++ if (rl_directory_completion_hook && (*rl_directory_completion_hook) (&d)) +++ { +++ free (*dirname); +++ *dirname = d; +++ } +++ } +++ ++ /* Handle symbolic link references and other directory name ++ expansions while hacking completion. */ ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 9 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 10 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-011 bash-3.0/bash30-011 +--- orig-bash-3.0/bash30-011 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-011 2005-02-14 22:33:59.000000000 +0200 +@@ -0,0 +1,71 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-011 ++ ++Bug-Reported-by: Egmont Koblinger <egmont@uhulinux.hu> ++Bug-Reference-ID: <Pine.LNX.4.58L0.0407282151140.8088@sziami.cs.bme.hu> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-07/msg00277.html ++ ++Bug-Description: ++ ++I've just upgraded to readline 5.0 and bash 3.0 and tried them with UTF-8 ++encoding. I found line editing to be quite buggy: ++ ++I type an accented letter, let's say <E1>. Then <E1> appears. I press the left ++arrow, the cursor goes back, it is now over <E1>. I press <E9>. Now <E9><E1> is ++visible, which is correct, but the cursor is past the two letters, though ++it should be over <E1>. Here only the first Left arrow takes affect, moves ++the cursor over <E1>, but the 2nd time I press Left, it just beeps, doesn't ++move to the first char (<E9>). Now a Right arrow doesn't move the cursor, but ++causes further Left and Right arrows to work as expected. To go on, ++similar bug occurs nearly every time that I insert an accented letter ++before or amongs other ones (but not at the end of the line). When the ++command line has about ten or twenty accented letters (and no or hardly ++any non-accented ones), line editing becomes a total chaos, where ++sometimes inserting another accented letter causes the cursor to jump many ++characters to the right, and pressing the Left arrow sometimes causes the ++cursor to jump back lots of characters at once. ++ ++Patch: ++ ++*** ../bash-3.0/lib/readline/mbutil.c Wed Jan 14 09:44:52 2004 ++--- lib/readline/mbutil.c Wed Aug 18 22:25:57 2004 ++*************** ++*** 127,135 **** ++ { ++ tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); ++! while (wcwidth (wc) == 0) ++ { ++ point += tmp; ++ tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); ++! if (tmp == (size_t)(0) || tmp == (size_t)(-1) || tmp == (size_t)(-2)) ++ break; ++ } ++--- 127,135 ---- ++ { ++ tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); ++! while (tmp > 0 && wcwidth (wc) == 0) ++ { ++ point += tmp; ++ tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps); ++! if (MB_NULLWCH (tmp) || MB_INVALIDCH (tmp)) ++ break; ++ } ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 10 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 11 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-012 bash-3.0/bash30-012 +--- orig-bash-3.0/bash30-012 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-012 2005-02-14 22:34:00.000000000 +0200 +@@ -0,0 +1,56 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-012 ++ ++Bug-Reported-by: ben@ncipher.com ++Bug-Reference-ID: <E1BxQYe-0002p1-00@berdoo.ncipher.com> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00215.html ++ ++Bug-Description: ++ ++When using the pipefail option, the following command: ++ echo foo | false ++produces an exit status of 0, ignoring the exit status of false. ++ ++Patch: ++ ++*** ../bash-3.0/jobs.c Fri Apr 23 16:28:25 2004 ++--- jobs.c Wed Aug 18 11:15:07 2004 ++*************** ++*** 1779,1784 **** ++ { ++ fail = 0; ++! for (p = jobs[job]->pipe; p->next != jobs[job]->pipe; p = p->next) ++! if (p->status != EXECUTION_SUCCESS) fail = p->status; ++ return fail; ++ } ++--- 1779,1789 ---- ++ { ++ fail = 0; ++! p = jobs[job]->pipe; ++! do ++! { ++! if (p->status != EXECUTION_SUCCESS) fail = p->status; ++! p = p->next; ++! } ++! while (p != jobs[job]->pipe); ++ return fail; ++ } ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 11 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 12 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-013 bash-3.0/bash30-013 +--- orig-bash-3.0/bash30-013 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-013 2005-02-14 22:34:00.000000000 +0200 +@@ -0,0 +1,86 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-013 ++ ++Bug-Reported-by: Len Lattanzi <llattanzi@apple.com> ++Bug-Reference-ID: <556CE1CE-E1AC-11D8-A2D9-00039383EC60@apple.com> ++Bug-Reference-URL: ++ ++Bug-Description: ++ ++vi-mode filename completion/glob expansion should understand and perform ++tilde expansion. ++ ++Patch: ++ ++*** ../bash-3.0/bashline.c Mon Jul 5 23:22:12 2004 ++--- bashline.c Thu Sep 2 16:00:12 2004 ++*************** ++*** 2514,2518 **** ++ static int ind; ++ int glen; ++! char *ret; ++ ++ if (state == 0) ++--- 2545,2549 ---- ++ static int ind; ++ int glen; ++! char *ret, *ttext; ++ ++ if (state == 0) ++*************** ++*** 2524,2538 **** ++ FREE (globtext); ++ ++ if (rl_explicit_arg) ++ { ++! globorig = savestring (text); ++! glen = strlen (text); ++ globtext = (char *)xmalloc (glen + 2); ++! strcpy (globtext, text); ++ globtext[glen] = '*'; ++ globtext[glen+1] = '\0'; ++ } ++ else ++! globtext = globorig = savestring (text); ++ ++ matches = shell_glob_filename (globtext); ++--- 2555,2574 ---- ++ FREE (globtext); ++ +++ ttext = bash_tilde_expand (text, 0); +++ ++ if (rl_explicit_arg) ++ { ++! globorig = savestring (ttext); ++! glen = strlen (ttext); ++ globtext = (char *)xmalloc (glen + 2); ++! strcpy (globtext, ttext); ++ globtext[glen] = '*'; ++ globtext[glen+1] = '\0'; ++ } ++ else ++! globtext = globorig = savestring (ttext); ++! ++! if (ttext != text) ++! free (ttext); ++ ++ matches = shell_glob_filename (globtext); ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 12 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 13 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-014 bash-3.0/bash30-014 +--- orig-bash-3.0/bash30-014 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-014 2005-02-14 22:34:01.000000000 +0200 +@@ -0,0 +1,52 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-014 ++ ++Bug-Reported-by: agriffis@gentoo.org ++Bug-Reference-ID: <20040929024759.A437FEB1E0@piment.flatmonk.org> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00250.html ++ ++Bug-Description: ++ ++ # ++ # BROKEN case: variable with braces inside quotes ++ # ++ ++ $ D=W ++ $ echo "${D}"{illy,onka} => W{illy,onka} ++ ++Patch: ++ ++*** ../bash-3.0-patched/braces.c Wed Sep 8 11:07:53 2004 ++--- braces.c Fri Sep 17 18:42:36 2004 ++*************** ++*** 403,407 **** ++ pass_next = 1; ++ i++; ++! level++; ++ continue; ++ } ++--- 403,408 ---- ++ pass_next = 1; ++ i++; ++! if (quoted == 0) ++! level++; ++ continue; ++ } ++*** ../bash-3.0-patched/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 13 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 14 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-015 bash-3.0/bash30-015 +--- orig-bash-3.0/bash30-015 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-015 2005-02-14 22:34:01.000000000 +0200 +@@ -0,0 +1,56 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-015 ++ ++Bug-Reported-by: opengeometry@yahoo.ca ++Bug-Reference-ID: <200410202012.i9KKCTEB001860@node1.opengeometry.net> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-10/msg00297.html ++ ++Bug-Description: ++ ++ Shell variable can start with number and can even be printed with ++ 'declare', as in ++ 1=aaa ++ 1a=bbb ++ declare -p 1 1a ++ ++ But, they can't be removed, as in ++ unset 1 1a --> ...: not a valid identifier ++ ++ Bash-2.05b correctly gives me error, however. ++ ++Patch: ++ ++*** ../bash-3.0-patched/general.c Wed Apr 14 23:20:13 2004 ++--- general.c Wed Oct 20 16:59:59 2004 ++*************** ++*** 268,272 **** ++ ++ #if defined (ARRAY_VARS) ++! if ((legal_variable_starter (c) == 0) && (flags && c != '[')) /* ] */ ++ #else ++ if (legal_variable_starter (c) == 0) ++--- 268,272 ---- ++ ++ #if defined (ARRAY_VARS) ++! if ((legal_variable_starter (c) == 0) && (flags == 0 || c != '[')) /* ] */ ++ #else ++ if (legal_variable_starter (c) == 0) ++ ++*** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 ++--- patchlevel.h Thu Sep 2 15:04:32 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 14 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 15 ++ ++ #endif /* _PATCHLEVEL_H_ */ +diff -urN orig-bash-3.0/bash30-016 bash-3.0/bash30-016 +--- orig-bash-3.0/bash30-016 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-016 2005-02-14 22:34:02.000000000 +0200 +@@ -0,0 +1,84 @@ ++ BASH PATCH REPORT ++ ================= ++ ++Bash-Release: 3.0 ++Patch-ID: bash30-016 ++ ++Bug-Reported-by: William Park <opengeometry@yahoo.ca> ++Bug-Reference-ID: <200411012217.iA1MHxL7031818@node1.opengeometry.net> ++Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-11/msg00017.html ++ ++Bug-Description: ++ ++ Offset from the end of array in ${var: -n} is still off by 1. Eg. ++ x=( {0..9} ) ++ echo ${x[*]: -1} --> 8 9 ++ ++Patch: ++ ++*** ../bash-3.0-patched/subst.c Wed Sep 8 11:07:55 2004 ++--- subst.c Tue Nov 9 16:26:59 2004 ++*************** ++*** 4900,4905 **** ++ case VT_ARRAYVAR: ++ a = (ARRAY *)value; ++! /* For arrays, the first value deals with array indices. */ ++! len = array_max_index (a); /* arrays index from 0 to n - 1 */ ++ break; ++ #endif ++--- 4900,4906 ---- ++ case VT_ARRAYVAR: ++ a = (ARRAY *)value; ++! /* For arrays, the first value deals with array indices. Negative ++! offsets count from one past the array's maximum index. */ ++! len = array_max_index (a) + (*e1p < 0); /* arrays index from 0 to n - 1 */ ++ break; ++ #endif ++*** ../bash-3.0-patched/tests/array.tests Sat Oct 4 23:25:00 2003 ++--- tests/array.tests Tue Nov 9 16:36:29 2004 ++*************** ++*** 323,327 **** ++ echo positive offset - expect five seven ++ echo ${av[@]:5:2} ++! echo negative offset - expect five seven ++ echo ${av[@]: -2:2} ++ ++--- 323,327 ---- ++ echo positive offset - expect five seven ++ echo ${av[@]:5:2} ++! echo negative offset to unset element - expect seven ++ echo ${av[@]: -2:2} ++ ++*** ../bash-3.0-patched/tests/array.right Sat Oct 4 23:25:10 2003 ++--- tests/array.right Tue Nov 9 16:37:25 2004 ++*************** ++*** 171,176 **** ++ positive offset - expect five seven ++ five seven ++! negative offset - expect five seven ++! five seven ++ positive offset 2 - expect seven ++ seven ++--- 171,176 ---- ++ positive offset - expect five seven ++ five seven ++! negative offset to unset element - expect seven ++! seven ++ positive offset 2 - expect seven ++ seven ++*** ../bash-3.0-patched/patchlevel.h Tue Oct 26 17:13:29 2004 ++--- patchlevel.h Tue Nov 9 16:31:24 2004 ++*************** ++*** 26,30 **** ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 15 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++--- 26,30 ---- ++ looks for to find the patch level (for the sccs version string). */ ++ ++! #define PATCHLEVEL 16 ++ ++ #endif /* _PATCHLEVEL_H_ */ ++ +diff -urN orig-bash-3.0/bash30-avoid_WCONTINUED bash-3.0/bash30-avoid_WCONTINUED +--- orig-bash-3.0/bash30-avoid_WCONTINUED 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/bash30-avoid_WCONTINUED 2005-09-05 20:37:01.000000000 +0300 +@@ -0,0 +1,27 @@ ++diff -Naur bash-3.0.orig/jobs.c bash-3.0/jobs.c ++--- bash-3.0.orig/jobs.c 2004-10-12 08:50:11.643481280 +0000 +++++ jobs.c 2004-10-12 08:51:35.110792320 +0000 ++@@ -2476,6 +2476,7 @@ ++ PROCESS *child; ++ pid_t pid; ++ int call_set_current, last_stopped_job, job, children_exited, waitpid_flags; +++ static int wcontinued_not_supported = 0; ++ ++ call_set_current = children_exited = 0; ++ last_stopped_job = NO_JOB; ++@@ -2489,7 +2490,15 @@ ++ : 0; ++ if (sigchld || block == 0) ++ waitpid_flags |= WNOHANG; +++ retry: +++ if (wcontinued_not_supported) +++ waitpid_flags &= ~WCONTINUED; ++ pid = WAITPID (-1, &status, waitpid_flags); +++ if (pid == -1 && errno == EINVAL) +++ { +++ wcontinued_not_supported = 1; +++ goto retry; +++ } ++ ++ /* The check for WNOHANG is to make sure we decrement sigchld only ++ if it was non-zero before we called waitpid. */ +diff -urN orig-bash-3.0/dcigettext.patch bash-3.0/dcigettext.patch +--- orig-bash-3.0/dcigettext.patch 1970-01-01 02:00:00.000000000 +0200 ++++ bash-3.0/dcigettext.patch 2006-02-07 11:29:06.000000000 +0200 +@@ -0,0 +1,13 @@ ++--- /lib/intl/orig-dcigettext.c 2003-12-09 19:39:11.000000000 +0200 +++++ /lib/intl/dcigettext.c 2006-02-07 09:46:06.000000000 +0200 ++@@ -134,6 +134,10 @@ ++ ++ /* @@ end of prolog @@ */ ++ +++#if defined (GETCWD_BROKEN) && !defined (HAVE_GETCWD) +++# define HAVE_GETCWD +++#endif +++ ++ #ifdef _LIBC ++ /* Rename the non ANSI C functions. This is required by the standard ++ because some ANSI C functions will require linking with this object diff --git a/packages/bash/bash_3.0.bb b/packages/bash/bash_3.0.bb index 8511035695..75da58b00b 100644 --- a/packages/bash/bash_3.0.bb +++ b/packages/bash/bash_3.0.bb @@ -3,9 +3,10 @@ HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" DEPENDS = "ncurses" SECTION = "base/shell" LICENSE = "GPL" -PR = "r6" +PR = "r7" SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ + file://bash-3.0-fixes.patch;patch=1 \ file://signames-mipsel.diff;patch=1" inherit autotools gettext diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb index 2c81f37899..db30f95a69 100644 --- a/packages/boost/boost_1.33.0.bb +++ b/packages/boost/boost_1.33.0.bb @@ -10,7 +10,7 @@ SECTION = "libs" DEPENDS = "boost-jam-native zlib" PRIORITY = "optional" LICENSE = "Boost Software License" -PR = "r0" +PR = "r1" # need debian package naming for the libs inherit debian @@ -128,6 +128,10 @@ BJAM_OPTS = '${BJAM_TOOLS} \ ${BJAM_EXTRA}' +do_configure_prepend() { + cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp +} + do_compile() { set -ex bjam ${BJAM_OPTS} --prefix=${prefix} \ diff --git a/packages/altboot/files/spitz/altboot-menu/.mtn2git_empty b/packages/cpusage/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/altboot/files/spitz/altboot-menu/.mtn2git_empty +++ b/packages/cpusage/.mtn2git_empty diff --git a/packages/altboot/files/spitz/altboot-menu/Advanced/.mtn2git_empty b/packages/cpusage/cpusage-0.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/altboot/files/spitz/altboot-menu/Advanced/.mtn2git_empty +++ b/packages/cpusage/cpusage-0.1/.mtn2git_empty diff --git a/packages/cpusage/cpusage-0.1/cpusage.patch b/packages/cpusage/cpusage-0.1/cpusage.patch new file mode 100644 index 0000000000..091c7a9817 --- /dev/null +++ b/packages/cpusage/cpusage-0.1/cpusage.patch @@ -0,0 +1,63 @@ +--- /orig-cpusage.c 2005-08-16 15:37:25.000000000 +0300 ++++ /cpusage.c 2006-03-17 22:27:09.000000000 +0200 +@@ -168,6 +168,7 @@ + int main(int argc, char** argv) { + + int i,c,limit; ++ int single; /* run just one's and exit */ + int avg; /* is avg measurement allready running */ + int avg_run; /* did we allready had an avg measurement */ + static long cp_time1[CPUSTATES]; +@@ -184,15 +185,21 @@ + long total; + limit = LIMIT; + output = 0; /* human readable */ ++ single = 1; /*run continuesly */ + + /* reading commandline options */ + while (1) { +- c = getopt(argc, argv, "aohl:"); ++ c = getopt(argc, argv, "saohl:"); + +- if (c == -1) ++ if (c == -1){ + break; ++ } + + switch(c){ ++ case 's': ++ /*run once and exit */ ++ single = 0; ++ break; + /* use avg from begin to end -> same as "-l 100" */ + case 'a': + limit = 100; +@@ -278,6 +285,10 @@ + + print_perc(cpu_perc, ""); + ++ if (!single ) { ++ breakloop=1; ++ } ++ + if (breakloop) { + if (avg) { + avg = 0; +@@ -292,7 +303,8 @@ + if (sigaction(SIGINT, &sigold, &signew) < 0 ){ + fprintf(stderr, "Could not restore signal handler -> exiting"); + } +- ++ ++ if (single != 0) { + printf("---Summary----\n"); + + print_perc(cpu_min, "Min"); +@@ -301,6 +313,7 @@ + + perc(CPUSTATES, cp_avg_start, cp_avg_stop, cp_diff); + print_perc(cpu_perc, "Avg"); ++ } + + return 0; + } diff --git a/packages/cpusage/cpusage_0.1.bb b/packages/cpusage/cpusage_0.1.bb new file mode 100644 index 0000000000..d90c630ceb --- /dev/null +++ b/packages/cpusage/cpusage_0.1.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "This tool read out the tics counter of the operating system and \ +calculates the Percentages spend in each CPU_STATE." +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www8.in.tum.de/~schneifa/group/sources/cpusage-${PV}.tar.gz \ + file://cpusage.patch;patch=1" + +S = "${WORKDIR}/cpusage-${PV}" + +FILES_${PN} = "/sbin/cpusage" + +CFLAGS_append =" -D_BSD_SOURCE=1" +CFLAGS_append = '${@base_conditional("KERNEL_MAJOR_VERSION", "2.6", " -D__Linux26__ ", " -D__Linux24__ ",d)}' + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -o cpusage cpusage.c +} + +do_install() { + install -d ${D}${base_sbindir} + install -m 0755 cpusage ${D}${base_sbindir}/cpusage +} diff --git a/packages/cpusage/cpusage_0.2.bb b/packages/cpusage/cpusage_0.2.bb new file mode 100644 index 0000000000..7d4df4eccf --- /dev/null +++ b/packages/cpusage/cpusage_0.2.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "This tool read out the tics counter of the operating system and \ +calculates the Percentages spend in each CPU_STATE." +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www8.in.tum.de/~schneifa/group/sources/cpusage-${PV}.tar.gz" + +S = "${WORKDIR}/cpusage-${PV}" + +FILES_${PN} = "/sbin/cpusage" + +CFLAGS_append =" -D_BSD_SOURCE=1" +CFLAGS_append = '${@base_conditional("KERNEL_MAJOR_VERSION", "2.6", " -D__Linux26__ ", " -D__Linux24__ ",d)}' + + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} -o cpusage cpusage.c +} + +do_install() { + install -d ${D}${base_sbindir} + install -m 0755 cpusage ${D}${base_sbindir}/cpusage +} diff --git a/packages/e17/e-iconbar_20060128.bb b/packages/e17/e-iconbar_20060128.bb index 7bfd2d0c7e..333f2406e1 100644 --- a/packages/e17/e-iconbar_20060128.bb +++ b/packages/e17/e-iconbar_20060128.bb @@ -1,14 +1,12 @@ DESCRIPTION = "An Iconbar for the Enlightenment Window Manager" DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11" LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r1" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/iconbar;date=${PV}" -S = "${WORKDIR}/iconbar" +inherit e -inherit autotools +SRC_URI = "${E_CVS};module=e17/apps/iconbar;date=${PV}" +S = "${WORKDIR}/iconbar" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" diff --git a/packages/e17/e-modules_20060128.bb b/packages/e17/e-modules_20060128.bb index 3a50083130..85929a6967 100644 --- a/packages/e17/e-modules_20060128.bb +++ b/packages/e17/e-modules_20060128.bb @@ -1,13 +1,11 @@ DESCRIPTION = "Enlightenment Window Manager Extra Modules" DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e" LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r1" -inherit autotools +inherit e -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e_modules;date=${PV}" +SRC_URI = "${E_CVS};module=e17/apps/e_modules;date=${PV}" S = "${WORKDIR}/e_modules" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" diff --git a/packages/e17/e-utils_20060128.bb b/packages/e17/e-utils_20060128.bb index 18cd7a93cf..3f1af895ae 100644 --- a/packages/e17/e-utils_20060128.bb +++ b/packages/e17/e-utils_20060128.bb @@ -1,13 +1,11 @@ DESCRIPTION = "Enlightenment Window Manager Utilities" DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtual/imlib2 e epsilon" LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r1" -inherit autotools +inherit e -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e_utils;date=${PV}" +SRC_URI = "${E_CVS};module=e17/apps/e_utils;date=${PV}" S = "${WORKDIR}/e_utils" FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-wm_0.16.999.023.bb b/packages/e17/e-wm_0.16.999.025.bb index f7f61ef747..ff7e322018 100644 --- a/packages/e17/e-wm_0.16.999.023.bb +++ b/packages/e17/e-wm_0.16.999.025.bb @@ -1,15 +1,15 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r3" -SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \ +inherit e + +SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ file://remove-large-fonts.patch;patch=1 \ file://Xsession.d/98enlightenment" - + # cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" # file://disable-splash.patch;patch=1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ @@ -20,8 +20,6 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz S = "${WORKDIR}/enlightenment-${PV}" -inherit autotools - PROFILE = "LORES_PDA" PROFILE_c7x0 = "HIRES_PDA" PROFILE_tosa = "HIRES_PDA" @@ -48,3 +46,8 @@ do_install_append() { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d } + +#pkg_postinst() { +# enlightenment_remote -menu-autoscroll-margin-set 5 +# enlightenment_remote -menu-autoscroll-cursor-margin-set 5 +#}
\ No newline at end of file diff --git a/packages/e17/e-wm_20060128.bb b/packages/e17/e-wm_20060128.bb index b97253514d..a836284b5f 100644 --- a/packages/e17/e-wm_20060128.bb +++ b/packages/e17/e-wm_20060128.bb @@ -1,19 +1,17 @@ DESCRIPTION = "E17 - the Enlightenment Window Mananger" DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r3" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e;date=${PV} \ +inherit e + +SRC_URI = "${E_CVS};module=e17/apps/e;date=${PV} \ file://Xsession.d/98enlightenment \ file://fix-configure.patch;patch=1 \ file://remove-large-fonts.patch;patch=1" S = "${WORKDIR}/e" -inherit autotools - PROFILE = "LORES_PDA" PROFILE_c7x0 = "HIRES_PDA" PROFILE_tosa = "HIRES_PDA" diff --git a/packages/e17/e17genmenu_2.0.2.bb b/packages/e17/e17genmenu_2.0.2.bb index 8b43e5995a..49b139a213 100644 --- a/packages/e17/e17genmenu_2.0.2.bb +++ b/packages/e17/e17genmenu_2.0.2.bb @@ -1,16 +1,12 @@ DESCRIPTION = "Convert Gnome or KDE menus to e17 menus" -SECTION = "e/utils" DEPENDS = "e virtual/ecore virtual/evas eet engrave" LICENSE = "GPL" HOMEPAGE = "http://sourceforge.net/projects/e17genmenu" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r0" -export EET_CONFIG = "${STAGING_BINDIR}/eet-config" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" -export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" -export ENGRAVE_CONFIG = "${STAGING_BINDIR}/engrave-config" -export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR}/enlightenment-config" +inherit e + +SECTION = "e/utils" SRC_URI = "${SOURCEFORGE_MIRROR}/e17genmenu/e17genmenu-2.0.2.tar.gz" @@ -19,5 +15,3 @@ do_configure_prepend() { find -type f | xargs sed -i 's:share/icons/hicolor/48x48/apps:share/pixmaps:' find -type f | xargs sed -i 's:%s/share/pixmaps", GNOME_PREFIX, theme:%s/share/pixmaps", GNOME_PREFIX:' } - -inherit autotools diff --git a/packages/e17/eclair_20060128.bb b/packages/e17/eclair_20060128.bb index 7e1d1e5bda..36cf7c02ad 100644 --- a/packages/e17/eclair_20060128.bb +++ b/packages/e17/eclair_20060128.bb @@ -1,15 +1,12 @@ DESCRIPTION = "Eclair is the E17 multi media player" -SECTION = "e/apps" DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emotion esmart-x11 libxml2 sqlite3 taglibc" LICENSE = "MIT" -HOMEPAGE = "http://www.enlightenment.org" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r1" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/eclair;date=${PV}" -S = "${WORKDIR}/eclair" +inherit e -inherit autotools +SRC_URI = "${E_CVS};module=e17/apps/eclair;date=${PV}" +S = "${WORKDIR}/eclair" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" diff --git a/packages/e17/engage_20060128.bb b/packages/e17/engage_20060128.bb index bd925a969c..0bf9f80895 100644 --- a/packages/e17/engage_20060128.bb +++ b/packages/e17/engage_20060128.bb @@ -1,22 +1,15 @@ DESCRIPTION = "Engage is the E17 icon dock" DEPENDS = "evas-x11 ecore-x11 esmart-x11 imlib2-x11 edje ewl e" LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r2" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=misc/engage;date=${PV} \ +inherit e + +SRC_URI = "${E_CVS};module=misc/engage;date=${PV} \ file://no-local-includes.patch;patch=1" S = "${WORKDIR}/engage" -inherit autotools pkgconfig binconfig - EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index 05023f7fa2..ffc07f7661 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -1,16 +1,13 @@ DESCRIPTION = "Entice is the E17 picture viewer" -SECTION = "e/apps" # can also depend on GIMP for editing DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -HOMEPAGE = "http://www.enlightenment.org" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r1" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/entice;date=${PV}" -S = "${WORKDIR}/entice" +inherit e -inherit autotools +SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" +S = "${WORKDIR}/entice" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" diff --git a/packages/e17/entrance_0.9.0.005.bb b/packages/e17/entrance_0.9.0.006.bb index c17d52c587..1b928b972c 100644 --- a/packages/e17/entrance_0.9.0.005.bb +++ b/packages/e17/entrance_0.9.0.006.bb @@ -1,26 +1,24 @@ DESCRIPTION = "Entrance is the Enlightenment login manager" -SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common login-manager" RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1 login-manager" HOMEPAGE = "http://www.enlightenment.org" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r13" -SRC_URI = "http://enlightenment.freedesktop.org/files/entrance-${PV}.tar.gz \ +inherit e + +SRC_URI = "${E_URI}/entrance-${PV}.tar.gz \ file://config-db.patch;patch=1 \ file://allow-missing-xsession.patch;patch=1 \ file://run-Xinit.patch;patch=1 \ file://set-display-env.patch;patch=1 \ file://fix-auth-mode.patch;patch=1 \ file://use-bash.patch;patch=1 \ - file://Sessions" + file://Sessions" S = "${WORKDIR}/entrance-${PV}" -inherit autotools - EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ --with-xsession=/etc/X11/Xsession \ --with-auth-mode=0" diff --git a/packages/e17/entrance_20060128.bb b/packages/e17/entrance_20060128.bb index b234664fe6..825a81cdec 100644 --- a/packages/e17/entrance_20060128.bb +++ b/packages/e17/entrance_20060128.bb @@ -1,26 +1,24 @@ DESCRIPTION = "Entrance is the Enlightenment login manager" -SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1" HOMEPAGE = "http://www.enlightenment.org" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r11" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/entrance;date=${PV} \ +inherit e update-rc.d + +SRC_URI = "${E_CVS};module=e17/apps/entrance;date=${PV} \ file://config-db.patch;patch=1 \ file://allow-missing-xsession.patch;patch=1 \ file://run-Xinit.patch;patch=1 \ file://set-display-env.patch;patch=1 \ file://fix-auth-mode.patch;patch=1 \ file://use-bash.patch;patch=1 \ - file://Sessions" + file://Sessions" S = "${WORKDIR}/entrance" -inherit autotools update-rc.d - INITSCRIPT_NAME = "entrance" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." diff --git a/packages/e17/evidence_20060128.bb b/packages/e17/evidence_20060128.bb index 5c24152b17..683ac8e536 100644 --- a/packages/e17/evidence_20060128.bb +++ b/packages/e17/evidence_20060128.bb @@ -1,12 +1,12 @@ DESCRIPTION = "evidence, an enlightenemt file manager" LICENSE = "GPL" -SECTION = "e" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" # can support dbus, avifile, libmpeg3 DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype" RDEPENDS += "examine" PR = "r0" +inherit e + SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence;date=${PV}" S = "${WORKDIR}/evidence" @@ -21,21 +21,9 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ --enable-browser-view \ --with-libxine=${STAGING_LIBDIR}" -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - do_compile_prepend() { sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile } -export EET_CONFIG = "${STAGING_BINDIR}/eet-config" -export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config" -export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config" -export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config" -export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config" - FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*" -inherit autotools pkgconfig binconfig diff --git a/packages/e17/examine_20060128.bb b/packages/e17/examine_20060128.bb index 45ceb65458..e689eb1712 100644 --- a/packages/e17/examine_20060128.bb +++ b/packages/e17/examine_20060128.bb @@ -1,20 +1,13 @@ DESCRIPTION = "examine, the program configurator" DEPENDS = "virtual/ecore ewl" LICENSE = "MIT" -SECTION = "e/apps" -MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r0" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/examine;date=${PV}" +inherit e + +SRC_URI = "${E_CVS};module=e17/apps/examine;date=${PV}" S = "${WORKDIR}/examine" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" -inherit autotools pkgconfig binconfig - -do_prepsources () { - make clean distclean || true -} -addtask prepsources after do_fetch before do_unpack - FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/efl/e_0.16.999.023.bb b/packages/efl/e_0.16.999.025.bb index 0f400d51cc..bd40c68b0e 100644 --- a/packages/efl/e_0.16.999.023.bb +++ b/packages/efl/e_0.16.999.025.bb @@ -5,7 +5,7 @@ PR = "r2" inherit efl -SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz" +SRC_URI = "${E_URI}/enlightenment-${PV}.tar.gz" S = "${WORKDIR}/enlightenment-${PV}" PROFILE = "LORES_PDA" diff --git a/packages/efl/e_20060128.bb b/packages/efl/e_20060128.bb index 495b647101..132da0c23a 100644 --- a/packages/efl/e_20060128.bb +++ b/packages/efl/e_20060128.bb @@ -5,7 +5,7 @@ PR = "r1" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e;date=${PV} \ +SRC_URI = "${E_CVS};module=e17/apps/e;date=${PV} \ file://fix-configure.patch;patch=1" S = "${WORKDIR}/e" diff --git a/packages/efl/ecore-fb_0.9.9.023.bb b/packages/efl/ecore-fb_0.9.9.025.bb index a5a843aeb4..a957c5dd8c 100644 --- a/packages/efl/ecore-fb_0.9.9.023.bb +++ b/packages/efl/ecore-fb_0.9.9.025.bb @@ -7,6 +7,7 @@ EXTRA_OECONF = "--enable-ecore-fb \ --enable-poll \ --enable-ecore-dbus \ --enable-ecore-evas \ + --enable-ecore-evas-buffer \ --enable-ecore-evas-fb \ --disable-ecore-evas-x \ --disable-ecore-evas-xrender \ diff --git a/packages/efl/ecore-fb_20060128.bb b/packages/efl/ecore-fb_20060128.bb index 4badfa42ec..5bffca1295 100644 --- a/packages/efl/ecore-fb_20060128.bb +++ b/packages/efl/ecore-fb_20060128.bb @@ -1,7 +1,7 @@ include ecore.inc PR = "r1" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/ecore;date=${PV}" S = "${WORKDIR}/ecore" ### add tslib support diff --git a/packages/efl/ecore-native_0.9.9.023.bb b/packages/efl/ecore-native_0.9.9.025.bb index 299470841c..299470841c 100644 --- a/packages/efl/ecore-native_0.9.9.023.bb +++ b/packages/efl/ecore-native_0.9.9.025.bb diff --git a/packages/efl/ecore-native_20060128.bb b/packages/efl/ecore-native_20060128.bb index 5eb8541fdc..a4d67bf056 100644 --- a/packages/efl/ecore-native_20060128.bb +++ b/packages/efl/ecore-native_20060128.bb @@ -1,7 +1,7 @@ include ecore.inc PR = "r1" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV} \ +SRC_URI = "${E_CVS};module=e17/libs/ecore;date=${PV} \ file://remove-tslib-configure.patch;patch=1" S = "${WORKDIR}/ecore" diff --git a/packages/efl/ecore-x11_0.9.9.023.bb b/packages/efl/ecore-x11_0.9.9.025.bb index 40527561aa..3a88ad229b 100644 --- a/packages/efl/ecore-x11_0.9.9.023.bb +++ b/packages/efl/ecore-x11_0.9.9.025.bb @@ -10,6 +10,7 @@ EXTRA_OECONF = "--enable-ecore-fb \ --enable-ecore-dbus \ --enable-ecore-evas-fb \ --enable-ecore-evas-x \ + --enable-ecore-evas-buffer \ --disable-ecore-evas-gl \ --enable-ecore-con \ --enable-ecore-ipc \ diff --git a/packages/efl/ecore-x11_20060128.bb b/packages/efl/ecore-x11_20060128.bb index cc4fc76de7..7b9f3a6f76 100644 --- a/packages/efl/ecore-x11_20060128.bb +++ b/packages/efl/ecore-x11_20060128.bb @@ -2,7 +2,7 @@ include ecore.inc DEPENDS += "evas-x11" PR = "r2" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV} \ +SRC_URI = "${E_CVS};module=e17/libs/ecore;date=${PV} \ file://evas-x11-include.patch;patch=1 \ file://remove-tslib-configure.patch;patch=1" S = "${WORKDIR}/ecore" diff --git a/packages/efl/edb-native_1.0.5.005.bb b/packages/efl/edb-native_1.0.5.006.bb index d83a3b77c6..d83a3b77c6 100644 --- a/packages/efl/edb-native_1.0.5.005.bb +++ b/packages/efl/edb-native_1.0.5.006.bb diff --git a/packages/efl/edb-utils_1.0.5.005.bb b/packages/efl/edb-utils_1.0.5.006.bb index 401d0e7e46..8d47e068a7 100644 --- a/packages/efl/edb-utils_1.0.5.005.bb +++ b/packages/efl/edb-utils_1.0.5.006.bb @@ -12,7 +12,7 @@ PACKAGES = "edb-utils" FILES_${PN} = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" RDEPENDS_${PN} += "ncurses" -SRC_URI = "http://enlightenment.freedesktop.org/files/edb-${PV}.tar.gz" +SRC_URI = "${E_URI}/edb-${PV}.tar.gz" S = "${WORKDIR}/edb-${PV}" libraries = "" diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.006.bb index a152530b47..a152530b47 100644 --- a/packages/efl/edb_1.0.5.005.bb +++ b/packages/efl/edb_1.0.5.006.bb diff --git a/packages/efl/edb_20060128.bb b/packages/efl/edb_20060128.bb index 0d0d899037..8b1f39ed88 100644 --- a/packages/efl/edb_20060128.bb +++ b/packages/efl/edb_20060128.bb @@ -6,7 +6,7 @@ PR = "r1" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/edb;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/edb;date=${PV}" S = "${WORKDIR}/edb" EXTRA_OECONF += "--disable-gtk" diff --git a/packages/efl/edje-native_0.5.0.023.bb b/packages/efl/edje-native_0.5.0.025.bb index 44b4e80c20..5e7bed336d 100644 --- a/packages/efl/edje-native_0.5.0.023.bb +++ b/packages/efl/edje-native_0.5.0.025.bb @@ -7,8 +7,7 @@ inherit native DEPENDS = "evas-native ecore-native eet-native embryo-native imlib2-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" -EXTRA_OECONF = "--with-fb-only \ - --with-evas-config=${STAGING_BINDIR}/evas-config-native \ +EXTRA_OECONF = "--with-evas-config=${STAGING_BINDIR}/evas-config-native \ --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ --with-eet-config=${STAGING_BINDIR}/eet-config-native \ --with-embryo-config=${STAGING_BINDIR}/embryo-config-native \ diff --git a/packages/efl/edje-utils_0.5.0.023.bb b/packages/efl/edje-utils_0.5.0.025.bb index 837157ee3e..f8eb917e4d 100644 --- a/packages/efl/edje-utils_0.5.0.023.bb +++ b/packages/efl/edje-utils_0.5.0.025.bb @@ -9,8 +9,8 @@ PACKAGES = "edje-utils" FILES_${PN} = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include" RDEPENDS_${PN} += "embryo-utils cpp cpp-symlinks gcc gcc-symlinks" -SRC_URI = "http://enlightenment.freedesktop.org/files/edje-${PV}.tar.gz \ - cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101" +SRC_URI = "${E_URI}/edje-${PV}.tar.gz \ + ${E_CVS};module=e17/libs/edje/m4;date=20060101" S = "${WORKDIR}/edje-${PV}" libraries = "" diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.025.bb index 43e135ac5d..0d4acab003 100644 --- a/packages/efl/edje_0.5.0.023.bb +++ b/packages/efl/edje_0.5.0.025.bb @@ -18,7 +18,7 @@ FILES_${PN}-examples = "${datadir}/edje/data/images ${datadir}/edje/data/src ${d FILES_${SRCNAME}-themes = "" -SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101" +SRC_URI += "${E_CVS};module=e17/libs/edje/m4;date=20060101" LEAD_SONAME = "libedje.so" diff --git a/packages/efl/edje_20060128.bb b/packages/efl/edje_20060128.bb index 9a23201f80..e4c1d4f51b 100644 --- a/packages/efl/edje_20060128.bb +++ b/packages/efl/edje_20060128.bb @@ -6,7 +6,7 @@ PR = "r1" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/edje;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/edje;date=${PV}" S = "${WORKDIR}/edje" LEAD_SONAME = "libedje.so" diff --git a/packages/efl/eet-native_0.9.10.023.bb b/packages/efl/eet-native_0.9.10.025.bb index fa20c9fb30..fa20c9fb30 100644 --- a/packages/efl/eet-native_0.9.10.023.bb +++ b/packages/efl/eet-native_0.9.10.025.bb diff --git a/packages/efl/eet_0.9.10.023.bb b/packages/efl/eet_0.9.10.025.bb index 6e6032e098..6e6032e098 100644 --- a/packages/efl/eet_0.9.10.023.bb +++ b/packages/efl/eet_0.9.10.025.bb diff --git a/packages/efl/eet_20060128.bb b/packages/efl/eet_20060128.bb index 70dde944fa..883c122a94 100644 --- a/packages/efl/eet_20060128.bb +++ b/packages/efl/eet_20060128.bb @@ -8,5 +8,5 @@ PR = "r1" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/eet;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/eet;date=${PV}" S = "${WORKDIR}/eet" diff --git a/packages/efl/embryo-native_0.9.1.023.bb b/packages/efl/embryo-native_0.9.1.025.bb index a33adb7bd2..a33adb7bd2 100644 --- a/packages/efl/embryo-native_0.9.1.023.bb +++ b/packages/efl/embryo-native_0.9.1.025.bb diff --git a/packages/efl/embryo-utils_0.9.1.023.bb b/packages/efl/embryo-utils_0.9.1.025.bb index 7899e4aa2f..d507c53cce 100644 --- a/packages/efl/embryo-utils_0.9.1.023.bb +++ b/packages/efl/embryo-utils_0.9.1.025.bb @@ -8,7 +8,7 @@ PR = "r4" inherit efl -SRC_URI = "http://enlightenment.freedesktop.org/files/embryo-${PV}.tar.gz" +SRC_URI = "${E_URI}/embryo-${PV}.tar.gz" S = "${WORKDIR}/embryo-${PV}" PACKAGES = "embryo-utils" diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.025.bb index 0009c0a149..0009c0a149 100644 --- a/packages/efl/embryo_0.9.1.023.bb +++ b/packages/efl/embryo_0.9.1.025.bb diff --git a/packages/efl/embryo_20060128.bb b/packages/efl/embryo_20060128.bb index 58ff67869b..bdf208aeda 100644 --- a/packages/efl/embryo_20060128.bb +++ b/packages/efl/embryo_20060128.bb @@ -8,5 +8,5 @@ PR = "r1" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/embryo;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/embryo;date=${PV}" S = "${WORKDIR}/embryo" diff --git a/packages/efl/emotion_20060128.bb b/packages/efl/emotion_20060128.bb index a567c030cc..90847f297a 100644 --- a/packages/efl/emotion_20060128.bb +++ b/packages/efl/emotion_20060128.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/emotion;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/emotion;date=${PV}" S = "${WORKDIR}/emotion" PACKAGES += "emotion-plugins" diff --git a/packages/efl/engrave_20060128.bb b/packages/efl/engrave_20060128.bb index e3b64a82d3..63eb24eb1f 100644 --- a/packages/efl/engrave_20060128.bb +++ b/packages/efl/engrave_20060128.bb @@ -5,7 +5,7 @@ DEPENDS = "virtual/evas virtual/ecore" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/engrave;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/engrave;date=${PV}" S = "${WORKDIR}/engrave" do_stage_append() { diff --git a/packages/efl/epeg_0.9.0.005.bb b/packages/efl/epeg_0.9.0.006.bb index c35ec63606..c35ec63606 100644 --- a/packages/efl/epeg_0.9.0.005.bb +++ b/packages/efl/epeg_0.9.0.006.bb diff --git a/packages/efl/epeg_20060128.bb b/packages/efl/epeg_20060128.bb index 36ababb26f..df63c0f335 100644 --- a/packages/efl/epeg_20060128.bb +++ b/packages/efl/epeg_20060128.bb @@ -4,5 +4,5 @@ DEPENDS = "jpeg" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/epeg;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/epeg;date=${PV}" S = "${WORKDIR}/epeg" diff --git a/packages/efl/epsilon_0.3.0.005.bb b/packages/efl/epsilon_0.3.0.006.bb index d454a538a6..58c0f02a45 100644 --- a/packages/efl/epsilon_0.3.0.005.bb +++ b/packages/efl/epsilon_0.3.0.006.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/imlib2 epeg libpng virtual/evas virtual/ecore perl-native edj inherit efl SRC_URI += "file://compile-fix.patch;patch=1 \ - cvs://anonymous@thinktux.net/root;module=e17/libs/epsilon/m4;date=20060101" + ${E_CVS};module=e17/libs/epsilon/m4;date=20060101" do_configure_prepend() { install -d "${S}/m4" diff --git a/packages/efl/esmart-fb_0.9.0.005.bb b/packages/efl/esmart-fb_0.9.0.006.bb index 35bef239ee..35bef239ee 100644 --- a/packages/efl/esmart-fb_0.9.0.005.bb +++ b/packages/efl/esmart-fb_0.9.0.006.bb diff --git a/packages/efl/esmart-fb_20060128.bb b/packages/efl/esmart-fb_20060128.bb index 302fb95159..655a61d06f 100644 --- a/packages/efl/esmart-fb_20060128.bb +++ b/packages/efl/esmart-fb_20060128.bb @@ -1,7 +1,7 @@ include esmart.inc PR = "r0" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/esmart;date=${PV}" S = "${WORKDIR}/esmart" SRC_URI += "file://disable-x-only-features.patch;patch=1 \ diff --git a/packages/efl/esmart-x11_0.9.0.005.bb b/packages/efl/esmart-x11_0.9.0.006.bb index cb5cc1da91..cb5cc1da91 100644 --- a/packages/efl/esmart-x11_0.9.0.005.bb +++ b/packages/efl/esmart-x11_0.9.0.006.bb diff --git a/packages/efl/esmart-x11_20060128.bb b/packages/efl/esmart-x11_20060128.bb index cccb7c36ff..076f4bf22f 100644 --- a/packages/efl/esmart-x11_20060128.bb +++ b/packages/efl/esmart-x11_20060128.bb @@ -1,7 +1,7 @@ include esmart.inc PR = "r2" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/esmart;date=${PV}" SRC_URI += "file://ecore-fix.patch;patch=1 \ file://include-stdio.patch;patch=1 \ file://compile-fix.patch;patch=1" diff --git a/packages/efl/etox_20060128.bb b/packages/efl/etox_20060128.bb index d460479c4f..fa51dba3c4 100644 --- a/packages/efl/etox_20060128.bb +++ b/packages/efl/etox_20060128.bb @@ -7,7 +7,7 @@ PR = "r1" inherit efl -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/etox;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/etox;date=${PV}" S = "${WORKDIR}/etox" libdirectory = "src" diff --git a/packages/efl/evas-fb_0.9.9.023.bb b/packages/efl/evas-fb_0.9.9.023.bb deleted file mode 100644 index b0c9d5bdb6..0000000000 --- a/packages/efl/evas-fb_0.9.9.023.bb +++ /dev/null @@ -1,48 +0,0 @@ -include evas.inc -DEPENDS = "freetype libpng jpeg eet" -PR = "r2" - -EXTRA_OECONF = "--enable-fb \ - --disable-directfb \ - --disable-buffer \ - --disable-software-qtopia \ - --disable-software-x11 \ - --disable-gl-x11 \ - --disable-xrender-x11 \ - --enable-image-loader-eet \ - --disable-image-loader-edb \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-small-dither-mask \ - --enable-cpu-c \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --disable-convert-16-rgb-555 \ - --disable-convert-16-rgb-444 \ - --disable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --disable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --disable-convert-24-rgb-888 \ - --disable-convert-24-bgr-888 \ - --disable-convert-32-rgb-8888 \ - --disable-convert-32-rgbx-8888 \ - --disable-convert-32-bgr-8888 \ - --disable-convert-32-bgrx-8888 \ - --disable-convert-32-rgb-rot-0 \ - --disable-convert-32-rgb-rot-90 \ - --disable-convert-32-rgb-rot-270" - -headers = "Evas_Engine_Buffer.h \ - Evas_Engine_FB.h \ - Evas.h" diff --git a/packages/efl/evas-fb_0.9.9.025.bb b/packages/efl/evas-fb_0.9.9.025.bb new file mode 100644 index 0000000000..7ccecabfb2 --- /dev/null +++ b/packages/efl/evas-fb_0.9.9.025.bb @@ -0,0 +1,48 @@ +include evas.inc +DEPENDS = "freetype libpng jpeg eet" +PR = "r3" + +EXTRA_OECONF = "--enable-fb \ + --disable-directfb \ + --enable-buffer \ + --disable-software-qtopia \ + --disable-software-x11 \ + --disable-gl-x11 \ + --disable-xrender-x11 \ + --enable-image-loader-eet \ + --disable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --enable-convert-8-rgb-332 \ + --enable-convert-8-rgb-666 \ + --enable-convert-8-rgb-232 \ + --enable-convert-8-rgb-222 \ + --enable-convert-8-rgb-221 \ + --enable-convert-8-rgb-121 \ + --enable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --enable-convert-16-rgb-555 \ + --enable-convert-16-rgb-444 \ + --enable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --enable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --enable-convert-24-rgb-888 \ + --enable-convert-24-bgr-888 \ + --enable-convert-32-rgb-8888 \ + --enable-convert-32-rgbx-8888 \ + --enable-convert-32-bgr-8888 \ + --enable-convert-32-bgrx-8888 \ + --enable-convert-32-rgb-rot-0 \ + --enable-convert-32-rgb-rot-90 \ + --enable-convert-32-rgb-rot-270" + +headers = "../modules/engines/buffer/Evas_Engine_Buffer.h \ + ../modules/engines/fb/Evas_Engine_FB.h \ + Evas.h" diff --git a/packages/efl/evas-fb_20060113.bb b/packages/efl/evas-fb_20060113.bb index e3bbccc383..1a889a2649 100644 --- a/packages/efl/evas-fb_20060113.bb +++ b/packages/efl/evas-fb_20060113.bb @@ -1,8 +1,8 @@ include evas.inc DEPENDS = "freetype libpng jpeg eet" -PR = "r0" +PR = "r1" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV} \ +SRC_URI = "${E_CVS};module=e17/libs/evas;date=${PV} \ file://pkg.m4" S = "${WORKDIR}/evas" diff --git a/packages/efl/evas-native_0.9.9.023.bb b/packages/efl/evas-native_0.9.9.025.bb index cb4336dfab..fafaaf2c62 100644 --- a/packages/efl/evas-native_0.9.9.023.bb +++ b/packages/efl/evas-native_0.9.9.025.bb @@ -2,4 +2,7 @@ include evas-fb_${PV}.bb inherit native DEPENDS = "freetype-native libpng-native jpeg-native eet-native" PROVIDES = "evas-native" -EXTRA_OECONF += "--enable-buffer" + +do_install() { + autotools_do_install +}
\ No newline at end of file diff --git a/packages/efl/evas-x11_0.9.9.023.bb b/packages/efl/evas-x11_0.9.9.025.bb index 4b833d8d9c..dc99b96761 100644 --- a/packages/efl/evas-x11_0.9.9.023.bb +++ b/packages/efl/evas-x11_0.9.9.025.bb @@ -1,6 +1,6 @@ include evas.inc DEPENDS += "libx11 libxext freetype" -PR = "r4" +PR = "r5" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ @@ -44,9 +44,9 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --disable-convert-32-rgb-rot-90 \ --disable-convert-32-rgb-rot-270" -headers = "Evas_Engine_Software_X11.h \ - Evas_Engine_XRender_X11.h \ - Evas_Engine_Buffer.h \ - Evas_Engine_FB.h \ +headers = "../modules/engines/software_x11/Evas_Engine_Software_X11.h \ + ../modules/engines/xrender_x11/Evas_Engine_XRender_X11.h \ + ../modules/engines/buffer/Evas_Engine_Buffer.h \ + ../modules/engines/fb/Evas_Engine_FB.h \ Evas.h" diff --git a/packages/efl/evas-x11_20060113.bb b/packages/efl/evas-x11_20060113.bb index dab078a9bc..c10bd77857 100644 --- a/packages/efl/evas-x11_20060113.bb +++ b/packages/efl/evas-x11_20060113.bb @@ -1,8 +1,8 @@ include evas.inc DEPENDS += "libx11 libxext freetype" -PR = "r4" +PR = "r5" -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/evas;date=${PV}" S = "${WORKDIR}/evas" EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 33625e812d..bffd0668cb 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -20,7 +20,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "<override me>" - do_configure_prepend() { if [ -e "${WORKDIR}/m4" ]; then install -d "${S}/m4" @@ -29,5 +28,16 @@ do_configure_prepend() { fi } +do_stage_append() { + cd src + modules=`find modules -name ".libs"` + for module in $modules + do + install -d ${STAGING_LIBDIR}/evas/`dirname $module` + install -m 0755 $module/module.so ${STAGING_LIBDIR}/evas/`dirname $module`/module.so + done +} + headers = "<override me>" -libraries = "libevas"
\ No newline at end of file +libraries = "libevas" +FILES_${PN} += "/usr/lib/evas/" diff --git a/packages/efl/evas/fix-configure-0.9.9.025.patch b/packages/efl/evas/fix-configure-0.9.9.025.patch new file mode 100644 index 0000000000..61e2446c24 --- /dev/null +++ b/packages/efl/evas/fix-configure-0.9.9.025.patch @@ -0,0 +1,35 @@ +--- evas-0.9.9.023/configure.in~ 2006-01-11 21:34:57.000000000 -0800 ++++ evas-0.9.9.023/configure.in 2006-02-03 12:15:45.000000000 -0800 +@@ -152,9 +152,7 @@ + [ + AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true) + AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="-lX11 -lXext" + ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load" + ], + [ +@@ -423,10 +421,10 @@ + AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) + AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) + AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) +- x_dir=${x_dir:-/usr/X11R6}; ++ x_dir=${x_dir:-}; + x_cflags=${x_cflags:--I$x_dir/include} + x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" +- gl_cflags="-I/usr/include" ++ gl_cflags="" + gl_libs="-lGL -lGLU -lpthread" + gl_dir="" + ENGINE_GL_X11_PRG="evas_gl_x11_test" +@@ -489,7 +487,7 @@ + AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) + AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) + AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) +- x_dir="/usr/X11R6"; ++ x_dir=""; + x_cflags="-I"$x_dir"/include" + x_libs="-L"$x_dir"/lib -lX11 -lXext" + ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test" diff --git a/packages/efl/ewl_0.0.4.005.bb b/packages/efl/ewl_0.0.4.006.bb index 85b85e0c05..85b85e0c05 100644 --- a/packages/efl/ewl_0.0.4.005.bb +++ b/packages/efl/ewl_0.0.4.006.bb diff --git a/packages/efl/imlib2-fb_1.2.1.010.bb b/packages/efl/imlib2-fb_1.2.1.011.bb index 09fecdaf8b..09fecdaf8b 100644 --- a/packages/efl/imlib2-fb_1.2.1.010.bb +++ b/packages/efl/imlib2-fb_1.2.1.011.bb diff --git a/packages/efl/imlib2-fb_20060128.bb b/packages/efl/imlib2-fb_20060128.bb index 88f988e8a0..68357df7af 100644 --- a/packages/efl/imlib2-fb_20060128.bb +++ b/packages/efl/imlib2-fb_20060128.bb @@ -1,6 +1,6 @@ include imlib2.inc -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/imlib2;date=${PV}" S = "${WORKDIR}/imlib2" EXTRA_OECONF = "--without-x \ diff --git a/packages/efl/imlib2-native_1.2.1.010.bb b/packages/efl/imlib2-native_1.2.1.011.bb index 6f8ebe477a..6f8ebe477a 100644 --- a/packages/efl/imlib2-native_1.2.1.010.bb +++ b/packages/efl/imlib2-native_1.2.1.011.bb diff --git a/packages/efl/imlib2-native_20060128.bb b/packages/efl/imlib2-native_20060128.bb index 11c2fa4b89..de546add72 100644 --- a/packages/efl/imlib2-native_20060128.bb +++ b/packages/efl/imlib2-native_20060128.bb @@ -1,6 +1,6 @@ include imlib2.inc -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/imlib2;date=${PV}" S = "${WORKDIR}/imlib2" inherit native diff --git a/packages/efl/imlib2-x11_1.2.1.010.bb b/packages/efl/imlib2-x11_1.2.1.011.bb index fec8b32205..fec8b32205 100644 --- a/packages/efl/imlib2-x11_1.2.1.010.bb +++ b/packages/efl/imlib2-x11_1.2.1.011.bb diff --git a/packages/efl/imlib2-x11_20060128.bb b/packages/efl/imlib2-x11_20060128.bb index f77fa6498c..3012466b3b 100644 --- a/packages/efl/imlib2-x11_20060128.bb +++ b/packages/efl/imlib2-x11_20060128.bb @@ -1,6 +1,6 @@ include imlib2.inc -SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}" +SRC_URI = "${E_CVS};module=e17/libs/imlib2;date=${PV}" S = "${WORKDIR}/imlib2" DEPENDS += "libx11 libxext" diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb deleted file mode 100644 index 18ad005092..0000000000 --- a/packages/evince/evince_0.3.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Evince is simply a document viewer" -LICENSE = "GPL" -DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" -RDEPENDS = "espgs gconf" -RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r1" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.3/${PN}-${PV}.tar.bz2 \ - file://no-doc.patch;patch=1" - -EXTRA_OECONF = "--disable-tiff" - -inherit gnome pkgconfig - - diff --git a/packages/evince/evince_0.5.1.bb b/packages/evince/evince_0.5.1.bb deleted file mode 100644 index a772bb2de5..0000000000 --- a/packages/evince/evince_0.5.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Evince is simply a document viewer" -LICENSE = "GPL" -DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui" -RDEPENDS = "espgs gconf" -RRECOMMENDS = "gnome-vfs-plugin-file" -PR = "r0" - -inherit gnome pkgconfig - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.5/${PN}-${PV}.tar.bz2 \ - file://more-no-doc.patch;patch=1" - -EXTRA_OECONF = "--disable-tiff" - diff --git a/packages/evince/evince_0.5.0.bb b/packages/evince/evince_0.5.2.bb index a772bb2de5..a772bb2de5 100644 --- a/packages/evince/evince_0.5.0.bb +++ b/packages/evince/evince_0.5.2.bb diff --git a/packages/gammu/gammu_1.04.0.bb b/packages/gammu/gammu_1.05.00.bb index 0b18e2a0bd..514819935c 100644 --- a/packages/gammu/gammu_1.04.0.bb +++ b/packages/gammu/gammu_1.05.00.bb @@ -20,7 +20,7 @@ do_stage() { install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ - ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4 \ + ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \ ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ @@ -40,7 +40,7 @@ do_stage() { install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 - install -m 0644 common/phone/nokia/dct4/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4 + install -m 0644 common/phone/nokia/dct4tiku/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service diff --git a/packages/gimp/gimp_2.2.7.bb b/packages/gimp/gimp_2.2.10.bb index 5380106a64..59fb0a0467 100644 --- a/packages/gimp/gimp_2.2.7.bb +++ b/packages/gimp/gimp_2.2.10.bb @@ -13,3 +13,8 @@ EXTRA_OECONF = " --disable-gtktest \ --without-libtiff \ --disable-print \ --enable-mp" + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g +} + diff --git a/packages/gimp/gimp_2.3.3.bb b/packages/gimp/gimp_2.3.3.bb deleted file mode 100644 index 89d9be3e8d..0000000000 --- a/packages/gimp/gimp_2.3.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "The GIMP is the GNU Image Manipulation Program." -HOMEPAGE = "http://www.gimp.org" -LICENSE = "GPL" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" - -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2" - -DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" - -inherit autotools pkgconfig -#Don't laugh, this just builds a threaded gimp -EXTRA_OECONF = " --disable-gtktest \ - --disable-print \ - --disable-python \ - --enable-mp" - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g -} diff --git a/packages/glib-2.0/glib-2.0_2.10.1.bb b/packages/glib-2.0/glib-2.0_2.10.1.bb index 1c887e0206..fb47651f0c 100644 --- a/packages/glib-2.0/glib-2.0_2.10.1.bb +++ b/packages/glib-2.0/glib-2.0_2.10.1.bb @@ -16,6 +16,8 @@ FILES_glib-2.0-utils = "${bindir}/*" EXTRA_OECONF = "--disable-debug" +DEFAULT_PREFERENCE="-1" + SRC_URI = "http://download.gnome.org/sources/glib/2.10//glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h" diff --git a/packages/gnome/goffice_0.0.1.bb b/packages/gnome/goffice_0.0.1.bb deleted file mode 100644 index eabe184e36..0000000000 --- a/packages/gnome/goffice_0.0.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r1" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - - diff --git a/packages/gnome/goffice_0.0.3.bb b/packages/gnome/goffice_0.0.3.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.0.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.0.4.bb b/packages/gnome/goffice_0.0.4.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.0.4.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.1.0.bb b/packages/gnome/goffice_0.1.0.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.1.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.1.2.bb b/packages/gnome/goffice_0.1.2.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.1.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.2.0.bb b/packages/gnome/goffice_0.2.0.bb deleted file mode 100644 index 59372fa5ec..0000000000 --- a/packages/gnome/goffice_0.2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION="Gnome Office Library" -LICENSE="GPLv2" -PR="r0" - -DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl" - -inherit gnome pkgconfig - -do_stage() { - gnome_stage_includes - oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR} -} - -PACKAGES_DYNAMIC = "goffice-plugin-*" - -python populate_packages_prepend () { - goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d) - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - diff --git a/packages/gnome/goffice_0.0.2.bb b/packages/gnome/goffice_0.2.1.bb index 59372fa5ec..59372fa5ec 100644 --- a/packages/gnome/goffice_0.0.2.bb +++ b/packages/gnome/goffice_0.2.1.bb diff --git a/packages/gnome/orbit2-native_2.14.0.bb b/packages/gnome/orbit2-native_2.14.0.bb new file mode 100644 index 0000000000..c10afb58db --- /dev/null +++ b/packages/gnome/orbit2-native_2.14.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "CORBA ORB" +LICENSE = "LGPL GPL" +SECTION = "x11/gnome/libs" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \ + file://configure-lossage.patch;patch=1;pnum=1 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "libidl-native popt-native gtk-doc" + +S = "${WORKDIR}/ORBit2-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/orbit2" + +PARALLEL_MAKE = "" +inherit autotools native pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure_prepend() { + mkdir -p m4 + install ${WORKDIR}/gtk-doc.m4 ./m4/ + install ${WORKDIR}/gtk-doc.make ./ +} diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty b/packages/gnome/orbit2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty +++ b/packages/gnome/orbit2/.mtn2git_empty diff --git a/packages/gnome/orbit2/configure-lossage.patch b/packages/gnome/orbit2/configure-lossage.patch new file mode 100644 index 0000000000..7485a0ce0c --- /dev/null +++ b/packages/gnome/orbit2/configure-lossage.patch @@ -0,0 +1,35 @@ +--- orbit/configure.in~ 2004-05-07 09:31:32.000000000 +0100 ++++ orbit/configure.in 2004-05-08 19:27:35.000000000 +0100 +@@ -193,19 +193,19 @@ + dnl So many people with broken linking setups asked about this + dnl it turned out to be necessary to check for this. + dnl +-dofus_save_libs="$LIBS" +-LIBS="$ORBIT_LIBS $LIBS" +-AC_TRY_RUN([ #include <stdio.h> +- main () +- { +- return 0; +- } ],, +- AC_MSG_ERROR([ +-Linking is badly borked on your system. Please ensure your library path is correct +-Check config.log for details - check near the end of the log above 'failed program was' +-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the +-prefix you're compiling on: '${prefix}' ])) +-LIBS="$dofus_save_libs" ++dnl dofus_save_libs="$LIBS" ++dnl LIBS="$ORBIT_LIBS $LIBS" ++dnl AC_TRY_RUN([ #include <stdio.h> ++dnl main () ++dnl { ++dnl return 0; ++dnl } ],, ++dnl AC_MSG_ERROR([ ++dnl Linking is badly borked on your system. Please ensure your library path is correct ++dnl Check config.log for details - check near the end of the log above 'failed program was' ++dnl Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the ++dnl prefix you're compiling on: '${prefix}' ])) ++dnl LIBS="$dofus_save_libs" + + orig_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS" diff --git a/packages/gnome/orbit2_2.14.0.bb b/packages/gnome/orbit2_2.14.0.bb new file mode 100644 index 0000000000..008ec2c7b3 --- /dev/null +++ b/packages/gnome/orbit2_2.14.0.bb @@ -0,0 +1,46 @@ +LICENSE = "GPL" +PR = "r2" +DESCRIPTION = "CORBA ORB" +SECTION = "x11/gnome/libs" +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \ + file://configure-lossage.patch;patch=1;pnum=1 \ + file://gtk-doc.m4 \ + file://gtk-doc.make" +DEPENDS = "libidl popt orbit2-native gtk-doc" + +FILES_${PN} += "${libdir}/orbit-2.0/*.so" + +S = "${WORKDIR}/ORBit2-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-gtk-doc" +EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR}/orbit-idl-2'" + +do_configure_prepend() { + mkdir -p m4 + install ${WORKDIR}/gtk-doc.m4 ./m4/ + install ${WORKDIR}/gtk-doc.make ./ +} + +do_compile_append () { + sed 's:^orbit_idl=.*/:orbit_idl=${STAGING_BINDIR}/:' < ORBit-2.0.pc > ORBit-2.0.pc.new + mv ORBit-2.0.pc.new ORBit-2.0.pc +} + +do_stage() { + oe_libinstall -so -C src/orb libORBit-2 ${STAGING_LIBDIR} + oe_libinstall -so -C src/services/name libORBitCosNaming-2 ${STAGING_LIBDIR} + oe_libinstall -so -C src/services/imodule libORBit-imodule-2 ${STAGING_LIBDIR} + install -m 0644 src/services/name/libname-server-2.a ${STAGING_LIBDIR}/ + + for dir in orbit orbit/poa orbit/orb-core orbit/util orbit/dynamic; do + install -d ${STAGING_INCDIR}/orbit-2.0/$dir + ( cd include/$dir; for i in *.h; do install -m 0644 $i ${STAGING_INCDIR}/orbit-2.0/$dir/$i; done ) + done + + install -d ${STAGING_INCDIR}/orbit-2.0/ORBitservices + install -m 0644 src/services/name/CosNaming.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ + install -m 0644 src/services/name/CosNaming_impl.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ + install -m 0644 src/services/imodule/orbit-imodule.h ${STAGING_INCDIR}/orbit-2.0/ORBitservices/ +} diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch b/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch deleted file mode 100644 index fe06e2bae3..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch +++ /dev/null @@ -1,11 +0,0 @@ -+++ Makefile.am 2004-04-07 15:47:04.000000000 +0100 ---- Makefile.am.orig 2004-07-23 18:03:34.000000000 +0100 -@@ -44,7 +44,7 @@ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ -+# xmldocs.make \ -- xmldocs.make \ - omf.make \ - $(server_in_files) $(server_DATA) - diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch b/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch deleted file mode 100644 index 08ce8e1ee2..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch +++ /dev/null @@ -1,11 +0,0 @@ -+++ gnumeric-doc.make 2004-03-31 02:32:25.000000000 +0100 ---- gnumeric-doc.make.orig 2004-07-26 15:51:43.000000000 +0100 -@@ -24,7 +24,7 @@ - include $(top_srcdir)/xmldocs.make - - # include generated files to simplify installation --EXTRA_DIST += \ -+EXTRA_DIST = \ - func.defs \ - functions.xml \ - func-header.xml func-footer.xml diff --git a/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch b/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch deleted file mode 100644 index 2fbd71ceaf..0000000000 --- a/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gnumeric/src/workbook-control-gui-priv.h.orig 2004-07-19 07:06:18.000000000 +0100 -+++ gnumeric/src/workbook-control-gui-priv.h 2004-07-28 00:15:46.000000000 +0100 -@@ -111,7 +111,7 @@ - void wbcg_insert_sheet (GtkWidget *ignored, WorkbookControlGUI *wbcg); - void wbcg_append_sheet (GtkWidget *ignored, WorkbookControlGUI *wbcg); - void wbcg_set_selection_halign (WorkbookControlGUI *wbcg, StyleHAlignFlags halign); --void wbcg_set_selection_valign (WorkbookControlGUI *wbcg, StyleHAlignFlags halign); -+void wbcg_set_selection_valign (WorkbookControlGUI *wbcg, StyleVAlignFlags halign); - - enum { - WBCG_MARKUP_CHANGED, diff --git a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch deleted file mode 100644 index 4a9108bd4e..0000000000 --- a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000 -+++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000 -@@ -1,4 +1,4 @@ --SUBDIRS = . po po-functions src plugins icons templates doc schemas -+SUBDIRS = . po po-functions src plugins icons templates schemas - if WITH_WIN32 - SUBDIRS += tools - endif diff --git a/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch deleted file mode 100644 index 4a9108bd4e..0000000000 --- a/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- gnumeric-1.5.2/Makefile.am.orig 2005-08-01 11:32:36.119921544 +0000 -+++ gnumeric-1.5.2/Makefile.am 2005-08-01 11:32:44.689618752 +0000 -@@ -1,4 +1,4 @@ --SUBDIRS = . po po-functions src plugins icons templates doc schemas -+SUBDIRS = . po po-functions src plugins icons templates schemas - if WITH_WIN32 - SUBDIRS += tools - endif diff --git a/packages/gnumeric/gnumeric_1.3.1.bb b/packages/gnumeric/gnumeric_1.3.1.bb deleted file mode 100644 index 299c36cbb2..0000000000 --- a/packages/gnumeric/gnumeric_1.3.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r3" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += 'file://workbook-control-gui-priv.h.patch;patch=1' - -EXTRA_OEMAKE_prepend = ' ORBIT_IDL=`which orbit-idl-2` ' - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.3.1.cvs.bb b/packages/gnumeric/gnumeric_1.3.1.cvs.bb deleted file mode 100644 index 6bbbf645c4..0000000000 --- a/packages/gnumeric/gnumeric_1.3.1.cvs.bb +++ /dev/null @@ -1,30 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -#SRCDATE="20040719" -CVSTAG="GNUMERIC_1_3_1" - -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/gnumeric" - - -PR = "r1" -SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gnumeric;tag=${CVSTAG} \ - file://gnumeric-doc.make.patch;patch=1 \ - file://Makefile.am.patch;patch=1" - -DEPENDS = "libgsf1 gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" - - -EXTRA_OECONF = "--without-gnome" - -do_configure_prepend() { - touch xmldocs.make - intltoolize --automake --debug -# # aclocal seems to insist on looking in here. Make sure it exists. -# mkdir -p ${S}/m4 -# # work around automake lossage with AC_CONFIG_AUX_DIR -# ( cd libmutt; libtoolize --force ; cp ../ltmain.sh . ) -} - -inherit autotools diff --git a/packages/gnumeric/gnumeric_1.5.3.bb b/packages/gnumeric/gnumeric_1.5.3.bb deleted file mode 100644 index c3a594a391..0000000000 --- a/packages/gnumeric/gnumeric_1.5.3.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.5.5.bb b/packages/gnumeric/gnumeric_1.5.5.bb deleted file mode 100644 index c3a594a391..0000000000 --- a/packages/gnumeric/gnumeric_1.5.5.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -PR = "r0" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.5.90.bb b/packages/gnumeric/gnumeric_1.5.90.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.5.90.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.1.bb b/packages/gnumeric/gnumeric_1.6.1.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.6.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.2.bb b/packages/gnumeric/gnumeric_1.6.2.bb deleted file mode 100644 index 18ab5472a4..0000000000 --- a/packages/gnumeric/gnumeric_1.6.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui" -DESCRIPTION = "Gnumeric spreadsheet for GNOME" - -inherit gnome flow-lossage - -SRC_URI += "file://remove-docs.patch;patch=1" - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC = "gnumeric-plugin-*" - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True) -} diff --git a/packages/gnumeric/gnumeric_1.6.0.bb b/packages/gnumeric/gnumeric_1.6.3.bb index 18ab5472a4..0fc45bbd63 100644 --- a/packages/gnumeric/gnumeric_1.6.0.bb +++ b/packages/gnumeric/gnumeric_1.6.3.bb @@ -13,6 +13,8 @@ EXTRA_OECONF=" --without-perl " PACKAGES_DYNAMIC = "gnumeric-plugin-*" +FILES_gnumeric_append = " /usr/lib/libspreadsheet-${PV}.so " + python populate_packages_prepend () { gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) diff --git a/packages/gomunicator/gomunicator_cvs.bb b/packages/gomunicator/gomunicator_cvs.bb index d6d4ac6218..a567d16009 100644 --- a/packages/gomunicator/gomunicator_cvs.bb +++ b/packages/gomunicator/gomunicator_cvs.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.linuxdevelopment.org/projects.html" LICENSE = "GPLv2" AUTHOR = "Robert Woerle" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -DEPENDS = "libgpewidget gtk+ glib-2.0" +DEPENDS = "libgpewidget gtk+ glib-2.0 alsa-lib" +RDEPENDS = "alsa-lib" #Remove the dash below when 0.1.3 changes in PV PV = "0.1.3+cvs-${SRCDATE}" diff --git a/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty b/packages/gperiodic/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty +++ b/packages/gperiodic/.mtn2git_empty diff --git a/packages/gperiodic/gperiodic_1.3.3.bb b/packages/gperiodic/gperiodic_1.3.3.bb new file mode 100644 index 0000000000..3202fc2a48 --- /dev/null +++ b/packages/gperiodic/gperiodic_1.3.3.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "GPeriodic is a periodic table application for Linux. \ +It allows you to browse through a periodic table of the elements, \ +and view detailed information on each of the elements. \ +118 elements are currently listed." +LICENSE = "GPL" +HOMEPAGE = "http://gperiodic.seul.org" +SECTION = "x11/apps" +DEPENDS = "gtk+-1.2" + +SRC_URI = "http://gperiodic.seul.org/downloads/gperiodic-${PV}.tar.gz" + +inherit autotools diff --git a/packages/grub/grub_0.93.bb b/packages/grub/grub_0.93.bb index d67247ccff..8341184476 100644 --- a/packages/grub/grub_0.93.bb +++ b/packages/grub/grub_0.93.bb @@ -1,5 +1,6 @@ +DESCRIPTION = "GRUB is the GRand Unified Bootloader" SECTION = "base" -DESCRIPTION = "grand unified bootloader" +HOMEPAGE = "http://www.gnu.org/software/grub" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \ file://autohell.patch;patch=1 \ @@ -10,9 +11,4 @@ S = "${WORKDIR}/grub-${PV}" inherit autotools -python __anonymous () { - import re - host = bb.data.getVar('HOST_SYS', d, 1) - if not re.match('i.86.*-linux', host): - raise bb.parse.SkipPackage("incompatible with host %s" % host) -} +COMPATIBLE_HOST = 'i.86.*-linux' diff --git a/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty b/packages/gtkhtml2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty +++ b/packages/gtkhtml2/.mtn2git_empty diff --git a/packages/gtkhtml2/gtkhtml2_cvs.bb b/packages/gtkhtml2/gtkhtml2_cvs.bb new file mode 100644 index 0000000000..1223254e91 --- /dev/null +++ b/packages/gtkhtml2/gtkhtml2_cvs.bb @@ -0,0 +1,27 @@ +SECTION = "libs" +DEPENDS = "gtk+ glib-2.0 libxml2" +DESCRIPTION = "A GTK+ HTML rendering library." +LICENSE = "GPL" +MAINTAINER = "Chris Lord <chris@openedhand.com>" +PV = "2.11.0+cvs${SRCDATE}" +PR = "r2" + +SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gtkhtml2 \ + http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/css-stylesheet-user.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/css-media.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/fix-margin-inherit.patch;patch=1;pnum=0 \ + http://svn.o-hand.com/repos/web/trunk/patches/add-end-element-signal.patch;patch=1;pnum=0" + +S = "${WORKDIR}/${PN}" + +inherit pkgconfig autotools + +EXTRA_OECONF = " --disable-accessibility" + +do_stage() { + oe_libinstall -so -C libgtkhtml libgtkhtml-2 ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml + ( for i in css document dom dom/core dom/events dom/html dom/traversal dom/views graphics layout layout/html util view; do install -d ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml/$i; install -m 0644 ${S}/libgtkhtml/$i/*.h ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml/$i; done ) + install -m 0644 ${S}/libgtkhtml/*.h ${STAGING_INCDIR}/gtkhtml-2.0/libgtkhtml +} diff --git a/packages/iperf/iperf_2.0.2.bb b/packages/iperf/iperf_2.0.2.bb new file mode 100644 index 0000000000..357ac19dd0 --- /dev/null +++ b/packages/iperf/iperf_2.0.2.bb @@ -0,0 +1,27 @@ +SECTION = "console/network" +DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics" +HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/" +LICENSE = "BSD" +PR = "r0" + +SRC_URI = "http://dast.nlanr.net/Projects/Iperf2.0/iperf-${PV}.tar.gz" +# file://socketaddr-h-errno.diff;patch=1" + +inherit autotools + +S="${WORKDIR}/iperf-${PV}" + +# --disable-threads is needed on epia/x86 with uclibc +do_configure() { + oe_runconf --exec-prefix=${STAGING_DIR} --disable-threads +} + +do_compile() { + cd ${WORKDIR}/iperf-${PV} + oe_runmake +} + +do_install() { + cd ${WORKDIR}/iperf-${PV}/src + oe_runmake DESTDIR=${D} install +} diff --git a/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty b/packages/ipkg-utils/ipkg-link/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty +++ b/packages/ipkg-utils/ipkg-link/.mtn2git_empty diff --git a/packages/ipkg-utils/ipkg-link/link-vfat-libs.patch b/packages/ipkg-utils/ipkg-link/link-vfat-libs.patch new file mode 100644 index 0000000000..7f495f9f4c --- /dev/null +++ b/packages/ipkg-utils/ipkg-link/link-vfat-libs.patch @@ -0,0 +1,34 @@ +--- ipkg-utils/ipkg-link.orig 2006-04-05 00:08:28.518992136 +0200 ++++ ipkg-utils/ipkg-link 2006-04-05 00:08:40.399186072 +0200 +@@ -58,6 +58,31 @@ + `ln -s "$PREFIX$line" "$line"` + fi + fi ++ ++ # The next function checks whether the _source_ file (ie: /media/card/something) ++ # does actually exist. If it doesn't, it could by a library symlink (ie: libsomething.0.1 -> libsomething.0) ++ # Since VFAT & friends do not support symlinks, these library links would not exist after installation ++ # and trying to symlink them into the rootfs with ipkg-link results in unconnected symlinks in the rootfs. ++ # So we use the real lib file in /media/card/whatever and create all needed symlinks in the rootfs ++ # using the real file as source. ++ ++ if [ ! -e "$PREFIX$line" ]; then ++ if ( echo "$line" | grep -q "lib" ) ; then ++ libsearchfile=$(echo $line | sed -e "s#[a-z0-9/.]*/##g") ++ libfoundfiles=$(find $PREFIX -name "$libsearchfile*") ++ ++ for liblinkfile in $libfoundfiles; do ++ echo "Linking $line to $liblinkfile" ++ # link will be pointing to nowhere ++ if test -L $line; then ++ rm -f $line ++ fi ++ ln -s $liblinkfile $line ++ done ++ else ++ echo "WARNING: Source file [$PREFIX$line] is missing!" ++ fi ++ fi + done + } + diff --git a/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb index 826a9fbdb6..35e5ba1086 100644 --- a/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb @@ -3,9 +3,10 @@ DESCRIPTION = "Itsy Package Manager utilities link script" LICENSE = "GPL" CONFLICTS = "ipkg-utils" SRCDATE = "20050404" -PR = "r3" +PR = "r4" -SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" +SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \ + file://link-vfat-libs.patch;patch=1" S = "${WORKDIR}/ipkg-utils" diff --git a/packages/iqnotes/iqnotes.inc b/packages/iqnotes/iqnotes.inc new file mode 100644 index 0000000000..ec49ee2d54 --- /dev/null +++ b/packages/iqnotes/iqnotes.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "IQNotes is notes kept in a hierarchical(tree like) manner. \ +It handles todo, events, sketching. It can acts as a contact, password, \ +credit card manager and even more, because is highly configurable. \ +Data can be crypted by strong AES algorithm." +SECTION = "opie/applications" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/libqpe" +MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" +HOMEPAGE = "http://iqnotes.berlios.de" +AUTHOR = "Peter Vrabel <kybu@kybu.org>" + +S = "${WORKDIR}/iqnotes/iqnotes" + +inherit palmtop + +QMAKE_PROFILES = "iqnotes.pro" +export OE_QMAKE_LINK="${CXX}" + +do_install() { + install -d ${D}${palmtopdir}/help/html \ + ${D}${palmtopdir}/bin \ + ${D}${palmtopdir}/apps/Applications \ + ${D}${palmtopdir}/pics/iqnotes/items \ + ${D}${palmtopdir}/iqnotes/icons + install -m 0755 ${S}/../bin/iqnotes ${D}${palmtopdir}/bin/ + install -m 0644 ${S}/../apps/Applications/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 ${S}/../pics/iqnotes/*.png ${D}${palmtopdir}/pics/iqnotes/ + install -m 0644 ${S}/../help/html/iqnotes.html ${D}${palmtopdir}/help/html/ + install -m 0644 ${S}/../pics/*.xpm ${D}${palmtopdir}/pics/ +} diff --git a/packages/iqnotes/iqnotes_2.0.2.bb b/packages/iqnotes/iqnotes_2.0.2.bb index a1c77896c4..fd42188079 100644 --- a/packages/iqnotes/iqnotes_2.0.2.bb +++ b/packages/iqnotes/iqnotes_2.0.2.bb @@ -1,36 +1,7 @@ -DESCRIPTION = "IQNotes is notes kept in a hierarchical(tree like) manner. \ -It handles todo, events, sketching. It can acts as a contact, password, \ -credit card manager and even more, because is highly configurable. \ -Data can be crypted by strong AES algorithm." -SECTION = "opie/applications" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqpe" -HOMEPAGE = "http://iqnotes.kybu.org" -AUTHOR = "Peter Vrabel <kybu@kybu.org>" -PR = "r3" +include iqnotes.inc + +PR = "r4" SRC_URI = "http://www.vanille.de/mirror/iqnotes-2.0.2-src.tar.bz2 \ file://md5.diff;patch=1 \ file://qt2310-fontbug.patch;patch=1" - -S = "${WORKDIR}/iqnotes/iqnotes" - -inherit palmtop - -QMAKE_PROFILES = "iqnotes.pro" -export OE_QMAKE_LINK="${CXX}" - - -do_install() { - install -d ${D}${palmtopdir}/help/html \ - ${D}${palmtopdir}/bin \ - ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/iqnotes/items \ - ${D}${palmtopdir}/iqnotes/icons - install -m 0755 ${S}/../bin/iqnotes ${D}${palmtopdir}/bin/ - install -m 0644 ${S}/../apps/Applications/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${S}/../pics/iqnotes/*.png ${D}${palmtopdir}/pics/iqnotes/ - install -m 0644 ${S}/../help/html/iqnotes.html ${D}${palmtopdir}/help/html/ - install -m 0644 ${S}/../pics/*.xpm ${D}${palmtopdir}/pics/ -} diff --git a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb index b205c33ceb..6309d8ba1a 100644 --- a/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb +++ b/packages/iqnotes/iqnotes_2.0.99-2.1.0rc1.bb @@ -1,16 +1,8 @@ -DESCRIPTION = "IQNotes is notes kept in a hierarchical(tree like) manner. \ -It handles todo, events, sketching. It can acts as a contact, password, \ -credit card manager and even more, because is highly configurable. \ -Data can be crypted by strong AES algorithm." -SECTION = "opie/applications" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libqpe" -HOMEPAGE = "http://iqnotes.berlios.de" -AUTHOR = "Peter Vrabel <kybu@users.berlios.de>" +include iqnotes.inc #upstream version UPV = "2.1.0rc1" +PR = "r1" SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \ file://pro.patch;patch=1" @@ -18,19 +10,3 @@ SRC_URI = "http://download.berlios.de/iqnotes/iqnotes-${UPV}.tar.bz2 \ S = "${WORKDIR}/iqnotes-${UPV}/iqnotes/" EXTRA_QMAKEVARS_POST += "CONFIG-=desktop CONFIG-=debug CONFIG+=pda LIBS-=-lqtopia" -inherit palmtop - -export OE_QMAKE_LINK="${CXX}" - -do_install() { - install -d ${D}${palmtopdir}/help/html \ - ${D}${palmtopdir}/bin \ - ${D}${palmtopdir}/apps/Applications \ - ${D}${palmtopdir}/pics/iqnotes/items \ - ${D}${palmtopdir}/iqnotes/icons - install -m 0755 ${S}/../bin/iqnotes ${D}${palmtopdir}/bin/ - install -m 0644 ${S}/../apps/Applications/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -m 0644 ${S}/../pics/iqnotes/*.png ${D}${palmtopdir}/pics/iqnotes/ - install -m 0644 ${S}/../help/html/iqnotes.html ${D}${palmtopdir}/help/html/ - install -m 0644 ${S}/../pics/*.xpm ${D}${palmtopdir}/pics/ -} diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc index 8ef83c2830..a0ffca6320 100644 --- a/packages/keylaunch/files/akita/keylaunchrc +++ b/packages/keylaunch/files/akita/keylaunchrc @@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop -#key=....F11:-:~matchbox-remote -menu +key=....F11:-:~matchbox-remote -menu #key=...*1:-:~zoom out #key=...*2:-:~zoom in key=...*3:-:~display-brightness.sh down diff --git a/packages/keylaunch/files/borzoi/keylaunchrc b/packages/keylaunch/files/borzoi/keylaunchrc index 8ef83c2830..a0ffca6320 100644 --- a/packages/keylaunch/files/borzoi/keylaunchrc +++ b/packages/keylaunch/files/borzoi/keylaunchrc @@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop -#key=....F11:-:~matchbox-remote -menu +key=....F11:-:~matchbox-remote -menu #key=...*1:-:~zoom out #key=...*2:-:~zoom in key=...*3:-:~display-brightness.sh down diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc index 8ef83c2830..a0ffca6320 100644 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ b/packages/keylaunch/files/spitz/keylaunchrc @@ -3,7 +3,7 @@ key=....F10:-:gpe-calendar key=....F13:-:sylpheed key=....F12:-:~matchbox-remote -next key=...*F12:-:~matchbox-remote -desktop -#key=....F11:-:~matchbox-remote -menu +key=....F11:-:~matchbox-remote -menu #key=...*1:-:~zoom out #key=...*2:-:~zoom in key=...*3:-:~display-brightness.sh down diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index c0d0b2c44a..a1c13188ca 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r1" +PR = "r2" SRC_URI += " file://keylaunchrc" diff --git a/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map new file mode 100644 index 0000000000..4640bd56d4 --- /dev/null +++ b/packages/keymap-locales/files/akita/keymap-extension-2.6-fi.map @@ -0,0 +1,7 @@ +# Finnish keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis + diff --git a/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map new file mode 100644 index 0000000000..4640bd56d4 --- /dev/null +++ b/packages/keymap-locales/files/borzoi/keymap-extension-2.6-fi.map @@ -0,0 +1,7 @@ +# Finnish keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis + diff --git a/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map new file mode 100644 index 0000000000..4640bd56d4 --- /dev/null +++ b/packages/keymap-locales/files/c7x0/keymap-extension-2.6-fi.map @@ -0,0 +1,7 @@ +# Finnish keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis + diff --git a/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map b/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map new file mode 100644 index 0000000000..314db5843a --- /dev/null +++ b/packages/keymap-locales/files/collie/keymap-extension-2.4-fi.map @@ -0,0 +1,7 @@ +# Finnish keymappings +shift altgr keycode 63 = +Adiaeresis +shift altgr keycode 13 = +Odiaeresis +altgr keycode 63 = +adiaeresis +altgr keycode 13 = +odiaeresis + +keycode 103 = AltGr
\ No newline at end of file diff --git a/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map b/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map new file mode 100644 index 0000000000..4640bd56d4 --- /dev/null +++ b/packages/keymap-locales/files/spitz/keymap-extension-2.6-fi.map @@ -0,0 +1,7 @@ +# Finnish keymapping +charset "iso-8859-1" +altgr keycode 24 = +odiaeresis +altgr keycode 30 = +adiaeresis +shift altgr keycode 24 = +Odiaeresis +shift altgr keycode 30 = +Adiaeresis + diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index 5ba84e69ca..e54fea1d2d 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -4,16 +4,21 @@ PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PR = "r4" +PR = "r6" SRC_URI = "file://*.map" # If any python guru wants to setup PACKAGES_$machine with some code instead, -# be my guet =) -PACKAGES_akita = "keymap-extension-de" +# be my guest =) +PACKAGES_akita = "keymap-extension-de keymap-extension-fi" +PACKAGES_spitz = "keymap-extension-de keymap-extension-fi" +PACKAGES_borzoi = "keymap-extension-de keymap-extension-fi" +PACKAGES_c7x0 = "keymap-extension-de keymap-extension-fi" +PACKAGES_collie = "keymap-extension-de keymap-extension-fi" FILES_keymap-extension-de = "/etc/*-de.map" FILES_keymap-extension-fr = "/etc/*-fr.map" +FILES_keymap-extension-fi = "/etc/*-fi.map" do_install() { install -d ${D}/${sysconfdir} diff --git a/packages/python/python-2.4.2/.mtn2git_empty b/packages/konqueror/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-2.4.2/.mtn2git_empty +++ b/packages/konqueror/files/.mtn2git_empty diff --git a/packages/konqueror/files/inject-extraflags.patch b/packages/konqueror/files/inject-extraflags.patch new file mode 100644 index 0000000000..1b8b02d175 --- /dev/null +++ b/packages/konqueror/files/inject-extraflags.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- kdenox/konq-embed/src/Makefile.am~fixit ++++ kdenox/konq-embed/src/Makefile.am +@@ -49,7 +49,7 @@ + $(top_builddir)/konq-embed/kdesrc/kssl/libkssl.la + + +-konqueror_LDFLAGS = $(KONQ_SSL_LDFLAGS) $(all_libraries) -export-dynamic ++konqueror_LDFLAGS = $(KONQ_SSL_LDFLAGS) $(all_libraries) -export-dynamic $(EXTRA_LDFLAGS) + konqueror_METASOURCES = AUTO + konqueror_DEPENDENCIES = $(LIB_KJSHTML) $(LIB_KHTML) $(LIB_ADDONS) + BUILT_SOURCES = init.inc diff --git a/packages/konqueror/konqueror-embedded-20030705/packing.patch b/packages/konqueror/konqueror-embedded-20030705/packing.patch index 37a3754854..be3f362c03 100644 --- a/packages/konqueror/konqueror-embedded-20030705/packing.patch +++ b/packages/konqueror/konqueror-embedded-20030705/packing.patch @@ -1,17 +1,21 @@ -diff -ur konqe.old/konq-embed/kdesrc/kjs/ustring.h konqueror-embedded-snapshot-20030705/konq-embed/kdesrc/kjs/ustring.h ---- konqe.old/konq-embed/kdesrc/kjs/ustring.h 2001-07-28 17:32:15.000000000 +0200 -+++ konqueror-embedded-snapshot-20030705/konq-embed/kdesrc/kjs/ustring.h 2004-08-22 21:30:04.000000000 +0200 + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- konqueror-embedded-snapshot-20030705/konq-embed/kdesrc/kjs/ustring.h~packing.patch ++++ konqueror-embedded-snapshot-20030705/konq-embed/kdesrc/kjs/ustring.h @@ -154,11 +154,11 @@ /** * @return Lower byte. */ - unsigned char& low() const { return ref().lo; } -+ unsigned char& low() const { return *(&ref().lo); } ++ unsigned char& low() const { return *((unsigned char*)&ref().lo); } /** * @return Higher byte. */ - unsigned char& high() const { return ref().hi; } -+ unsigned char& high() const { return *(&ref().hi); } ++ unsigned char& high() const { return *((unsigned char*)&ref().hi); } /** * @return Character converted to lower case. */ diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb index 7bfd88568c..5bdc4ed765 100644 --- a/packages/konqueror/konqueror-embedded_20030705.bb +++ b/packages/konqueror/konqueror-embedded_20030705.bb @@ -1,9 +1,10 @@ DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition" +HOMEPAGE = "http://www.konqueror.org/embedded" SECTION = "opie/applications" PRIORITY = "optional" DEPENDS = "libqpe-opie openssl pcre" LICENSE = "LGPL/GPL" -PR = "r4" +PR = "r5" # Note if this .bb files fails with the error: # "No rule to make target `-lpcre', needed by `konqueror'. Stop." diff --git a/packages/konqueror/konqueror-embedded_svn.bb b/packages/konqueror/konqueror-embedded_svn.bb new file mode 100644 index 0000000000..f032b9b587 --- /dev/null +++ b/packages/konqueror/konqueror-embedded_svn.bb @@ -0,0 +1,79 @@ +DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition" +SECTION = "opie/applications" +PRIORITY = "optional" +HOMEPAGE = "http://www.konqueror.org/" +DEPENDS = "openssl pcre libqte-mt-static dcopidl-native" +LICENSE = "LGPL/GPL" +DEFAULT_PREFERENCE = "-1" +FILES_${PN} = "${palmtopdir} /usr/share" +PR = "r1" +PV = "3.5.1+svn${SRCDATE}" + +# this Konqueror needs the KDEDIR set and the font helvetica installed on the target + +inherit autotools + +SRC_URI = "svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.1;module=kdelibs \ + svn://anonsvn.kde.org/home/kde/trunk;module=kdenox \ + file://inject-extraflags.patch;patch=1" + +S = "${WORKDIR}/kdenox" + +export QMAKE = "${STAGING_BINDIR}/qmake" +export MOC = "${STAGING_BINDIR}/moc" +export UIC = "${STAGING_BINDIR}/uic" +export exec_prefix = "${palmtopdir}" +export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" +export PCRE_CONFIG = "invalid" +EXTRAFLAGS = "-lts" +EXTRAFLAGS_c7x0 = "-lts -laticore" +export EXTRA_OEMAKE = "EXTRA_LDFLAGS='${EXTRAFLAGS}'" + +EXTRA_OECONF = '--prefix=${palmtopdir} \ + --exec-prefix=${palmtopdir} \ + --includedir=${STAGING_INCDIR} \ + --with-extra-includes=${STAGING_INCDIR} \ + --with-extra-libs=${STAGING_LIBDIR} \ + --with-ssl-version=0.9.7e \ + --with-ssl-dir=${STAGING_LIBDIR}/.. \ + --with-qt-includes=${STAGING_DIR}/${HOST_SYS}/qt2/include \ + --with-qt-libraries=${STAGING_DIR}/${HOST_SYS}/qt2/lib \ + --enable-fontsubs \ + --with-konq-tmp-prefix=/tmp/kde-cache \ + --enable-static \ +# --disable-static \ +# --enable-shared \ + --disable-debug \ + --with-gui=road \ + --with-ipv6-lookup=no \ + --without-xinerama \ + --disable-scrollbars \ + --disable-selection \ + --disable-bookmarks \ + --with-javascript=static \ + --enable-debug=yes \ + --disable-printing \ + --enable-pcre \ + --without-arts \ + --enable-jshostext \ + --disable-selection \ + --enable-final \ + --enable-qt-embedded \ + --enable-rtti-embedded \ + --enable-mt \ + --enable-qt-mt\ + --enable-fwnewepg=yes \ + --enable-embedded ' + +do_configure_prepend() { + cd ${S} + if ! test -L admin + then + ln -s ../kdelibs/admin admin + fi + make -f Makefile.cvs +} + +do_compile_prepend() { + perl admin/am_edit +} diff --git a/packages/libxml/libxml2_2.6.10.bb b/packages/libxml/libxml2_2.6.10.bb index 745ddacd18..9f789a499e 100644 --- a/packages/libxml/libxml2_2.6.10.bb +++ b/packages/libxml/libxml2_2.6.10.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/libxml/libxml2_2.6.22.bb b/packages/libxml/libxml2_2.6.22.bb index eb5f087df7..fae00a6063 100644 --- a/packages/libxml/libxml2_2.6.22.bb +++ b/packages/libxml/libxml2_2.6.22.bb @@ -8,9 +8,8 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz \ +SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \ file://no-testapi.patch;patch=1" - inherit autotools pkgconfig EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n" diff --git a/packages/libxml/libxml2_2.6.7.bb b/packages/libxml/libxml2_2.6.7.bb index fc04b5e9d3..b204351b7b 100644 --- a/packages/libxml/libxml2_2.6.7.bb +++ b/packages/libxml/libxml2_2.6.7.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/libxml/libxml2_2.6.9.bb b/packages/libxml/libxml2_2.6.9.bb index 745ddacd18..9f789a499e 100644 --- a/packages/libxml/libxml2_2.6.9.bb +++ b/packages/libxml/libxml2_2.6.9.bb @@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xml-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz" +SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz" inherit autotools pkgconfig diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb index 0e8ff6d1cb..f2e77735f9 100644 --- a/packages/libxsettings-client/libxsettings-client_0.14.bb +++ b/packages/libxsettings-client/libxsettings-client_0.14.bb @@ -1,7 +1,9 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings libx11" +DEPENDS = "libxsettings libx11 libxt" +# libxt is required to stop configure breaking builds by +# including system paths to find it if it isn't present. inherit autotools pkgconfig gpe @@ -17,4 +19,3 @@ do_stage () { install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h done } - diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index c668971de8..45d9b1c307 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -1,7 +1,9 @@ SECTION = "gpe/libs" LICENSE = "BSD-X" PRIORITY = "optional" -DEPENDS = "libxsettings libx11" +DEPENDS = "libxsettings libx11 libxt" +# libxt is required to stop configure breaking builds by +# including system paths to find it if it isn't present. MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" PR="r1" diff --git a/packages/libxslt/libxslt_1.1.7.bb b/packages/libxslt/libxslt_1.1.7.bb index 81d4fddead..fd81cba5d2 100644 --- a/packages/libxslt/libxslt_1.1.7.bb +++ b/packages/libxslt/libxslt_1.1.7.bb @@ -10,7 +10,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xslt-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxslt-${PV}.tar.gz" +SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxslt-${PV}.tar.gz" S = "${WORKDIR}/libxslt-${PV}" inherit autotools pkgconfig diff --git a/packages/libxslt/libxslt_1.1.8.bb b/packages/libxslt/libxslt_1.1.8.bb index 81d4fddead..fd81cba5d2 100644 --- a/packages/libxslt/libxslt_1.1.8.bb +++ b/packages/libxslt/libxslt_1.1.8.bb @@ -10,7 +10,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" FILES_${PN}-dev += "${bindir}/xslt-config" FILES_${PN}-utils += "${bindir}" -SRC_URI = "http://xmlsoft.org/sources/old/libxslt-${PV}.tar.gz" +SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxslt-${PV}.tar.gz" S = "${WORKDIR}/libxslt-${PV}" inherit autotools pkgconfig diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb index 122bb33efc..915efa2439 100644 --- a/packages/linux/handhelds-pxa-2.6_cvs.bb +++ b/packages/linux/handhelds-pxa-2.6_cvs.bb @@ -10,8 +10,6 @@ COMPATIBLE_HOST = "arm.*-linux" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ - file://ide_not_removable-r0.patch;patch=1 \ - file://block-pio.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/kernel26" diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 index f2c8c37a5d..996fba9724 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 @@ -920,6 +920,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_CORGI=y # CONFIG_LEDS_TOSA is not set CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_IDE_DISK=y # # Multimedia devices diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie b/packages/linux/linux-openzaurus-2.6.16/defconfig-collie index e786c98b52..bfc5809f30 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-collie @@ -737,7 +737,7 @@ CONFIG_FB_SA1100=y # CONFIG_MDA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y CONFIG_FONT_8x8=y # CONFIG_FONT_8x16 is not set diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 index ce2ba2c269..794ff52a88 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 @@ -907,6 +907,7 @@ CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_SPITZ=y # CONFIG_LEDS_TOSA is not set CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_IDE_DISK=y # # Multimedia devices diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle index 8af0dcce11..c8c74522bd 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle @@ -844,7 +844,7 @@ CONFIG_KEYBOARD_LOCOMO=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_TOUCHSCREEN_CORGI is not set +CONFIG_TOUCHSCREEN_CORGI=y # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set @@ -1036,7 +1036,7 @@ CONFIG_FB_PXA=y # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y CONFIG_FONT_8x8=y # CONFIG_FONT_8x16 is not set @@ -1058,7 +1058,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_DEVICE=y -CONFIG_BACKLIGHT_CORGI=y +# CONFIG_BACKLIGHT_CORGI is not set # # Sound diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm b/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm index 6ca081b31f..2d896af0e6 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm @@ -625,7 +625,7 @@ CONFIG_HWMON=y # # LED devices # -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y # # Multimedia devices diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa index cb3ffc5a8d..f1a5c1e1c4 100644 --- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa @@ -919,6 +919,7 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TOSA=y CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_IDE_DISK=y # # Multimedia devices diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc index ad4b9b252f..74edea8df8 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -39,6 +39,8 @@ CMDLINE_MEM_collie = "mem=${mem}M" CMDLINE_ROTATE_spitz = "fbcon=rotate:1" CMDLINE_ROTATE_akita = "fbcon=rotate:1" CMDLINE_ROTATE_borzoi = "fbcon=rotate:1" +CMDLINE_ROTATE_collie = "fbcon=rotate:1" +CMDLINE_ROTATE_poodle = "fbcon=rotate:1" CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" ############################################################### @@ -118,8 +120,9 @@ do_compile_append() { do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin + tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib } do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_install diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 26f01e6cef..0cf048ed72 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r2" +PR = "r4" DEFAULT_PREFERENCE = "-1" @@ -15,15 +15,15 @@ DEFAULT_PREFERENCE = "-1" # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ - ${RPSRC}/led_core-r14.patch;patch=1 \ - ${RPSRC}/led_triggers-r11.patch;patch=1 \ - ${RPSRC}/led_trig_timer-r6.patch;patch=1 \ + ${RPSRC}/led_core-r15.patch;patch=1 \ + ${RPSRC}/led_triggers-r14.patch;patch=1 \ + ${RPSRC}/led_trig_timer-r8.patch;patch=1 \ ${RPSRC}/led_trig_sharpsl_pm-r5.patch;patch=1 \ ${RPSRC}/led_zaurus-r10.patch;patch=1 \ ${RPSRC}/led_locomo-r7.patch;patch=1 \ ${RPSRC}/led_ixp4xx-r2.patch;patch=1 \ ${RPSRC}/led_tosa-r5.patch;patch=1 \ - ${RPSRC}/led_ide-r4a.patch;patch=1 \ + ${RPSRC}/led_ide-r6.patch;patch=1 \ ${RPSRC}/led_nand-r3.patch;patch=1 \ ${RPSRC}/ide_end_request-r1.patch;patch=1 \ ${RPSRC}/rtc-subsystem-library-functions.patch;patch=1 \ @@ -57,8 +57,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ ${RPSRC}/misc_fix1-r0.patch;patch=1 \ - ${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \ - ${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \ + ${RPSRC}/corgi_bl_cleanup-r3.patch;patch=1 \ + ${RPSRC}/corgi_bl_generic-r3.patch;patch=1 \ + ${RPSRC}/w100_accel1-r0.patch;patch=1 \ + ${RPSRC}/poodle_partsize-r0.patch;patch=1 \ + ${RPSRC}/poodle_memsize-r0.patch;patch=1 \ + ${RPSRC}/collie_frontlight-r1.patch;patch=1 \ + ${RPSRC}/zlib_inflate-r3.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ @@ -66,6 +71,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${DOSRC}/kexec-arm-r2.patch;patch=1 \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ + ${RPSRC}/poodle_ts_hack-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ ${RPSRC}/pxa-linking-bug.patch;patch=1 \ diff --git a/packages/lyx/lyx_1.3.6.bb b/packages/lyx/lyx_1.4.0.bb index de58313b0a..b3f6a2c7ad 100644 --- a/packages/lyx/lyx_1.3.6.bb +++ b/packages/lyx/lyx_1.4.0.bb @@ -5,25 +5,21 @@ HOMEPAGE = "http://www.lyx.org" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "boost qt3x11" RRECOMMENDS = "tetex" -PR = "r1" +PR = "r0" -SRC_URI = "ftp://ftp.lyx.org/pub/lyx/stable/lyx-${PV}.tar.bz2" +# we're checking out from svn because the tarball doesn't contain the necessary stuff to run autoreconf +SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_0;rev=13538" +S = "${WORKDIR}/lyx-1_4_0" inherit autotools qt3x11 EXTRA_OECONF = "--with-frontend=qt --with-qt-dir=${QTDIR}" +PARALLEL_MAKE = "" -export UIC="${OE_QMAKE_UIC}" -export MOC="${OE_QMAKE_MOC}" - -do_configure() { - oe_runconf -} - -do_install_append() { - for i in noweb2lyx lyx reLyX - do - ln -sf ./${TARGET_PREFIX}$i ${D}/${bindir}/$i - done +do_configure_prepend() { + echo "NOTE: touching missing files, please report to upstream" + touch lib/configure.ac lib/doc/LaTeXConfig.lyx lib/textclass.lst } +export UIC="${OE_QMAKE_UIC}" +export MOC="${OE_QMAKE_MOC}" diff --git a/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty b/packages/matchbox-panel/matchbox-panel-0.9.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty +++ b/packages/matchbox-panel/matchbox-panel-0.9.3/.mtn2git_empty diff --git a/packages/matchbox-panel/matchbox-panel-0.9.3/mb-applet-battery-repaint-093.patch b/packages/matchbox-panel/matchbox-panel-0.9.3/mb-applet-battery-repaint-093.patch new file mode 100644 index 0000000000..22cc56e56a --- /dev/null +++ b/packages/matchbox-panel/matchbox-panel-0.9.3/mb-applet-battery-repaint-093.patch @@ -0,0 +1,32 @@ +--- matchbox-panel-0.9.3/applets/mb-applet-battery.c.orig 2006-04-05 12:28:01.883215416 +0200 ++++ matchbox-panel-0.9.3/applets/mb-applet-battery.c 2006-04-05 12:29:14.973104064 +0200 +@@ -374,12 +374,6 @@ + + MBPixbufImage *img_backing = NULL; + +- while (!read_apm(apm_vals)) +- usleep(50000L); +- +- if (last_percentage == apm_vals[PERCENTAGE] && last_ac == apm_vals[AC_POWER]) +- return; +- + img_backing = mb_tray_app_get_background (app, pb); + + /* we assume width = height */ +@@ -571,10 +565,12 @@ + + } + +-void +-timeout_callback ( MBTrayApp *app ) +-{ +- mb_tray_app_repaint (app); ++void timeout_callback (MBTrayApp *app) { ++ while (!read_apm(apm_vals)) ++ usleep(50000L); ++ ++ if (last_percentage != apm_vals[PERCENTAGE] || last_ac != apm_vals[AC_POWER]) ++ mb_tray_app_repaint (app); + } + + void diff --git a/packages/matchbox-panel/matchbox-panel_0.9.3.bb b/packages/matchbox-panel/matchbox-panel_0.9.3.bb new file mode 100644 index 0000000000..9c6e75b9a5 --- /dev/null +++ b/packages/matchbox-panel/matchbox-panel_0.9.3.bb @@ -0,0 +1,5 @@ +include matchbox-panel.inc + +PR="r0" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ + file://mb-applet-battery-repaint-093.patch;patch=1" diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/akita/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty +++ b/packages/matchbox-wm/matchbox-wm/akita/.mtn2git_empty diff --git a/packages/matchbox-wm/matchbox-wm/akita/kbdconfig b/packages/matchbox-wm/matchbox-wm/akita/kbdconfig new file mode 100644 index 0000000000..7de0071c08 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm/akita/kbdconfig @@ -0,0 +1,51 @@ +# +# This is an example keyboard config file for matchbox +# +# You can edit this file or change per user by copying to +# ~/.matchbox/kbdconfig +# +# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) + +### Window operation short cuts + +<Alt>n=next +<Alt>p=prev +<Alt>c=close +<Alt>d=desktop +<Alt>m=!matchbox-remote -mbmenu + +### App launching. + +<ctrl><alt>x=!xterm +<ctrl><alt>r=!rxvt + +### App launching with startup notify + +<ctrl><alt>e=!!gpe-calender + +### windows style key shortcuts + +<alt>Tab=next +<alt><shift>Tab=prev + +<alt>space=taskmenu +<alt>escape=!matchbox-remote -mbmenu +<alt>f4=close + +# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function +# to this key via keylaunch, this must be commented out. +# NOTE: Uncommenting this usually means that matchbox crashes on startup! +# +# f11=fullscreen + +### super should be a 'window' key, uncomment '#' if you have one. + +#<super>d=desktop +#<super>r=!xterm +#<super>e=!!nautilus + +### Special keys, likely probably only available on extended keyboards. + +#App=!matchbox-remote -mbmenu +#Menu=!matchbox-remote -mbmenu + diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty +++ b/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty diff --git a/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig b/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig new file mode 100644 index 0000000000..7de0071c08 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm/borzoi/kbdconfig @@ -0,0 +1,51 @@ +# +# This is an example keyboard config file for matchbox +# +# You can edit this file or change per user by copying to +# ~/.matchbox/kbdconfig +# +# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) + +### Window operation short cuts + +<Alt>n=next +<Alt>p=prev +<Alt>c=close +<Alt>d=desktop +<Alt>m=!matchbox-remote -mbmenu + +### App launching. + +<ctrl><alt>x=!xterm +<ctrl><alt>r=!rxvt + +### App launching with startup notify + +<ctrl><alt>e=!!gpe-calender + +### windows style key shortcuts + +<alt>Tab=next +<alt><shift>Tab=prev + +<alt>space=taskmenu +<alt>escape=!matchbox-remote -mbmenu +<alt>f4=close + +# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function +# to this key via keylaunch, this must be commented out. +# NOTE: Uncommenting this usually means that matchbox crashes on startup! +# +# f11=fullscreen + +### super should be a 'window' key, uncomment '#' if you have one. + +#<super>d=desktop +#<super>r=!xterm +#<super>e=!!nautilus + +### Special keys, likely probably only available on extended keyboards. + +#App=!matchbox-remote -mbmenu +#Menu=!matchbox-remote -mbmenu + diff --git a/packages/zd1211/zd1211-20050822/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zd1211/zd1211-20050822/.mtn2git_empty +++ b/packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty diff --git a/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig b/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig new file mode 100644 index 0000000000..7de0071c08 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm/spitz/kbdconfig @@ -0,0 +1,51 @@ +# +# This is an example keyboard config file for matchbox +# +# You can edit this file or change per user by copying to +# ~/.matchbox/kbdconfig +# +# Se the matchbox manual for more info ( http://projects.o-hand.com/matchbox ) + +### Window operation short cuts + +<Alt>n=next +<Alt>p=prev +<Alt>c=close +<Alt>d=desktop +<Alt>m=!matchbox-remote -mbmenu + +### App launching. + +<ctrl><alt>x=!xterm +<ctrl><alt>r=!rxvt + +### App launching with startup notify + +<ctrl><alt>e=!!gpe-calender + +### windows style key shortcuts + +<alt>Tab=next +<alt><shift>Tab=prev + +<alt>space=taskmenu +<alt>escape=!matchbox-remote -mbmenu +<alt>f4=close + +# On SL-Cxxxx, F11 is the "menu" key. In order to be able to assign a function +# to this key via keylaunch, this must be commented out. +# NOTE: Uncommenting this usually means that matchbox crashes on startup! +# +# f11=fullscreen + +### super should be a 'window' key, uncomment '#' if you have one. + +#<super>d=desktop +#<super>r=!xterm +#<super>e=!!nautilus + +### Special keys, likely probably only available on extended keyboards. + +#App=!matchbox-remote -mbmenu +#Menu=!matchbox-remote -mbmenu + diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index 7654ebd94c..c17ce96252 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PV = "0.9.5+svn${SRCDATE}" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \ diff --git a/packages/meta/e-image-core.bb b/packages/meta/e-image-core.bb index 46957d1c53..f20f6c61f1 100644 --- a/packages/meta/e-image-core.bb +++ b/packages/meta/e-image-core.bb @@ -5,13 +5,18 @@ PR = "r1" export IMAGE_BASENAME = "e-image-core" export IMAGE_LINGUAS = "" -DEPENDS = "task-bootstrap xserver-kdrive task-e-x11-core" +DEPENDS = "task-bootstrap \ + xserver-kdrive \ + task-e-x11-core \ + glibc-charmap-utf-8 \ + glibc-localedata-i18n" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/evas = "evas-x11" PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" +PREFERRED_PROVIDER_libx11 = "libx11" export IPKG_INSTALL = "task-bootstrap task-e-x11-core xserver-kdrive-fbdev" diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index cbb74fc823..e23bfd1d8f 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -5,7 +5,7 @@ # DESCRIPTION = "Packages that are required for the SlugOS native build environment" LICENSE = "MIT" -PR = "r0" +PR = "r1" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" @@ -16,8 +16,7 @@ PROVIDES += "${SLUGOS_IMAGENAME}-native" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. SLUGOS_NATIVE_RT_prepend_linux = "\ - glibc-extra-nss glibc-utils \ - libc6 libc6-dev \ + glibc-extra-nss glibc-utils glibc \ " SLUGOS_NATIVE_RT_prepend_linux-uclibc = "\ uclibc-dev uclibc-utils \ diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES index dedc2431ee..8d6908c74d 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES @@ -1,4 +1,4 @@ -Unslung-5.x Family Release Notes +Unslung-6.x Family Release Notes Unslung is a replacement firmware image for the Linksys NSLU2 which is designed to allow you to make changes to the root filesystem (including the installation @@ -18,7 +18,7 @@ posting to the mailing list or asking a question in the IRC channel OK! Now that that's out of the way... This file is provided to give general information and usage notes for the -Unslung 5.x firmware. If you are looking for installation instructions, please +Unslung 6.x firmware. If you are looking for installation instructions, please stop now and go to the README file. Follow the README instructions WORD for WORD to keep from turning your NSLU2 into a brick. The information contained in this file will make more sense if you have already "unslung" your NSLU2. @@ -38,8 +38,8 @@ GENERAL INFORMATION As stated above, Unslung firmware is a replacement firmware image for the Linksys NSLU2. The Unslung firmware is intended to be used for loading new packages (giving enhanced or additional functionality) with minimal changes -to the standard user interface and firmware. The differences in the Unslung 5.x -firmware from the standard Linksys 2.3R29 firmware can be found at: +to the standard user interface and firmware. The differences in the Unslung 6.x +firmware from the standard Linksys 2.3R63 firmware can be found at: http://www.nslu2-linux.org/wiki/Unslung/UnslungFeatures @@ -447,3 +447,48 @@ Added disk auto-wait countdown to /linuxrc (courtesy of glc). 5.5: First public release of 5.x firmware. + +6.1: + +Upgraded to Linksys firmware V2.3R63. + +6.1 to 6.7: + +"Unslung" status (i.e. Unslung to disk, or running from internal +flash) is now displayed on the home page in the Web GUI, as well as +displayed at login. + +Using "ipkg" when running from internal flash now displays a helpful +message indicating why ipkg won't run. + +The unsling script now contains a number of sanity checks, and prints +(hopefully) helpful error messages if the system will be unlikely to +unsling correctly. + +The unsling script now prompts for a new root password, and sets the +password for both booting with as well as without drives attached. (A +new argument "-nopw" can be given to unsling to have it skip prompting +for and setting the root password.) + +The "Enable Telnet" web gui page can now be reached from the home page +in the Linksys Web GUI. + +The new Unslung logo is now featured in the Web GUI. + +The special handling for unslinging to flash devices now works for +both USB Port 1 and 2. + +The utmp and wtmp files are now created by unsling, and will be +"emptied" at each boot. Additionally, the .pid files in /var/run and +/var/log are cleaned out at boot; this avoids a number of strange and +difficult-to-reproduce problems. + +The following additional kernel modules are provided: loop.o isofs.o +keyspan.o netconsole.o + +Sundry bugfixes. + +6.8: + +First public release of 6.x firmware. + diff --git a/packages/nslu2-binary-only/unslung-rootfs/README b/packages/nslu2-binary-only/unslung-rootfs/README index e8b27197ea..c750709e5f 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/README +++ b/packages/nslu2-binary-only/unslung-rootfs/README @@ -1,4 +1,4 @@ -Unslung-5.x Family Release README INSTALLATION +Unslung-6.x Family Release README INSTALLATION You must follow the steps in this README *exactly*. Do not skip any steps, and do not skip ahead thinking you know what you are doing and don't need to follow @@ -80,54 +80,42 @@ PRE-INSTALLATION CONSIDERATIONS FIRMWARE INSTALLATION DETAILS 1) Shutdown the NSLU2, and remove any disks that you may have plugged into the - NSLU2. Power back up the NSLU2. + NSLU2. - Firmware upgrades must always be performed with *no* hard disks or flash disks attached. This CANNOT be emphasized enough. Are you sure you unplugged the disks before powering up? If so, you may continue. -2) Access the Web interface. Note that you should use the username "admin" and - password "admin" for the web interface at this point (as no disks are - attached, the default username and password is the only way to access the - Management web pages). - - 2-a) If you are installing Unslung 5.x onto an NSLU2 unit with Linksys - standard firmware *or* Unslung version 1.x or version 2.x already - installed, flash unslung-5.x.bin as you normally would flash new - firmware (using the web interface "Upgrade Firmware" page). - - 2-b) If you are installing Unslung 5.x onto an NSLU2 unit with Unslung - version 3.x already installed, you must put the NSLU2 into - maintenance mode before you can use the web interface to flash a new - version. Just click the "Enter Maintenance Mode" link on the web - interface "Upgrade Firmware" page, wait for the NSLU2 to reboot, and - then flash the new firmware in the normal manner (using the web - interface "Upgrade Firmware" page). - - 2-c) If you are installing Unslung 5.x onto an NSLU2 unit with Unslung - version 4.x already installed, you must put the NSLU2 into RedBoot - Upgrade Mode before you can upload new firmware. Note that Unslung - version 4.x has an "Enter Maintenance Mode" link on the web interface - "Upgrade Firmware" page, but it does not work, so you will need to - use the instructions at - - http://www.nslu2-linux.org/wiki/HowTo/TelnetIntoRedBoot - - to access the RedBoot command line, and then type "upgrade" to put - the NSLU2 into RedBoot Upgrade Mode. Then you will need to use the - Linux UpSlug tool or the Windows SerComm Upgrade tool to upload the - new firmware. - - 2-d) If you are installing Unslung 5.x onto an NSLU2 unit with version 5.x - already installed, you must first put the NSLU2 into RedBoot Upgrade - Mode. Just click the "Enter Upgrade Mode" link on the web interface - "Upgrade Firmware" page, wait for the NSLU2 to reboot, and for the - Ready/Status LED to begin flashing red and green, and then use either - the Linux UpSlug tool or the Windows SerComm Upgrade tool to upload - the new firmware. +2-a) If you are installing Unslung 6.x onto an NSLU2 unit with Linksys standard + firmware already installed, flash unslung-6.x.bin as you normally would + flash new firmware (using the web interface "Upgrade Firmware" page). + See your NSLU2 user manual for details if you don't know how to do this. - During firmware flashing, the top LED - Ready/Status - flashes red and - green (approximately 5 minutes, but can be much longer). + green (approximately 5 minutes, but can be much longer). + + - The NSLU2 will reboot after the flashing is complete. + +2-b) If you are installing Unslung 6.x onto an NSLU2 unit with an existing + version of nslu2-linux.org firmware already installed, you must first put + the NSLU2 into RedBoot Upgrade Mode. + + - The NSLU2 should still be powered off at this point. If not, shut it + down again before proceeding. + - Using a paper clip, push and hold in the reset button which is located + on the back of the NSLU2 near the power socket. + - While holding in the reset button, press and release the power button. + - Watch the Ready/Status LED and as soon as it turns red, then quickly + release the reset button. + - You should now be in upgrade mode which is indicated by the Ready/Status + LED alternating between red and green. + - Use either the Linux UpSlug tool or the Windows SerComm Upgrade tool to + upload the new firmware - you can find download links at + + http://www.nslu2-linux.org/wiki/HowTo/InstallUnslungFirmware + + - During firmware flashing, the top LED - Ready/Status - flashes red and + green (approximately 5 minutes, but can be much longer). - The NSLU2 will reboot after the flashing is complete. @@ -209,9 +197,20 @@ you won't have access until you change the file /share/hdd/conf/passwd. 3) OK, now that you don't have any disks attached, you can proceed and telnet into the NSLU2 using the username root and password uNSLUng. -4) Identify which drive you wish you "unsling", and plug it in. Wait a minute - or two while the disk is mounted. Check the web interface to make sure - that the disk has been recognised by the Linksys software. + - If you are upgrading from a previous release of Unslung, please read + + http://www.nslu2-linux.org/wiki/Unslung/UpgradingToUnslung6 + +4) Identify which drive you wish you "unsling", and plug it in. Note that for + Unslung 6.x it is recommended that you plug the target disk into the Disk2 + port so that you can use the Disk1 port for attaching multiple ext3 and/or + NTFS data disks via a USB hub. For more information, see + + http://www.nslu2-linux.org/wiki/Unslung/WhichUSBPortforUnslung6 + + Wait a minute or two while the disk is mounted. Check the web + interface to make sure that the disk has been recognised by the + Linksys software. - If the disk has not been previously formatted on the NSLU2, then now is the time to do that. Make sure that the drive is recognized in the @@ -219,7 +218,8 @@ you won't have access until you change the file /share/hdd/conf/passwd. 5) In the telnet session, run "/sbin/unsling disk1" or "/sbin/unsling disk2" (depending upon whether you want to unsling to a disk connected to the - Disk1 port or the Disk2 port). + Disk1 port or the Disk2 port). Again, we recommend for Unslung 6.x that + you unsling to disk2. - Once you "unsling" to an external disk on a particular port (Disk 1 or Disk 2), it is important that you keep that disk continually plugged @@ -246,7 +246,7 @@ you won't have access until you change the file /share/hdd/conf/passwd. 6) If you wish to migrate your packages from the old Unslung 3.x location in the /share/hdd/conf (disk1) or /share/flash/conf (disk2) partitions to the - new Unslung 4.x and 5.x location on the data partition, then run: + new Unslung 4.x, 5.x and 6.x location on the data partition, then run: "/sbin/slingover disk1" (if your packages were previously on disk1 and you ran "/sbin/unsling disk1" in step 5) or "/sbin/slingover disk2" (if your packages were previously on disk2 and you ran "/sbin/unsling disk2" in @@ -271,7 +271,7 @@ you won't have access until you change the file /share/hdd/conf/passwd. ***** Congratulations, you're now Unslung! ***** -Make sure you add an entry to the "The Unslung 5.x" table in the Yahoo group. +Make sure you add an entry to the "The Unslung 6.x" table in the Yahoo group. Just use the next free integer for your Unslung number. If you make no further changes, your NSLU2 will continue to operate normally. diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb index 61ce72663b..421b342476 100644 --- a/packages/openobex/openobex_1.2.bb +++ b/packages/openobex/openobex_1.2.bb @@ -3,15 +3,17 @@ open source implementation of the Object Exchange \ (OBEX) protocol." HOMEPAGE = "http://openobex.triq.net" SECTION = "libs" +PROVIDES = "openobex-apps" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ file://disable-cable-test.patch;patch=1" inherit autotools binconfig pkgconfig -EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump" +EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ + --with-usb=${STAGING_DIR} --with-bluez=${STAGING_DIR}" do_stage() { oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR} diff --git a/packages/pango/pango_1.12.0.bb b/packages/pango/pango_1.12.0.bb index e06e659b7b..08aa64b6a2 100644 --- a/packages/pango/pango_1.12.0.bb +++ b/packages/pango/pango_1.12.0.bb @@ -15,6 +15,8 @@ SRC_URI = "http://download.gnome.org/sources/pango/1.12/pango-${PV}.tar.bz2 \ inherit autotools pkgconfig +DEFAULT_PREFERENCE="-1" + EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ --disable-debug" diff --git a/packages/poppler/poppler_0.3.0.bb b/packages/poppler/poppler_0.3.0.bb deleted file mode 100644 index dc0a7c70ac..0000000000 --- a/packages/poppler/poppler_0.3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -LICENSE = "GPL" - -DEPENDS = "jpeg gtk+ cairo" - -SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" - -EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" -inherit pkgconfig autotools - diff --git a/packages/poppler/poppler_0.3.3.bb b/packages/poppler/poppler_0.3.3.bb deleted file mode 100644 index 6e03cf9355..0000000000 --- a/packages/poppler/poppler_0.3.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -LICENSE = "GPL" - -DEPENDS = "jpeg gtk+ cairo" - -SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" - -EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" -inherit pkgconfig autotools - - -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - install -m 755 poppler/.libs/libpoppler.so.0.0.0 ${STAGING_LIBDIR}/libpoppler.so - install -m 755 glib/.libs/libpoppler-glib.so.0.0.0 ${STAGING_LIBDIR}/libpoppler-glib.so - -} - - diff --git a/packages/poppler/poppler_0.4.2.bb b/packages/poppler/poppler_0.4.2.bb deleted file mode 100644 index 6e03cf9355..0000000000 --- a/packages/poppler/poppler_0.4.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -LICENSE = "GPL" - -DEPENDS = "jpeg gtk+ cairo" - -SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" - -EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" -inherit pkgconfig autotools - - -do_stage() { - autotools_stage_includes - install -d ${STAGING_LIBDIR} - install -m 755 poppler/.libs/libpoppler.so.0.0.0 ${STAGING_LIBDIR}/libpoppler.so - install -m 755 glib/.libs/libpoppler-glib.so.0.0.0 ${STAGING_LIBDIR}/libpoppler-glib.so - -} - - diff --git a/packages/poppler/poppler_0.5.0.bb b/packages/poppler/poppler_0.5.0.bb deleted file mode 100644 index ebe06c4015..0000000000 --- a/packages/poppler/poppler_0.5.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." -MAINTAINER = "Koen Kooi <koen@handhelds.org>" -LICENSE = "GPL" - -DEPENDS = "fontconfig jpeg gtk+ cairo" - -SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" - -EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" -inherit pkgconfig autotools - - -do_stage() { - autotools_stage_all -} - - diff --git a/packages/poppler/poppler_0.4.3.bb b/packages/poppler/poppler_0.5.1.bb index ebe06c4015..ebe06c4015 100644 --- a/packages/poppler/poppler_0.4.3.bb +++ b/packages/poppler/poppler_0.5.1.bb diff --git a/packages/python/python-2.4.2-manifest.inc b/packages/python/python-2.4.3-manifest.inc index da7fc6d28b..0178d4e186 100644 --- a/packages/python/python-2.4.2-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sun Mar 12 18:58:32 2006 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Thu Mar 30 17:39:30 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -11,247 +11,247 @@ PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-threading="Python Threading & Synchronization Support" -PR_python-threading="ml2" +PR_python-threading="ml0" RDEPENDS_python-threading="python-core python-lang" FILES_python-threading="${libdir}/python2.4/_threading_local.* ${libdir}/python2.4/bisect.* ${libdir}/python2.4/dummy_thread.* ${libdir}/python2.4/dummy_threading.* ${libdir}/python2.4/mutex.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* " DESCRIPTION_python-distutils="Python Distribution Utilities" -PR_python-distutils="ml2" +PR_python-distutils="ml0" RDEPENDS_python-distutils="python-core" FILES_python-distutils="${libdir}/python2.4/config ${libdir}/python2.4/distutils " DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support" -PR_python-textutils="ml1" +PR_python-textutils="ml0" RDEPENDS_python-textutils="python-core python-io python-re python-stringold" FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* " DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support" -PR_python-codecs="ml2" +PR_python-codecs="ml0" RDEPENDS_python-codecs="python-core" FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/gettext.* ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/stringprep.* ${libdir}/python2.4/xdrlib.* " DESCRIPTION_python-pickle="Python Persistence Support" -PR_python-pickle="ml1" +PR_python-pickle="ml0" RDEPENDS_python-pickle="python-core python-codecs python-re" FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so " DESCRIPTION_python-datetime="Python Calendar and Time support" -PR_python-datetime="ml1" +PR_python-datetime="ml0" RDEPENDS_python-datetime="python-core python-codecs" FILES_python-datetime="${libdir}/python2.4/_strptime.* ${libdir}/python2.4/calendar.* ${libdir}/python2.4/lib-dynload/datetime.so " DESCRIPTION_python-core="Python Interpreter and core modules (needed!)" -PR_python-core="ml2" +PR_python-core="ml0" RDEPENDS_python-core="" FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python " DESCRIPTION_python-io="Python Low-Level I/O" -PR_python-io="ml2" +PR_python-io="ml0" RDEPENDS_python-io="python-core python-math" FILES_python-io="${libdir}/python2.4/lib-dynload/_socket.so ${libdir}/python2.4/lib-dynload/_ssl.so ${libdir}/python2.4/lib-dynload/select.so ${libdir}/python2.4/lib-dynload/termios.so ${libdir}/python2.4/lib-dynload/cStringIO.so ${libdir}/python2.4/pipes.* ${libdir}/python2.4/socket.* ${libdir}/python2.4/tempfile.* ${libdir}/python2.4/StringIO.* " DESCRIPTION_python-compiler="Python Compiler Support" -PR_python-compiler="ml1" +PR_python-compiler="ml0" RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.4/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml1" +PR_python-compression="ml0" RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml2" +PR_python-re="ml0" RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" -PR_python-xmlrpc="ml1" +PR_python-xmlrpc="ml0" RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang" FILES_python-xmlrpc="${libdir}/python2.4/xmlrpclib.* ${libdir}/python2.4/SimpleXMLRPCServer.* " DESCRIPTION_python-terminal="Python Terminal Controlling Support" -PR_python-terminal="ml1" +PR_python-terminal="ml0" RDEPENDS_python-terminal="python-core python-io" FILES_python-terminal="${libdir}/python2.4/pty.* ${libdir}/python2.4/tty.* " DESCRIPTION_python-email="Python Email Support" -PR_python-email="ml1" +PR_python-email="ml0" RDEPENDS_python-email="python-core python-io python-re" FILES_python-email="${libdir}/python2.4/email " DESCRIPTION_python-image="Python Graphical Image Handling" -PR_python-image="ml1" +PR_python-image="ml0" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.4/colorsys.* ${libdir}/python2.4/imghdr.* ${libdir}/python2.4/lib-dynload/imageop.so ${libdir}/python2.4/lib-dynload/rgbimg.so " DESCRIPTION_python-resource="Python Resource Control Interface" -PR_python-resource="ml1" +PR_python-resource="ml0" RDEPENDS_python-resource="python-core" FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so " DESCRIPTION_python-devel="Python Development Package" -PR_python-devel="ml1" +PR_python-devel="ml0" RDEPENDS_python-devel="python-core" FILES_python-devel="/usr/include /usr/lib/python2.4/config " DESCRIPTION_python-math="Python Math Support" -PR_python-math="ml1" +PR_python-math="ml0" RDEPENDS_python-math="python-core" FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* ${libdir}/python2.4/sets.* " DESCRIPTION_python-hotshot="Python Hotshot Profiler" -PR_python-hotshot="ml1" +PR_python-hotshot="ml0" RDEPENDS_python-hotshot="python-core" FILES_python-hotshot="${libdir}/python2.4/hotshot ${libdir}/python2.4/lib-dynload/_hotshot.so " DESCRIPTION_python-unixadmin="Python Unix Administration Support" -PR_python-unixadmin="ml1" +PR_python-unixadmin="ml0" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.4/lib-dynload/nis.so ${libdir}/python2.4/lib-dynload/grp.so ${libdir}/python2.4/lib-dynload/pwd.so ${libdir}/python2.4/getpass.* " DESCRIPTION_python-tkinter="Python Tcl/Tk Bindings" -PR_python-tkinter="ml1" +PR_python-tkinter="ml0" RDEPENDS_python-tkinter="python-core" FILES_python-tkinter="${libdir}/python2.4/lib-dynload/_tkinter.so ${libdir}/python2.4/lib-tk " DESCRIPTION_python-gdbm="Python GNU Database Support" -PR_python-gdbm="ml1" +PR_python-gdbm="ml0" RDEPENDS_python-gdbm="python-core libgdbm3" FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so " DESCRIPTION_python-fcntl="Python's fcntl Interface" -PR_python-fcntl="ml1" +PR_python-fcntl="ml0" RDEPENDS_python-fcntl="python-core" FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so " DESCRIPTION_python-netclient="Python Internet Protocol Clients" -PR_python-netclient="ml2" +PR_python-netclient="ml0" RDEPENDS_python-netclient="python-core python-datetime python-io python-lang python-logging python-mime" FILES_python-netclient="${libdir}/python2.4/_LWPCookieJar.* ${libdir}/python2.4/_MozillaCookieJar.* ${libdir}/python2.4/base64.* ${libdir}/python2.4/cookielib.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* " DESCRIPTION_python-pprint="Python Pretty-Print Support" -PR_python-pprint="ml1" +PR_python-pprint="ml0" RDEPENDS_python-pprint="python-core" FILES_python-pprint="${libdir}/python2.4/pprint.* " DESCRIPTION_python-netserver="Python Internet Protocol Servers" -PR_python-netserver="ml1" +PR_python-netserver="ml0" RDEPENDS_python-netserver="python-core python-netclient" FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* " DESCRIPTION_python-curses="Python Curses Support" -PR_python-curses="ml1" +PR_python-curses="ml0" RDEPENDS_python-curses="python-core libncurses5" FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so " DESCRIPTION_python-syslog="Python's syslog Interface" -PR_python-syslog="ml1" +PR_python-syslog="ml0" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so " DESCRIPTION_python-html="Python HTML Processing" -PR_python-html="ml1" +PR_python-html="ml0" RDEPENDS_python-html="python-core" FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentitydefs.* ${libdir}/python2.4/htmllib.* ${libdir}/python2.4/markupbase.* ${libdir}/python2.4/sgmllib.* " DESCRIPTION_python-readline="Python Readline Support" -PR_python-readline="ml1" +PR_python-readline="ml0" RDEPENDS_python-readline="python-core libreadline4" FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* " DESCRIPTION_python-pydoc="Python Interactive Help Support" -PR_python-pydoc="ml1" +PR_python-pydoc="ml0" RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re" FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* " DESCRIPTION_python-logging="Python Logging Support" -PR_python-logging="ml1" +PR_python-logging="ml0" RDEPENDS_python-logging="python-core" FILES_python-logging="${libdir}/python2.4/logging " DESCRIPTION_python-mailbox="Python Mailbox Format Support" -PR_python-mailbox="ml1" +PR_python-mailbox="ml0" RDEPENDS_python-mailbox="python-core python-mime" FILES_python-mailbox="${libdir}/python2.4/mailbox.* " DESCRIPTION_python-xml="Python basic XML support." -PR_python-xml="ml1" +PR_python-xml="ml0" RDEPENDS_python-xml="python-core python-re" FILES_python-xml="${libdir}/python2.4/lib-dynload/pyexpat.so ${libdir}/python2.4/xml ${libdir}/python2.4/xmllib.* " DESCRIPTION_python-mime="Python MIME Handling APIs" -PR_python-mime="ml2" +PR_python-mime="ml0" RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/quopri.* ${libdir}/python2.4/rfc822.* " DESCRIPTION_python-tests="Python Tests" -PR_python-tests="ml1" +PR_python-tests="ml0" RDEPENDS_python-tests="python-core" FILES_python-tests="${libdir}/python2.4/test " DESCRIPTION_python-unittest="Python Unit Testing Framework" -PR_python-unittest="ml1" +PR_python-unittest="ml0" RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.4/unittest.* " DESCRIPTION_python-stringold="Python Deprecated String APIs" -PR_python-stringold="ml2" +PR_python-stringold="ml0" RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" -PR_python-lib-old-and-deprecated="ml1" +PR_python-lib-old-and-deprecated="ml0" RDEPENDS_python-lib-old-and-deprecated="python-core" FILES_python-lib-old-and-deprecated="${libdir}/python2.4/lib-old " DESCRIPTION_python-compile="Python Bytecode Compilation Support" -PR_python-compile="ml1" +PR_python-compile="ml0" RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml1" +PR_python-shell="ml0" RDEPENDS_python-shell="python-core python-re" FILES_python-shell="${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" -PR_python-bsddb="ml1" +PR_python-bsddb="ml0" RDEPENDS_python-bsddb="python-core" FILES_python-bsddb="${libdir}/python2.4/bsddb " DESCRIPTION_python-mmap="Python Memory-Mapped-File Support" -PR_python-mmap="ml1" +PR_python-mmap="ml0" RDEPENDS_python-mmap="python-core python-io" FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so " DESCRIPTION_python-zlib="Python zlib Support." -PR_python-zlib="ml1" +PR_python-zlib="ml0" RDEPENDS_python-zlib="python-core libz1" FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so " DESCRIPTION_python-db="Python File-Based Database Support" -PR_python-db="ml1" +PR_python-db="ml0" RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.4/anydbm.* ${libdir}/python2.4/dumbdbm.* ${libdir}/python2.4/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml1" +PR_python-crypt="ml0" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so " DESCRIPTION_python-idle="Python Integrated Development Environment" -PR_python-idle="ml1" +PR_python-idle="ml0" RDEPENDS_python-idle="python-core python-tkinter" FILES_python-idle="/usr/bin/idle /usr/lib/python2.4/idlelib " DESCRIPTION_python-lang="Python Low-Level Language Support" -PR_python-lang="ml1" +PR_python-lang="ml0" RDEPENDS_python-lang="python-core" FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/lib-dynload/itertools.so ${libdir}/python2.4/lib-dynload/collections.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* " DESCRIPTION_python-audio="Python Audio Handling" -PR_python-audio="ml1" +PR_python-audio="ml0" RDEPENDS_python-audio="python-core" FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so " diff --git a/packages/zd1211/zd1211-r52/.mtn2git_empty b/packages/python/python-2.4.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/zd1211/zd1211-r52/.mtn2git_empty +++ b/packages/python/python-2.4.3/.mtn2git_empty diff --git a/packages/python/python-2.4.2/autohell.patch b/packages/python/python-2.4.3/autohell.patch index b0eebb9ce8..b0eebb9ce8 100644 --- a/packages/python/python-2.4.2/autohell.patch +++ b/packages/python/python-2.4.3/autohell.patch diff --git a/packages/python/python-2.4.2/bindir-libdir.patch b/packages/python/python-2.4.3/bindir-libdir.patch index 27ae5dce5b..27ae5dce5b 100644 --- a/packages/python/python-2.4.2/bindir-libdir.patch +++ b/packages/python/python-2.4.3/bindir-libdir.patch diff --git a/packages/python/python-2.4.2/crosscompile.patch b/packages/python/python-2.4.3/crosscompile.patch index f917bb2567..f917bb2567 100644 --- a/packages/python/python-2.4.2/crosscompile.patch +++ b/packages/python/python-2.4.3/crosscompile.patch diff --git a/packages/python/python-2.4.2/fix-tkinter-detection.patch b/packages/python/python-2.4.3/fix-tkinter-detection.patch index 602aa8e021..602aa8e021 100644 --- a/packages/python/python-2.4.2/fix-tkinter-detection.patch +++ b/packages/python/python-2.4.3/fix-tkinter-detection.patch diff --git a/packages/python/python-egenix-mx-base_2.0.5.bb b/packages/python/python-egenix-mx-base_2.0.6.bb index 9e7f426928..84bf7e2e3c 100644 --- a/packages/python/python-egenix-mx-base_2.0.5.bb +++ b/packages/python/python-egenix-mx-base_2.0.6.bb @@ -12,4 +12,7 @@ S = "${WORKDIR}/${SRCNAME}-${PV}" inherit distutils +export INCLUDE = "${STAGING_INCDIR}/${PYTHON_DIR}" +export LIB = "${STAGING_LIBDIR}" + FILES_${PN} += "${datadir}" diff --git a/packages/python/python-psyco_1.5.bb b/packages/python/python-psyco_1.5.bb new file mode 100644 index 0000000000..b633b65061 --- /dev/null +++ b/packages/python/python-psyco_1.5.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Psyco lets you run your existing Python software much faster, with no change in your source." +HOMEPAGE = "http://psyco.sourceforge.net" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "dkm@kataplop.net" +LICENSE = "PSF" +RDEPENDS = "python-core" +SRCNAME = "psyco" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}-src.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +COMPATIBLE_HOST = 'i.86.*-linux' + +inherit distutils diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.3.bb index 9424589c7d..7d3856d719 100644 --- a/packages/python/python_2.4.2.bb +++ b/packages/python/python_2.4.3.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" -PR = "ml5" +PR = "ml0" PYTHON_MAJMIN = "2.4" diff --git a/packages/qemu/files/trunk_nodocs.patch b/packages/qemu/files/trunk_nodocs.patch new file mode 100644 index 0000000000..36977ca0e7 --- /dev/null +++ b/packages/qemu/files/trunk_nodocs.patch @@ -0,0 +1,40 @@ +diff -Naur trunk_orig/Makefile trunk/Makefile +--- trunk_orig/Makefile 2006-04-01 11:01:54.000000000 +0200 ++++ trunk/Makefile 2006-04-01 12:40:45.000000000 +0200 +@@ -12,7 +12,7 @@ + ifdef CONFIG_STATIC + LDFLAGS+=-static + endif +-DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 ++DOCS= + + all: dyngen$(EXESUF) $(TOOLS) $(DOCS) + for d in $(TARGET_DIRS); do \ +@@ -54,10 +54,10 @@ + pc-bios/proll.elf \ + pc-bios/linux_boot.bin "$(datadir)" + mkdir -p "$(docdir)" +- install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" ++# install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" + ifndef CONFIG_WIN32 + mkdir -p "$(mandir)/man1" +- install qemu.1 qemu-img.1 "$(mandir)/man1" ++# install qemu.1 qemu-img.1 "$(mandir)/man1" + mkdir -p "$(datadir)/keymaps" + install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps" + endif +@@ -122,10 +122,10 @@ + $(datadir)/ppc_rom.bin \ + $(datadir)/video.x \ + $(datadir)/proll.elf \ +- $(datadir)/linux_boot.bin \ +- $(docdir)/qemu-doc.html \ +- $(docdir)/qemu-tech.html \ +- $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 ) ++ $(datadir)/linux_boot.bin ++# $(docdir)/qemu-doc.html \ ++# $(docdir)/qemu-tech.html \ ++# $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 ) + + ifneq ($(wildcard .depend),) + include .depend diff --git a/packages/qemu/qemu-qop-nogfx-native_svn.bb b/packages/qemu/qemu-qop-nogfx-native_svn.bb new file mode 100644 index 0000000000..58c65b606b --- /dev/null +++ b/packages/qemu/qemu-qop-nogfx-native_svn.bb @@ -0,0 +1,18 @@ +LICENSE = "GPL" +PV = "0.8.0+svn${SRCDATE}" +PROVIDES = "qemu-native" + +SRC_URI = "svn://nowt.dyndns.org/svn/qemu;module=trunk;proto=https \ + file://configure.patch;patch=1 \ + file://trunk_nodocs.patch;patch=1" + +S = "${WORKDIR}/trunk" + +inherit autotools native + +EXTRA_OECONF = "--disable-gcc-check --target-list=arm-user,arm-softmmu --disable-gfx-check" + +prefix = "${STAGING_DIR}/${BUILD_SYS}" + +# tested to work with gcc4 for arm target only +# this is purely for others to test, not intended to be used as a replacement for the real qemu diff --git a/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty b/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty diff --git a/packages/qt/qt-x11-free-4.0.1/cross-compile.patch b/packages/qt/qt-x11-free-4.1.1/cross-compile.patch index 39d095d7a0..39d095d7a0 100644 --- a/packages/qt/qt-x11-free-4.0.1/cross-compile.patch +++ b/packages/qt/qt-x11-free-4.1.1/cross-compile.patch diff --git a/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch b/packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch index bc30cab216..bc30cab216 100644 --- a/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch +++ b/packages/qt/qt-x11-free-4.1.1/fix-resinit-declaration.patch diff --git a/packages/qt/qt-x11-free-4.0.1/no-tools.patch b/packages/qt/qt-x11-free-4.1.1/no-tools.patch index 75a146a838..75a146a838 100644 --- a/packages/qt/qt-x11-free-4.0.1/no-tools.patch +++ b/packages/qt/qt-x11-free-4.1.1/no-tools.patch diff --git a/packages/qt/qt-x11-free/gcc4_1-HACK.patch b/packages/qt/qt-x11-free/gcc4_1-HACK.patch new file mode 100644 index 0000000000..818bced4ee --- /dev/null +++ b/packages/qt/qt-x11-free/gcc4_1-HACK.patch @@ -0,0 +1,28 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch ++++ qt-x11-free-3.3.6/src/tools/qstring.h +@@ -60,7 +60,7 @@ + #endif + #endif + +- ++#define Q_NO_PACKED_REFERENCE + /***************************************************************************** + QString class + *****************************************************************************/ +@@ -194,9 +194,9 @@ + char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } + ushort unicode() const { return ucs; } + #ifdef Q_NO_PACKED_REFERENCE +- ushort &unicode() { return *(&ucs); } ++ ushort &unicode() { return *((ushort*)&ucs); } + #else +- ushort &unicode() { return ucs; } ++ ushort &unicode() { return (ushort)ucs; } + #endif + #ifndef QT_NO_CAST_ASCII + // like all ifdef'd code this is undocumented diff --git a/packages/qt/qt-x11-free_3.3.5.bb b/packages/qt/qt-x11-free_3.3.6.bb index 0f57314971..f92414ac73 100644 --- a/packages/qt/qt-x11-free_3.3.5.bb +++ b/packages/qt/qt-x11-free_3.3.6.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Qt/X11 Version ${PV}" +DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework" SECTION = "x11/libs" PRIORITY = "optional" LICENSE = "GPL QPL" @@ -6,11 +6,12 @@ HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc3-native freetype libx11 xft libxext libxrender libxrandr libxcursor mysql" PROVIDES = "qt3x11" -PR = "r10" +PR = "r0" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ - file://no-examples.patch;patch=1" + file://no-examples.patch;patch=1 \ + file://gcc4_1-HACK.patch;patch=1" S = "${WORKDIR}/qt-x11-free-${PV}" inherit qmake-base qt3x11 diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.1.1.bb index 32ddca6158..32ddca6158 100644 --- a/packages/qt/qt-x11-free_4.0.1.bb +++ b/packages/qt/qt-x11-free_4.1.1.bb diff --git a/packages/qte/qte-2.3.10/fix-errno-exception-spec.patch b/packages/qte/qte-2.3.10/fix-errno-exception-spec.patch new file mode 100644 index 0000000000..19a5c134c8 --- /dev/null +++ b/packages/qte/qte-2.3.10/fix-errno-exception-spec.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-2.3.10/src/kernel/qsoundqss_qws.cpp~fix-errno-exception-spec.patch ++++ qt-2.3.10/src/kernel/qsoundqss_qws.cpp +@@ -51,8 +51,6 @@ + #include <sys/ioctl.h> + #include <sys/soundcard.h> + +-extern int errno; +- + #define QT_QWS_SOUND_16BIT 1 // or 0, or undefined for always 0 + #define QT_QWS_SOUND_STEREO 1 // or 0, or undefined for always 0 + diff --git a/packages/qte/qte-2.3.10/kernel-keymap-CXK.patch b/packages/qte/qte-2.3.10/kernel-keymap-CXK.patch index 6aca81e97d..a32207dc14 100644 --- a/packages/qte/qte-2.3.10/kernel-keymap-CXK.patch +++ b/packages/qte/qte-2.3.10/kernel-keymap-CXK.patch @@ -3,14 +3,16 @@ # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher # ---- qt-2.3.10/src/kernel/qkeyboard_qws.cpp~kernel-keymap-CXK.patch 2005-05-05 19:34:05.000000000 +0200 -+++ qt-2.3.10/src/kernel/qkeyboard_qws.cpp 2005-05-05 19:35:47.000000000 +0200 -@@ -1809,7 +1809,11 @@ - case Qt::Key_Up: +Index: qt-2.3.10/src/kernel/kernelkeyboard.cpp +=================================================================== +--- qt-2.3.10.orig/src/kernel/kernelkeyboard.cpp 2006-04-05 23:04:30.000000000 +0200 ++++ qt-2.3.10/src/kernel/kernelkeyboard.cpp 2006-04-05 23:09:40.514650408 +0200 +@@ -568,7 +568,11 @@ case Qt::Key_Down: + unicode = 0xffff; mod_key = false; +#if QT_QWS_SLCXK -+ if (qt_screen->transformOrientation() != 3) ++ if (qt_screen->transformOrientation() != 3) +#else if (qt_screen->isTransformed()) +#endif diff --git a/packages/qte/qte-2.3.10/kernel-keymap.patch b/packages/qte/qte-2.3.10/kernel-keymap.patch index 7b786eb294..79c0bd07ad 100644 --- a/packages/qte/qte-2.3.10/kernel-keymap.patch +++ b/packages/qte/qte-2.3.10/kernel-keymap.patch @@ -1,278 +1,176 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.10-snapshot-20050131/src/kernel/qkeyboard_qws.cpp~kernel-keymap -+++ qt-2.3.10-snapshot-20050131/src/kernel/qkeyboard_qws.cpp -@@ -30,6 +30,42 @@ - ** - **********************************************************************/ - -+/**************************************************************************** -+** -+** Keyboard Handling Redesign -+** Copyright 2003, Chris Larson <kergoth@handhelds.org> -+** Copyright 2004,2005 Holger Hans Peter Frether <freyther@handhelds.org> -+** -+** TODO: (key: . = in progress, x = completed) -+** -+** [.] Tty driver should load its initial keymap from the kernel, -+** thereby ensuring keymap consistency between X, console, and qt/e -+** [x] Read kernel keymappings. -+** [x] Read kernel keycode -> unicode map. -+** [x] Use them, along with the existing keyM, to push events up. -+** [x] Create a new table, from transformed keycode -> qt keycode, rather -+** than the existing raw keycode -> qt keycode. -+** [ ] Adapt handleKey to deal with keys that have no unicode value, such as -+** keypresses that are mapped to strings in the string table. (e.g. F keys) -+** [x] Cursor orientation change based on display rotation should not -+** be bound to Ipaq or 5xxx, but instead as a runtime choice based -+** on whether or not we're using a Transformed display driver. -+** [.] Double check that VT handling, particularly with regard to switching, -+** is handled properly. -+** [ ] Add a generic means of dealing with additional (outside the realm of -+** ctrl, alt, shift, altgr) modifiers. Also ensure a means of binding -+** a keypress/combination to a 'lock' of said additional modifiers. -+** -+** Holgers Todo -+** -+** [ ] Fix NumLock handling -+** [ ] Fix Keypad handling -+** [ ] Fix LED handling (LED_NUM and LED_CAP) don't seem to work -+** [ ] Fix CTRL+ALT+H (somehow takes the function of CTRL+ALT+BACKSPACE) -+** -+**********************************************************************/ -+ -+ - #include "qwindowsystem_qws.h" - #include "qwsutils_qws.h" - #include "qgfx_qws.h" -@@ -45,15 +81,18 @@ - #include <ctype.h> - - #include <unistd.h> --#ifdef _OS_LINUX_ --#include <linux/kd.h> --#endif -+#include <sys/wait.h> - #include <sys/ioctl.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> - #include <errno.h> - #include <signal.h> -+#include <termios.h> -+#ifdef _OS_LINUX_ -+#include <linux/kd.h> -+#include <linux/keyboard.h> -+#endif - - #ifdef QT_QWS_TIP2 - #include <qcopchannel_qws.h> -@@ -135,17 +174,6 @@ - }; - #endif - --#ifdef QT_QWS_SL5XXX --#include <asm/sharp_char.h> --#endif -- --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) --#define QT_QWS_AUTOREPEAT_MANUALLY --#endif -- -- -- --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) - static int dir_keyrot = -1; - - static int xform_dirkey(int key) -@@ -169,7 +197,6 @@ - int xf = qt_screen->transformOrientation() + dir_keyrot; - return (key-Qt::Key_Left+xf)%4+Qt::Key_Left; - } --#endif - - #define VTSWITCHSIG SIGUSR2 - -@@ -300,11 +327,19 @@ - { Qt::Key_F35, 0xffff , 0xffff , 0xffff }, // 21 light - { Qt::Key_Escape, 0xffff , 0xffff , 0xffff }, // 22 - -+#ifdef QT_QWS_SL6000 - // Direction key code are for *UNROTATED* display. -- { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 -- { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 -- { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 -- { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 -+ { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 23 -+ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 24 -+ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 25 -+ { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 26 -+#else -+ // Direction key code are for *UNROTATED* display. -+ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 -+ { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 -+ { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 -+ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 -+#endif - - { Qt::Key_F33, 0xffff , 0xffff , 0xffff }, // 27 OK - { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, // 28 40 home -@@ -369,7 +404,7 @@ - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 -- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 -+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 - { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 -@@ -649,12 +684,61 @@ - public: - QWSTtyKeyboardHandler(const QString&); - virtual ~QWSTtyKeyboardHandler(); -+ void readKeyboardMap(); -+ void readUnicodeMap(); -+ void handleKey(unsigned char code); - - private slots: - void readKeyboardData(); - - private: -+ void modifyModifier( int map, int modify, bool release ); -+ void modifyLock( unsigned int lock, bool release ); -+ void handleExtra( unsigned int key, bool release ); -+ static void restoreLeds(); -+ static void toggleLed(unsigned int); -+ int map_to_modif (); +Index: src/kernel/kernelkeyboard.cpp +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ src/kernel/kernelkeyboard.cpp 2006-04-01 23:42:35.154645456 +0200 +@@ -0,0 +1,701 @@ ++/* + -+private: - struct termios origTermData; -+ unsigned short acm[E_TABSZ]; -+ struct KeyMap { -+ enum ExtraKey{ -+ Key_AltGr = 0x01ffff, -+ Key_Console1 = 0x02ffff, -+ Key_Console2 = 0x03ffff, -+ Key_Console3 = 0x04ffff, -+ Key_Console4 = 0x05ffff, -+ Key_Console5 = 0x06ffff, -+ Key_Console6 = 0x07ffff, -+ Key_Console7 = 0x08ffff, -+ Key_Console8 = 0x09ffff, -+ Key_Console9 = 0x0affff, -+ Key_Console10 = 0x0bffff, -+ Key_Console11 = 0x0cffff, -+ Key_Console12 = 0x0dffff, -+ Key_NumLock = 0x0effff, -+ Key_ShiftLock = 0x0fffff, -+ Key_CtrlLock = 0x10ffff, -+ Key_AltLock = 0x11ffff, -+ Key_AltGrLock = 0x12ffff -+ }; ++ Copyright (C) 2003 Chris Larson ++ Copyright (C) 2004, 2005 Holger Hans Peter Freyther ++ All rights reserved. + -+ KeyMap( Qt::Key _key = Qt::Key_unknown, unsigned short _code = 0 ) -+ : key( _key ), code( _code ) -+ {} -+ KeyMap( ExtraKey _key, unsigned short _code ) -+ : key( _key ), code( _code ) -+ {} -+ unsigned int key; // 16 Bit -+ unsigned short code; -+ }; ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions are met: + -+ KeyMap kernel_map[(1<<KG_CAPSSHIFT)][NR_KEYS]; -+ int current_map; -+ int modifier; -+ bool numlock : 1; -+ bool capslock : 1; - }; - - -@@ -814,6 +898,7 @@ - fn = FALSE; - - numLock = FALSE; -+#if 0 - sharp_kbdctl_modifstat st; - int dev = ::open("/dev/sharp_kbdctl", O_RDWR); - if( dev >= 0 ) { -@@ -825,6 +910,7 @@ - ::close(dev); - } - #endif -+#endif - #if defined(QT_QWS_IPAQ) - // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! - ipaq_return_pressed = FALSE; -@@ -954,7 +1040,7 @@ - } - } else if ( extended == 2 ) { - switch (code) { -- case 0x1d: -+ case 0x1d: - return; - case 0x45: - keyCode = Qt::Key_Pause; -@@ -1199,7 +1285,7 @@ - unicode = '`'; - } else - #endif -- ++ Redistributions of source code must retain the above copyright notice, ++ this list of conditions and the following disclaimer. + - if (bCtrl) - unicode = currentKey->ctrl_unicode; - else if (bCaps) -@@ -1244,9 +1330,12 @@ - // - // Tty keyboard - // ++ Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ ++ Neither the name Chris Larson nor the names of its ++ contributors may be used to endorse or promote products derived ++ from this software without specific prior written permission. ++ ++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS ++ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ++ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, ++ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ++ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING ++ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ POSSIBILITY OF SUCH DAMAGE. ++ ++*/ ++ ++/* ++ Copyright (C) 2005 ROAD GmbH ++ ++ This program is free software; you can redistribute it ++ and/or modify it under the terms of the GNU General Public ++ License as published by the Free Software Foundation; ++ either version 2 of the License, or (at your option) any ++ later version. ++ ++ This program is distributed in the hope that it will be ++ useful, but WITHOUT ANY WARRANTY; without even the implied ++ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++ PURPOSE. See the GNU General Public License for more ++ details. ++ ++ You should have received a copy of the GNU General Public ++ License along with this program; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, ++ Boston, MA 02111-1307 USA ++ ++ ++ Changes Done: ++ -ShiftL and ShiftR modifier handling ++ -Keypad handling improved ++ -Handle unmapped keys by lookin them up in the first column ++ -Handle AutoRepeat ++ -Handle Keys >127 ++ -Handle Increment and Decrement the Console ++ -Handle the Home Key ++ -Fix handling of Function Keys ++ -Fix handling of the unicode value (to fix QPopupMenu,QAction) ++ ++ */ ++ ++/* ++ This is an alternative implementation of the QWSTtyKeyboardHandler ++ of Trolltech's QtE. ++ ++ Instead of using a hardcoded incomplete map, this implementation ++ imports the Keymap from a Linux Kernel. ++ ++ */ ++ ++ ++// ++// Tty keyboard ++// +#include "keyboard_linux_to_qt.h" - - QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) ++ ++QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) + : current_map(0), modifier( 0 ), numlock( false ), capslock( false ) - { ++{ + restoreLeds(); - kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); - - if ( kbdFD >= 0 ) { -@@ -1262,11 +1351,7 @@ - tcgetattr( kbdFD, &termdata ); - - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) --# ifdef QT_QWS_USE_KEYCODES -- ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW); --# else -- ioctl(kbdFD, KDSKBMODE, K_RAW); --# endif ++ kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); ++ ++ if ( kbdFD >= 0 ) { ++ QSocketNotifier *notifier; ++ notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this ); ++ connect( notifier, SIGNAL(activated(int)),this, ++ SLOT(readKeyboardData()) ); ++ ++ // save for restore. ++ tcgetattr( kbdFD, &origTermData ); ++ ++ struct termios termdata; ++ tcgetattr( kbdFD, &termdata ); ++ ++#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) + ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW); - #endif - - termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); -@@ -1279,6 +1364,9 @@ - cfsetospeed(&termdata, 9600); - tcsetattr(kbdFD, TCSANOW, &termdata); - ++#endif ++ ++ termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); ++ termdata.c_oflag = 0; ++ termdata.c_cflag = CREAD | CS8; ++ termdata.c_lflag = 0; ++ termdata.c_cc[VTIME]=0; ++ termdata.c_cc[VMIN]=1; ++ cfsetispeed(&termdata, 9600); ++ cfsetospeed(&termdata, 9600); ++ tcsetattr(kbdFD, TCSANOW, &termdata); ++ + readUnicodeMap(); + readKeyboardMap(); + - signal(VTSWITCHSIG, vtSwitchHandler); - - #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -@@ -1300,6 +1388,7 @@ - - QWSTtyKeyboardHandler::~QWSTtyKeyboardHandler() - { ++ signal(VTSWITCHSIG, vtSwitchHandler); ++ ++#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) ++ struct vt_mode vtMode; ++ ioctl(kbdFD, VT_GETMODE, &vtMode); ++ ++ // let us control VT switching ++ vtMode.mode = VT_PROCESS; ++ vtMode.relsig = VTSWITCHSIG; ++ vtMode.acqsig = VTSWITCHSIG; ++ ioctl(kbdFD, VT_SETMODE, &vtMode); ++ ++ struct vt_stat vtStat; ++ ioctl(kbdFD, VT_GETSTATE, &vtStat); ++ vtQws = vtStat.v_active; ++#endif ++ } ++} ++ ++QWSTtyKeyboardHandler::~QWSTtyKeyboardHandler() ++{ + restoreLeds(); - if (kbdFD >= 0) - { - -@@ -1328,13 +1417,451 @@ - kbdFD = -1; - } - } ++ if (kbdFD >= 0) ++ { ++#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) ++ struct vt_mode vtMode; ++ ioctl(kbdFD, VT_GETMODE, &vtMode); ++ ++ /* Mickey says: "Better give up control of VT switching. ++ * Hey, I really hate that OS-will-reacquire-resources on process-death ++ * kind of thinking! ++ */ ++ vtMode.mode = VT_AUTO; ++ vtMode.relsig = 0; ++ vtMode.acqsig = 0; ++ ioctl(kbdFD, VT_SETMODE, &vtMode); ++ ++ signal(VTSWITCHSIG, 0); ++ qDebug( "~QWSTtyKeyboardHandler() - released VT." ); ++#endif ++ ++#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) ++ ioctl(kbdFD, KDSKBMODE, K_XLATE); ++#endif ++ tcsetattr(kbdFD, TCSANOW, &origTermData); ++ ::close(kbdFD); ++ kbdFD = -1; ++ } ++} +void QWSTtyKeyboardHandler::readUnicodeMap() +{ + if (kbdFD < 0) @@ -294,12 +192,13 @@ + + for (int key = 0; key < NR_KEYS; ++key) { + kbe.kb_index = key; -+ -+ if (ioctl(kbdFD, KDGKBENT, &kbe) != 0) -+ continue; -+ -+ if ((kbe.kb_value == K_HOLE) || (kbe.kb_value == K_NOSUCHMAP)) -+ continue; ++ ++ ++ if ( (ioctl(kbdFD, KDGKBENT, &kbe) != 0) || ++ ((kbe.kb_value == K_HOLE) || (kbe.kb_value == K_NOSUCHMAP)) ) { ++ kernel_map[map][key] = KeyMap( KeyMap::Key_NotMapped, 0 ); ++ continue; ++ } + + kval = KVAL(kbe.kb_value); + switch (KTYP(kbe.kb_value)) { @@ -309,6 +208,7 @@ + */ + case KT_LETTER: + case KT_LATIN: ++ case KT_META: + kernel_map[map][key] = KeyMap( linux_to_qt[kval], kval ); + break; + @@ -319,12 +219,9 @@ + case KT_FN: + if ( kval <= 19 ) + kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F1 + kval ), kval ); -+ else if ( kval >= 31 && kval <= 33) -+ kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F21 + kval ), kval ); -+ else if ( kval >= 34 && kval <= 45 ) { -+ int off = kval-34; -+ kernel_map[map][key] = KeyMap(static_cast<KeyMap::ExtraKey>( KeyMap::Key_Console1+off ), kval ); -+ }else ++ else if ( kval >= 30 && kval <= 44) ++ kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F21 + (kval - 30) ), kval ); ++ else + switch(kbe.kb_value ) { + case K_INSERT: + kernel_map[map][key] = KeyMap( Qt::Key_Insert, kval ); @@ -351,6 +248,8 @@ + kernel_map[map][key] = KeyMap( Qt::Key_Pause, kval ); + break; + case K_FIND: ++ kernel_map[map][key] = KeyMap( Qt::Key_Home, kval ); ++ break; + case K_DO: + default: + kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval ); @@ -372,7 +271,13 @@ + case K_HOLD: + kernel_map[map][key] = KeyMap( Qt::Key_ScrollLock, kval ); + break; -+ case K_HOLE: ++ case K_DECRCONSOLE: ++ kernel_map[map][key] = KeyMap( KeyMap::Key_DecConsole, kval ); ++ break; ++ case K_INCRCONSOLE: ++ kernel_map[map][key] = KeyMap( KeyMap::Key_IncConsole, kval ); ++ break; ++ case K_HOLE: + case K_SH_REGS: + case K_SH_MEM: + case K_SH_STAT: @@ -384,8 +289,6 @@ + case K_CAPSON: + case K_COMPOSE: + case K_SAK: -+ case K_DECRCONSOLE: -+ case K_INCRCONSOLE: + case K_SPAWNCONSOLE: + case K_BARENUMLOCK: + default: @@ -399,34 +302,34 @@ + */ + switch(kbe.kb_value ) { + case K_P0: -+ kernel_map[map][key] = KeyMap( Qt::Key_0, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_0, 48 ); + break; + case K_P1: -+ kernel_map[map][key] = KeyMap( Qt::Key_1, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_1, 49 ); + break; + case K_P2: -+ kernel_map[map][key] = KeyMap( Qt::Key_2, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_2, 50 ); + break; + case K_P3: -+ kernel_map[map][key] = KeyMap( Qt::Key_3, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_3, 51 ); + break; + case K_P4: -+ kernel_map[map][key] = KeyMap( Qt::Key_4, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_4, 52 ); + break; + case K_P5: -+ kernel_map[map][key] = KeyMap( Qt::Key_5, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_5, 53 ); + break; + case K_P6: -+ kernel_map[map][key] = KeyMap( Qt::Key_6, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_6, 54 ); + break; + case K_P7: -+ kernel_map[map][key] = KeyMap( Qt::Key_7, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_7, 55 ); + break; + case K_P8: -+ kernel_map[map][key] = KeyMap( Qt::Key_8, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_8, 56 ); + break; + case K_P9: -+ kernel_map[map][key] = KeyMap( Qt::Key_9, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_9, 57 ); + break; + case K_PPLUS: + kernel_map[map][key] = KeyMap( Qt::Key_Plus, kval ); @@ -435,7 +338,7 @@ + kernel_map[map][key] = KeyMap( Qt::Key_Minus, kval ); + break; + case K_PSTAR: -+ kernel_map[map][key] = KeyMap( Qt::Key_multiply, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_multiply, 42 ); + break; + case K_PSLASH: + kernel_map[map][key] = KeyMap( Qt::Key_division, kval ); @@ -475,8 +378,14 @@ + } + break; + -+ case KT_CONS: -+ kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval ); ++ /* ++ * Console keys ++ */ ++ case KT_CONS: ++ if ( kval < 10 ) ++ kernel_map[map][key] = KeyMap(static_cast<KeyMap::ExtraKey>( KeyMap::Key_Console1+kval ), kval ); ++ else ++ kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval ); + break; + + case KT_CUR: @@ -511,8 +420,12 @@ + kernel_map[map][key] = KeyMap( KeyMap::Key_AltGr, kval ); + break; + case K_SHIFTL: ++ kernel_map[map][key] = KeyMap( KeyMap::Key_ShiftL, kval ); ++ break; + case K_SHIFTR: -+ case K_CTRLL: ++ kernel_map[map][key] = KeyMap( KeyMap::Key_ShiftR, kval ); ++ break; ++ case K_CTRLL: + case K_CTRLR: + case K_CAPSSHIFT: + default: @@ -555,9 +468,9 @@ + if ( !release ) { + int term = 0; + if ( (modifier & (1<<KG_ALT)) && (modifier & (1<<KG_CTRL)) ) { -+ if ( key == Qt::Key_Left ) ++ if ( key == Qt::Key_Left || key == KeyMap::Key_DecConsole ) + term = QMAX(vtQws -1, 1 ); -+ else if ( key == Qt::Key_Right ) ++ else if ( key == Qt::Key_Right || key == KeyMap::Key_IncConsole ) + term = QMIN(vtQws +1, 12 ); + } + @@ -598,24 +511,22 @@ + } +} + -+void QWSTtyKeyboardHandler::handleKey(unsigned char code) ++void QWSTtyKeyboardHandler::handleKey(unsigned int code, bool release) +{ + int old_modifier = modifier; -+ bool release = false; + bool mod_key = true; + -+ if (code & 0x80) -+ { -+ release = true; -+ code &= 0x7f; -+ } -+ + KeyMap key_map = kernel_map[current_map][code]; -+ unsigned short unicode = acm[key_map.code]; ++ if( key_map.key == KeyMap::Key_NotMapped ) { ++ qWarning("Unmapped Key Pressed fixing up map:%d modif:%d code:%d", current_map, modifier, code); ++ key_map = kernel_map[0][code]; ++ } ++ ++ unsigned short unicode = acm[key_map.code] & 0xff; + unsigned int qtKeyCode = key_map.key; + -+ if ( !release ) -+ qWarning( "KeyCode: %d KVAL: %d", qtKeyCode, key_map.code ); ++// if ( !release ) ++// qWarning( "KeyCode: %d KVAL: %d", qtKeyCode, key_map.code ); +// qWarning( "Alt:%d Ctrl:%d Shift:%d Key = %d", modifier & (1<<KG_ALT), +// modifier & (1<<KG_CTRL), +// modifier & (1<<KG_SHIFT), key_map.key ); @@ -631,24 +542,36 @@ + switch (qtKeyCode) + { + case Qt::Key_Alt: -+ case Qt::Key_F22: ++ unicode = 0xffff; + modif = (1<<KG_ALT); ++ map = modif; + break; + case Qt::Key_Control: ++ unicode = 0xffff; + modif = (1<<KG_CTRL); + map = modif; + break; + case Qt::Key_Shift: ++ unicode = 0xffff; + modif = (1<<KG_SHIFT); + map = modif; + break; + case KeyMap::Key_AltGr: + map = (1<<KG_ALTGR ); + break; ++ case KeyMap::Key_ShiftL: ++ unicode = 0xfff; ++ map = (1<<KG_SHIFTL); ++ break; ++ case KeyMap::Key_ShiftR: ++ unicode = 0xfff; ++ map = (1<<KG_SHIFTR); ++ break; + case Qt::Key_Left: + case Qt::Key_Right: + case Qt::Key_Up: + case Qt::Key_Down: ++ unicode = 0xffff; + mod_key = false; + if (qt_screen->isTransformed()) + qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) ); @@ -658,6 +581,7 @@ + */ + case Qt::Key_CapsLock: + case Qt::Key_NumLock: ++ unicode = 0xffff; + lock = true; + default: + mod_key = false; @@ -681,16 +605,58 @@ + if ( modifier == old_modifier && mod_key ) + return; + -+ processKeyEvent(unicode & 0xff, qtKeyCode, map_to_modif(), !release, 0); ++ processKeyEvent(unicode, qtKeyCode, map_to_modif(), !release, 0); +} - - void QWSTtyKeyboardHandler::readKeyboardData() - { - unsigned char buf[81]; - int n = ::read(kbdFD, buf, 80 ); - for ( int loop = 0; loop < n; loop++ ) -- doKey(buf[loop]); -+ handleKey(buf[loop]); ++ ++ ++/* ++ * We will read the keys off the kernel. We have two cases here ++ * 1. ) keycode < 128, bit8 is the down/up bit and the rest is ++ * is the value of the key. we can simply process it ++ * 2. ) keycode > 128, the first byte is either empty or 0x80. ++ * We need to save the status ( press/release ) the following ++ * two bytes. ++ * The difficulty is we might have not read all keys into the ++ * buffer. This makes the reading of highkeys a bit harder and ++ * I've decided against rereading, or adding a special case for ++ * the 'all' buffers in loop instead we have a simple state machine. ++ */ ++void QWSTtyKeyboardHandler::readKeyboardData() ++{ ++ unsigned char buf[81]; ++ unsigned char code; ++ bool release = false; ++ bool release_bit; ++ ++ bool highKey = false; ++ unsigned int highKeyCode = 0; ++ unsigned int highNeedMoreKey = 0; ++ ++ int n = ::read(kbdFD, buf, 80 ); ++ for ( int loop = 0; loop < n; loop++ ) { ++ code = buf[loop] & 0x7f; ++ release_bit = buf[loop] & 0x80; ++ ++ if ( highKey ) { ++ if ( highNeedMoreKey == 2 ) { ++ highNeedMoreKey--; ++ highKeyCode = code << 7; ++ }else if ( highNeedMoreKey == 1 ) { ++ highNeedMoreKey = 0; ++ highKeyCode |= code; ++ highKey = false; ++ if ( highKeyCode > 127 && highKeyCode < NR_KEYS ) ++ handleKey( highKeyCode, release ); ++ } ++ }else if (code == 0) { ++ highKey = true; ++ highNeedMoreKey = 2; ++ release = release_bit; ++ }else { ++ release = release_bit; ++ handleKey(code, release); ++ } ++ } +} + +void QWSTtyKeyboardHandler::modifyLock( unsigned int lock, bool release ) { @@ -719,59 +685,282 @@ + int ret = ioctl(kbdFD, KDGETLED, &leds ); + leds = leds & led ? (leds & ~led) : (leds | led); + ret = ioctl(kbdFD, KDSETLED, &leds ); - } ++} ++ ++void QWSTtyKeyboardHandler::processKeyEvent(int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ) { ++ static int last_unicode = -1; ++ static int last_keycode = -1; ++ ++ autoRepeat = false; ++ if( last_unicode == unicode && last_keycode == keycode && isPress ) ++ autoRepeat = true; ++ ++ QWSPC101KeyboardHandler::processKeyEvent(unicode, keycode, modifiers, isPress, autoRepeat); ++ ++ if ( isPress ) { ++ last_unicode = unicode; ++ last_keycode = keycode; ++ } else { ++ last_unicode = last_keycode = -1; ++ } ++} +Index: src/kernel/qkeyboard_qws.cpp +=================================================================== +--- src/kernel/qkeyboard_qws.cpp.orig 2006-04-01 23:36:22.499297680 +0200 ++++ src/kernel/qkeyboard_qws.cpp 2006-04-01 23:38:19.913448016 +0200 +@@ -45,15 +45,18 @@ + #include <ctype.h> + + #include <unistd.h> +-#ifdef _OS_LINUX_ +-#include <linux/kd.h> +-#endif ++#include <sys/wait.h> + #include <sys/ioctl.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <errno.h> + #include <signal.h> ++#include <termios.h> ++#ifdef _OS_LINUX_ ++#include <linux/kd.h> ++#include <linux/keyboard.h> ++#endif - typedef struct { -@@ -1439,13 +1966,13 @@ - return; #ifdef QT_QWS_TIP2 - // custom scan codes - translate them and create a key event immediately -- if( overrideMap && event.value == 0 || overrideMap->find( event.value ) ) -+ if( overrideMap && event.value == 0 || overrideMap->find( event.value ) ) - { - if( event.value ) - { - int modifiers = 0; - QWSServer::KeyMap *km = overrideMap->find( event.value ); -- switch( km->unicode ) -+ switch( km->unicode ) - { - case Key_Menu: - case Key_Back: -@@ -1473,14 +2000,14 @@ - TRUE, FALSE ); - } - lastPress = km; -- } -- else if( lastPress ) -+ } -+ else if( lastPress ) - { -- processKeyEvent( lastPress->unicode, lastPress->key_code, 0, -+ processKeyEvent( lastPress->unicode, lastPress->key_code, 0, - FALSE, FALSE ); - lastPress = 0; - } -- } -+ } - else - #endif - { -@@ -1845,10 +2372,10 @@ - handler = new QWSUsbKeyboardHandler(device); - } else if ( type == "TTY" ) { - handler = new QWSTtyKeyboardHandler(device); -- } -+ } - else if( type == "Samsung" ) { - handler = new QWSSamsungKeypadHandler(device); -- } -+ } - else { - qWarning( "Keyboard type %s:%s unsupported", spec.latin1(), device.latin1() ); + #include <qcopchannel_qws.h> +@@ -135,17 +138,6 @@ + }; + + +-#ifdef QT_QWS_SL5XXX +-#include <asm/sharp_char.h> +-#endif +- +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) +-#define QT_QWS_AUTOREPEAT_MANUALLY +-#endif +- +- +- +-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) + static int dir_keyrot = -1; + + static int xform_dirkey(int key) +@@ -169,7 +161,6 @@ + int xf = qt_screen->transformOrientation() + dir_keyrot; + return (key-Qt::Key_Left+xf)%4+Qt::Key_Left; + } +-#endif + + #define VTSWITCHSIG SIGUSR2 + +@@ -643,18 +634,81 @@ + ioctl(0, KDSETLED, leds); + } + ++/* ++ * This class was extended by: ++ * ++ * Copyright 2002 Chris Larson ++ * Copyright 2004, 2005 Holger Hans Peter Freyther ++ */ + class QWSTtyKeyboardHandler : public QWSPC101KeyboardHandler + { + Q_OBJECT + public: + QWSTtyKeyboardHandler(const QString&); + virtual ~QWSTtyKeyboardHandler(); ++ void readKeyboardMap(); ++ void readUnicodeMap(); ++ void handleKey(unsigned int key, bool release); + + private slots: + void readKeyboardData(); + + private: ++ void modifyModifier( int map, int modify, bool release ); ++ void modifyLock( unsigned int lock, bool release ); ++ void handleExtra( unsigned int key, bool release ); ++ static void restoreLeds(); ++ static void toggleLed(unsigned int); ++ int map_to_modif (); ++ ++private: + struct termios origTermData; ++ unsigned short acm[E_TABSZ]; ++ struct KeyMap { ++ enum ExtraKey{ ++ Key_AltGr = 0x01ffff, ++ Key_Console1 = 0x02ffff, ++ Key_Console2 = 0x03ffff, ++ Key_Console3 = 0x04ffff, ++ Key_Console4 = 0x05ffff, ++ Key_Console5 = 0x06ffff, ++ Key_Console6 = 0x07ffff, ++ Key_Console7 = 0x08ffff, ++ Key_Console8 = 0x09ffff, ++ Key_Console9 = 0x0affff, ++ Key_Console10 = 0x0bffff, ++ Key_Console11 = 0x0cffff, ++ Key_Console12 = 0x0dffff, ++ Key_NumLock = 0x0effff, ++ Key_ShiftLock = 0x0fffff, ++ Key_CtrlLock = 0x10ffff, ++ Key_AltLock = 0x11ffff, ++ Key_AltGrLock = 0x12ffff, ++ Key_ShiftL = 0x130000, ++ Key_ShiftR = 0x130001, ++ Key_IncConsole= 0x130002, ++ Key_DecConsole= 0x130003, ++ Key_NotMapped = 0x130004, ++ }; ++ ++ KeyMap( Qt::Key _key = Qt::Key_unknown, unsigned short _code = 0 ) ++ : key( _key ), code( _code ) ++ {} ++ KeyMap( ExtraKey _key, unsigned short _code ) ++ : key( _key ), code( _code ) ++ {} ++ unsigned int key; // 16 Bit ++ unsigned short code; ++ }; ++ ++ KeyMap kernel_map[(1<<KG_CAPSSHIFT)][NR_KEYS]; ++ int current_map; ++ int modifier; ++ bool numlock : 1; ++ bool capslock : 1; ++ ++protected: ++ void processKeyEvent(int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat ); + }; + + +@@ -814,6 +868,7 @@ + fn = FALSE; + + numLock = FALSE; ++#if 0 + sharp_kbdctl_modifstat st; + int dev = ::open("/dev/sharp_kbdctl", O_RDWR); + if( dev >= 0 ) { +@@ -825,6 +880,7 @@ + ::close(dev); } ---- /dev/null -+++ qt-2.3.10-snapshot-20050131/src/kernel/keyboard_linux_to_qt.h + #endif ++#endif + #if defined(QT_QWS_IPAQ) + // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! + ipaq_return_pressed = FALSE; +@@ -1250,98 +1306,10 @@ + // + // Tty keyboard + // +- +-QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) +-{ +- kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); +- +- if ( kbdFD >= 0 ) { +- QSocketNotifier *notifier; +- notifier = new QSocketNotifier( kbdFD, QSocketNotifier::Read, this ); +- connect( notifier, SIGNAL(activated(int)),this, +- SLOT(readKeyboardData()) ); +- +- // save for restore. +- tcgetattr( kbdFD, &origTermData ); +- +- struct termios termdata; +- tcgetattr( kbdFD, &termdata ); +- +-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) +-# ifdef QT_QWS_USE_KEYCODES +- ioctl(kbdFD, KDSKBMODE, K_MEDIUMRAW); +-# else +- ioctl(kbdFD, KDSKBMODE, K_RAW); +-# endif +-#endif +- +- termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); +- termdata.c_oflag = 0; +- termdata.c_cflag = CREAD | CS8; +- termdata.c_lflag = 0; +- termdata.c_cc[VTIME]=0; +- termdata.c_cc[VMIN]=1; +- cfsetispeed(&termdata, 9600); +- cfsetospeed(&termdata, 9600); +- tcsetattr(kbdFD, TCSANOW, &termdata); +- +- signal(VTSWITCHSIG, vtSwitchHandler); +- +-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) +- struct vt_mode vtMode; +- ioctl(kbdFD, VT_GETMODE, &vtMode); +- +- // let us control VT switching +- vtMode.mode = VT_PROCESS; +- vtMode.relsig = VTSWITCHSIG; +- vtMode.acqsig = VTSWITCHSIG; +- ioctl(kbdFD, VT_SETMODE, &vtMode); +- +- struct vt_stat vtStat; +- ioctl(kbdFD, VT_GETSTATE, &vtStat); +- vtQws = vtStat.v_active; +-#endif +- } +-} +- +-QWSTtyKeyboardHandler::~QWSTtyKeyboardHandler() +-{ +- if (kbdFD >= 0) +- { +- +-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) +- struct vt_mode vtMode; +- ioctl(kbdFD, VT_GETMODE, &vtMode); +- +- /* Mickey says: "Better give up control of VT switching. +- * Hey, I really hate that OS-will-reacquire-resources on process-death +- * kind of thinking! +- */ +- vtMode.mode = VT_AUTO; +- vtMode.relsig = 0; +- vtMode.acqsig = 0; +- ioctl(kbdFD, VT_SETMODE, &vtMode); +- +- signal(VTSWITCHSIG, 0); +- qDebug( "~QWSTtyKeyboardHandler() - released VT." ); +-#endif +- +-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) +- ioctl(kbdFD, KDSKBMODE, K_XLATE); +-#endif +- tcsetattr(kbdFD, TCSANOW, &origTermData); +- ::close(kbdFD); +- kbdFD = -1; +- } +-} +- +-void QWSTtyKeyboardHandler::readKeyboardData() +-{ +- unsigned char buf[81]; +- int n = ::read(kbdFD, buf, 80 ); +- for ( int loop = 0; loop < n; loop++ ) +- doKey(buf[loop]); +-} ++/* ++ * Include the alternative implementation ++ */ ++#include "kernelkeyboard.cpp" + + typedef struct { + unsigned short key; +Index: src/kernel/keyboard_linux_to_qt.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ src/kernel/keyboard_linux_to_qt.h 2006-04-01 23:37:03.928999408 +0200 @@ -0,0 +1,263 @@ +/* + * Generated with a small python utility found at @@ -779,38 +968,38 @@ + */ + +static const Qt::Key linux_to_qt[] = { -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, ++Qt::Key_At, ++Qt::Key_A, ++Qt::Key_B, ++Qt::Key_C, ++Qt::Key_D, ++Qt::Key_E, ++Qt::Key_F, ++Qt::Key_G, +Qt::Key_Backspace, +Qt::Key_Tab, -+Qt::Key_unknown, // LineFeed -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, // No Symbol -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, // No Symbol -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, -+Qt::Key_unknown, ++Qt::Key_J, // Linefeed ++Qt::Key_K, ++Qt::Key_L, ++Qt::Key_Enter, ++Qt::Key_N, ++Qt::Key_O, ++Qt::Key_P, ++Qt::Key_Q, ++Qt::Key_R, ++Qt::Key_S, ++Qt::Key_T, ++Qt::Key_U, ++Qt::Key_V, ++Qt::Key_W, ++Qt::Key_X, ++Qt::Key_Y, ++Qt::Key_Z, +Qt::Key_Escape, -+Qt::Key_unknown, -+Qt::Key_unknown, // No symbol -+Qt::Key_unknown, -+Qt::Key_unknown, ++Qt::Key_Backslash, ++Qt::Key_BracketRight, ++Qt::Key_AsciiCircum, ++Qt::Key_Underscore, +Qt::Key_Space, +Qt::Key_Exclam, +Qt::Key_QuoteDbl, diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc new file mode 100644 index 0000000000..083174ccad --- /dev/null +++ b/packages/qte/qte-common_2.3.10.inc @@ -0,0 +1,168 @@ +DESCRIPTION = "Qt/Embedded Version ${PV}" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL" +DEPENDS = "zlib libpng jpeg tslib uicmoc-native" +DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" +DEPENDS_append_c7x0 = " sharp-aticore-oss" +PROVIDES = "virtual/qte virtual/libqte2" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qte-${PV}" + +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \ + file://qpe.patch;patch=1 \ + file://vt-switch.patch;patch=1 \ + file://daemonize.patch;patch=1 \ + file://no-moc.patch;patch=1 \ + file://gcc3.patch;patch=1 \ + file://gcc4.patch;patch=1 \ + file://c700-hardware.patch;patch=1 \ + file://encoding.patch;patch=1 \ + file://fix-qgfxraster.patch;patch=1 \ + file://qt-visibility.patch;patch=1 \ + file://tslib.patch;patch=1 \ + file://simpad.patch;patch=1 \ + file://handhelds.patch;patch=1 \ + file://qiconview-speed.patch;patch=1 \ + file://qtabbar.patch;patch=1 \ + file://increase-qxml-robustness.patch;patch=1 \ + file://qte-fix-iconsize.patch;patch=1 \ + file://fix-linuxfb-setmode.patch;patch=1 \ + file://fix-linuxfb-offscreenoverflow.patch;patch=1 \ + file://fix-qscreen-sync.patch;patch=1 \ + file://improve-calibration-r0.patch;patch=1 \ + file://key.patch;patch=1 \ + file://bidimetrics.patch;patch=5 \ + file://fix-native-build.patch;patch=1 \ + file://simpad-defaultkbd.patch;patch=1 \ + file://fix-errno-exception-spec.patch;patch=1 \ + file://sharp_char.h \ + file://switches.h " + +SRC_URI_append_simpad = "file://devfs.patch;patch=1 " +SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 \ + file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " +SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_borzoi = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " +SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1;pnum=0 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ + file://mnci.patch;patch=1 \ + file://mnci-touchscreen.patch;patch=1 \ + file://qkeyboard_qws.h \ + file://qkeyboard_qws.cpp " +SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " + + +S = "${WORKDIR}/qt-${PV}" + +export QTDIR = "${S}" + +def qte_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "x86" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + +QTE_ARCH := "${@qte_arch(d)}" + +EXTRA_OECONF_CONFIG = "-qconfig qpe" +EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100" +EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb" +EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \ + -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" +EXTRA_OEMAKE = "-e" + +# +# FIXME: Add more here +# +EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" +EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" +EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" +EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" +EXTRA_DEFINES_h3600 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_h1910 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_a716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" +EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" +EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" +EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" +EXTRA_DEFINES_borzoi = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" +EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" + +export SYSCONF_CC = "${CC}" +export SYSCONF_CXX = "${CXX}" +export SYSCONF_LINK = "${CCLD}" +export SYSCONF_SHLIB = "${CCLD}" +export SYSCONF_CFLAGS = "${CFLAGS}" +export SYSCONF_LINK_SHLIB = "${CCLD}" +export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +export SYSCONF_LFLAGS = "${LDFLAGS} -lts" +export SYSCONF_LFLAGS_mnci = "${LDFLAGS}" +export SYSCONF_MOC = "${STAGING_BINDIR}/moc" +export SYSCONF_UIC = "${STAGING_BINDIR}/uic" + +do_configure_prepend_mnci() { + chmod -R a+w ${S}/src/kernel + cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel + cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel + mkdir bin + ln -sf ${STAGING_BINDIR}/moc bin/moc + ln -sf ${STAGING_BINDIR}/uic bin/uic +} + +# generate uclibc and eabi configurations +do_configure() { + for f in ${S}/configs/linux-*-g++-shared; do + sed -e 's,-linux-,-linux-uclibc-,g' < $f \ + > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'` + sed -e 's,-linux-,-linux-gnueabi-,g' < $f \ + > `dirname $f`/`basename $f | sed -e 's,linux-,linux-gnueabi-,'` + done + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +do_compile() { + unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS + install -d include/asm/ + install -m 0644 ${WORKDIR}/sharp_char.h include/asm/ + install -d include/linux/ + install -m 0644 ${WORKDIR}/switches.h include/linux/ + + # Create symlinks first and then compile the library + oe_runmake symlinks + oe_runmake src-mt sub-src +} + +do_stage() { + rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib + oe_libinstall -so -C lib lib${PN} ${STAGING_DIR}/${HOST_SYS}/qt2/lib + rm -f include/qxt.h + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ +} + +do_install() { + oe_libinstall -so -C lib lib${PN} ${D}${palmqtdir}/lib/ +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${palmqtdir}" diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb new file mode 100644 index 0000000000..ab0844135c --- /dev/null +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -0,0 +1,23 @@ +require qte-common_${PV}.inc +PR = "r0" + +EXTRA_OECONF += "-thread -static" +export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" + +do_stage() { + rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib + oe_libinstall -a -C lib libqte-mt ${STAGING_DIR}/${HOST_SYS}/qt2/lib + rm -f include/qxt.h + install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ +} + +do_install() { + : +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${palmqtdir}" diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb new file mode 100644 index 0000000000..eeed231496 --- /dev/null +++ b/packages/qte/qte-mt_2.3.10.bb @@ -0,0 +1,11 @@ +require qte-common_${PV}.inc + +PR = "r0" + +EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif -thread -static \ + -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" +export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" +#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fexceptions -frtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +FILES_${PN} = "${palmqtdir}" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index fc03ca216b..345a585254 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,166 +1,2 @@ -DESCRIPTION = "Qt/Embedded Version ${PV}" -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -HOMEPAGE = "http://www.trolltech.com" -LICENSE = "GPL" -DEPENDS = "zlib libpng jpeg tslib uicmoc-native" -DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" -DEPENDS_append_c7x0 = " sharp-aticore-oss" -PROVIDES = "virtual/qte virtual/libqte2" -PR = "r30" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \ - file://qpe.patch;patch=1 \ - file://vt-switch.patch;patch=1 \ - file://daemonize.patch;patch=1 \ - file://no-moc.patch;patch=1 \ - file://gcc3.patch;patch=1 \ - file://gcc4.patch;patch=1 \ - file://c700-hardware.patch;patch=1 \ - file://encoding.patch;patch=1 \ - file://fix-qgfxraster.patch;patch=1 \ - file://qt-visibility.patch;patch=1 \ - file://tslib.patch;patch=1 \ - file://simpad.patch;patch=1 \ - file://handhelds.patch;patch=1 \ - file://qiconview-speed.patch;patch=1 \ - file://qtabbar.patch;patch=1 \ - file://increase-qxml-robustness.patch;patch=1 \ - file://qte-fix-iconsize.patch;patch=1 \ - file://fix-linuxfb-setmode.patch;patch=1 \ - file://fix-linuxfb-offscreenoverflow.patch;patch=1 \ - file://fix-qscreen-sync.patch;patch=1 \ - file://improve-calibration-r0.patch;patch=1 \ - file://key.patch;patch=1 \ - file://bidimetrics.patch;patch=5 \ - file://fix-native-build.patch;patch=1 \ - file://simpad-defaultkbd.patch;patch=1 \ - file://sharp_char.h \ - file://switches.h " - -SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ - file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " -SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_borzoi = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ - file://mnci.patch;patch=1 \ - file://mnci-touchscreen.patch;patch=1 \ - file://qkeyboard_qws.h \ - file://qkeyboard_qws.cpp " -SRC_URI_append_h3600 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_h3900 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_h1910 = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " - - -S = "${WORKDIR}/qt-${PV}" - -export QTDIR = "${S}" - -def qte_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "x86" - elif arch == "x86_64": - arch = "x86" - elif arch == "mipsel": - arch = "mips" - return arch - -QTE_ARCH := "${@qte_arch(d)}" - -EXTRA_OECONF_CONFIG = "-qconfig qpe" -EXTRA_OECONF_CONFIG_c7x0 = "-qconfig qpe -accel-w100" -EXTRA_OECONF_CONFIG_native = "-qconfig qpe -qvfb" -EXTRA_OECONF = "-system-jpeg -system-libpng -system-zlib -no-qvfb -no-xft -no-vnc -gif \ - -xplatform ${TARGET_OS}-${QTE_ARCH}-g++ ${EXTRA_OECONF_CONFIG} -depths 8,16,32" -EXTRA_OEMAKE = "-e" - -# -# FIXME: Add more here -# -EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" -EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" -EXTRA_DEFINES_h3600 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h3900 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_h1910 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_a716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" -EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_borzoi = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" - -export SYSCONF_CC = "${CC}" -export SYSCONF_CXX = "${CXX}" -export SYSCONF_LINK = "${CCLD}" -export SYSCONF_SHLIB = "${CCLD}" -export SYSCONF_CFLAGS = "${CFLAGS}" -export SYSCONF_LINK_SHLIB = "${CCLD}" -export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" -#export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES} -DUSE_BIDI" -export SYSCONF_LFLAGS = "${LDFLAGS} -lts" -export SYSCONF_LFLAGS_mnci = "${LDFLAGS}" -export SYSCONF_MOC = "${STAGING_BINDIR}/moc" -export SYSCONF_UIC = "${STAGING_BINDIR}/uic" - -do_configure_prepend_mnci() { - chmod -R a+w ${S}/src/kernel - cp ${WORKDIR}/qkeyboard_qws.h ${S}/src/kernel - cp ${WORKDIR}/qkeyboard_qws.cpp ${S}/src/kernel - mkdir bin - ln -sf ${STAGING_BINDIR}/moc bin/moc - ln -sf ${STAGING_BINDIR}/uic bin/uic -} - -# generate uclibc and eabi configurations -do_configure() { - for f in ${S}/configs/linux-*-g++-shared; do - sed -e 's,-linux-,-linux-uclibc-,g' < $f \ - > `dirname $f`/`basename $f | sed -e 's,linux-,linux-uclibc-,'` - sed -e 's,-linux-,-linux-gnueabi-,g' < $f \ - > `dirname $f`/`basename $f | sed -e 's,linux-,linux-gnueabi-,'` - done - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS - install -d include/asm/ - install -m 0644 ${WORKDIR}/sharp_char.h include/asm/ - install -d include/linux/ - install -m 0644 ${WORKDIR}/switches.h include/linux/ - - # Create symlinks first and then compile the library - oe_runmake symlinks - oe_runmake src-mt sub-src -} - -do_stage() { - rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/lib - oe_libinstall -so -C lib libqte ${STAGING_DIR}/${HOST_SYS}/qt2/lib - rm -f include/qxt.h - install -d ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pfLR include/* ${STAGING_DIR}/${HOST_SYS}/qt2/include - cp -pPR lib/fonts ${STAGING_DIR}/${HOST_SYS}/qt2/lib/ -} - -do_install() { - oe_libinstall -so -C lib libqte ${D}${palmqtdir}/lib/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "${palmqtdir}" +require qte-common_${PV}.inc +PR = "r40" diff --git a/packages/qwt/qwt_4.2.0rc1.bb b/packages/qwt/qwt_4.2.0rc1.bb index 3b93c4c88c..efae3446e9 100644 --- a/packages/qwt/qwt_4.2.0rc1.bb +++ b/packages/qwt/qwt_4.2.0rc1.bb @@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tgz \ inherit qmake -EXTRA_QMAKEVARS_POST = "CONFIG-=thread" +EXTRA_QMAKEVARS_POST = "CONFIG-=thread DEFINES+=QWS" do_stage() { oe_libinstall -so -C lib libqwt ${STAGING_LIBDIR} diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index f7fe0e7960..b365a49dda 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -403,6 +403,12 @@ boot_rootfs() { return 1 };; *) { echo '#!/bin/sh' + echo 'modprobe ehci-hcd' + echo 'modprobe ohci-hcd' + echo 'modprobe sd_mod' + echo 'modprobe usb-storage' + echo 'modprobe ext3' + echo 'sleep 5' echo 'leds beep' test "$sleep" -gt 0 && echo -n "sleep='$sleep' " test -n "$uuid" && echo -n "UUID='$uuid' " diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 3f1ab456ac..971f6cf288 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r57" +PR = "r58" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/soundtracker/soundtracker-gtk2_0.6.7.bb b/packages/soundtracker/soundtracker-gtk2_0.6.7.bb index a42bf4ae21..e5131e904a 100644 --- a/packages/soundtracker/soundtracker-gtk2_0.6.7.bb +++ b/packages/soundtracker/soundtracker-gtk2_0.6.7.bb @@ -3,9 +3,9 @@ DEPENDS = "gtk+ libgnomeui audiofile esound-gpe alsa-lib" LICENSE = "GPL" SECTION = "x11/multimedia" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r0" +PR = "r1" -SRC_URI = "http://metamorph0sis.nm.ru/soundtracker-${PV}-2.gtk2.tar.bz2" +SRC_URI = "http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2" S = "${WORKDIR}/soundtracker-${PV}.gtk2" inherit autotools @@ -20,4 +20,3 @@ do_install() { install -d ${D}${bindir} install -m 0755 app/soundtracker ${D}${bindir} } - diff --git a/packages/soundtracker/soundtracker_0.6.7.bb b/packages/soundtracker/soundtracker_0.6.8.bb index cc2dc4be8c..b228c03c88 100644 --- a/packages/soundtracker/soundtracker_0.6.7.bb +++ b/packages/soundtracker/soundtracker_0.6.8.bb @@ -1,10 +1,14 @@ DESCRIPTION = "Music composition program in the style of AMIGA Impulse Tracker" +HOMEPAGE = "http://www.soundtracker.org" DEPENDS = "gtk+-1.2" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" SECTION = "x11/multimedia" +PR = "r0" + MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -SRC_URI = "http://www.soundtracker.org/dl/v0.6/soundtracker-${PV}.tar.gz \ - file://remove-chown.patch;patch=1" + +SRC_URI = "http://www.soundtracker.org/dl/v0.6/soundtracker-${PV}.tar.gz" inherit autotools diff --git a/packages/strace/strace-4.5.14/.mtn2git_empty b/packages/strace/strace-4.5.14/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/strace/strace-4.5.14/.mtn2git_empty diff --git a/packages/strace/strace-4.5.14/arm-eabi.patch b/packages/strace/strace-4.5.14/arm-eabi.patch new file mode 100644 index 0000000000..53e27f8ce8 --- /dev/null +++ b/packages/strace/strace-4.5.14/arm-eabi.patch @@ -0,0 +1,65 @@ +2006-03-30 Daniel Jacobowitz <dan@codesourcery.com> + + * process.c (change_syscall): Add ARM support. + * syscall.c (get_scno): Handle ARM EABI. + +Index: strace/process.c +=================================================================== +--- strace.orig/process.c 2006-03-30 17:36:14.000000000 -0500 ++++ strace/process.c 2006-03-30 17:44:16.000000000 -0500 +@@ -694,6 +694,16 @@ int new; + 0x100000 | new) < 0) + return -1; + return 0; ++#elif defined(ARM) ++ /* Some kernels support this, some (pre-2.6.16 or so) don't. */ ++# ifndef PTRACE_SET_SYSCALL ++# define PTRACE_SET_SYSCALL 23 ++# endif ++ ++ if (ptrace (PTRACE_SET_SYSCALL, tcp->pid, 0, new) != 0) ++ return -1; ++ ++ return 0; + #else + #warning Do not know how to handle change_syscall for this architecture + #endif /* architecture */ +Index: strace/syscall.c +=================================================================== +--- strace.orig/syscall.c 2006-03-30 17:36:14.000000000 -0500 ++++ strace/syscall.c 2006-03-30 17:44:16.000000000 -0500 +@@ -1108,16 +1108,25 @@ struct tcb *tcp; + return 0; + } + +- if ((scno & 0x0ff00000) != 0x0f900000) { +- fprintf(stderr, "syscall: unknown syscall trap 0x%08lx\n", +- scno); +- return -1; +- } ++ /* Handle the EABI syscall convention. We do not ++ bother converting structures between the two ++ ABIs, but basic functionality should work even ++ if strace and the traced program have different ++ ABIs. */ ++ if (scno == 0xef000000) { ++ scno = regs.ARM_r7; ++ } else { ++ if ((scno & 0x0ff00000) != 0x0f900000) { ++ fprintf(stderr, "syscall: unknown syscall trap 0x%08lx\n", ++ scno); ++ return -1; ++ } + +- /* +- * Fixup the syscall number +- */ +- scno &= 0x000fffff; ++ /* ++ * Fixup the syscall number ++ */ ++ scno &= 0x000fffff; ++ } + } + + if (tcp->flags & TCB_INSYSCALL) { diff --git a/packages/strace/strace_4.5.14.bb b/packages/strace/strace_4.5.14.bb new file mode 100644 index 0000000000..cc15d962ae --- /dev/null +++ b/packages/strace/strace_4.5.14.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +SECTION = "console/utils" +PR = "r0" + +DESCRIPTION = "strace is a system call tracing tool." + +SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \ + file://arm-eabi.patch;patch=1" + +inherit autotools + +export INCLUDES = "-I. -I./linux" diff --git a/packages/sylpheed/sylpheed_0.9.99-gtk2-20041024.bb b/packages/sylpheed/sylpheed_0.9.99-gtk2-20041024.bb deleted file mode 100644 index 5312e89a44..0000000000 --- a/packages/sylpheed/sylpheed_0.9.99-gtk2-20041024.bb +++ /dev/null @@ -1,25 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/sylpheed-gtk2/sylpheed-${PV}.tar.gz" - -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN}-doc += "${datadir}" - -do_configure_prepend() { - mkdir -p m4 -} - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps - install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ -} - diff --git a/packages/sylpheed/sylpheed_1.0.0-gtk2-20041224.bb b/packages/sylpheed/sylpheed_1.0.0-gtk2-20041224.bb deleted file mode 100644 index 3ee58453e5..0000000000 --- a/packages/sylpheed/sylpheed_1.0.0-gtk2-20041224.bb +++ /dev/null @@ -1,30 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -LICENSE = "GPL" -PR = "r4" - -SRC_URI = "${SOURCEFORGE_MIRROR}/sylpheed-gtk2/sylpheed-${PV}.tar.gz \ - file://sylpheed-gnutls.patch;patch=1" - -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN}-doc += "${datadir}" - -EXTRA_OECONF = "--enable-gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -do_configure_prepend() { - mkdir -p m4 -} - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps - install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ -} - diff --git a/packages/sylpheed/sylpheed_1.9.12.bb b/packages/sylpheed/sylpheed_1.9.12.bb deleted file mode 100644 index b02aead205..0000000000 --- a/packages/sylpheed/sylpheed_1.9.12.bb +++ /dev/null @@ -1,31 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Phil Blundell <pb@handhelds.org>" -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "http://sylpheed.good-day.net/sylpheed/v1.9/sylpheed-1.9.12.tar.bz2 \ - file://sylpheed-gnutls.patch;patch=1 \ - file://Makefile-am.patch;patch=1" - -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN}-doc += "${datadir}" - -EXTRA_OECONF = "--enable-gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -do_configure_prepend() { - mkdir -p m4 -} - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps - install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ -} - diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb deleted file mode 100644 index aa2040b432..0000000000 --- a/packages/sylpheed/sylpheed_2.0.0beta6.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>" -LICENSE = "GPL" -PR = "r3" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \ - file://sylpheed-gnutls_2.0.0beta6.patch;patch=1 \ - file://sylpheed-gnutls-extra.patch;patch=1 " - -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN}-doc += "${datadir}" - -EXTRA_OECONF = "--enable-gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -do_configure_prepend() { - mkdir -p m4 -} - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps - install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ -} - diff --git a/packages/sylpheed/sylpheed_2.0.0rc.bb b/packages/sylpheed/sylpheed_2.0.0rc.bb deleted file mode 100644 index 531d694f98..0000000000 --- a/packages/sylpheed/sylpheed_2.0.0rc.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>" -LICENSE = "GPL" -PR = "r3" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0rc.tar.bz2 \ - file://sylpheed-gnutls_2.0.0rc.patch;patch=1 \ - file://sylpheed-gnutls-extra.patch;patch=1 " - -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN}-doc += "${datadir}" - -EXTRA_OECONF = "--enable-gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -do_configure_prepend() { - mkdir -p m4 -} - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps - install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ -} - diff --git a/packages/sylpheed/sylpheed_2.2.2.bb b/packages/sylpheed/sylpheed_2.2.2.bb deleted file mode 100644 index bc63f0d71b..0000000000 --- a/packages/sylpheed/sylpheed_2.2.2.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "x11/network" -DESCRIPTION = "Mail user agent" -DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>" -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.2/sylpheed-${PV}.tar.bz2 \ - file://sylpheed-2.2.2-libsylph-Makefile-am.patch;patch=1 \ - file://sylpheed-2.2.2-src-Makefile-am.patch;patch=1" - - -FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications" -FILES_${PN}-doc += "${datadir}" - -EXTRA_OECONF = "--enable-gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -do_configure_prepend() { - mkdir -p m4 -} - -inherit autotools - -do_install_append() { - install -d ${D}${datadir}/applications - install -m 0644 sylpheed.desktop ${D}${datadir}/applications/ - install -d ${D}${datadir}/pixmaps - install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/ -} - diff --git a/packages/sylpheed/sylpheed_2.2.3.bb b/packages/sylpheed/sylpheed_2.2.4.bb index bc63f0d71b..4756bb200d 100644 --- a/packages/sylpheed/sylpheed_2.2.3.bb +++ b/packages/sylpheed/sylpheed_2.2.4.bb @@ -1,7 +1,7 @@ SECTION = "x11/network" DESCRIPTION = "Mail user agent" DEPENDS = "gtk+ gpgme gnutls" -MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>" +MAINTAINER = "Graeme Gregory <dp@xora.org.uk>" LICENSE = "GPL" PR = "r3" diff --git a/packages/tslib/tslib/akita/tslib.sh b/packages/tslib/tslib/akita/tslib.sh index dc7484cada..218da0751b 100644 --- a/packages/tslib/tslib/akita/tslib.sh +++ b/packages/tslib/tslib/akita/tslib.sh @@ -9,7 +9,7 @@ case `uname -r` in *) TSLIB_TSDEVICE=/dev/input/event1 TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/borzoi/tslib.sh b/packages/tslib/tslib/borzoi/tslib.sh index dc7484cada..218da0751b 100644 --- a/packages/tslib/tslib/borzoi/tslib.sh +++ b/packages/tslib/tslib/borzoi/tslib.sh @@ -9,7 +9,7 @@ case `uname -r` in *) TSLIB_TSDEVICE=/dev/input/event1 TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/c7x0/tslib.sh b/packages/tslib/tslib/c7x0/tslib.sh index dc7484cada..218da0751b 100644 --- a/packages/tslib/tslib/c7x0/tslib.sh +++ b/packages/tslib/tslib/c7x0/tslib.sh @@ -9,7 +9,7 @@ case `uname -r` in *) TSLIB_TSDEVICE=/dev/input/event1 TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/collie/tslib.sh b/packages/tslib/tslib/collie/tslib.sh index 187b7ce6d2..d9cc02cb1c 100644 --- a/packages/tslib/tslib/collie/tslib.sh +++ b/packages/tslib/tslib/collie/tslib.sh @@ -1,10 +1,16 @@ #!/bin/sh -if (uname -r|grep -q 'embedix'); then +case `uname -r` in +2.4*) TSLIB_TSDEVICE=/dev/ts TSLIB_TSEVENTTYPE=COLLIE -else - TSLIB_TSDEVICE=/dev/input/event0 -fi + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4 + ;; +*) + TSLIB_TSDEVICE=/dev/input/event1 + TSLIB_TSEVENTTYPE=INPUT + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf + ;; +esac -export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE +export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/h1940/tslib.sh b/packages/tslib/tslib/h1940/tslib.sh index 5e5e283962..d83673e259 100644 --- a/packages/tslib/tslib/h1940/tslib.sh +++ b/packages/tslib/tslib/h1940/tslib.sh @@ -1,7 +1,7 @@ #!/bin/sh TSLIB_TSDEVICE=`detect-stylus --device` -TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 +TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf QWS_MOUSE_PROTO=TPanel export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh index be9448b1dc..0de3534a51 100644 --- a/packages/tslib/tslib/h2200/tslib.sh +++ b/packages/tslib/tslib/h2200/tslib.sh @@ -11,7 +11,7 @@ case `uname -r` in ;; *) TSLIB_TSDEVICE=`detect-stylus --device` - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh index 5c446c2610..3c27b075f7 100644 --- a/packages/tslib/tslib/h3600/tslib.sh +++ b/packages/tslib/tslib/h3600/tslib.sh @@ -7,7 +7,7 @@ case `uname -r` in ;; *) TSLIB_TSDEVICE=`detect-stylus --device` - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh index be9448b1dc..0de3534a51 100644 --- a/packages/tslib/tslib/h3900/tslib.sh +++ b/packages/tslib/tslib/h3900/tslib.sh @@ -11,7 +11,7 @@ case `uname -r` in ;; *) TSLIB_TSDEVICE=`detect-stylus --device` - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh index 21aaad9ca4..548bc918ff 100644 --- a/packages/tslib/tslib/h6300/tslib.sh +++ b/packages/tslib/tslib/h6300/tslib.sh @@ -1,7 +1,7 @@ #!/bin/sh TSLIB_TSDEVICE=`detect-stylus --device` -TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300 +TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh index 72ebcba7c2..3adaba0de8 100644 --- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh +++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh @@ -1,6 +1,6 @@ #!/bin/sh TSLIB_TSDEVICE=`detect-stylus --device` -TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600 +TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf export TSLIB_TSDEVICE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/poodle/ts.conf b/packages/tslib/tslib/poodle/ts.conf deleted file mode 100644 index 2099b9b414..0000000000 --- a/packages/tslib/tslib/poodle/ts.conf +++ /dev/null @@ -1,5 +0,0 @@ -module_raw collie -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib/poodle/tslib.sh b/packages/tslib/tslib/poodle/tslib.sh index 187b7ce6d2..d9cc02cb1c 100644 --- a/packages/tslib/tslib/poodle/tslib.sh +++ b/packages/tslib/tslib/poodle/tslib.sh @@ -1,10 +1,16 @@ #!/bin/sh -if (uname -r|grep -q 'embedix'); then +case `uname -r` in +2.4*) TSLIB_TSDEVICE=/dev/ts TSLIB_TSEVENTTYPE=COLLIE -else - TSLIB_TSDEVICE=/dev/input/event0 -fi + TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4 + ;; +*) + TSLIB_TSDEVICE=/dev/input/event1 + TSLIB_TSEVENTTYPE=INPUT + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf + ;; +esac -export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE +export TSLIB_TSDEVICE TSLIB_TSEVENTTYPE TSLIB_CONFFILE diff --git a/packages/tslib/tslib/simpad/tslib.sh b/packages/tslib/tslib/simpad/tslib.sh index 8bb94a037f..5301239373 100644 --- a/packages/tslib/tslib/simpad/tslib.sh +++ b/packages/tslib/tslib/simpad/tslib.sh @@ -7,7 +7,7 @@ case `uname -r` in ;; *) TSLIB_TSDEVICE=/dev/input/event0 - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/spitz/tslib.sh b/packages/tslib/tslib/spitz/tslib.sh index dc7484cada..218da0751b 100644 --- a/packages/tslib/tslib/spitz/tslib.sh +++ b/packages/tslib/tslib/spitz/tslib.sh @@ -9,7 +9,7 @@ case `uname -r` in *) TSLIB_TSDEVICE=/dev/input/event1 TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/tosa/ts.conf b/packages/tslib/tslib/tosa/ts.conf deleted file mode 100644 index 07fbbea2a8..0000000000 --- a/packages/tslib/tslib/tosa/ts.conf +++ /dev/null @@ -1,5 +0,0 @@ -module_raw corgi -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib/tosa/tslib.sh b/packages/tslib/tslib/tosa/tslib.sh index dc7484cada..218da0751b 100644 --- a/packages/tslib/tslib/tosa/tslib.sh +++ b/packages/tslib/tslib/tosa/tslib.sh @@ -9,7 +9,7 @@ case `uname -r` in *) TSLIB_TSDEVICE=/dev/input/event1 TSLIB_TSEVENTTYPE=INPUT - TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi + TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf ;; esac diff --git a/packages/tslib/tslib/ts.conf-corgi b/packages/tslib/tslib/ts-2.6.conf index 09309719f2..09309719f2 100644 --- a/packages/tslib/tslib/ts.conf-corgi +++ b/packages/tslib/tslib/ts-2.6.conf diff --git a/packages/tslib/tslib/collie/ts.conf b/packages/tslib/tslib/ts.conf-collie-2.4 index 2099b9b414..2099b9b414 100644 --- a/packages/tslib/tslib/collie/ts.conf +++ b/packages/tslib/tslib/ts.conf-collie-2.4 diff --git a/packages/tslib/tslib/ts.conf-h2200 b/packages/tslib/tslib/ts.conf-h2200 deleted file mode 100644 index 09309719f2..0000000000 --- a/packages/tslib/tslib/ts.conf-h2200 +++ /dev/null @@ -1,5 +0,0 @@ -module_raw input -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib/ts.conf-h3600 b/packages/tslib/tslib/ts.conf-h3600 deleted file mode 100644 index 09309719f2..0000000000 --- a/packages/tslib/tslib/ts.conf-h3600 +++ /dev/null @@ -1,5 +0,0 @@ -module_raw input -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib/ts.conf-h6300 b/packages/tslib/tslib/ts.conf-h6300 deleted file mode 100644 index 09309719f2..0000000000 --- a/packages/tslib/tslib/ts.conf-h6300 +++ /dev/null @@ -1,5 +0,0 @@ -module_raw input -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib/ts.conf-simpad b/packages/tslib/tslib/ts.conf-simpad deleted file mode 100644 index 09309719f2..0000000000 --- a/packages/tslib/tslib/ts.conf-simpad +++ /dev/null @@ -1,5 +0,0 @@ -module_raw input -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index 2513a436a6..02f0c555ae 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -1,17 +1,16 @@ SECTION = "base" DESCRIPTION = "tslib is a touchscreen access library." PV = "0.0+cvs${SRCDATE}" -PR = "r32" +PR = "r33" SRC_URI_OVERRIDES_PACKAGE_ARCH = "0" PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ - file://ts.conf \ - file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h6300 \ - file://ts.conf-corgi file://ts.conf-corgi-2.4 \ - file://ts.conf-simpad file://ts.conf-simpad-2.4 \ + file://ts.conf file://ts-2.6.conf \ + file://ts.conf-h3600-2.4 file://ts.conf-simpad-2.4 \ + file://ts.conf-corgi-2.4 file://ts.conf-collie-2.4 \ file://tslib.sh" SRC_URI_append_mnci += " file://devfs.patch;patch=1" SRC_URI_append_mnci += " file://event1.patch;patch=1" @@ -40,21 +39,29 @@ do_install_append() { case ${MACHINE} in h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) install -d ${D}${datadir}/tslib - for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do + for f in ts-2.6.conf ts.conf-h3600-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ done rm -f ${D}${sysconfdir}/ts.conf ;; c7x0 | spitz | akita | tosa | borzoi ) install -d ${D}${datadir}/tslib - for f in ts.conf-corgi ts.conf-corgi-2.4; do + for f in ts-2.6.conf ts.conf-corgi-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ done rm -f ${D}${sysconfdir}/ts.conf ;; + collie | poodle ) + install -d ${D}${datadir}/tslib + for f in ts-2.6.conf ts.conf-collie-2.4; do + install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ + done + rm -f ${D}${sysconfdir}/ts.conf + ;; + simpad ) install -d ${D}${datadir}/tslib - for f in ts.conf-simpad ts.conf-simpad-2.4; do + for f in ts-2.6.conf ts.conf-simpad-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ done rm -f ${D}${sysconfdir}/ts.conf diff --git a/packages/ttf-fonts/ttf-dejavu_2.3.bb b/packages/ttf-fonts/ttf-dejavu_2.3.bb index d627574ac8..304b30cfd6 100644 --- a/packages/ttf-fonts/ttf-dejavu_2.3.bb +++ b/packages/ttf-fonts/ttf-dejavu_2.3.bb @@ -3,7 +3,6 @@ LICENSE = "Bitstream Vera" HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" -PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}-1.tar.gz" @@ -19,6 +18,3 @@ FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.tt FILES_ttf-dejavu-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf" FILES_ttf-dejavu-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf" FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf" - -RCONFLICTS_ttf-dejavu-sans-mono = "ttf-dejavu-sans-mono-lite" -RREPLACES_ttf-dejavu-sans-mono = "ttf-dejavu-sans-mono-lite" diff --git a/packages/ttf-fonts/ttf-gentium_1.02.bb b/packages/ttf-fonts/ttf-gentium_1.02.bb index 4ec03767f7..c9ad78448c 100644 --- a/packages/ttf-fonts/ttf-gentium_1.02.bb +++ b/packages/ttf-fonts/ttf-gentium_1.02.bb @@ -3,7 +3,7 @@ LICENSE = "SIL Open Font License" HOMEPAGE = "http://scripts.sil.org/gentium" LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL" -SRC_URI = "${DEBIAN_MIRROR}/non-free/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz \ file://OFL.gz" include ttf.inc diff --git a/packages/udev/files/local.rules b/packages/udev/files/local.rules index 4bcaaa8aba..5f2efbeb0c 100644 --- a/packages/udev/files/local.rules +++ b/packages/udev/files/local.rules @@ -1,5 +1,22 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" +# Handle network interface setup SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" diff --git a/packages/udev/files/udev.rules b/packages/udev/files/udev.rules index 044ababa7f..5c566f6cef 100644 --- a/packages/udev/files/udev.rules +++ b/packages/udev/files/udev.rules @@ -28,7 +28,7 @@ BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ # usbfs-like devices SUBSYSTEM=="usb_device", \ - PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" # serial devices KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" diff --git a/packages/udev/udev-084/local.rules b/packages/udev/udev-084/local.rules new file mode 100644 index 0000000000..bb8459ba23 --- /dev/null +++ b/packages/udev/udev-084/local.rules @@ -0,0 +1,28 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# Media automounting +SUBSYSTEM=="block", ACTION=="add" RUN+="/etc/udev/scripts/mount.sh" +SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh" + +# Handle network interface setup +SUBSYSTEM=="net", ACTION=="add" RUN+="/etc/udev/scripts/network.sh" +SUBSYSTEM=="net", ACTION=="remove" RUN+="/etc/udev/scripts/network.sh" + +# The first rtc device is symlinked to /dev/rtc +KERNEL="rtc0", SYMLINK="rtc" + +# Try and modprobe for drivers for new hardware +ACTION="add", DEVPATH="/devices/*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" diff --git a/packages/udev/udev-084/udev.rules b/packages/udev/udev-084/udev.rules index 6308cb0918..7b4152c5bf 100644 --- a/packages/udev/udev-084/udev.rules +++ b/packages/udev/udev-084/udev.rules @@ -28,7 +28,7 @@ BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ # usbfs-like devices SUBSYSTEM=="usb_device", \ - PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + PROGRAM="/bin/sh -c 'export X=%k; export X=$${X#usbdev}; export B=$${X%%%%.*}; export D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" # serial devices KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" diff --git a/packages/udev/udev_084.bb b/packages/udev/udev_084.bb index 85393315c5..6bafa615d7 100644 --- a/packages/udev/udev_084.bb +++ b/packages/udev/udev_084.bb @@ -13,7 +13,7 @@ include udev.inc INITSCRIPT_PARAMS = "start 03 S . start 55 0 6 ." -PR = "r1" +PR = "r3" FILES_${PN} += "${base_libdir}" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" diff --git a/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch b/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch new file mode 100644 index 0000000000..3cca3e0d1d --- /dev/null +++ b/packages/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch @@ -0,0 +1,226 @@ +--- qt-2.3.10/src/kernel/qsharedmemory.cpp~64bit 2005-12-14 12:31:39.000000000 +0000 ++++ qt-2.3.10/src/kernel/qsharedmemory.cpp 2005-12-14 13:24:41.000000000 +0000 +@@ -36,6 +36,7 @@ + + #include <sys/ipc.h> + #include <sys/types.h> ++#include <stdint.h> + + #if defined(QT_POSIX_QSHM) + #include <fcntl.h> +@@ -122,8 +123,8 @@ + if (shmId == -1) + shmId = shmget (key, shmSize, 0); + +- shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ intptr_t shmBase = (intptr_t) shmat (shmId, 0, 0); ++ if (shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-2.3.10/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 12:15:42.000000000 +0000 ++++ qt-2.3.10/src/kernel/qapplication_qws.cpp 2005-12-14 12:19:39.000000000 +0000 +@@ -87,6 +87,7 @@ + #include <sys/shm.h> + #include <sys/sem.h> + #include <sys/socket.h> ++#include <stdint.h> + #endif + + #include <stdlib.h> +@@ -2041,7 +2042,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -2060,11 +2061,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2635,7 +2636,7 @@ + } + if ( !qws_overrideCursor ) { // is override cursor active? + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-12-14 12:04:56.000000000 +0000 +@@ -42,6 +42,7 @@ + #include <sys/mman.h> + #include <fcntl.h> + #include <errno.h> ++#include <stdint.h> + + #include "qgfxlinuxfb_qws.h" + #include "qwindowsystem_qws.h" +@@ -164,7 +165,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -703,7 +704,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-2.3.10/src/kernel/qmemorymanager_qws.h~64bit 2005-01-23 14:00:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qmemorymanager_qws.h 2005-12-14 12:00:32.000000000 +0000 +@@ -33,6 +33,9 @@ + #ifndef QMEMORYMANAGER_H + #define QMEMORYMANAGER_H + ++/* Needed for uintptr_t to allow 64bit clean pointer handling */ ++#include <stdint.h> ++ + #ifndef QT_H + #include <qfontmanager_qws.h> + #include <qstring.h> +@@ -126,8 +129,8 @@ + // constructs from a memory ptr to where the data after the item starts + QSMCacheItemPtr(void *data) { + char *ptr = (char*)data; +- if ( (int)ptr != (((int)ptr+3)&~3) ) +- qDebug("err, passed a non-aligned data ptr %x", (int)ptr); ++ if (intptr_t(data)&3!=0) ++ qDebug("err, passed a non-aligned data ptr %p", ptr); + d = (QSMCacheItem*)(ptr - sizeof(QSMCacheItem)); + } + // returns a pointer to the data after the item +--- qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 13:25:06.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 13:25:51.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include <stdlib.h> ++#include <stdint.h> + + #ifndef QT_NO_QWS_MULTIPROCESS + #include <sys/types.h> +@@ -286,7 +287,7 @@ + data = (unsigned char *)shmat( shmId, 0, SHM_RDONLY ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-2.3.10/src/kernel/qpixmapcache.cpp~64bit 2005-12-14 13:26:43.000000000 +0000 ++++ qt-2.3.10/src/kernel/qpixmapcache.cpp 2005-12-14 13:30:33.000000000 +0000 +@@ -38,6 +38,7 @@ + #include "qpixmapcache.h" + #include "qcache.h" + #include "qobject.h" ++#include <stdint.h> + + + // REVISED: paul +@@ -519,7 +520,7 @@ + #endif // DEBUG_SHARED_MEMORY_CACHE + } + +- if ( shmId == -1 || (int)shm == -1 ) ++ if ( shmId == -1 || (intptr_t)shm == -1 ) + qFatal("Cannot attach to shared memory"); + + qt_sharedMemoryData = shm->data; +@@ -536,8 +537,8 @@ + shm->tail.setFree(false); + shm->tail.setNextFree(QSMemPtr()); + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)&shm->first + sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)&shm->tail) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)&shm->first + sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)&shm->tail) - freePageStart; + if ( freePagesLength ) { + # ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Initially marking free pages as not needed"); +@@ -770,8 +771,8 @@ + node = newFreeNode->next(); + + #ifdef THROW_AWAY_UNUSED_PAGES +- int freePageStart = PAGE_ALIGN((int)newFreeNode+sizeof(QSMemNode)); +- int freePagesLength = PAGE_ALIGN((int)node) - freePageStart; ++ intptr_t freePageStart = PAGE_ALIGN((intptr_t)newFreeNode+sizeof(QSMemNode)); ++ intptr_t freePagesLength = PAGE_ALIGN((intptr_t)node) - freePageStart; + if ( freePagesLength ) { + #ifdef DEBUG_SHARED_MEMORY_CACHE + qDebug("Marking pages not needed"); +--- qt-2.3.10/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 12:20:46.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwidget_qws.cpp 2005-12-14 12:30:35.000000000 +0000 +@@ -50,6 +50,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include <stdint.h> + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -633,7 +634,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1840,11 +1841,11 @@ + void QWidget::updateCursor( const QRegion &r ) const + { + if ( qt_last_x && (!QWidget::mouseGrabber() || QWidget::mouseGrabber() == this) && +- qt_last_cursor != (WId)cursor().handle() && !qws_overrideCursor ) { ++ qt_last_cursor != (uintptr_t)cursor().handle() && !qws_overrideCursor ) { + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif +--- qt-2.3.10/tools/qvfb/qvfbview.cpp~64bit 2005-12-14 13:32:47.000000000 +0000 ++++ qt-2.3.10/tools/qvfb/qvfbview.cpp 2005-12-14 13:33:27.000000000 +0000 +@@ -40,6 +40,7 @@ + #include <fcntl.h> + #include <errno.h> + #include <math.h> ++#include <stdint.h> + + + QVFbView::QVFbView( int display_id, int _w, int _h, int d, Rotation r, QWidget *parent, +@@ -136,7 +137,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- if ( (int)data == -1 ){ ++ if ( (intptr_t)data == -1 ){ + ::close(mouseFd); + ::close(keyboardFd); + qFatal( "Cannot attach to shared memory %d",shmId ); diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index db884e166a..c9457e139e 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -1,15 +1,17 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x" +HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz \ file://fix-makefile.patch;patch=1 \ file://gcc3_4.patch;patch=1" \ file://gcc4.patch;patch=1 \ - file://gcc4_1.patch;patch=1" + file://gcc4_1.patch;patch=1 \ + file://64bit-cleanup.patch;patch=1" S = "${WORKDIR}/qt-${PV}" inherit native qmake-base diff --git a/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch new file mode 100644 index 0000000000..17836802a6 --- /dev/null +++ b/packages/uicmoc/uicmoc3-native-3.3.5/64bit-cleanup.patch @@ -0,0 +1,147 @@ +--- qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp~64bit 2005-12-14 15:51:23.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/embedded/qgfxlinuxfb_qws.cpp 2005-12-14 15:52:29.000000000 +0000 +@@ -176,7 +176,7 @@ + MAP_SHARED, fd, 0); + data += dataoffset; + +- if ((int)data == -1) { ++ if ((intptr_t)data == -1) { + perror("mapping /dev/fb0"); + qWarning("Error: failed to map framebuffer device to memory."); + return FALSE; +@@ -737,7 +737,7 @@ + psize += 8; // for alignment + psize &= ~0x7; // align + +- unsigned int pos=(unsigned int)data; ++ uintptr_t pos=(uintptr_t)data; + pos += psize; + entryp = ((int *)pos); + lowest = ((unsigned int *)pos)+1; +--- qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp~64bit 2005-12-14 15:34:43.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qsharedmemory_p.cpp 2005-12-14 15:35:26.000000000 +0000 +@@ -31,6 +31,7 @@ + **********************************************************************/ + + #include "qsharedmemory_p.h" ++#include <stdint.h> + + #if !defined(QT_QWS_NO_SHM) + +@@ -132,7 +133,7 @@ + shmId = shmget (key, shmSize, 0); + + shmBase = shmat (shmId, 0, 0); +- if ((int) shmBase == -1 || shmBase == 0) ++ if ((intptr_t) shmBase == -1 || shmBase == 0) + return FALSE; + else + return TRUE; +--- qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp~64bit 2005-12-14 15:27:14.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qapplication_qws.cpp 2005-12-14 15:28:37.000000000 +0000 +@@ -107,6 +107,7 @@ + #include <locale.h> + #include <errno.h> + #include <sys/time.h> ++#include <stdint.h> + + #if defined(Q_OS_QNX) + #include <sys/select.h> +@@ -1879,7 +1880,7 @@ + w = widgetAt(*qt_last_x, *qt_last_y, FALSE); + if ( !w ) + w = desktop(); +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + + void QApplication::restoreOverrideCursor() +@@ -1898,11 +1899,11 @@ + cursorStack = 0; + qws_overrideCursor = FALSE; + if ( w->testWState(WState_OwnCursor) ) +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)w->cursor().handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)w->cursor().handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(w, ArrowCursor); + } else { +- QPaintDevice::qwsDisplay()->selectCursor(w, (int)app_cursor->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(w, (intptr_t)app_cursor->handle()); + } + } + #endif// QT_NO_CURSOR +@@ -2130,7 +2131,7 @@ + } + if ( !qws_overrideCursor ) { + if (curs) +- QPaintDevice::qwsDisplay()->selectCursor(widget, (int)curs->handle()); ++ QPaintDevice::qwsDisplay()->selectCursor(widget, (intptr_t)curs->handle()); + else + QPaintDevice::qwsDisplay()->selectCursor(widget, ArrowCursor); + } +--- qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp~64bit 2005-12-14 15:29:17.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qfont_qws.cpp 2005-12-14 15:29:54.000000000 +0000 +@@ -49,6 +49,7 @@ + #include "qgfx_qws.h" + #include "qtextengine_p.h" + #include "qfontengine_p.h" ++#include <stdint.h> + + QFont::Script QFontPrivate::defaultScript = QFont::UnknownScript; + +@@ -133,7 +134,7 @@ + req.pointSize = req.pixelSize*10; + + if ( ! engineData ) { +- QFontCache::Key key( req, QFont::NoScript, (int)paintdevice ); ++ QFontCache::Key key( req, QFont::NoScript, (intptr_t)paintdevice ); + + // look for the requested font in the engine data cache + engineData = QFontCache::instance->findEngineData( key ); +--- qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp~64bit 2005-12-14 15:32:12.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwsregionmanager_qws.cpp 2005-12-14 15:32:52.000000000 +0000 +@@ -32,6 +32,7 @@ + #include "qwsdisplay_qws.h" + #include "qwsregionmanager_qws.h" + #include <stdlib.h> ++#include <stdint.h> + + #ifndef QT_NO_QWS_MULTIPROCESS + #include <sys/types.h> +@@ -288,7 +289,7 @@ + data = (unsigned char *)shmat( shmId, 0, 0 ); + } + +- return ( shmId != -1 && (int)data != -1 ); ++ return ( shmId != -1 && (intptr_t)data != -1 ); + #else + int dataSize = sizeof(QWSRegionHeader) // header + + sizeof(QWSRegionIndex) * QT_MAX_REGIONS // + index +--- qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp~64bit 2005-12-14 15:30:36.000000000 +0000 ++++ qt-embedded-free-3.3.5/src/kernel/qwidget_qws.cpp 2005-12-14 15:31:37.000000000 +0000 +@@ -53,6 +53,7 @@ + #include "qwsmanager_qws.h" + #include "qwsregionmanager_qws.h" + #include "qinputcontext_p.h" ++#include <stdint.h> + + void qt_insert_sip( QWidget*, int, int ); // defined in qapplication_x11.cpp + int qt_sip_count( QWidget* ); // --- "" --- +@@ -631,7 +632,7 @@ + qt_mouseGrb->releaseMouse(); + + qwsDisplay()->grabMouse(this,TRUE); +- qwsDisplay()->selectCursor(this, (unsigned int)cursor.handle()); ++ qwsDisplay()->selectCursor(this, (uintptr_t)cursor.handle()); + qt_mouseGrb = this; + qt_pressGrab = 0; + } +@@ -1845,7 +1846,7 @@ + QSize s( qt_screen->width(), qt_screen->height() ); + QPoint pos = qt_screen->mapToDevice(QPoint(*qt_last_x, *qt_last_y), s); + if ( r.contains(pos) ) +- qwsDisplay()->selectCursor((QWidget*)this, (unsigned int)cursor().handle()); ++ qwsDisplay()->selectCursor((QWidget*)this, (uintptr_t)cursor().handle()); + } + } + #endif diff --git a/packages/uicmoc/uicmoc3-native_3.3.5.bb b/packages/uicmoc/uicmoc3-native_3.3.5.bb index 6354377bcf..142b3997e0 100644 --- a/packages/uicmoc/uicmoc3-native_3.3.5.bb +++ b/packages/uicmoc/uicmoc3-native_3.3.5.bb @@ -1,11 +1,14 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x" +HOMEPAGE = "http://www.trolltech.com" SECTION = "devel" PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL QPL" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-${PV}.tar.bz2 \ - file://no-examples.patch;patch=1" + file://no-examples.patch;patch=1 \ + file://64bit-cleanup.patch;patch=1" S = "${WORKDIR}/qt-embedded-free-${PV}" diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch index 491edde370..491edde370 100644 --- a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch +++ b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch diff --git a/packages/uicmoc/uicmoc4-native_4.0.1.bb b/packages/uicmoc/uicmoc4-native_4.1.1.bb index 399215c0eb..59bdd1bc40 100644 --- a/packages/uicmoc/uicmoc4-native_4.0.1.bb +++ b/packages/uicmoc/uicmoc4-native_4.1.1.bb @@ -2,10 +2,10 @@ DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11| SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL QPL" -PR = "r1" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz" -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - file://fix-mkspecs.patch;patch=1 " S = "${WORKDIR}/qt-x11-opensource-src-${PV}" inherit native diff --git a/packages/web/.mtn2git_empty b/packages/web/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/web/.mtn2git_empty diff --git a/packages/web/web_svn.bb b/packages/web/web_svn.bb new file mode 100644 index 0000000000..1c8d447c11 --- /dev/null +++ b/packages/web/web_svn.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +SECTION = "x11" +DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js" +MAINTAINER = "Chris Lord <chris@openedhand.com>" +DESCRIPTION = "Web is a multi-platform web browsing application." + +SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" +S = "${WORKDIR}/trunk" + +inherit autotools pkgconfig + diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in deleted file mode 100644 index 69f8ac1db2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/config.in +++ /dev/null @@ -1,21 +0,0 @@ -WLAN_VERSION=0 -WLAN_PATCHLEVEL=2 -WLAN_SUBLEVEL=2 -WLAN_EXTRAVERSION= -#LINUX_SRC=$(KERNEL_SOURCE) -PCMCIA_SRC= -PREFIX= -INST_EXEDIR=/sbin -#TARGET_ROOT_ON_HOST= -#RC_DIR=/etc/init.d -PCMCIA_DIR=/etc/pcmcia -SYSV_INIT=y -INSTALL_DEPMOD= -WLAN_DEBUG=n -CROSS_COMPILE_ENABLED=n -CROSS_COMPILE= -HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y -PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch deleted file mode 100644 index a156229331..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/might-sleep.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/src/include/wlan/wlan_compat.h~might_sleep -+++ linux-wlan-ng-0.2.2/src/include/wlan/wlan_compat.h -@@ -584,7 +584,7 @@ - #endif - - #ifndef might_sleep --#define might_sleep(a) do { } while (0) -+#define might_sleep() do { } while (0) - #endif - - /* Apparently 2.4.2 ethtool is quite different, maybe newer too? */ diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch deleted file mode 100644 index a22d39dca2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/module_param_array.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c~ 2005-07-20 19:16:55.000000000 +0200 -+++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_cs.c 2005-09-01 19:02:59.099563318 +0200 -@@ -22,12 +22,16 @@ - * says. - */ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) ) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,5)) - static int numlist = 4; - module_param_array(irq_list, int, numlist, 0444); - #else - module_param_array(irq_list, int, NULL, 0444); - #endif -+#else -+MODULE_PARM( irq_list, "1-4i" ); -+#endif - module_param( irq_mask, int, 0644); - #endif - diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch deleted file mode 100644 index 4ce8173f93..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/more-compat.patch +++ /dev/null @@ -1,7 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/wlan_compat.h -+++ /dev/null diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch deleted file mode 100644 index d98116b07c..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/msleep-vs-mdelay.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.2/src/prism2/driver/prism2_usb.c~msleep-vs-mdelay -+++ linux-wlan-ng-0.2.2/src/prism2/driver/prism2_usb.c -@@ -279,7 +279,7 @@ - * is "wake up", so that's easy. - * (I'd like a better way to do this, really.) - */ -- msleep(100); -+ mdelay(100); - - /* Now delete the CTLXs, because no-one else can now. */ - list_for_each_safe(entry, temp, &cleanlist) { diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch deleted file mode 100644 index 4f59f0fa5d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/no-compat.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h~no-compat -+++ linux-wlan-ng-0.2.1pre21/src/include/wlan/wlan_compat.h -@@ -351,14 +351,14 @@ - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20)) - #ifdef _LINUX_LIST_H -- -+/* - static inline void list_move_tail(struct list_head *list, - struct list_head *head) - { - __list_del(list->prev, list->next); - list_add_tail(list, head); - } -- -+*/ - static inline void __list_splice(struct list_head *list, - struct list_head *head) - { -@@ -372,13 +372,13 @@ - last->next = at; - at->prev = last; - } -- -+/* - static inline void list_move(struct list_head *list, struct list_head *head) - { - __list_del(list->prev, list->next); - list_add(list, head); - } -- -+*/ - static inline void list_splice_init(struct list_head *list, - struct list_head *head) - { -@@ -388,7 +388,6 @@ - } - } - -- - #endif // LIST_H - #endif diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch deleted file mode 100644 index a119460a1d..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/only-the-modules.patch +++ /dev/null @@ -1,31 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- linux-wlan-ng-0.2.1-pre26/src/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/Makefile -@@ -44,10 +44,8 @@ - - include ../config.mk - --DIRS=p80211 prism2 shared wlanctl wland nwepgen \ -- mkmeta wlancfg --ALL_DIRS=mkmeta p80211 prism2 shared wlanctl wland \ -- nwepgen wlancfg -+DIRS=p80211 prism2 shared mkmeta -+ALL_DIRS=mkmeta p80211 prism2 shared - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` ---- linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile~only-the-modules.patch -+++ linux-wlan-ng-0.2.1-pre26/src/prism2/Makefile -@@ -44,7 +44,7 @@ - - include ../../config.mk - --DIRS=driver ridlist download -+DIRS=driver ridlist - - ifneq ($(wildcard *.addon),) - DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc index b27bad1a38..8be211d4c9 100644 --- a/packages/wlan-ng/wlan-ng-modules.inc +++ b/packages/wlan-ng/wlan-ng-modules.inc @@ -25,10 +25,10 @@ do_configure() { install -m 0655 ${WORKDIR}/config.in ${S}/config.in oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi +# if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then +# echo "PRISM2_PCMCIA=y" >> config.mk +# echo "WLAN_KERN_PCMCIA=y" >> config.mk +# fi echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk echo "CC=${KERNEL_CC}" >> config.mk diff --git a/packages/wlan-ng/wlan-ng-modules/config.in b/packages/wlan-ng/wlan-ng-modules/config.in index 9a34bf5f7b..a2b245e967 100644 --- a/packages/wlan-ng/wlan-ng-modules/config.in +++ b/packages/wlan-ng/wlan-ng-modules/config.in @@ -15,7 +15,7 @@ WLAN_DEBUG=n CROSS_COMPILE_ENABLED=n CROSS_COMPILE= HOST_COMPILE= -PRISM2_PLX=y -PRISM2_PCMCIA=y -PRISM2_PCI=y +PRISM2_PLX=n +PRISM2_PCMCIA=n +PRISM2_PCI=n PRISM2_USB=y diff --git a/packages/wlan-ng/wlan-ng-modules/usb-owner.patch b/packages/wlan-ng/wlan-ng-modules/usb-owner.patch index aa66ceeef9..06a305548e 100644 --- a/packages/wlan-ng/wlan-ng-modules/usb-owner.patch +++ b/packages/wlan-ng/wlan-ng-modules/usb-owner.patch @@ -1,13 +1,13 @@ Index: trunk/src/prism2/driver/prism2_usb.c =================================================================== ---- trunk.orig/src/prism2/driver/prism2_usb.c 2006-03-22 09:10:51.049384984 +0100 -+++ trunk/src/prism2/driver/prism2_usb.c 2006-03-22 09:14:39.152708008 +0100 +--- trunk.orig/src/prism2/driver/prism2_usb.c 2006-04-02 11:06:32.045530320 +0200 ++++ trunk/src/prism2/driver/prism2_usb.c 2006-04-02 11:09:31.080312896 +0200 @@ -313,7 +313,7 @@ struct usb_driver prism2_usb_driver = { --#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19)) -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)) +-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)) ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,4,19) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16))) .owner = THIS_MODULE, #endif .name = "prism2_usb", diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb deleted file mode 100644 index 177eb41fd6..0000000000 --- a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb +++ /dev/null @@ -1,65 +0,0 @@ -DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11Mbps wireless lan cards" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/modules" -DEPENDS = "virtual/kernel" -RRECOMMENDS = "wlan-ng-utils" -LICENSE = "GPL" -PR = "r1" - -# 0.2.1-pre works with the tosa internal wlan chipset, while 0.2.2 does not :/ -DEFAULT_PREFERENCE_tosa = "-1" - -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://no-compat.patch;patch=1 \ - file://msleep-vs-mdelay.patch;patch=1 \ - file://might-sleep.patch;patch=1 \ - file://only-the-modules.patch;patch=1 \ - file://module_param_array.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -inherit module - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "CC="${KERNEL_CC}" LD=${KERNEL_LD} PARALLEL_MAKE=''" - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "CC=${KERNEL_CC}" >> config.mk - echo "LD=${KERNEL_LD}" >> config.mk - echo "LDFLAGS=" >> config.mk - - # Listen closely... sssshhh... can you hear the wlan-ng build system suck? - rm -f ${KERNEL_SOURCE}/../config.mk - rm -f ${KERNEL_SOURCE}/../../config.mk - ln -sf ${S}/config.mk ${KERNEL_SOURCE}/.. - ln -sf ${S}/config.mk ${KERNEL_SOURCE}/../.. - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake -C src all -} - -do_install() { - oe_runmake install DESTDIR=${D} - - # Listen closely... sssshhh... can you hear the wlan-ng build system suck? - rm -f ${KERNEL_SOURCE}/../config.mk - rm -f ${KERNEL_SOURCE}/../../config.mk -} - -FILES_${PN} = "/lib" diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb index 01457bbae3..4fa16c4de8 100644 --- a/packages/wlan-ng/wlan-ng-modules_svn.bb +++ b/packages/wlan-ng/wlan-ng-modules_svn.bb @@ -1,6 +1,6 @@ include wlan-ng-modules.inc PR = "r0" -PV = "0.23+svn${SRCDATE}" +PV = "0.2.3+svn${SRCDATE}" SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " S = "${WORKDIR}/trunk" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb b/packages/wlan-ng/wlan-ng-utils_0.2.2.bb deleted file mode 100644 index 17cf3cab83..0000000000 --- a/packages/wlan-ng/wlan-ng-utils_0.2.2.bb +++ /dev/null @@ -1,68 +0,0 @@ -DESCRIPTION = "linux-wlan-ng userland utilities" -HOMEPAGE = "http://www.linux-wlan.org" -SECTION = "kernel/userland" -DEPENDS = "virtual/kernel" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ - file://only-the-utils.patch;patch=1 \ - file://scripts-makefile-hostcc.patch;patch=1 \ - file://pcmciasrc.patch;patch=1 \ - file://wlan-ng.modutils \ - file://wlan.agent \ - file://usbctl \ - file://resume \ - file://pre-up \ - file://post-down \ - file://config.in" -S = "${WORKDIR}/linux-wlan-ng-${PV}" - -# yeah, it's kind of backwards, but otherwise the config step will fail -inherit module - -do_configure() { - install -m 0655 ${WORKDIR}/config.in ${S}/config.in - oe_runmake LINUX_SRC=${KERNEL_SOURCE} auto_config - - if grep CONFIG_PCMCIA=[ym] ${STAGING_KERNEL_DIR}/kernel-config; then - echo "PRISM2_PCMCIA=y" >> config.mk - echo "WLAN_KERN_PCMCIA=y" >> config.mk - fi - echo "TARGET_ROOT_ON_HOST=${D}/" >> config.mk - echo "FIRMWARE_DIR=/etc/wlan" >> config.mk - echo "TARGET_MODDIR=${D}/lib/modules/${KERNEL_VERSION}/wlan-ng" >> config.mk - echo "TARGET_INST_EXEDIR=${D}/sbin" >> config.mk - echo "RC_DIR=${sysconfdir}/" >> config.mk - echo "CC=${CC}" >> config.mk - echo "LD=${LD}" >> config.mk - - # Shut up, you broken buildsystem - install -m 0655 config.mk src/prism2/config.mk - install -d src/prism2/driver/include - ln -sf ${S}/src/include/wlan src/prism2/driver/include/wlan - ln -sf ${S}/src/prism2/include/prism2 src/prism2/driver/include/prism2 -} - -do_compile() { - oe_runmake all -} - -do_install() { - oe_runmake install - mkdir -p ${D}${sysconfdir}/modutils/ - mkdir -p ${D}${sysconfdir}/hotplug/ - mkdir -p ${D}${base_sbindir}/ - install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf - install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent - install -d ${D}${sysconfdir}/network/if-pre-up.d - install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng - install -d ${D}${sysconfdir}/network/if-post-down.d - install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng - install -d ${D}${sysconfdir}/apm/resume.d - install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng - install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl - install -d ${D}${mandir} -} - -FILES_${PN} = "/etc /sbin" diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb index b57a0dffd5..a5762e32aa 100644 --- a/packages/wlan-ng/wlan-ng-utils_svn.bb +++ b/packages/wlan-ng/wlan-ng-utils_svn.bb @@ -4,7 +4,7 @@ SECTION = "kernel/userland" DEPENDS = "virtual/kernel" LICENSE = "GPL" PR = "r0" -PV = "0.23+svn${SRCDATE}" +PV = "0.2.3+svn${SRCDATE}" SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ file://only-the-utils.patch;patch=1 \ diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch index f4ef7c5aee..e2d56874c9 100644 --- a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch +++ b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch @@ -25,8 +25,8 @@ + + if ! test -e "/tmp/gpe-panel.session-$panel_user" + then -+ cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" -+ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr ++ test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" ++ test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + else + cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + rm "/tmp/gpe-panel.session-$panel_user" diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 4f20dc23c5..52a7b353d3 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -3,7 +3,7 @@ SECTION = "base" MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>" DESCRIPTION = "Daemon to handle device specifc features." PV = "0.0+svn${SRCDATE}" -PR = "r1" +PR = "r2" DEPENDS = "tslib" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ diff --git a/packages/zd1211/zd1211-20050822/access_ok.patch b/packages/zd1211/zd1211-20050822/access_ok.patch deleted file mode 100644 index 95fbb592b0..0000000000 --- a/packages/zd1211/zd1211-20050822/access_ok.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zd1211/src/zd1205.c.orig 2005-10-06 03:30:27.200837520 +0200 -+++ zd1211/src/zd1205.c 2005-10-06 03:29:37.176442384 +0200 -@@ -4434,7 +4434,7 @@ - { SIOCIWFIRSTPRIV + 0xD, 0, 0, "save_conf" }, - }; - -- err = verify_area(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab)); -+ err = access_ok(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab)); - if (err) - break; - diff --git a/packages/zd1211/zd1211-20050822/iwconfig-rate.patch b/packages/zd1211/zd1211-20050822/iwconfig-rate.patch deleted file mode 100644 index c1cb634b1a..0000000000 --- a/packages/zd1211/zd1211-20050822/iwconfig-rate.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- zd1211/src/zd1205.c 7 Jun 2005 21:45:21 -0000 1.17 -+++ zd1211/src/zd1205.c 24 Aug 2005 11:39:29 -0000 -@@ -3599,9 +3599,59 @@ - - } - -+static const unsigned long zd1205_rates[] = { -+ /* RATE_1M, 0 */ -+ 1000000, -+ /* RATE_2M, 1 */ -+ 2000000, -+ /* RATE_5M, 2 */ -+ 5500000, -+ /* RATE_11M, 3 */ -+ 11000000, -+ /* RATE_6M, 4 */ -+ 600000, -+ /* RATE_9M, 5 */ -+ 9000000, -+ /* RATE_12M, 6 */ -+ 12000000, -+ /* RATE_18M, 7 */ -+ 18000000, -+ /* RATE_24M, 8 */ -+ 24000000, -+ /* RATE_36M, 9 */ -+ 36000000, -+ /* RATE_48M, 10 */ -+ 48000000, -+ /* RATE_54M, 11 */ -+ 54000000, -+}; -+ -+#define ZD1205_NRATES ((sizeof(zd1205_rates))/(sizeof(unsigned long))) -+ - static int zd1205_ioctl_setrate(struct net_device *dev, struct iw_param *frq) - { -- return 0; -+ struct zd1205_private *macp = dev->priv; -+ U8 rate; -+ if(frq->value < 0) { -+ /* Auto */ -+ macp->bFixedRate = 0; -+ macp->AdapterMaxRate = RATE_54M; -+ return 0; -+ } -+ for(rate = 0; rate < ZD1205_NRATES; rate++) -+ if(zd1205_rates[rate] == frq->value) { -+ zd1205_lock(macp); -+ macp->bFixedRate = frq->fixed; -+ if(frq->fixed) -+ macp->cardSetting.FixedRate = rate; -+ else { -+ macp->AdapterMaxRate = rate; -+ macp->cardSetting.TxRate = rate; -+ } -+ zd1205_unlock(macp); -+ return 0; -+ } -+ return -EINVAL; - } - - static int zd1205_ioctl_getrate(struct net_device *dev, struct iw_param *frq) -@@ -3612,60 +3662,9 @@ - frq->disabled = 0; - frq->value = 0; - -- switch(macp->cardSetting.CurrTxRate) -- { -- case RATE_1M: -- frq->value = 1000000; -- break; -- -- case RATE_2M: -- frq->value = 2000000; -- break; -- -- case RATE_5M: -- frq->value = 5500000; -- break; -- -- case RATE_11M: -- frq->value = 11000000; -- break; -- -- case RATE_6M: -- frq->value = 600000; -- break; -- -- case RATE_9M: -- frq->value = 9000000; -- break; -- -- case RATE_12M: -- frq->value = 12000000; -- break; -- -- case RATE_18M: -- frq->value = 18000000; -- break; -- -- case RATE_24M: -- frq->value = 24000000; -- break; -- -- case RATE_36M: -- frq->value = 36000000; -- break; -- -- case RATE_48M: -- frq->value = 48000000; -- break; -- -- case RATE_54M: -- frq->value = 54000000; -- break; -- -- default: -+ if(macp->cardSetting.CurrTxRate > ZD1205_NRATES) - return -EINVAL; -- } -- -+ frq->value = zd1205_rates[macp->cardSetting.CurrTxRate]; - return 0; - } - diff --git a/packages/zd1211/zd1211-20050822/makefile.patch b/packages/zd1211/zd1211-20050822/makefile.patch deleted file mode 100644 index 91f3192d4d..0000000000 --- a/packages/zd1211/zd1211-20050822/makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zd1211/Makefile.orig 2005-04-15 12:34:32.000000000 -1000 -+++ zd1211/Makefile 2005-09-02 02:40:41.857339000 -1000 -@@ -90,7 +90,7 @@ - ifeq ($(KVER), 2.6) # we're on a 2.6.x kernel - $(MAKE) V=0 -C $(KSRC) SUBDIRS=$(SUBDIRS) modules - else -- $(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) depend modules -+ $(MAKE) -C $(KSRC) SUBDIRS=$(SUBDIRS) modules - endif - - $(SRC_DIR)/zddevlist.h: $(SRC_DIR)/zddevlist diff --git a/packages/zd1211/zd1211-20050822/urb-async.patch b/packages/zd1211/zd1211-20050822/urb-async.patch deleted file mode 100644 index cd1149e766..0000000000 --- a/packages/zd1211/zd1211-20050822/urb-async.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- zd1211/src/zd1211.c.orig 2005-03-27 22:47:35.000000000 +0200 -+++ zd1211/src/zd1211.c 2005-10-06 02:53:23.380909536 +0200 -@@ -313,7 +313,6 @@ - } else { - usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pBuffer, DataLen,zd1211_reg_cb, macp); - } -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - - if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed reg_urb\n"); -@@ -362,7 +361,6 @@ - } else { - usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp); - } -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - if ((ret = SUBMIT_URB(macp->reg_urb, memflags))) { - printk(KERN_ERR "zd1211: failed reg_urb\n"); - zd1211_DumpErrorCode(macp, ret); -@@ -426,7 +424,6 @@ - } else { - usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp); - } -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - - if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed reg_urb\n"); -@@ -569,7 +566,6 @@ - usb_fill_bulk_urb(macp->reg_urb, macp->usb,usb_sndbulkpipe(macp->usb, EP_REG_OUT),pRegBuffer, bufSize,zd1211_reg_cb, macp); - } - -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed reg_urb\n"); - zd1211_DumpErrorCode(macp, ret); -@@ -1240,7 +1236,6 @@ - pRegBuffer, bufSize, - zd1211_reg_cb, macp); - -- macp->reg_urb->transfer_flags |= URB_ASYNC_UNLINK; - - if ((ret = SUBMIT_URB(macp->reg_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed rf reg_urb\n"); -@@ -1311,7 +1306,6 @@ - return; - - printk("%s: Tx timed out.\n", dev->name); -- macp->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; - USB_URB(macp->tx_urb); - } - -@@ -1384,7 +1378,6 @@ - zd1211_intr_cb, macp); - #endif - -- macp->intr_urb->transfer_flags |= URB_ASYNC_UNLINK; - - if ((res = SUBMIT_URB(macp->intr_urb, GFP_KERNEL))) { - printk(KERN_ERR "zd1211: failed intr_urb\n"); -@@ -1822,7 +1815,6 @@ - macp->IntEPBuffer, MAX_EPINT_BUFFER, - zd1211_intr_cb, macp); - -- macp->intr_urb->transfer_flags |= URB_ASYNC_UNLINK; - status = SUBMIT_URB(macp->intr_urb, GFP_ATOMIC); - - if (status) -@@ -1916,7 +1908,6 @@ - usb_rcvbulkpipe(macp->usb, EP_DATA_IN), - rx_buff, bufLen, zd1211_rx_comp_cb, macp); - -- macp->rx_urb->transfer_flags |= URB_ASYNC_UNLINK; - if ((res = SUBMIT_URB(macp->rx_urb, GFP_ATOMIC))) { - printk(KERN_ERR "zd1211: failed rx_urb\n"); - zd1211_DumpErrorCode(macp, res); -@@ -2024,7 +2015,6 @@ - macp->tx_buff, TotalLength,zd1211_tx_comp_cb, macp); - - macp->tx_urb->transfer_buffer_length = TotalLength; -- macp->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; - res = SUBMIT_URB(macp->tx_urb, GFP_ATOMIC); - if (res) { - printk("error in tx submit urb: %d", res); diff --git a/packages/zd1211/zd1211-r52/firmware.patch b/packages/zd1211/zd1211-r52/firmware.patch deleted file mode 100644 index b7cd575c24..0000000000 --- a/packages/zd1211/zd1211-r52/firmware.patch +++ /dev/null @@ -1,327 +0,0 @@ -Index: branches/vendor/src/WS11UPhR.h -=================================================================== ---- zd1211-driver-r52/src/WS11UPhR.h (revision 8) -+++ zd1211-driver-r52/Makefile/src/WS11UPhR.h (revision 53) -@@ -166,164 +166,163 @@ - ={ - 0x08, 0x91, 0xFF, 0xED, 0x09, 0x93, 0x1E, 0xEE, 0xD1, 0x94, 0x11, 0xEE, 0x88, 0xD4, 0xD1, 0x96, 0xD1, 0x98, 0x5C, 0x99, 0x5C, 0x99, 0x4C, 0x99, 0x04, 0x9D, 0xD1, 0x98, 0xD1, 0x9A, 0x03, 0xEE, -- 0xF4, 0x94, 0xD3, 0xD4, 0x41, 0x2A, 0x40, 0x4A, 0x45, 0xBE, 0x88, 0x92, 0x41, 0x24, 0x40, 0x44, 0x53, 0xBE, 0x40, 0xF0, 0x8E, 0xEE, 0x41, 0xEE, 0x98, 0x9A, 0xEB, 0xF7, 0x02, 0x00, 0x1F, 0xEC, -- 0x00, 0x00, 0xB2, 0xF8, 0x4D, 0x00, 0xA1, 0xEC, 0x00, 0x00, 0xBD, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xD8, 0xA0, 0x90, 0x98, 0x9A, 0x98, 0x9A, 0xA0, 0xD8, -- 0x40, 0xF0, 0xCC, 0xF0, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0x5F, 0xEF, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0x09, 0xF1, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, -- 0x0E, 0xF7, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0x0F, 0xF6, 0xA0, 0x90, 0x98, 0x9A, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0xAE, 0xF7, 0xA0, 0x90, 0x98, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -- 0x01, 0x00, 0x0D, 0x03, 0x03, 0x00, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x42, 0x02, 0xC1, 0x92, 0x03, 0x96, 0x1B, 0xD7, 0x2A, 0x86, 0x1A, 0xD5, 0x2B, 0x86, 0x09, 0xA3, 0x00, 0x80, 0x19, 0xD3, -- 0x2C, 0x86, 0x00, 0xEE, 0x0A, 0x65, 0xC0, 0x7A, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFE, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, -- 0x05, 0x00, 0x05, 0x94, 0xC5, 0xD4, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x01, 0xD4, 0x42, 0x02, 0xC1, 0x96, 0x0A, 0x65, 0xC0, 0x7A, 0x02, 0x99, 0xC4, 0x92, 0x41, 0xA2, 0xC4, 0xD2, 0xC5, 0x98, -- 0x1C, 0xD9, 0x2A, 0x86, 0x01, 0x98, 0x1C, 0xD9, 0x2B, 0x86, 0x1B, 0xD7, 0x2C, 0x86, 0x00, 0xEE, 0x09, 0xB3, 0xFE, 0xFF, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, -- 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xE0, 0xEE, 0x11, 0x93, 0xEF, 0xF7, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xA9, 0xEE, 0x40, 0xF1, 0x40, 0x92, 0x19, 0xD3, 0xEF, 0xF7, 0xC5, 0x92, 0x41, 0x92, -- 0x19, 0xD3, 0x00, 0x83, 0x40, 0x92, 0x19, 0xD3, 0x00, 0x83, 0x0F, 0x9F, 0x95, 0xF8, 0x0F, 0x9F, 0x94, 0xEE, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x94, 0xEE, 0x40, 0x92, 0x19, 0xD3, 0xEF, 0xF7, -- 0x09, 0x93, 0xDE, 0xF7, 0x19, 0xD3, 0x91, 0xEC, 0x40, 0xF0, 0x72, 0xF2, 0x09, 0x63, 0x00, 0x80, 0x19, 0xD3, 0xF2, 0xBD, 0x0F, 0x9F, 0x94, 0xEE, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -- 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0x19, 0xD3, 0x12, 0x95, 0x19, 0xD3, 0x10, 0x95, 0x19, 0xD3, 0x02, 0x80, 0x19, 0xD3, 0x03, 0x82, 0x09, 0x93, 0xDE, 0xF7, 0x19, 0xD3, 0x91, 0xEC, 0x40, 0xF0, -- 0x72, 0xF2, 0x40, 0xF0, 0xFB, 0xF3, 0x11, 0x93, 0x04, 0xEC, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xDE, 0xEE, 0x40, 0x92, 0x19, 0xD3, 0x04, 0xEC, 0x40, 0xF0, 0x4B, 0xF2, 0x88, 0x98, 0x90, 0x9A, -- 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x44, 0x96, 0x09, 0xB3, 0xFF, 0xFD, 0x19, 0xD3, 0x44, 0x96, 0x40, 0xF0, 0xA7, 0xF7, 0x6E, 0x92, 0x19, 0xD3, 0x05, 0x84, 0x40, 0xF0, 0xBF, 0xEE, -- 0x4B, 0x62, 0x0A, 0x95, 0x2E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x2B, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x00, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x2F, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x34, 0xEE, 0xD1, 0xD4, -- 0x0B, 0x97, 0x39, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x3E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x43, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x2E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x48, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, -- 0x49, 0xEE, 0xC1, 0xD4, 0x0A, 0x65, 0x00, 0x44, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x43, 0xF1, 0x09, 0x93, 0x01, 0x3F, 0x19, 0xD3, 0xC0, 0x85, 0x11, 0x93, 0x44, 0x96, 0x09, 0xB3, -- 0xFF, 0xFC, 0x19, 0xD3, 0x44, 0x96, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x03, 0x00, 0x03, 0x96, 0x41, 0x02, 0x03, 0x99, 0xC4, 0x94, 0x42, 0x04, 0xC1, 0x04, -- 0xC2, 0x94, 0xC3, 0xD4, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0x13, 0x97, 0x95, 0xEC, 0x1B, 0xD7, 0x02, 0x80, 0x11, 0x93, 0x99, 0xEC, -- 0x19, 0xD3, 0x7C, 0x96, 0x0B, 0x97, 0xA0, 0x00, 0x1B, 0xD7, 0x6E, 0xEC, 0x0A, 0x65, 0x0E, 0x42, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFF, 0xBF, 0x11, 0xA3, 0x9A, 0xEC, 0xC2, 0xD2, 0x0A, 0x65, -- 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -- 0x47, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x14, 0x99, 0x03, 0x80, 0x0C, 0xB3, 0x00, 0x10, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xAF, 0xF0, 0x11, 0x93, 0x30, 0x9B, 0x41, 0xB2, 0x40, 0x42, 0x02, 0x4E, -- 0x0F, 0x9F, 0x78, 0xEF, 0x09, 0x93, 0x0C, 0x02, 0x19, 0xD3, 0x02, 0x80, 0x0F, 0x9F, 0xC9, 0xF0, 0x11, 0x93, 0x9F, 0xEC, 0x41, 0x02, 0x19, 0xD3, 0x9F, 0xEC, 0x11, 0x93, 0xED, 0xF7, 0x40, 0x42, -- 0x02, 0x4E, 0x0F, 0x9F, 0x8C, 0xEF, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x00, 0x04, 0xC2, 0xD2, 0x0F, 0x9F, 0xC9, 0xF0, 0x11, 0x93, 0x94, 0xEC, 0x02, 0xD2, 0x40, 0x42, -- 0x02, 0x5E, 0x0F, 0x9F, 0xD8, 0xEF, 0x41, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0x19, 0xD3, 0x9F, 0xEC, 0x12, 0x95, 0x02, 0x80, 0x1A, 0xD5, 0x95, 0xEC, 0x13, 0x97, 0x7C, 0x96, 0x1B, 0xD7, 0x99, 0xEC, -- 0x0A, 0x65, 0x0E, 0x42, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0x00, 0x40, 0x19, 0xD3, 0x9A, 0xEC, 0x09, 0x63, 0x00, 0x40, 0xC2, 0xD2, 0x02, 0x94, 0x1A, 0xD5, 0x7C, 0x96, 0x0C, 0xB3, 0x00, 0x08, -- 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xB8, 0xEF, 0x0C, 0xB3, 0xFF, 0x07, 0x0F, 0x9F, 0xBC, 0xEF, 0x11, 0x93, 0x06, 0x80, 0x09, 0xB3, 0xFF, 0x07, 0x09, 0x03, 0x00, 0xA0, 0x19, 0xD3, 0x97, 0xEC, -- 0x40, 0x98, 0x0B, 0x97, 0x9C, 0xEC, 0x04, 0x95, 0x03, 0x05, 0x14, 0x03, 0x97, 0xEC, 0x46, 0x02, 0xC1, 0x92, 0xC2, 0xD2, 0x41, 0x08, 0x42, 0x48, 0x02, 0x9E, 0x0F, 0x9F, 0xC3, 0xEF, 0x11, 0x93, -- 0x97, 0xEC, 0xC1, 0x92, 0xC5, 0xD2, 0x5F, 0xB2, 0x19, 0xD3, 0x9B, 0xEC, 0x0F, 0x9F, 0xDB, 0xEF, 0x13, 0x97, 0x98, 0xEC, 0xC5, 0xD6, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x08, 0x40, 0x42, -- 0x02, 0x4E, 0x0F, 0x9F, 0xF1, 0xEF, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xF3, 0xF7, 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x00, 0x10, 0x19, 0xD3, 0xF2, 0xF7, 0x40, 0x98, 0x1C, 0xD9, -- 0x9B, 0xEC, 0x12, 0x95, 0x9B, 0xEC, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, 0x9E, 0xF0, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x0F, 0xF0, 0x0A, 0xB3, 0x07, 0x00, 0x09, 0x05, -- 0xA9, 0xEC, 0xC2, 0x94, 0x01, 0xD4, 0x09, 0x03, 0xA1, 0xEC, 0xC1, 0x92, 0x19, 0xD3, 0x9B, 0xEC, 0xC5, 0x94, 0x0A, 0xB5, 0x00, 0xFF, 0x01, 0xA5, 0xC5, 0xD4, 0x0F, 0x9F, 0x1B, 0xF0, 0x0A, 0x05, -- 0xFF, 0xFF, 0x0A, 0x03, 0xB1, 0xEC, 0xC1, 0x92, 0x01, 0xD2, 0x1A, 0xD5, 0x9B, 0xEC, 0xC5, 0x96, 0x0B, 0x07, 0xFF, 0xFF, 0xC5, 0xD6, 0x11, 0x93, 0x97, 0xEC, 0xC5, 0x98, 0xC1, 0xD8, 0x11, 0x93, -- 0x97, 0xEC, 0x09, 0x05, 0x0B, 0x00, 0x03, 0xD4, 0xC2, 0x96, 0x06, 0xD6, 0x7B, 0x95, 0x7A, 0x95, 0x4C, 0x02, 0xC1, 0x92, 0x59, 0x93, 0x59, 0x93, 0x01, 0xA5, 0x01, 0x98, 0x0C, 0xF5, 0x7B, 0x93, -- 0x09, 0x09, 0x01, 0x00, 0x06, 0x92, 0x09, 0xB3, 0xFF, 0x00, 0x04, 0xD2, 0x5C, 0x93, 0x59, 0x93, 0x04, 0x94, 0x01, 0xA5, 0x03, 0x96, 0xC3, 0xD4, 0x11, 0x93, 0x97, 0xEC, 0x4C, 0x02, 0x05, 0xD2, -- 0xC1, 0x92, 0x09, 0xB3, 0x00, 0xFF, 0x7C, 0x95, 0x7A, 0x95, 0x02, 0xA3, 0x05, 0x98, 0xC4, 0xD2, 0x12, 0x95, 0x97, 0xEC, 0x45, 0x04, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x00, 0x01, 0xC2, 0xD2, -- 0x12, 0x95, 0x97, 0xEC, 0x4D, 0x04, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xFF, 0x00, 0xC2, 0xD2, 0x12, 0x95, 0x97, 0xEC, 0x4E, 0x04, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0x00, 0xFF, 0xC2, 0xD2, -- 0x12, 0x95, 0x9B, 0xEC, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x73, 0xF0, 0x12, 0x95, 0x97, 0xEC, 0x4A, 0x04, 0x02, 0x99, 0xC4, 0x92, 0x01, 0x98, 0x0C, 0xF3, 0x7B, 0x93, -- 0x41, 0x02, 0x0F, 0x9F, 0x94, 0xF0, 0x43, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x95, 0xF0, 0x11, 0x93, 0x97, 0xEC, 0x42, 0x02, 0x0A, 0x05, 0xFF, 0xFF, 0xC1, 0xD4, 0x11, 0x93, 0x97, 0xEC, 0x4A, 0x02, -- 0x12, 0x95, 0x60, 0x96, 0xC1, 0xD4, 0x12, 0x95, 0x97, 0xEC, 0x4B, 0x04, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0x1F, 0xFF, 0xC2, 0xD2, 0x12, 0x95, 0x97, 0xEC, 0x4B, 0x04, 0x11, 0x93, 0x62, 0x96, -- 0x41, 0x93, 0x59, 0x93, 0x02, 0x99, 0xC4, 0xA2, 0xC2, 0xD2, 0xC5, 0x92, 0x19, 0xD3, 0x98, 0xEC, 0x0A, 0x95, 0x0C, 0x02, 0x1A, 0xD5, 0x02, 0x80, 0x0F, 0x9F, 0xC9, 0xF0, 0x09, 0x63, 0xFE, 0x7F, -- 0x01, 0x97, 0xC3, 0x94, 0x0A, 0xA5, 0x00, 0x04, 0xC1, 0xD4, 0x11, 0x93, 0x9F, 0xEC, 0x09, 0xA3, 0x00, 0x01, 0x19, 0xD3, 0x9F, 0xEC, 0x40, 0xF0, 0x34, 0xEF, 0x0F, 0x9F, 0xC9, 0xF0, 0x11, 0x93, -- 0x94, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xBE, 0xF0, 0x40, 0xF0, 0x34, 0xEF, 0x11, 0x93, 0x95, 0xEC, 0x44, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC9, 0xF0, 0x48, 0x98, 0x1C, 0xD9, -- 0x02, 0x80, 0x11, 0x93, 0x91, 0xEC, 0x41, 0x22, 0x0A, 0x95, 0xC9, 0xF0, 0x88, 0xD4, 0x88, 0xDC, 0x91, 0x9A, 0x47, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, -- 0x04, 0x82, 0x48, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xE0, 0xF0, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFF, 0xFE, 0xC2, 0xD2, 0x41, 0x92, 0x19, 0xD3, 0xBF, 0xEC, -- 0x11, 0x93, 0x04, 0x82, 0x43, 0xB2, 0x12, 0x95, 0x03, 0x82, 0x02, 0xB3, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x07, 0xF1, 0x0A, 0xB3, 0x00, 0xFF, 0x48, 0xA2, 0x19, 0xD3, 0x03, 0x82, 0x40, 0xF0, -- 0x08, 0xF4, 0x11, 0x93, 0xBF, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x07, 0xF1, 0x11, 0x93, 0x07, 0x82, 0x11, 0x43, 0x03, 0xEC, 0x02, 0x0E, 0x0F, 0x9F, 0x07, 0xF1, 0x11, 0x93, 0x03, 0x82, -- 0x09, 0xA3, 0x00, 0x01, 0x19, 0xD3, 0x03, 0x82, 0x40, 0x96, 0x1B, 0xD7, 0xBF, 0xEC, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x20, 0xBC, 0xC8, 0xD2, 0x40, 0xF0, -- 0x5B, 0xF1, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x05, 0x00, 0x05, 0x94, 0x41, 0x02, 0xC1, 0x92, 0x01, 0x97, 0xC3, 0x96, 0xC2, 0xD6, -- 0x0A, 0x45, 0x00, 0x95, 0x02, 0x5E, 0x0F, 0x9F, 0x58, 0xF1, 0xC1, 0x92, 0x41, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x58, 0xF1, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, -- 0x58, 0xF1, 0x41, 0x98, 0x1C, 0xD9, 0xC0, 0xEC, 0x12, 0x95, 0x02, 0x80, 0x01, 0xD4, 0x40, 0xF0, 0x69, 0xF2, 0x0B, 0x67, 0xFD, 0x7D, 0x03, 0x99, 0xC4, 0x92, 0x0C, 0x99, 0x96, 0x03, 0x1C, 0xD9, -- 0x06, 0x82, 0x41, 0x98, 0x1C, 0xD9, 0x02, 0x82, 0x42, 0x98, 0x1C, 0xD9, 0x05, 0x82, 0x0C, 0x69, 0x80, 0x7F, 0x1C, 0xD9, 0x00, 0xB0, 0x09, 0xA3, 0x00, 0x01, 0xC3, 0xD2, 0x01, 0x94, 0x0A, 0xB3, -- 0x04, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x56, 0xF1, 0x42, 0xA4, 0x1A, 0xD5, 0x02, 0x80, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x05, 0x92, -- 0xC5, 0xD2, 0x60, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x68, 0xF1, 0x40, 0xF0, 0x4C, 0xF7, 0xC5, 0x94, 0x0A, 0xB3, 0x10, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x71, 0xF1, 0x40, 0xF0, -- 0x3A, 0xF6, 0xC5, 0x96, 0x0B, 0xB3, 0x40, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x7A, 0xF1, 0x40, 0xF0, 0x74, 0xF5, 0xC5, 0x94, 0x0A, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, -- 0xDB, 0xF1, 0x13, 0x97, 0x21, 0xBC, 0x01, 0xD6, 0x0B, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x8C, 0xF1, 0x40, 0xF0, 0x62, 0xFB, 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, 0x40, 0x42, -- 0x02, 0x4E, 0x0F, 0x9F, 0x95, 0xF1, 0x40, 0xF0, 0x6C, 0xFB, 0x01, 0x96, 0x0B, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xB5, 0xF1, 0x40, 0xF0, 0xB0, 0xFA, 0x41, 0x92, 0x19, 0xD3, -- 0xEC, 0xF7, 0x11, 0x93, 0x03, 0xEC, 0x09, 0x43, 0x40, 0x00, 0x02, 0x5E, 0x0F, 0x9F, 0xAB, 0xF1, 0x40, 0x94, 0x1A, 0xD5, 0xEC, 0xF7, 0x11, 0x93, 0x00, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, -- 0xBE, 0xF1, 0x40, 0xF0, 0x4B, 0xF2, 0x0F, 0x9F, 0xBE, 0xF1, 0x01, 0x96, 0x0B, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xBE, 0xF1, 0x40, 0xF0, 0x7C, 0xFB, 0x01, 0x94, 0x0A, 0xB3, -- 0x10, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC7, 0xF1, 0x40, 0xF0, 0x87, 0xFB, 0x11, 0x93, 0x10, 0xEC, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xD2, 0xF1, 0x44, 0x96, 0x1B, 0xD7, 0x0B, 0xBC, -- 0x0F, 0x9F, 0xD8, 0xF1, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xD8, 0xF1, 0x19, 0xD3, 0x0B, 0xBC, 0x40, 0x92, 0x19, 0xD3, 0x10, 0xEC, 0xC5, 0x94, 0x0A, 0xB3, 0x80, 0x00, 0x40, 0x42, 0x02, 0x4E, -- 0x0F, 0x9F, 0x25, 0xF2, 0x13, 0x97, 0x28, 0xBC, 0x01, 0xD6, 0x0B, 0xB3, 0x40, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xED, 0xF1, 0x40, 0xF0, 0x2F, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x02, 0x00, -- 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x00, 0xF2, 0x40, 0xF0, 0xBF, 0xEE, 0x40, 0xF0, 0x8F, 0xFB, 0x40, 0xF0, 0x2E, 0xF2, 0x40, 0x96, 0x1B, 0xD7, 0x00, 0xEC, 0x41, 0x92, 0x19, 0xD3, 0xEF, 0xF7, -- 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x1C, 0xF2, 0x40, 0xF0, 0x9E, 0xFB, 0x09, 0x63, 0x00, 0x44, 0x01, 0x97, 0xC3, 0x94, 0x48, 0xA4, 0xC1, 0xD4, 0x00, 0xEE, -- 0x40, 0x92, 0x19, 0xD3, 0x12, 0x95, 0x19, 0xD3, 0x10, 0x95, 0x19, 0xD3, 0x02, 0x80, 0x19, 0xD3, 0x03, 0x82, 0x41, 0x92, 0x19, 0xD3, 0xEF, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, -- 0x02, 0x4E, 0x0F, 0x9F, 0x25, 0xF2, 0x40, 0xF0, 0xAE, 0xFB, 0x0A, 0x65, 0x00, 0x44, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -- 0x01, 0x00, 0x09, 0x63, 0x00, 0x40, 0x19, 0xD3, 0xF2, 0xBD, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, -- 0x40, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0x00, 0x80, -- 0x19, 0xD3, 0xF2, 0xBD, 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, -- 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x00, 0x01, 0x19, 0xD3, 0x02, 0x80, -- 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x00, 0x09, 0x19, 0xD3, 0x02, 0x80, 0x40, 0xF0, 0x69, 0xF2, 0x40, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0xC8, 0xD2, 0x09, 0x93, -- 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, 0x25, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0x52, 0xF5, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x98, 0xF2, -- 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0xA5, 0xF2, 0x40, 0xF0, 0xA7, 0xF2, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xA5, 0xF2, 0xC8, 0xD2, 0x09, 0x93, -- 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, 0x25, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xF1, 0xBD, 0x19, 0xD3, 0xB6, 0xEC, 0x11, 0x93, 0xB4, 0xEC, -- 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xBF, 0xF2, 0x09, 0x63, 0x00, 0x80, 0x01, 0x97, 0xC3, 0x94, 0x0A, 0x07, 0x07, 0x00, 0xC1, 0xD6, 0x0A, 0x05, 0x00, 0xA0, 0x1A, 0xD5, 0x96, 0xEC, 0x11, 0x93, -- 0xB6, 0xEC, 0x19, 0xD3, 0x01, 0x80, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x41, 0xA2, 0xC2, 0xD2, 0x40, 0x92, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, -- 0x13, 0x97, 0xB4, 0xEC, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x49, 0xF3, 0x12, 0x95, 0x96, 0xEC, 0x0A, 0x03, 0x07, 0x00, 0xC1, 0x92, 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0x09, 0x05, 0x01, 0x00, -- 0x48, 0x02, 0xC1, 0x92, 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0x4E, 0x02, 0xC1, 0x94, 0xC5, 0xD6, 0xC5, 0x92, 0x11, 0x07, 0x96, 0xEC, 0x0B, 0x03, 0x0F, 0x00, 0xC1, 0x98, 0x46, 0x06, 0x7A, 0x93, -- 0x79, 0x93, 0x5C, 0x95, 0x5A, 0x95, 0x02, 0xA3, 0xC3, 0xD2, 0x04, 0x95, 0xC5, 0x96, 0x41, 0x06, 0xC5, 0xD6, 0x42, 0x46, 0x02, 0x9E, 0x0F, 0x9F, 0xE8, 0xF2, 0x11, 0x93, 0x96, 0xEC, 0x09, 0x05, -- 0x05, 0x00, 0x41, 0x02, 0xC1, 0x92, 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0xC1, 0x92, 0x09, 0xB5, 0x1F, 0x00, 0x43, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x15, 0xF3, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, -- 0x16, 0xF3, 0x0A, 0x05, 0xFF, 0xFF, 0x0F, 0x9F, 0x16, 0xF3, 0x43, 0x94, 0x11, 0x93, 0x96, 0xEC, 0x42, 0x02, 0xC1, 0xD4, 0x13, 0x97, 0x96, 0xEC, 0x03, 0x93, 0xD1, 0x94, 0x7A, 0x95, 0x7A, 0x95, -- 0xC1, 0x92, 0x59, 0x93, 0x59, 0x93, 0x01, 0x05, 0x49, 0x06, 0xC3, 0x92, 0x7F, 0xB2, 0x01, 0x05, 0x1A, 0xD5, 0xB4, 0xEC, 0x0A, 0x03, 0xF2, 0xFF, 0x19, 0xD3, 0x92, 0xEC, 0x0A, 0x45, 0xD0, 0x07, -- 0x02, 0x9E, 0x0F, 0x9F, 0x49, 0xF3, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xF3, 0xF7, 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x40, 0x00, 0x19, 0xD3, 0xF2, 0xF7, 0x09, 0x63, 0x00, 0x80, -- 0x01, 0x95, 0xC2, 0x94, 0x1A, 0xD5, 0xB5, 0xEC, 0x40, 0x96, 0x1B, 0xD7, 0xB4, 0xEC, 0x0F, 0x9F, 0xAF, 0xF3, 0x11, 0x93, 0x92, 0xEC, 0x12, 0x95, 0xB6, 0xEC, 0x02, 0x43, 0x02, 0x8E, 0x0F, 0x9F, -- 0x97, 0xF3, 0x02, 0x0E, 0x0F, 0x9F, 0x6A, 0xF3, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xF3, 0xF7, 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x80, 0x00, 0x19, 0xD3, 0xF2, 0xF7, 0x09, 0x63, -- 0x00, 0x80, 0x01, 0x95, 0xC2, 0x94, 0x1A, 0xD5, 0xB5, 0xEC, 0x40, 0x96, 0x1B, 0xD7, 0xB4, 0xEC, 0x0F, 0x9F, 0xAF, 0xF3, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x40, 0x40, 0x42, 0x02, 0x4E, -- 0x0F, 0x9F, 0x7C, 0xF3, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x7C, 0xF3, 0x40, 0xF0, 0xC3, 0xF3, 0x0F, 0x9F, 0xB1, 0xF3, 0x41, 0x92, 0xC8, 0xD2, 0x0A, 0x95, 0x91, 0xEC, -- 0xC8, 0xD4, 0x40, 0xF0, 0x25, 0xEF, 0x42, 0x00, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x8F, 0xF3, 0x42, 0x96, 0x1B, 0xD7, 0xC0, 0xEC, 0x0F, 0x9F, 0xB1, 0xF3, 0x0A, 0x65, -- 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x42, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0xB1, 0xF3, 0x12, 0x45, 0x03, 0xEC, 0x02, 0x4E, 0x0F, 0x9F, 0xA9, 0xF3, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, -- 0xF3, 0xF7, 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x00, 0x08, 0x19, 0xD3, 0xF2, 0xF7, 0x1A, 0xD5, 0x92, 0xEC, 0x11, 0x93, 0x92, 0xEC, 0x19, 0x25, 0x92, 0xEC, 0x09, 0x63, 0x00, 0x80, 0x19, 0xD3, -- 0xF2, 0xBD, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xC3, 0xF3, 0x40, 0x92, 0xC8, 0xD2, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, 0x25, 0xEF, -- 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xEE, 0xF7, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xD3, 0xF3, 0x0A, 0x65, 0xBC, 0x69, 0x02, 0x97, 0xC3, 0x92, -- 0x09, 0x83, 0x00, 0x02, 0xC2, 0xD2, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x40, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xE6, 0xF3, 0x11, 0x93, 0xF3, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xF3, 0xF7, -- 0x11, 0x93, 0xF2, 0xF7, 0x09, 0xA3, 0x00, 0x20, 0x19, 0xD3, 0xF2, 0xF7, 0x11, 0x93, 0xB5, 0xEC, 0x19, 0xD3, 0x04, 0x80, 0x12, 0x95, 0xB4, 0xEC, 0x1A, 0xD5, 0x05, 0x80, 0x09, 0x63, 0x00, 0x80, -- 0x01, 0x97, 0xC3, 0x96, 0x1B, 0xD7, 0xB5, 0xEC, 0x40, 0x94, 0x1A, 0xD5, 0xB4, 0xEC, 0x19, 0xD3, 0xF2, 0xBD, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x96, 0x03, -- 0x19, 0xD3, 0x06, 0x82, 0x09, 0x93, 0x00, 0x01, 0x19, 0xD3, 0x03, 0x82, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x47, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x01, 0x82, 0xC5, 0xD2, 0x40, 0x94, -- 0x01, 0xD4, 0x13, 0x97, 0xB8, 0xEC, 0x02, 0xD6, 0x03, 0x95, 0x0C, 0x99, 0xBB, 0xEC, 0x04, 0x05, 0x13, 0x97, 0x03, 0xEC, 0x01, 0x27, 0x02, 0x99, 0xC4, 0x92, 0x03, 0x03, 0xC2, 0xD2, 0x14, 0x99, -- 0xBA, 0xEC, 0x03, 0x09, 0x1C, 0xD9, 0xBA, 0xEC, 0x12, 0x95, 0x04, 0x82, 0x0A, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x40, 0xF5, 0x01, 0x92, 0x03, 0xD2, 0x0A, 0xA3, 0x02, 0x00, -- 0x19, 0xD3, 0x04, 0x82, 0x02, 0x96, 0x0B, 0x05, 0x01, 0x00, 0x1A, 0xD5, 0xB8, 0xEC, 0xC5, 0x92, 0x43, 0x42, 0x02, 0x9E, 0x0F, 0x9F, 0x54, 0xF4, 0x42, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x54, 0xF4, -- 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x54, 0xF4, 0x0C, 0x49, 0xD3, 0x08, 0x02, 0x8E, 0x0F, 0x9F, 0x54, 0xF4, 0x11, 0x63, 0x07, 0x82, 0x11, 0xA3, 0x07, 0x82, 0x71, 0x93, -- 0x79, 0x93, 0x79, 0x93, 0x79, 0x93, 0x03, 0xD2, 0xC5, 0x94, 0x0A, 0xB5, 0xFC, 0xFF, 0x04, 0xD4, 0x03, 0x96, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x63, 0xF4, 0x11, 0x93, 0xB8, 0xEC, 0x41, 0x42, -- 0x02, 0x8E, 0x0F, 0x9F, 0x70, 0xF4, 0xC5, 0x98, 0x0C, 0x03, 0xFF, 0xFF, 0x42, 0x42, 0x02, 0x8E, 0x0F, 0x9F, 0x97, 0xF4, 0x11, 0x93, 0xB8, 0xEC, 0x41, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x97, 0xF4, -- 0x0A, 0x95, 0xBB, 0xEC, 0x42, 0x92, 0x19, 0xD3, 0xB9, 0xEC, 0xC5, 0x96, 0x43, 0x46, 0x02, 0x9E, 0x0F, 0x9F, 0x89, 0xF4, 0x0B, 0x07, 0xFC, 0xFF, 0xC5, 0xD6, 0xD2, 0x98, 0x1C, 0xD9, 0xC8, 0xBC, -- 0xD2, 0x96, 0x1B, 0xD7, 0xCA, 0xBC, 0x09, 0x03, 0xFF, 0xFF, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x75, 0xF4, 0x19, 0xD3, 0xB9, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x95, 0xF4, 0x0A, 0x05, -- 0xFE, 0xFF, 0xCA, 0xD2, 0xC2, 0xD2, 0x0F, 0x9F, 0x97, 0xF4, 0x1A, 0xD5, 0x93, 0xEC, 0x03, 0x98, 0x40, 0x48, 0x02, 0x5E, 0x0F, 0x9F, 0xB9, 0xF4, 0x11, 0x93, 0xB8, 0xEC, 0x41, 0x42, 0x02, 0x9E, -- 0x0F, 0x9F, 0xB9, 0xF4, 0x04, 0x92, 0x48, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xB9, 0xF4, 0x41, 0x94, 0x01, 0xD4, 0x0A, 0x65, 0xBD, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x80, 0x00, 0xC2, 0xD2, -- 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x0F, 0x9F, 0x11, 0xF5, 0xC5, 0x92, 0x43, 0x42, 0x02, 0x9E, 0x0F, 0x9F, 0x11, 0xF5, 0x4F, 0x96, 0x41, 0xB2, -- 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC5, 0xF4, 0x47, 0x96, 0x11, 0x93, 0xB7, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xED, 0xF4, 0x11, 0x93, 0xB8, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, -- 0xED, 0xF4, 0x12, 0x95, 0x00, 0x82, 0x0A, 0x05, 0xFF, 0xAF, 0x05, 0xD4, 0xC8, 0xD6, 0xC8, 0xD2, 0x40, 0xF0, 0x92, 0xF7, 0x42, 0x00, 0x05, 0x96, 0xC3, 0x94, 0x01, 0xB5, 0x40, 0x44, 0x02, 0x4E, -- 0x0F, 0x9F, 0xED, 0xF4, 0x06, 0x98, 0x50, 0x98, 0x1C, 0xD9, 0xA2, 0xBC, 0x40, 0x98, 0x1C, 0xD9, 0xA2, 0xBC, 0x40, 0x92, 0x03, 0xD2, 0x0F, 0x9F, 0x16, 0xF5, 0x03, 0x94, 0x40, 0x44, 0x02, 0x5E, -- 0x0F, 0x9F, 0xFA, 0xF4, 0x0A, 0x65, 0x5E, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0x16, 0xF5, 0x11, 0x93, 0xB8, 0xEC, 0x0C, 0x99, 0xBB, 0xEC, 0x04, 0x03, 0x04, 0x96, -- 0x13, 0x25, 0x03, 0xEC, 0xC1, 0xD4, 0x11, 0x93, 0xBA, 0xEC, 0x19, 0x05, 0xBA, 0xEC, 0x1B, 0xD7, 0x01, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x99, 0xC4, 0x92, 0x43, 0xA2, 0xC2, 0xD2, 0x41, 0x92, -- 0x01, 0xD2, 0x03, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0x2A, 0xF5, 0x11, 0x93, 0xB9, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x22, 0xF5, 0x19, 0xD3, 0xB8, 0xEC, 0x19, 0xD3, 0xBA, 0xEC, -- 0x19, 0xD3, 0xBB, 0xEC, 0x03, 0x96, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x2A, 0xF5, 0x41, 0x98, 0x1C, 0xD9, 0xB7, 0xEC, 0x11, 0x93, 0xBF, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x3B, 0xF5, -- 0x11, 0x93, 0x00, 0x82, 0x19, 0xD3, 0x02, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x00, 0x01, 0xC2, 0xD2, 0x40, 0x98, 0x1C, 0xD9, 0xBF, 0xEC, 0x0F, 0x9F, 0x43, 0xF5, -- 0x01, 0x92, 0x19, 0xD3, 0xB7, 0xEC, 0x01, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0x4F, 0xF5, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x47, 0x00, -- 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x12, 0x95, 0x03, 0x80, 0x0A, 0xB3, 0x00, 0x40, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x6E, 0xF5, 0x0A, 0xB7, 0x00, 0x08, 0x40, 0x46, -- 0x02, 0x5E, 0x0F, 0x9F, 0x71, 0xF5, 0x11, 0x93, 0x03, 0xEC, 0x41, 0x02, 0x09, 0xB3, 0xFE, 0xFF, 0x12, 0x95, 0x07, 0x80, 0x01, 0x45, 0x02, 0x8E, 0x0F, 0x9F, 0x71, 0xF5, 0x41, 0x92, 0x0F, 0x9F, -- 0x72, 0xF5, 0x40, 0x92, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x13, 0x97, -- 0x6E, 0xEC, 0x0B, 0x47, 0xA0, 0x00, 0x02, 0x5E, 0x0F, 0x9F, 0x9D, 0xF5, 0x09, 0x63, 0x08, 0x43, 0x0A, 0x65, 0xFF, 0x5F, 0x01, 0x99, 0xC4, 0xD4, 0x0A, 0x95, 0x9B, 0xEC, 0xD2, 0x96, 0x1B, 0xD7, -- 0xFA, 0xBC, 0xD2, 0x96, 0xC4, 0xD6, 0xD2, 0x98, 0x1C, 0xD9, 0xFA, 0xBC, 0xD2, 0x96, 0xC1, 0xD6, 0xC2, 0x94, 0x1A, 0xD5, 0xFA, 0xBC, 0x0F, 0x9F, 0xDB, 0xF5, 0x0C, 0x69, 0xFF, 0x6F, 0x1C, 0xD9, -- 0xF8, 0xBC, 0x0B, 0x47, 0x10, 0x95, 0x02, 0x5E, 0x0F, 0x9F, 0xB5, 0xF5, 0x0A, 0x95, 0x6F, 0xEC, 0x09, 0x63, 0x06, 0x43, 0x01, 0x99, 0xC4, 0xD6, 0xD2, 0x96, 0x1B, 0xD7, 0xF8, 0xBC, 0x0C, 0x69, -- 0xEE, 0x6A, 0xC1, 0xD8, 0xC2, 0x94, 0x1A, 0xD5, 0xF8, 0xBC, 0x40, 0x92, 0xC5, 0xD2, 0x11, 0x43, 0xC1, 0xEC, 0x02, 0x0E, 0x0F, 0x9F, 0xD8, 0xF5, 0xC5, 0x94, 0x0A, 0x03, 0x71, 0xEC, 0xC1, 0x94, -- 0x1A, 0xD5, 0xFA, 0xBC, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xCA, 0xF5, 0x0A, 0x95, 0x6F, 0xEC, 0xC8, 0xD4, 0x40, 0xF0, 0xB3, 0xF7, 0x19, 0xD3, 0xF8, 0xBC, 0x41, 0x00, -- 0xC5, 0x96, 0x41, 0x06, 0xC5, 0xD6, 0x13, 0x47, 0xC1, 0xEC, 0x02, 0x1E, 0x0F, 0x9F, 0xBC, 0xF5, 0x40, 0x98, 0x1C, 0xD9, 0xFA, 0xBC, 0x40, 0x92, 0x19, 0xD3, 0x6E, 0xEC, 0x19, 0xD3, 0xC1, 0xEC, -- 0x0A, 0x65, 0x52, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, -- 0x88, 0xDA, 0x43, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x06, 0x92, 0x01, 0xD2, 0x0A, 0x65, 0xF0, 0x6A, 0x0B, 0x97, 0x6F, 0xEC, 0x02, 0x99, 0xC4, 0x98, 0xD3, 0xD8, 0x02, 0xD6, 0x0A, 0x03, 0x02, 0x00, -- 0x01, 0x97, 0xC3, 0x98, 0x02, 0x96, 0xC3, 0xD8, 0x01, 0x96, 0xC1, 0xD6, 0x1A, 0xD5, 0x6E, 0xEC, 0xC5, 0x98, 0x14, 0x99, 0x6F, 0xEC, 0xC2, 0xD8, 0x43, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -- 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0xC8, 0xD2, 0x40, 0xF0, 0xF0, 0xF5, 0x41, 0x00, 0x11, 0x93, 0xC0, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x2A, 0xF6, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, -- 0x27, 0xF6, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x42, 0xA2, 0xC2, 0xD2, 0x40, 0x92, 0x19, 0xD3, 0xC0, 0xEC, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, -- 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x63, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xAF, 0xBC, -- 0x47, 0xB2, 0x59, 0x95, 0x5A, 0x95, 0x12, 0xA5, 0xBF, 0xBC, 0x0A, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x4C, 0xF6, 0x41, 0x04, 0x05, 0x93, 0x40, 0x96, 0x20, 0xD6, 0x62, 0x97, -- 0x0F, 0x9F, 0x5B, 0xF6, 0x14, 0x99, 0xFC, 0xBC, 0xD1, 0xD8, 0x14, 0x99, 0xFE, 0xBC, 0xD1, 0xD8, 0x20, 0x98, 0x42, 0x08, 0x20, 0xD8, 0x20, 0x98, 0x03, 0x49, 0x02, 0x1E, 0x0F, 0x9F, 0x52, 0xF6, -- 0xC5, 0x92, 0x62, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x74, 0xF6, 0x02, 0x8E, 0x0F, 0x9F, 0x6E, 0xF6, 0x61, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x98, 0xF6, 0x0F, 0x9F, 0xC5, 0xF6, 0x63, 0x42, 0x02, 0x4E, -- 0x0F, 0x9F, 0xBB, 0xF6, 0x0F, 0x9F, 0xC5, 0xF6, 0x0D, 0x03, 0x01, 0x00, 0x0C, 0x99, 0x71, 0xEC, 0x0B, 0x05, 0xFF, 0xFF, 0x40, 0x96, 0x0F, 0x9F, 0x81, 0xF6, 0xD1, 0x96, 0xD4, 0xD6, 0x20, 0x96, -- 0x41, 0x06, 0x20, 0xD6, 0x02, 0x47, 0x02, 0x1E, 0x0F, 0x9F, 0x7D, 0xF6, 0x1A, 0xD5, 0xC1, 0xEC, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, -- 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x0F, 0x9F, 0xC5, 0xF6, 0x0A, 0x03, 0xFE, 0xFF, 0x61, 0x95, 0x40, 0x98, 0x20, 0xD8, 0x02, 0x49, 0x02, 0x0E, 0x0F, 0x9F, -- 0xC5, 0xF6, 0x0D, 0x03, 0x01, 0x00, 0x21, 0xD2, 0x20, 0x92, 0x05, 0x03, 0x42, 0x02, 0xC8, 0xD2, 0x21, 0x96, 0xC3, 0x92, 0x42, 0x06, 0x21, 0xD6, 0xC8, 0xD2, 0x22, 0xD4, 0x40, 0xF0, 0x14, 0xF1, -- 0x42, 0x00, 0x20, 0x98, 0x42, 0x08, 0x20, 0xD8, 0x22, 0x94, 0x02, 0x49, 0x02, 0x1E, 0x0F, 0x9F, 0xA4, 0xF6, 0x0F, 0x9F, 0xC5, 0xF6, 0x0D, 0x03, 0x03, 0x00, 0xC8, 0xD2, 0x02, 0x92, 0xC8, 0xD2, -- 0x01, 0x96, 0xC8, 0xD6, 0x40, 0xF0, 0xC8, 0xF6, 0x43, 0x00, 0x63, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x45, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x08, 0x00, 0x08, 0x94, 0xC5, 0xD4, -- 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x03, 0xD4, 0x42, 0x02, 0xC1, 0x92, 0x01, 0xD2, 0x02, 0x97, 0xC5, 0x94, 0x0A, 0x83, 0xFF, 0xFF, 0x11, 0xB3, 0x2C, 0x93, 0x09, 0xB3, 0xFB, 0xFF, 0x19, 0xD3, -- 0x2C, 0x93, 0x03, 0x92, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xFB, 0xF6, 0x01, 0x94, 0xD2, 0x92, 0x19, 0xD3, 0x2C, 0x93, 0x01, 0xD4, 0x02, 0x94, 0x12, 0x95, 0x2C, 0x93, 0x44, 0xA4, 0x1A, 0xD5, -- 0x2C, 0x93, 0x0A, 0xB5, 0xFB, 0xFF, 0x1A, 0xD5, 0x2C, 0x93, 0x0B, 0x07, 0xFF, 0xFF, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0xE6, 0xF6, 0x09, 0x63, 0xD4, 0x6C, 0x01, 0x95, 0xC2, 0x96, 0xC5, 0x94, -- 0x02, 0xA7, 0xC1, 0xD6, 0x03, 0x92, 0x54, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x0B, 0xF7, 0x0A, 0x83, 0xFF, 0xFF, 0x1B, 0xB3, 0x2C, 0x93, 0x45, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -- 0x01, 0x00, 0x09, 0x63, 0x00, 0x40, 0x19, 0xD3, 0xF2, 0xBD, 0x40, 0xF0, 0x52, 0xF5, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x1F, 0xF7, 0x40, 0xF0, 0xA7, 0xF2, 0x0F, 0x9F, 0x2D, 0xF7, 0x40, 0x96, -- 0xC8, 0xD6, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, 0x25, 0xEF, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -- 0x08, 0x0B, 0x01, 0x00, 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, -- 0x40, 0x92, 0x19, 0xD3, 0x2D, 0xBC, 0x0A, 0x65, 0xD8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, -- 0xEA, 0x43, 0x01, 0x97, 0xC3, 0x94, 0x44, 0xA4, 0xC1, 0xD4, 0x11, 0x93, 0xB9, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x86, 0xF7, 0x12, 0x95, 0x93, 0xEC, 0x0B, 0x67, 0x36, 0x43, 0xD2, 0x98, -- 0x1C, 0xD9, 0xC8, 0xBC, 0xD2, 0x98, 0x03, 0x93, 0xC1, 0xD8, 0x11, 0x93, 0xB9, 0xEC, 0x09, 0x03, 0xFF, 0xFF, 0x19, 0xD3, 0xB9, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x5F, 0xF7, 0x19, 0xD3, -- 0xB8, 0xEC, 0x19, 0xD3, 0xBA, 0xEC, 0x0A, 0x05, 0xFE, 0xFF, 0xCA, 0xD2, 0xCA, 0xD2, 0xC2, 0xD2, 0x0A, 0x65, 0x5E, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, -- 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0x0F, 0x9F, 0x8F, 0xF7, 0x11, 0x93, 0x03, 0xEC, 0x19, 0xD3, 0x01, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, 0x43, 0xA2, 0xC2, 0xD2, -- 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x03, 0x92, 0x04, 0x96, 0x0D, 0x5E, 0x50, 0x46, 0x02, 0x0E, 0x40, 0x92, 0x09, 0xEE, 0x44, 0x46, 0x04, 0x0E, 0x59, 0x93, 0x44, 0x26, -- 0x04, 0x5E, 0x46, 0xEE, 0x41, 0x93, 0x41, 0x26, 0x43, 0x4E, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xB1, 0xFE, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -- 0x01, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x03, 0x94, 0x1A, 0xD5, 0xBA, 0xF7, 0x11, 0x93, 0x00, 0x90, 0x88, 0x98, 0x90, 0x9A, 0x1D, 0x00, 0x1A, 0x00, 0x03, 0x00, -- 0x03, 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, 0x16, 0x00, 0x21, 0x00, 0x12, 0x00, 0x09, 0x00, 0x13, 0x00, 0x19, 0x00, 0x19, 0x00, 0x19, 0x00, 0x21, 0x00, 0x2D, 0x00, 0x21, 0x00, -- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0xF2, -- 0xE4, 0xF7, 0x00, 0x00, 0x87, 0xF2, 0xE4, 0xF7, 0x00, 0x00, 0xCC, 0xF2, 0xE1, 0xF7, 0xE8, 0xF7, 0x00, 0x00, 0xB4, 0xF3, 0xE4, 0xF7, 0x25, 0x47, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0xF4, 0x94, 0xD3, 0xD4, 0x41, 0x2A, 0x40, 0x4A, 0x45, 0xBE, 0x88, 0x92, 0x41, 0x24, 0x40, 0x44, 0x53, 0xBE, 0x40, 0xF0, 0x93, 0xEE, 0x41, 0xEE, 0x98, 0x9A, 0xC6, 0xF7, 0x02, 0x00, 0x1F, 0xEC, -+ 0x00, 0x00, 0xB2, 0xF8, 0x4D, 0x00, 0xA0, 0xEC, 0x00, 0x00, 0x98, 0xF7, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xD8, 0xA0, 0x90, 0x98, 0x9A, 0x98, 0x9A, 0xA0, 0xD8, -+ 0x40, 0xF0, 0xB4, 0xF0, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0x64, 0xEF, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0xF6, 0xF0, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, -+ 0xE9, 0xF6, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0xE7, 0xF5, 0xA0, 0x90, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, 0xF1, 0xF0, 0xA0, 0x90, 0x98, 0x9A, 0x98, 0x9A, 0xA0, 0xD8, 0x40, 0xF0, -+ 0x89, 0xF7, 0xA0, 0x90, 0x98, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x03, 0x00, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x42, 0x02, 0xC1, 0x92, 0x03, 0x96, 0x1B, 0xD7, 0x2A, 0x86, -+ 0x1A, 0xD5, 0x2B, 0x86, 0x09, 0xA3, 0x00, 0x80, 0x19, 0xD3, 0x2C, 0x86, 0x00, 0xEE, 0x0A, 0x65, 0xC0, 0x7A, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFE, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, -+ 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x05, 0x00, 0x05, 0x94, 0xC5, 0xD4, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x01, 0xD4, 0x42, 0x02, 0xC1, 0x96, 0x0A, 0x65, 0xC0, 0x7A, -+ 0x02, 0x99, 0xC4, 0x92, 0x41, 0xA2, 0xC4, 0xD2, 0xC5, 0x98, 0x1C, 0xD9, 0x2A, 0x86, 0x01, 0x98, 0x1C, 0xD9, 0x2B, 0x86, 0x1B, 0xD7, 0x2C, 0x86, 0x00, 0xEE, 0x09, 0xB3, 0xFE, 0xFF, 0xC2, 0xD2, -+ 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xE5, 0xEE, 0x11, 0x93, 0xCA, 0xF7, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xAE, 0xEE, 0x40, 0xF1, -+ 0x40, 0x92, 0x19, 0xD3, 0xCA, 0xF7, 0xC5, 0x92, 0x41, 0x92, 0x19, 0xD3, 0x00, 0x83, 0x40, 0x92, 0x19, 0xD3, 0x00, 0x83, 0x0F, 0x9F, 0x95, 0xF8, 0x0F, 0x9F, 0x99, 0xEE, 0x42, 0x42, 0x02, 0x5E, -+ 0x0F, 0x9F, 0x99, 0xEE, 0x40, 0x92, 0x19, 0xD3, 0xCA, 0xF7, 0x09, 0x93, 0xB9, 0xF7, 0x19, 0xD3, 0x91, 0xEC, 0x40, 0xF0, 0x5F, 0xF2, 0x09, 0x63, 0x00, 0x80, 0x19, 0xD3, 0xF2, 0xBD, 0x0F, 0x9F, -+ 0x99, 0xEE, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0x19, 0xD3, 0x12, 0x95, 0x19, 0xD3, 0x10, 0x95, 0x19, 0xD3, 0x02, 0x80, 0x19, 0xD3, 0x03, 0x82, -+ 0x09, 0x93, 0xB9, 0xF7, 0x19, 0xD3, 0x91, 0xEC, 0x40, 0xF0, 0x5F, 0xF2, 0x40, 0xF0, 0xCD, 0xF3, 0x11, 0x93, 0x04, 0xEC, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xE3, 0xEE, 0x40, 0x92, 0x19, 0xD3, -+ 0x04, 0xEC, 0x40, 0xF0, 0x38, 0xF2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x44, 0x96, 0x09, 0xB3, 0xFF, 0xFD, 0x19, 0xD3, 0x44, 0x96, 0x40, 0xF0, 0x82, 0xF7, -+ 0x6E, 0x92, 0x19, 0xD3, 0x05, 0x84, 0x40, 0xF0, 0xC4, 0xEE, 0x4B, 0x62, 0x0A, 0x95, 0x2E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x2B, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x00, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, -+ 0x2F, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x34, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x39, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x3E, 0xEE, 0xD1, 0xD4, 0x0B, 0x97, 0x43, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x48, 0xEE, -+ 0xD1, 0xD4, 0x0B, 0x97, 0x4D, 0xEE, 0xD1, 0xD6, 0x0A, 0x95, 0x4E, 0xEE, 0xC1, 0xD4, 0x0A, 0x65, 0x00, 0x44, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x43, 0xF1, 0x09, 0x93, 0x01, 0x3F, -+ 0x19, 0xD3, 0xC0, 0x85, 0x11, 0x93, 0x44, 0x96, 0x09, 0xB3, 0xFF, 0xFC, 0x19, 0xD3, 0x44, 0x96, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x03, 0x00, 0x03, 0x96, -+ 0x41, 0x02, 0x03, 0x99, 0xC4, 0x94, 0x42, 0x04, 0xC1, 0x04, 0xC2, 0x94, 0xC3, 0xD4, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0x13, 0x97, -+ 0x95, 0xEC, 0x1B, 0xD7, 0x02, 0x80, 0x11, 0x93, 0x99, 0xEC, 0x19, 0xD3, 0x7C, 0x96, 0x0B, 0x97, 0xA0, 0x00, 0x1B, 0xD7, 0x6E, 0xEC, 0x0A, 0x65, 0x0E, 0x42, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, -+ 0xFF, 0xBF, 0x11, 0xA3, 0x9A, 0xEC, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, -+ 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x47, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x14, 0x99, 0x03, 0x80, 0x0C, 0xB3, 0x00, 0x10, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x97, 0xF0, -+ 0x11, 0x93, 0x9F, 0xEC, 0x41, 0x02, 0x19, 0xD3, 0x9F, 0xEC, 0x11, 0x93, 0xC8, 0xF7, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x84, 0xEF, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, -+ 0x00, 0x04, 0xC2, 0xD2, 0x0F, 0x9F, 0xB1, 0xF0, 0x11, 0x93, 0x94, 0xEC, 0x02, 0xD2, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xD0, 0xEF, 0x41, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0x19, 0xD3, 0x9F, 0xEC, -+ 0x12, 0x95, 0x02, 0x80, 0x1A, 0xD5, 0x95, 0xEC, 0x13, 0x97, 0x7C, 0x96, 0x1B, 0xD7, 0x99, 0xEC, 0x0A, 0x65, 0x0E, 0x42, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0x00, 0x40, 0x19, 0xD3, 0x9A, 0xEC, -+ 0x09, 0x63, 0x00, 0x40, 0xC2, 0xD2, 0x02, 0x94, 0x1A, 0xD5, 0x7C, 0x96, 0x0C, 0xB3, 0x00, 0x08, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xB0, 0xEF, 0x0C, 0xB3, 0xFF, 0x07, 0x0F, 0x9F, 0xB4, 0xEF, -+ 0x11, 0x93, 0x06, 0x80, 0x09, 0xB3, 0xFF, 0x07, 0x09, 0x03, 0x00, 0xA0, 0x19, 0xD3, 0x97, 0xEC, 0x40, 0x98, 0x0B, 0x97, 0x9C, 0xEC, 0x04, 0x95, 0x03, 0x05, 0x14, 0x03, 0x97, 0xEC, 0x46, 0x02, -+ 0xC1, 0x92, 0xC2, 0xD2, 0x41, 0x08, 0x42, 0x48, 0x02, 0x9E, 0x0F, 0x9F, 0xBB, 0xEF, 0x11, 0x93, 0x97, 0xEC, 0xC1, 0x92, 0xC5, 0xD2, 0x5F, 0xB2, 0x19, 0xD3, 0x9B, 0xEC, 0x0F, 0x9F, 0xD3, 0xEF, -+ 0x13, 0x97, 0x98, 0xEC, 0xC5, 0xD6, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x08, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xE9, 0xEF, 0x11, 0x93, 0xCE, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xCE, 0xF7, -+ 0x11, 0x93, 0xCD, 0xF7, 0x09, 0xA3, 0x00, 0x10, 0x19, 0xD3, 0xCD, 0xF7, 0x40, 0x98, 0x1C, 0xD9, 0x9B, 0xEC, 0x12, 0x95, 0x9B, 0xEC, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, 0x86, 0xF0, 0x0A, 0xB3, -+ 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x07, 0xF0, 0x0A, 0xB3, 0x07, 0x00, 0x09, 0x05, 0xA8, 0xEC, 0xC2, 0x94, 0x01, 0xD4, 0x09, 0x03, 0xA0, 0xEC, 0xC1, 0x92, 0x19, 0xD3, 0x9B, 0xEC, -+ 0xC5, 0x94, 0x0A, 0xB5, 0x00, 0xFF, 0x01, 0xA5, 0xC5, 0xD4, 0x0F, 0x9F, 0x13, 0xF0, 0x0A, 0x05, 0xFF, 0xFF, 0x0A, 0x03, 0xB0, 0xEC, 0xC1, 0x92, 0x01, 0xD2, 0x1A, 0xD5, 0x9B, 0xEC, 0xC5, 0x96, -+ 0x0B, 0x07, 0xFF, 0xFF, 0xC5, 0xD6, 0x11, 0x93, 0x97, 0xEC, 0xC5, 0x98, 0xC1, 0xD8, 0x11, 0x93, 0x97, 0xEC, 0x09, 0x05, 0x0B, 0x00, 0x03, 0xD4, 0xC2, 0x96, 0x06, 0xD6, 0x7B, 0x95, 0x7A, 0x95, -+ 0x4C, 0x02, 0xC1, 0x92, 0x59, 0x93, 0x59, 0x93, 0x01, 0xA5, 0x01, 0x98, 0x0C, 0xF5, 0x7B, 0x93, 0x09, 0x09, 0x01, 0x00, 0x06, 0x92, 0x09, 0xB3, 0xFF, 0x00, 0x04, 0xD2, 0x5C, 0x93, 0x59, 0x93, -+ 0x04, 0x94, 0x01, 0xA5, 0x03, 0x96, 0xC3, 0xD4, 0x11, 0x93, 0x97, 0xEC, 0x4C, 0x02, 0x05, 0xD2, 0xC1, 0x92, 0x09, 0xB3, 0x00, 0xFF, 0x7C, 0x95, 0x7A, 0x95, 0x02, 0xA3, 0x05, 0x98, 0xC4, 0xD2, -+ 0x12, 0x95, 0x97, 0xEC, 0x45, 0x04, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x00, 0x01, 0xC2, 0xD2, 0x12, 0x95, 0x9B, 0xEC, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x5B, 0xF0, -+ 0x12, 0x95, 0x97, 0xEC, 0x4A, 0x04, 0x02, 0x99, 0xC4, 0x92, 0x01, 0x98, 0x0C, 0xF3, 0x7B, 0x93, 0x41, 0x02, 0x0F, 0x9F, 0x7C, 0xF0, 0x43, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x7D, 0xF0, 0x11, 0x93, -+ 0x97, 0xEC, 0x42, 0x02, 0x0A, 0x05, 0xFF, 0xFF, 0xC1, 0xD4, 0x11, 0x93, 0x97, 0xEC, 0x4A, 0x02, 0x12, 0x95, 0x60, 0x96, 0xC1, 0xD4, 0x12, 0x95, 0x97, 0xEC, 0x4B, 0x04, 0x02, 0x97, 0xC3, 0x92, -+ 0x09, 0xB3, 0x1F, 0xFF, 0xC2, 0xD2, 0x12, 0x95, 0x97, 0xEC, 0x4B, 0x04, 0x11, 0x93, 0x62, 0x96, 0x41, 0x93, 0x59, 0x93, 0x02, 0x99, 0xC4, 0xA2, 0xC2, 0xD2, 0xC5, 0x92, 0x19, 0xD3, 0x98, 0xEC, -+ 0x0A, 0x95, 0x0C, 0x02, 0x1A, 0xD5, 0x02, 0x80, 0x0F, 0x9F, 0xB1, 0xF0, 0x09, 0x63, 0xFE, 0x7F, 0x01, 0x97, 0xC3, 0x94, 0x0A, 0xA5, 0x00, 0x04, 0xC1, 0xD4, 0x11, 0x93, 0x9F, 0xEC, 0x09, 0xA3, -+ 0x00, 0x01, 0x19, 0xD3, 0x9F, 0xEC, 0x40, 0xF0, 0x39, 0xEF, 0x0F, 0x9F, 0xB1, 0xF0, 0x11, 0x93, 0x94, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xA6, 0xF0, 0x40, 0xF0, 0x39, 0xEF, 0x11, 0x93, -+ 0x95, 0xEC, 0x44, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xB1, 0xF0, 0x48, 0x98, 0x1C, 0xD9, 0x02, 0x80, 0x11, 0x93, 0x91, 0xEC, 0x41, 0x22, 0x0A, 0x95, 0xB1, 0xF0, 0x88, 0xD4, 0x88, 0xDC, -+ 0x91, 0x9A, 0x47, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x04, 0x82, 0x48, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC8, 0xF0, 0x0A, 0x65, 0xFD, 0x7D, -+ 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFF, 0xFE, 0xC2, 0xD2, 0x41, 0x92, 0x19, 0xD3, 0xBE, 0xEC, 0x11, 0x93, 0x04, 0x82, 0x43, 0xB2, 0x12, 0x95, 0x03, 0x82, 0x02, 0xB3, 0x40, 0x42, 0x02, 0x4E, -+ 0x0F, 0x9F, 0xEF, 0xF0, 0x0A, 0xB3, 0x00, 0xFF, 0x48, 0xA2, 0x19, 0xD3, 0x03, 0x82, 0x40, 0xF0, 0xDA, 0xF3, 0x11, 0x93, 0xBE, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xEF, 0xF0, 0x11, 0x93, -+ 0x07, 0x82, 0x11, 0x43, 0x03, 0xEC, 0x02, 0x0E, 0x0F, 0x9F, 0xEF, 0xF0, 0x11, 0x93, 0x03, 0x82, 0x09, 0xA3, 0x00, 0x01, 0x19, 0xD3, 0x03, 0x82, 0x40, 0x96, 0x1B, 0xD7, 0xBE, 0xEC, 0x88, 0x98, -+ 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x20, 0xBC, 0xC8, 0xD2, 0x40, 0xF0, 0x48, 0xF1, 0x41, 0x00, 0x88, 0x98, -+ 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x05, 0x00, 0x05, 0x94, 0x41, 0x02, 0xC1, 0x92, 0x01, 0x97, 0xC3, 0x96, 0xC2, 0xD6, 0x0A, 0x45, 0x00, 0x95, 0x02, 0x5E, -+ 0x0F, 0x9F, 0x45, 0xF1, 0xC1, 0x92, 0x41, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x45, 0xF1, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x45, 0xF1, 0x41, 0x98, 0x1C, 0xD9, -+ 0xBF, 0xEC, 0x12, 0x95, 0x02, 0x80, 0x01, 0xD4, 0x40, 0xF0, 0x56, 0xF2, 0x0B, 0x67, 0xFD, 0x7D, 0x03, 0x99, 0xC4, 0x92, 0x0C, 0x99, 0x96, 0x03, 0x1C, 0xD9, 0x06, 0x82, 0x41, 0x98, 0x1C, 0xD9, -+ 0x02, 0x82, 0x42, 0x98, 0x1C, 0xD9, 0x05, 0x82, 0x0C, 0x69, 0x80, 0x7F, 0x1C, 0xD9, 0x00, 0xB0, 0x09, 0xA3, 0x00, 0x01, 0xC3, 0xD2, 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, 0x40, 0x42, 0x02, 0x4E, -+ 0x0F, 0x9F, 0x43, 0xF1, 0x42, 0xA4, 0x1A, 0xD5, 0x02, 0x80, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x42, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x05, 0x92, 0xC5, 0xD2, 0x60, 0xB2, 0x40, 0x42, -+ 0x02, 0x4E, 0x0F, 0x9F, 0x55, 0xF1, 0x40, 0xF0, 0x27, 0xF7, 0xC5, 0x94, 0x0A, 0xB3, 0x10, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x5E, 0xF1, 0x40, 0xF0, 0x15, 0xF6, 0xC5, 0x96, 0x0B, 0xB3, -+ 0x40, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x67, 0xF1, 0x40, 0xF0, 0x4C, 0xF5, 0xC5, 0x94, 0x0A, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xC8, 0xF1, 0x13, 0x97, 0x21, 0xBC, -+ 0x01, 0xD6, 0x0B, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x79, 0xF1, 0x40, 0xF0, 0x62, 0xFB, 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x82, 0xF1, -+ 0x40, 0xF0, 0x6C, 0xFB, 0x01, 0x96, 0x0B, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xA2, 0xF1, 0x40, 0xF0, 0xB0, 0xFA, 0x41, 0x92, 0x19, 0xD3, 0xC7, 0xF7, 0x11, 0x93, 0x03, 0xEC, -+ 0x09, 0x43, 0x40, 0x00, 0x02, 0x5E, 0x0F, 0x9F, 0x98, 0xF1, 0x40, 0x94, 0x1A, 0xD5, 0xC7, 0xF7, 0x11, 0x93, 0x00, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xAB, 0xF1, 0x40, 0xF0, 0x38, 0xF2, -+ 0x0F, 0x9F, 0xAB, 0xF1, 0x01, 0x96, 0x0B, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xAB, 0xF1, 0x40, 0xF0, 0x7C, 0xFB, 0x01, 0x94, 0x0A, 0xB3, 0x10, 0x00, 0x40, 0x42, 0x02, 0x4E, -+ 0x0F, 0x9F, 0xB4, 0xF1, 0x40, 0xF0, 0x87, 0xFB, 0x11, 0x93, 0x10, 0xEC, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xBF, 0xF1, 0x44, 0x96, 0x1B, 0xD7, 0x0B, 0xBC, 0x0F, 0x9F, 0xC5, 0xF1, 0x41, 0x42, -+ 0x02, 0x5E, 0x0F, 0x9F, 0xC5, 0xF1, 0x19, 0xD3, 0x0B, 0xBC, 0x40, 0x92, 0x19, 0xD3, 0x10, 0xEC, 0xC5, 0x94, 0x0A, 0xB3, 0x80, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x12, 0xF2, 0x13, 0x97, -+ 0x28, 0xBC, 0x01, 0xD6, 0x0B, 0xB3, 0x40, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xDA, 0xF1, 0x40, 0xF0, 0x0A, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, -+ 0xED, 0xF1, 0x40, 0xF0, 0xC4, 0xEE, 0x40, 0xF0, 0x8F, 0xFB, 0x40, 0xF0, 0x1B, 0xF2, 0x40, 0x96, 0x1B, 0xD7, 0x00, 0xEC, 0x41, 0x92, 0x19, 0xD3, 0xCA, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x04, 0x00, -+ 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x09, 0xF2, 0x40, 0xF0, 0x9E, 0xFB, 0x09, 0x63, 0x00, 0x44, 0x01, 0x97, 0xC3, 0x94, 0x48, 0xA4, 0xC1, 0xD4, 0x00, 0xEE, 0x40, 0x92, 0x19, 0xD3, 0x12, 0x95, -+ 0x19, 0xD3, 0x10, 0x95, 0x19, 0xD3, 0x02, 0x80, 0x19, 0xD3, 0x03, 0x82, 0x41, 0x92, 0x19, 0xD3, 0xCA, 0xF7, 0x01, 0x94, 0x0A, 0xB3, 0x08, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x12, 0xF2, -+ 0x40, 0xF0, 0xAE, 0xFB, 0x0A, 0x65, 0x00, 0x44, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0x00, 0x40, -+ 0x19, 0xD3, 0xF2, 0xBD, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x0A, 0x65, -+ 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0x00, 0x80, 0x19, 0xD3, 0xF2, 0xBD, 0x0A, 0x65, -+ 0xE8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, -+ 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x00, 0x01, 0x19, 0xD3, 0x02, 0x80, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, -+ 0x08, 0x0B, 0x01, 0x00, 0x09, 0x93, 0x00, 0x09, 0x19, 0xD3, 0x02, 0x80, 0x40, 0xF0, 0x56, 0xF2, 0x40, 0x92, 0x19, 0xD3, 0x94, 0xEC, 0xC8, 0xD2, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, -+ 0x2A, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0x2A, 0xF5, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x85, 0xF2, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, -+ 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0x92, 0xF2, 0x40, 0xF0, 0x94, 0xF2, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x92, 0xF2, 0xC8, 0xD2, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, -+ 0x2A, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xF1, 0xBD, 0x19, 0xD3, 0xB5, 0xEC, 0x11, 0x93, 0xB3, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, -+ 0xAC, 0xF2, 0x09, 0x63, 0x00, 0x80, 0x01, 0x97, 0xC3, 0x94, 0x0A, 0x07, 0x07, 0x00, 0xC1, 0xD6, 0x0A, 0x05, 0x00, 0xA0, 0x1A, 0xD5, 0x96, 0xEC, 0x11, 0x93, 0xB5, 0xEC, 0x19, 0xD3, 0x01, 0x80, -+ 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x41, 0xA2, 0xC2, 0xD2, 0x40, 0x92, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x13, 0x97, 0xB3, 0xEC, 0x40, 0x46, -+ 0x02, 0x5E, 0x0F, 0x9F, 0x1B, 0xF3, 0x12, 0x95, 0x96, 0xEC, 0x0A, 0x03, 0x07, 0x00, 0xC1, 0x92, 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0x09, 0x05, 0x01, 0x00, 0x48, 0x02, 0xC1, 0x92, 0xC2, 0xD2, -+ 0x11, 0x93, 0x96, 0xEC, 0x4E, 0x02, 0xC1, 0x94, 0xC5, 0xD6, 0xC5, 0x92, 0x11, 0x07, 0x96, 0xEC, 0x0B, 0x03, 0x0F, 0x00, 0xC1, 0x98, 0x46, 0x06, 0x7A, 0x93, 0x79, 0x93, 0x5C, 0x95, 0x5A, 0x95, -+ 0x02, 0xA3, 0xC3, 0xD2, 0x04, 0x95, 0xC5, 0x96, 0x41, 0x06, 0xC5, 0xD6, 0x42, 0x46, 0x02, 0x9E, 0x0F, 0x9F, 0xD5, 0xF2, 0x11, 0x93, 0x96, 0xEC, 0x09, 0x05, 0x05, 0x00, 0x41, 0x02, 0xC1, 0x92, -+ 0xC2, 0xD2, 0x11, 0x93, 0x96, 0xEC, 0xC1, 0x92, 0x09, 0xB5, 0x1F, 0x00, 0x43, 0x44, 0x02, 0x8E, 0x0F, 0x9F, 0x02, 0xF3, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, 0x03, 0xF3, 0x0A, 0x05, 0xFF, 0xFF, -+ 0x0F, 0x9F, 0x03, 0xF3, 0x43, 0x94, 0x11, 0x93, 0x96, 0xEC, 0x42, 0x02, 0xC1, 0xD4, 0x13, 0x97, 0x96, 0xEC, 0x03, 0x93, 0xD1, 0x94, 0x7A, 0x95, 0x7A, 0x95, 0xC1, 0x92, 0x59, 0x93, 0x59, 0x93, -+ 0x01, 0x05, 0x49, 0x06, 0xC3, 0x92, 0x7F, 0xB2, 0x01, 0x05, 0x1A, 0xD5, 0xB3, 0xEC, 0x0A, 0x05, 0xF2, 0xFF, 0x1A, 0xD5, 0x92, 0xEC, 0x11, 0x93, 0x92, 0xEC, 0x12, 0x95, 0xB5, 0xEC, 0x02, 0x43, -+ 0x02, 0x8E, 0x0F, 0x9F, 0x69, 0xF3, 0x02, 0x0E, 0x0F, 0x9F, 0x3C, 0xF3, 0x11, 0x93, 0xCE, 0xF7, 0x41, 0x02, 0x19, 0xD3, 0xCE, 0xF7, 0x11, 0x93, 0xCD, 0xF7, 0x09, 0xA3, 0x80, 0x00, 0x19, 0xD3, -+ 0xCD, 0xF7, 0x09, 0x63, 0x00, 0x80, 0x01, 0x95, 0xC2, 0x94, 0x1A, 0xD5, 0xB4, 0xEC, 0x40, 0x96, 0x1B, 0xD7, 0xB3, 0xEC, 0x0F, 0x9F, 0x81, 0xF3, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x40, -+ 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x4E, 0xF3, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x4E, 0xF3, 0x40, 0xF0, 0x95, 0xF3, 0x0F, 0x9F, 0x83, 0xF3, 0x41, 0x92, 0xC8, 0xD2, -+ 0x0A, 0x95, 0x91, 0xEC, 0xC8, 0xD4, 0x40, 0xF0, 0x2A, 0xEF, 0x42, 0x00, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x61, 0xF3, 0x42, 0x96, 0x1B, 0xD7, 0xBF, 0xEC, 0x0F, 0x9F, -+ 0x83, 0xF3, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x42, 0xA2, 0xC2, 0xD2, 0x0F, 0x9F, 0x83, 0xF3, 0x12, 0x45, 0x03, 0xEC, 0x02, 0x4E, 0x0F, 0x9F, 0x7B, 0xF3, 0x11, 0x93, 0xCE, 0xF7, -+ 0x41, 0x02, 0x19, 0xD3, 0xCE, 0xF7, 0x11, 0x93, 0xCD, 0xF7, 0x09, 0xA3, 0x00, 0x08, 0x19, 0xD3, 0xCD, 0xF7, 0x1A, 0xD5, 0x92, 0xEC, 0x11, 0x93, 0x92, 0xEC, 0x19, 0x25, 0x92, 0xEC, 0x09, 0x63, -+ 0x00, 0x80, 0x19, 0xD3, 0xF2, 0xBD, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0x95, 0xF3, 0x40, 0x92, 0xC8, 0xD2, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, -+ 0x40, 0xF0, 0x2A, 0xEF, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xC9, 0xF7, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xA5, 0xF3, 0x0A, 0x65, 0xBC, 0x69, -+ 0x02, 0x97, 0xC3, 0x92, 0x09, 0x83, 0x00, 0x02, 0xC2, 0xD2, 0x11, 0x93, 0x03, 0x80, 0x09, 0xB3, 0x00, 0x40, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xB8, 0xF3, 0x11, 0x93, 0xCE, 0xF7, 0x41, 0x02, -+ 0x19, 0xD3, 0xCE, 0xF7, 0x11, 0x93, 0xCD, 0xF7, 0x09, 0xA3, 0x00, 0x20, 0x19, 0xD3, 0xCD, 0xF7, 0x11, 0x93, 0xB4, 0xEC, 0x19, 0xD3, 0x04, 0x80, 0x12, 0x95, 0xB3, 0xEC, 0x1A, 0xD5, 0x05, 0x80, -+ 0x09, 0x63, 0x00, 0x80, 0x01, 0x97, 0xC3, 0x96, 0x1B, 0xD7, 0xB4, 0xEC, 0x40, 0x94, 0x1A, 0xD5, 0xB3, 0xEC, 0x19, 0xD3, 0xF2, 0xBD, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, -+ 0x09, 0x93, 0x96, 0x03, 0x19, 0xD3, 0x06, 0x82, 0x09, 0x93, 0x00, 0x01, 0x19, 0xD3, 0x03, 0x82, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x47, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0x01, 0x82, -+ 0xC5, 0xD2, 0x40, 0x94, 0x01, 0xD4, 0x13, 0x97, 0xB7, 0xEC, 0x02, 0xD6, 0x03, 0x95, 0x0C, 0x99, 0xBA, 0xEC, 0x04, 0x05, 0x13, 0x97, 0x03, 0xEC, 0x01, 0x27, 0x02, 0x99, 0xC4, 0x92, 0x03, 0x03, -+ 0xC2, 0xD2, 0x14, 0x99, 0xB9, 0xEC, 0x03, 0x09, 0x1C, 0xD9, 0xB9, 0xEC, 0x12, 0x95, 0x04, 0x82, 0x0A, 0xB3, 0x02, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x18, 0xF5, 0x01, 0x92, 0x03, 0xD2, -+ 0x0A, 0xA3, 0x02, 0x00, 0x19, 0xD3, 0x04, 0x82, 0x02, 0x96, 0x0B, 0x05, 0x01, 0x00, 0x1A, 0xD5, 0xB7, 0xEC, 0xC5, 0x92, 0x43, 0x42, 0x02, 0x9E, 0x0F, 0x9F, 0x26, 0xF4, 0x42, 0x44, 0x02, 0x8E, -+ 0x0F, 0x9F, 0x26, 0xF4, 0x11, 0x93, 0xBE, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x26, 0xF4, 0x0C, 0x49, 0xD3, 0x08, 0x02, 0x8E, 0x0F, 0x9F, 0x26, 0xF4, 0x11, 0x63, 0x07, 0x82, 0x11, 0xA3, -+ 0x07, 0x82, 0x71, 0x93, 0x79, 0x93, 0x79, 0x93, 0x79, 0x93, 0x03, 0xD2, 0xC5, 0x94, 0x0A, 0xB5, 0xFC, 0xFF, 0x04, 0xD4, 0x03, 0x96, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x35, 0xF4, 0x11, 0x93, -+ 0xB7, 0xEC, 0x41, 0x42, 0x02, 0x8E, 0x0F, 0x9F, 0x3C, 0xF4, 0xC5, 0x98, 0x0C, 0x03, 0xFF, 0xFF, 0x42, 0x42, 0x02, 0x8E, 0x0F, 0x9F, 0x63, 0xF4, 0x0A, 0x95, 0xBA, 0xEC, 0x42, 0x92, 0x19, 0xD3, -+ 0xB8, 0xEC, 0xC5, 0x96, 0x43, 0x46, 0x02, 0x9E, 0x0F, 0x9F, 0x55, 0xF4, 0x0B, 0x07, 0xFC, 0xFF, 0xC5, 0xD6, 0xD2, 0x98, 0x1C, 0xD9, 0xC8, 0xBC, 0xD2, 0x96, 0x1B, 0xD7, 0xCA, 0xBC, 0x09, 0x03, -+ 0xFF, 0xFF, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x41, 0xF4, 0x19, 0xD3, 0xB8, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x61, 0xF4, 0x0A, 0x05, 0xFE, 0xFF, 0xCA, 0xD2, 0xC2, 0xD2, 0x0F, 0x9F, -+ 0x63, 0xF4, 0x1A, 0xD5, 0x93, 0xEC, 0x03, 0x98, 0x40, 0x48, 0x02, 0x5E, 0x0F, 0x9F, 0x90, 0xF4, 0x11, 0x93, 0xB7, 0xEC, 0x41, 0x42, 0x02, 0x9E, 0x0F, 0x9F, 0x73, 0xF4, 0x04, 0x94, 0x48, 0x44, -+ 0x02, 0x4E, 0x0F, 0x9F, 0x7E, 0xF4, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x90, 0xF4, 0x11, 0x93, 0x04, 0x82, 0x41, 0xB2, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x90, 0xF4, 0x41, 0x96, 0x01, 0xD6, -+ 0x0A, 0x65, 0xBD, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xA3, 0x80, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x0F, 0x9F, 0xE9, 0xF4, -+ 0xC5, 0x98, 0x43, 0x48, 0x02, 0x9E, 0x0F, 0x9F, 0xE9, 0xF4, 0x4F, 0x96, 0x0C, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x9D, 0xF4, 0x47, 0x96, 0x11, 0x93, 0xB6, 0xEC, 0x40, 0x42, -+ 0x02, 0x4E, 0x0F, 0x9F, 0xC5, 0xF4, 0x11, 0x93, 0xB7, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xC5, 0xF4, 0x12, 0x95, 0x00, 0x82, 0x0A, 0x05, 0xFF, 0xAF, 0x05, 0xD4, 0xC8, 0xD6, 0xC8, 0xD2, -+ 0x40, 0xF0, 0x6D, 0xF7, 0x42, 0x00, 0x05, 0x96, 0xC3, 0x94, 0x01, 0xB5, 0x40, 0x44, 0x02, 0x4E, 0x0F, 0x9F, 0xC5, 0xF4, 0x06, 0x98, 0x50, 0x98, 0x1C, 0xD9, 0xA2, 0xBC, 0x40, 0x98, 0x1C, 0xD9, -+ 0xA2, 0xBC, 0x40, 0x92, 0x03, 0xD2, 0x0F, 0x9F, 0xEE, 0xF4, 0x03, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0xD2, 0xF4, 0x0A, 0x65, 0x5E, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, -+ 0x0F, 0x9F, 0xEE, 0xF4, 0x11, 0x93, 0xB7, 0xEC, 0x0C, 0x99, 0xBA, 0xEC, 0x04, 0x03, 0x04, 0x96, 0x13, 0x25, 0x03, 0xEC, 0xC1, 0xD4, 0x11, 0x93, 0xB9, 0xEC, 0x19, 0x05, 0xB9, 0xEC, 0x1B, 0xD7, -+ 0x01, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x99, 0xC4, 0x92, 0x43, 0xA2, 0xC2, 0xD2, 0x41, 0x92, 0x01, 0xD2, 0x03, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0x02, 0xF5, 0x11, 0x93, 0xB8, 0xEC, -+ 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xFA, 0xF4, 0x19, 0xD3, 0xB7, 0xEC, 0x19, 0xD3, 0xB9, 0xEC, 0x19, 0xD3, 0xBA, 0xEC, 0x03, 0x96, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x02, 0xF5, 0x41, 0x98, -+ 0x1C, 0xD9, 0xB6, 0xEC, 0x11, 0x93, 0xBE, 0xEC, 0x41, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x13, 0xF5, 0x11, 0x93, 0x00, 0x82, 0x19, 0xD3, 0x02, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, -+ 0x09, 0xA3, 0x00, 0x01, 0xC2, 0xD2, 0x40, 0x98, 0x1C, 0xD9, 0xBE, 0xEC, 0x0F, 0x9F, 0x1B, 0xF5, 0x01, 0x92, 0x19, 0xD3, 0xB6, 0xEC, 0x01, 0x94, 0x40, 0x44, 0x02, 0x5E, 0x0F, 0x9F, 0x27, 0xF5, -+ 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x47, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x12, 0x95, 0x03, 0x80, 0x0A, 0xB3, -+ 0x00, 0x40, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x46, 0xF5, 0x0A, 0xB7, 0x00, 0x08, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0x49, 0xF5, 0x11, 0x93, 0x03, 0xEC, 0x41, 0x02, 0x09, 0xB3, 0xFE, 0xFF, -+ 0x12, 0x95, 0x07, 0x80, 0x01, 0x45, 0x02, 0x8E, 0x0F, 0x9F, 0x49, 0xF5, 0x41, 0x92, 0x0F, 0x9F, 0x4A, 0xF5, 0x40, 0x92, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x41, 0x20, 0x08, 0x0B, 0x01, 0x00, -+ 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x13, 0x97, 0x6E, 0xEC, 0x0B, 0x47, 0xA0, 0x00, 0x02, 0x5E, 0x0F, 0x9F, 0x75, 0xF5, 0x09, 0x63, 0x08, 0x43, -+ 0x0A, 0x65, 0xFF, 0x5F, 0x01, 0x99, 0xC4, 0xD4, 0x0A, 0x95, 0x9B, 0xEC, 0xD2, 0x96, 0x1B, 0xD7, 0xFA, 0xBC, 0xD2, 0x96, 0xC4, 0xD6, 0xD2, 0x98, 0x1C, 0xD9, 0xFA, 0xBC, 0xD2, 0x96, 0xC1, 0xD6, -+ 0xC2, 0x94, 0x1A, 0xD5, 0xFA, 0xBC, 0x0F, 0x9F, 0xB3, 0xF5, 0x0C, 0x69, 0xFF, 0x6F, 0x1C, 0xD9, 0xF8, 0xBC, 0x0B, 0x47, 0x10, 0x95, 0x02, 0x5E, 0x0F, 0x9F, 0x8D, 0xF5, 0x0A, 0x95, 0x6F, 0xEC, -+ 0x09, 0x63, 0x06, 0x43, 0x01, 0x99, 0xC4, 0xD6, 0xD2, 0x96, 0x1B, 0xD7, 0xF8, 0xBC, 0x0C, 0x69, 0xEE, 0x6A, 0xC1, 0xD8, 0xC2, 0x94, 0x1A, 0xD5, 0xF8, 0xBC, 0x40, 0x92, 0xC5, 0xD2, 0x11, 0x43, -+ 0xC0, 0xEC, 0x02, 0x0E, 0x0F, 0x9F, 0xB0, 0xF5, 0xC5, 0x94, 0x0A, 0x03, 0x71, 0xEC, 0xC1, 0x94, 0x1A, 0xD5, 0xFA, 0xBC, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0xA2, 0xF5, -+ 0x0A, 0x95, 0x6F, 0xEC, 0xC8, 0xD4, 0x40, 0xF0, 0x8E, 0xF7, 0x19, 0xD3, 0xF8, 0xBC, 0x41, 0x00, 0xC5, 0x96, 0x41, 0x06, 0xC5, 0xD6, 0x13, 0x47, 0xC0, 0xEC, 0x02, 0x1E, 0x0F, 0x9F, 0x94, 0xF5, -+ 0x40, 0x98, 0x1C, 0xD9, 0xFA, 0xBC, 0x40, 0x92, 0x19, 0xD3, 0x6E, 0xEC, 0x19, 0xD3, 0xC0, 0xEC, 0x0A, 0x65, 0x52, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xEB, 0x43, -+ 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x41, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x43, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x06, 0x92, 0x01, 0xD2, 0x0A, 0x65, 0xF0, 0x6A, -+ 0x0B, 0x97, 0x6F, 0xEC, 0x02, 0x99, 0xC4, 0x98, 0xD3, 0xD8, 0x02, 0xD6, 0x0A, 0x03, 0x02, 0x00, 0x01, 0x97, 0xC3, 0x98, 0x02, 0x96, 0xC3, 0xD8, 0x01, 0x96, 0xC1, 0xD6, 0x1A, 0xD5, 0x6E, 0xEC, -+ 0xC5, 0x98, 0x14, 0x99, 0x6F, 0xEC, 0xC2, 0xD8, 0x43, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x6E, 0x92, 0x19, 0xD3, 0x05, 0x84, 0x40, 0x96, 0xC8, 0xD6, 0x40, 0xF0, -+ 0xC8, 0xF5, 0x41, 0x00, 0x11, 0x93, 0xBF, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x05, 0xF6, 0x42, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x02, 0xF6, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, -+ 0x42, 0xA2, 0xC2, 0xD2, 0x40, 0x92, 0x19, 0xD3, 0xBF, 0xEC, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, -+ 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x63, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x11, 0x93, 0xAF, 0xBC, 0x47, 0xB2, 0x59, 0x95, 0x5A, 0x95, 0x12, 0xA5, 0xBF, 0xBC, -+ 0x0A, 0xB3, 0x01, 0x00, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x27, 0xF6, 0x41, 0x04, 0x05, 0x93, 0x40, 0x96, 0x20, 0xD6, 0x62, 0x97, 0x0F, 0x9F, 0x36, 0xF6, 0x14, 0x99, 0xFC, 0xBC, 0xD1, 0xD8, -+ 0x14, 0x99, 0xFE, 0xBC, 0xD1, 0xD8, 0x20, 0x98, 0x42, 0x08, 0x20, 0xD8, 0x20, 0x98, 0x03, 0x49, 0x02, 0x1E, 0x0F, 0x9F, 0x2D, 0xF6, 0xC5, 0x92, 0x62, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x4F, 0xF6, -+ 0x02, 0x8E, 0x0F, 0x9F, 0x49, 0xF6, 0x61, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x73, 0xF6, 0x0F, 0x9F, 0xA0, 0xF6, 0x63, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x96, 0xF6, 0x0F, 0x9F, 0xA0, 0xF6, 0x0D, 0x03, -+ 0x01, 0x00, 0x0C, 0x99, 0x71, 0xEC, 0x0B, 0x05, 0xFF, 0xFF, 0x40, 0x96, 0x0F, 0x9F, 0x5C, 0xF6, 0xD1, 0x96, 0xD4, 0xD6, 0x20, 0x96, 0x41, 0x06, 0x20, 0xD6, 0x02, 0x47, 0x02, 0x1E, 0x0F, 0x9F, -+ 0x58, 0xF6, 0x1A, 0xD5, 0xC0, 0xEC, 0x0A, 0x65, 0xEB, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xA3, 0xC0, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xE9, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, -+ 0xC2, 0xD2, 0x0F, 0x9F, 0xA0, 0xF6, 0x0A, 0x03, 0xFE, 0xFF, 0x61, 0x95, 0x40, 0x98, 0x20, 0xD8, 0x02, 0x49, 0x02, 0x0E, 0x0F, 0x9F, 0xA0, 0xF6, 0x0D, 0x03, 0x01, 0x00, 0x21, 0xD2, 0x20, 0x92, -+ 0x05, 0x03, 0x42, 0x02, 0xC8, 0xD2, 0x21, 0x96, 0xC3, 0x92, 0x42, 0x06, 0x21, 0xD6, 0xC8, 0xD2, 0x22, 0xD4, 0x40, 0xF0, 0x01, 0xF1, 0x42, 0x00, 0x20, 0x98, 0x42, 0x08, 0x20, 0xD8, 0x22, 0x94, -+ 0x02, 0x49, 0x02, 0x1E, 0x0F, 0x9F, 0x7F, 0xF6, 0x0F, 0x9F, 0xA0, 0xF6, 0x0D, 0x03, 0x03, 0x00, 0xC8, 0xD2, 0x02, 0x92, 0xC8, 0xD2, 0x01, 0x96, 0xC8, 0xD6, 0x40, 0xF0, 0xA3, 0xF6, 0x43, 0x00, -+ 0x63, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x45, 0x20, 0x08, 0x0B, 0x01, 0x00, 0x0D, 0x03, 0x08, 0x00, 0x08, 0x94, 0xC5, 0xD4, 0x09, 0x05, 0x01, 0x00, 0xC2, 0x94, 0x03, 0xD4, 0x42, 0x02, -+ 0xC1, 0x92, 0x01, 0xD2, 0x02, 0x97, 0xC5, 0x94, 0x0A, 0x83, 0xFF, 0xFF, 0x11, 0xB3, 0x2C, 0x93, 0x09, 0xB3, 0xFB, 0xFF, 0x19, 0xD3, 0x2C, 0x93, 0x03, 0x92, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, -+ 0xD6, 0xF6, 0x01, 0x94, 0xD2, 0x92, 0x19, 0xD3, 0x2C, 0x93, 0x01, 0xD4, 0x02, 0x94, 0x12, 0x95, 0x2C, 0x93, 0x44, 0xA4, 0x1A, 0xD5, 0x2C, 0x93, 0x0A, 0xB5, 0xFB, 0xFF, 0x1A, 0xD5, 0x2C, 0x93, -+ 0x0B, 0x07, 0xFF, 0xFF, 0x40, 0x46, 0x02, 0x5E, 0x0F, 0x9F, 0xC1, 0xF6, 0x09, 0x63, 0xD4, 0x6C, 0x01, 0x95, 0xC2, 0x96, 0xC5, 0x94, 0x02, 0xA7, 0xC1, 0xD6, 0x03, 0x92, 0x54, 0x42, 0x02, 0x5E, -+ 0x0F, 0x9F, 0xE6, 0xF6, 0x0A, 0x83, 0xFF, 0xFF, 0x1B, 0xB3, 0x2C, 0x93, 0x45, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0x00, 0x40, 0x19, 0xD3, 0xF2, 0xBD, -+ 0x40, 0xF0, 0x2A, 0xF5, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0xFA, 0xF6, 0x40, 0xF0, 0x94, 0xF2, 0x0F, 0x9F, 0x08, 0xF7, 0x40, 0x96, 0xC8, 0xD6, 0x09, 0x93, 0x91, 0xEC, 0xC8, 0xD2, 0x40, 0xF0, -+ 0x2A, 0xEF, 0x0A, 0x65, 0xFE, 0x7F, 0x02, 0x97, 0xC3, 0x92, 0x44, 0xA2, 0xC2, 0xD2, 0x42, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x0A, 0x65, 0xE8, 0x43, 0x02, 0x97, -+ 0xC3, 0x92, 0x09, 0xA3, 0x40, 0x00, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0xC2, 0xD2, 0x40, 0x92, 0x19, 0xD3, 0x2D, 0xBC, 0x0A, 0x65, 0xD8, 0x43, -+ 0x02, 0x97, 0xC3, 0x92, 0x09, 0xB3, 0xBF, 0xFF, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x09, 0x63, 0xEA, 0x43, 0x01, 0x97, 0xC3, 0x94, 0x44, 0xA4, 0xC1, 0xD4, -+ 0x11, 0x93, 0xB8, 0xEC, 0x40, 0x42, 0x02, 0x4E, 0x0F, 0x9F, 0x61, 0xF7, 0x12, 0x95, 0x93, 0xEC, 0x0B, 0x67, 0x36, 0x43, 0xD2, 0x98, 0x1C, 0xD9, 0xC8, 0xBC, 0xD2, 0x98, 0x03, 0x93, 0xC1, 0xD8, -+ 0x11, 0x93, 0xB8, 0xEC, 0x09, 0x03, 0xFF, 0xFF, 0x19, 0xD3, 0xB8, 0xEC, 0x40, 0x42, 0x02, 0x5E, 0x0F, 0x9F, 0x3A, 0xF7, 0x19, 0xD3, 0xB7, 0xEC, 0x19, 0xD3, 0xB9, 0xEC, 0x0A, 0x05, 0xFE, 0xFF, -+ 0xCA, 0xD2, 0xCA, 0xD2, 0xC2, 0xD2, 0x0A, 0x65, 0x5E, 0x43, 0x02, 0x97, 0xC3, 0x92, 0x48, 0xA2, 0xC2, 0xD2, 0x0A, 0x65, 0xEA, 0x43, 0x02, 0x99, 0xC4, 0x92, 0x09, 0xB3, 0xFB, 0xFF, 0x0F, 0x9F, -+ 0x6A, 0xF7, 0x11, 0x93, 0x03, 0xEC, 0x19, 0xD3, 0x01, 0x82, 0x0A, 0x65, 0xFD, 0x7D, 0x02, 0x97, 0xC3, 0x92, 0x43, 0xA2, 0xC2, 0xD2, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, -+ 0x03, 0x92, 0x04, 0x96, 0x0D, 0x5E, 0x50, 0x46, 0x02, 0x0E, 0x40, 0x92, 0x09, 0xEE, 0x44, 0x46, 0x04, 0x0E, 0x59, 0x93, 0x44, 0x26, 0x04, 0x5E, 0x46, 0xEE, 0x41, 0x93, 0x41, 0x26, 0x43, 0x4E, -+ 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x40, 0xF0, 0xB1, 0xFE, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, 0x01, 0x00, 0x88, 0x98, 0x90, 0x9A, 0x88, 0xDA, 0x08, 0x0B, -+ 0x01, 0x00, 0x03, 0x94, 0x1A, 0xD5, 0x95, 0xF7, 0x11, 0x93, 0x00, 0x90, 0x88, 0x98, 0x90, 0x9A, 0x1D, 0x00, 0x1A, 0x00, 0x03, 0x00, 0x03, 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, -+ 0x16, 0x00, 0x21, 0x00, 0x12, 0x00, 0x09, 0x00, 0x13, 0x00, 0x19, 0x00, 0x19, 0x00, 0x19, 0x00, 0x21, 0x00, 0x2D, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7E, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0xF2, 0xBF, 0xF7, 0x00, 0x00, 0x74, 0xF2, 0xBF, 0xF7, 0x00, 0x00, -+ 0xB9, 0xF2, 0xBC, 0xF7, 0xC3, 0xF7, 0x00, 0x00, 0x86, 0xF3, 0xBF, 0xF7, 0x21, 0x47, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; -- - #endif diff --git a/packages/zd1211/zd1211-r52/makefile.patch b/packages/zd1211/zd1211-r52/makefile.patch deleted file mode 100644 index 9ec821daa1..0000000000 --- a/packages/zd1211/zd1211-r52/makefile.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- zd1211-driver-r52/Makefile.orig 2006-01-22 11:32:24.000000000 +0100 -+++ zd1211-driver-r52/Makefile 2006-01-22 12:37:17.000000000 +0100 -@@ -4,17 +4,17 @@ - # - # - --CC=gcc --CPP=g++ --LD=ld --rM=rm -f -r -+#CC=gcc -+#CPP=g++ -+#LD=ld -+#RM=rm -f -r - --MODPATH := /lib/modules/$(shell uname -r) -+#MODPATH := /lib/modules/$(shell uname -r) - - # if the kernel is 2.6.x, turn on this - KERN_26=y - --KERNEL_SOURCE=$(MODPATH)/source -+#KERNEL_SOURCE=$(MODPATH)/source - #KERNEL_SOURCE=/usr/src/linux - - # set to 1 for zd1211b -@@ -46,7 +46,7 @@ - EXTRA_CFLAGS += -D__SMP__ -DSMP - endif - --KDIR := $(MODPATH)/build -+#KDIR := $(MODPATH)/build - PWD := $(shell pwd) - - WLAN_SRC=$(PWD) -@@ -219,15 +219,15 @@ - - - install: all -- mkdir -p $(MODPATH)/net -+# mkdir -p $(MODPATH)/net - # mkdir -p /etc/zd1211 -- cp $(MODULE) $(MODPATH)/net -- depmod -a -+# cp $(MODULE) $(MODPATH)/net -+# depmod -a - - #for apdbg -- gcc -o apdbg apdbg.c -- chmod +x apdbg -- cp ./apdbg /sbin/apdbg -+# gcc -o apdbg apdbg.c -+# chmod +x apdbg -+# cp ./apdbg /sbin/apdbg - - clean: - rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff b/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff deleted file mode 100644 index a225d37698..0000000000 --- a/packages/zd1211/zd1211-r52/transmitkey.index.fix.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- zd1211-driver-r52/src/zd1205.c.orig 2006-02-10 10:02:56.000000000 +0100 -+++ zd1211-driver-r52/src/zd1205.c 2006-02-10 10:02:56.000000000 +0100 -@@ -5693,7 +5693,12 @@ - /* Check if the key is not marked as invalid */ - if (!(erq->flags & IW_ENCODE_NOKEY)) { // for command: key xxxxxxxxxx [n] - // ZD1211DEBUG(0, "Set contents of key %d\n", index+1); -- pSetting->EncryKeyId = index; -+ /* We change the transmit key only if we are -+ * transitioning from a no-encrypt state. This -+ * behavior is deduced from the iwconfig man page */ -+ if (pSetting->EncryOnOff == 0) { -+ pSetting->EncryKeyId = index; -+ } - memcpy(&pSetting->keyVector[index][0], key, pSetting->WepKeyLen); - zd1205_config_wep_keys(macp); - } else { // For command: key on diff --git a/packages/zd1211/zd1211-r52/zd1205.c.diff b/packages/zd1211/zd1211-r52/zd1205.c.diff deleted file mode 100644 index 946df139df..0000000000 --- a/packages/zd1211/zd1211-r52/zd1205.c.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- zd1211-driver-r52/src/zd1205.c.orig 2006-02-09 02:45:12.000000000 +0100 -+++ zd1211-driver-r52/src/zd1205.c 2006-02-09 02:46:53.000000000 +0100 -@@ -8512,6 +8512,7 @@ - printk(KERN_ERR "STA_DEAUTHED\n"); - printk(KERN_ERR "mac addr = %02x:%02x:%02x:%02x:%02x:%02x\n", - StaAddr[0], StaAddr[1], StaAddr[2], StaAddr[3], StaAddr[4], StaAddr[5]); -+ memset(&macp->BSSID[0], 0, 6); - break; - - default: diff --git a/packages/zd1211/zd1211-r52/zdhci.c.diff b/packages/zd1211/zd1211-r52/zdhci.c.diff deleted file mode 100644 index ad6568685c..0000000000 --- a/packages/zd1211/zd1211-r52/zdhci.c.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- zd1211-driver-r52/src/zdhci.c.orig 2006-02-09 02:47:21.000000000 +0100 -+++ zd1211-driver-r52/src/zdhci.c 2006-02-09 02:48:27.000000000 +0100 -@@ -892,6 +892,7 @@ - //check capability ... - if (cap & CAP_PRIVACY) { - if (!mPrivacyInvoked) -+ if (!mPrivacyInvoked && !mProbeWithSsid) - continue; - } else { - if (mPrivacyInvoked) diff --git a/packages/zd1211/zd1211-r67/.mtn2git_empty b/packages/zd1211/zd1211-r67/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/zd1211/zd1211-r67/.mtn2git_empty diff --git a/packages/zd1211/zd1211-r67/makefile-unslung.patch b/packages/zd1211/zd1211-r67/makefile-unslung.patch new file mode 100644 index 0000000000..3ad1e24424 --- /dev/null +++ b/packages/zd1211/zd1211-r67/makefile-unslung.patch @@ -0,0 +1,48 @@ +--- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 ++++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 +@@ -4,24 +4,23 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + +-MODPATH := /lib/modules/$(shell uname -r) ++MODPATH ?= /lib/modules/$(shell uname -r) + + # if the kernel is 2.6.x, turn on this +-KERN_26=y ++#KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + +-SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++SRC_DIR=src ++DEFINES ?=-D__KERNEL__ -DMODULE=1 + + + +@@ -227,9 +226,9 @@ + depmod -a + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211-r67/makefile.patch b/packages/zd1211/zd1211-r67/makefile.patch new file mode 100644 index 0000000000..5c575faece --- /dev/null +++ b/packages/zd1211/zd1211-r67/makefile.patch @@ -0,0 +1,47 @@ +--- zd1211-driver-r59/Makefile.orig 2006-02-25 16:04:26.000000000 +0100 ++++ zd1211-driver-r59/Makefile 2006-02-25 17:11:27.000000000 +0100 +@@ -4,24 +4,23 @@ + # + # + +-CC=gcc +-CPP=g++ +-LD=ld +-rM=rm -f -r ++CC ?= gcc ++CPP ?= g++ ++LD ?= ld + +-MODPATH := /lib/modules/$(shell uname -r) ++MODPATH ?= /lib/modules/$(shell uname -r) + + # if the kernel is 2.6.x, turn on this + KERN_26=y + +-KERNEL_SOURCE=$(MODPATH)/source ++KERNEL_SOURCE ?= $(MODPATH)/source + #KERNEL_SOURCE=/usr/src/linux + + # set to 1 for zd1211b + ZD1211REV_B=0 + +-SRC_DIR=src +-DEFINES=-D__KERNEL__ -DMODULE=1 ++SRC_DIR=src ++DEFINES ?=-D__KERNEL__ -DMODULE=1 + + + +@@ -227,9 +226,9 @@ + depmod -a + + #for apdbg +- gcc -o apdbg apdbg.c +- chmod +x apdbg +- cp ./apdbg /sbin/apdbg ++# gcc -o apdbg apdbg.c ++# chmod +x apdbg ++# cp ./apdbg /sbin/apdbg + + clean: + rm -rf .tmp_versions .*.cmd *.ko *.mod.c *.mod.o *.o $(SRC_DIR)/*.o $(SRC_DIR)/.*.o.cmd diff --git a/packages/zd1211/zd1211_20050822.bb b/packages/zd1211/zd1211_20050822.bb deleted file mode 100644 index dbd2c905f4..0000000000 --- a/packages/zd1211/zd1211_20050822.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "Driver for zd1211 family of wireless USB Dongles" -PRIORITY = "optional" -SECTION = "kernel/modules" -MAINTAINER = "dyoung <dyoung8888@yahoo.com>" -LICENSE = "GPL" -PR = "r5" -RDEPENDS = "wireless-tools" - -SRC_URI = "http://download.sourceforge.net/zd1211/sf_zd1211_${PV}_src.tar.gz \ - file://makefile.patch;patch=1 \ - file://iwconfig-rate.patch;patch=1 \ - file://access_ok.patch;patch=1 \ - file://urb-async.patch;patch=1" - -S = "${WORKDIR}/zd1211" - -inherit module - -#do_compile_prepend() { -# cp -f ${WORKDIR}/Makefile ${S}/ -#} - -do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP - oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ - 'KDIR=${STAGING_KERNEL_DIR}' \ - 'KERNRELEASE=${KERNEL_VERSION}' \ - 'CC="${KERNEL_CC}"' \ - 'LD="${KERNEL_LD}"' -} - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net - install -m 0644 ${S}/src/modules-${KERNEL_VERSION}/*${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net -} - diff --git a/packages/zd1211/zd1211_r52.bb b/packages/zd1211/zd1211_r67.bb index 21982ad64f..af03e7657f 100644 --- a/packages/zd1211/zd1211_r52.bb +++ b/packages/zd1211/zd1211_r67.bb @@ -3,17 +3,17 @@ PRIORITY = "optional" SECTION = "kernel/modules" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" LICENSE = "GPL" -PR = "r4" +PR = "r2" RDEPENDS = "wireless-tools" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ file://makefile.patch;patch=1 \ - file://firmware.patch;patch=1 \ - file://zd1205.c.diff;patch=1 \ - file://zdhci.c.diff;patch=1 \ - file://transmitkey.index.fix.diff;patch=1 \ " +SRC_URI_unslung = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ + file://makefile-unslung.patch;patch=1 \ + " + S = "${WORKDIR}/zd1211-driver-${PV}" inherit module @@ -23,10 +23,9 @@ do_compile () { oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \ 'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \ 'KDIR=${STAGING_KERNEL_DIR}' \ - 'SRC_DIR=${S}/src' \ - 'KERNE_VERSION=${KERNEL_VERSION}' \ - 'CC="${KERNEL_CC}"' \ - 'LD="${KERNEL_LD}"' + 'KERNEL_VERSION=${KERNEL_VERSION}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' } do_install() { |