diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-04-04 09:27:59 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-04 09:27:59 +0000 |
| commit | 414a70ace8cf06857958fad7f87cfcb63b350072 (patch) | |
| tree | 71a0005a35f07b5273ebfe337783e692c3262c0a /packages | |
| parent | 2444331e2870baa9e5bf3978571cc7fc06cd13c7 (diff) | |
| parent | 6ce3ce8860572954d283d4ec66364875d66a6d9c (diff) | |
merge of 85a1c1efe7466253130cd2e2a63079154ba54454
and c67d38b84a548cc9efa81f9371658f5c59e87e43
Diffstat (limited to 'packages')
256 files changed, 2094 insertions, 3061 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 7d56cbd3a6..82314a8f22 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 = "r33" 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/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS index 3a41fccf79..baa426218b 100644 --- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS +++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS @@ -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 @@ -115,10 +129,10 @@ run_module() { 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..612a0243b2 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,10 +73,22 @@ 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 @@ -73,7 +99,7 @@ pivot_realfs() { # 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 +121,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 +140,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,7 +149,9 @@ pivot_image() { IMAGE_NAME="`ls *rootfs.bin`" test -z "$IMAGE_NAME" && die "No rootfs found (*rootfs.bin) in $1/$IMAGE_PATH" fi - + + + echo "" echo "Using [$IMAGE_NAME]" mkdir -p /media/image || die "mkdir -p /media/image failed" @@ -161,11 +201,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" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 850912f20c..ed95ce1c9c 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 @@ -273,7 +284,7 @@ wait_for_input() { # * * * * * * This is the main function * * * * * * -if test "`runlevel`" != "unknown" -a "$1" != "-force" +if test -f /proc/cmdline -a "$1" != "-force" then echo "altboot: Using real init [$REAL_INIT] [$*] *" >/dev/tty1 exec $REAL_INIT $* 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..69f7c8351b 100644 --- a/packages/altboot/files/borzoi/altboot-2.6.cfg +++ b/packages/altboot/files/spitz/altboot-2.6.cfg 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..edbaff8b87 100644 --- a/packages/altboot/files/borzoi/altboot-2.4.cfg +++ b/packages/altboot/files/tosa/altboot-2.4.cfg @@ -8,13 +8,13 @@ SH_SHELL="/bin/sh" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" +FSCK_IMAGES="no" 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/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/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..a7b1bd4029 --- /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 = "r2" + +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..3162ab147a 100644 --- a/packages/efl/evas-fb_20060113.bb +++ b/packages/efl/evas-fb_20060113.bb @@ -2,7 +2,7 @@ include evas.inc DEPENDS = "freetype libpng jpeg eet" PR = "r0" -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..125dfb0c97 100644 --- a/packages/efl/evas-x11_0.9.9.023.bb +++ b/packages/efl/evas-x11_0.9.9.025.bb @@ -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..8925920fcf 100644 --- a/packages/efl/evas-x11_20060113.bb +++ b/packages/efl/evas-x11_20060113.bb @@ -2,7 +2,7 @@ include evas.inc DEPENDS += "libx11 libxext freetype" PR = "r4" -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..3199453d31 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -30,4 +30,5 @@ do_configure_prepend() { } headers = "<override me>" -libraries = "libevas"
\ No newline at end of file +libraries = "libevas" +FILES_${PN} += "/usr/lib/evas/"
\ No newline at end of file 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/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/altboot/files/spitz/altboot-menu/.mtn2git_empty b/packages/gnome/orbit2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/altboot/files/spitz/altboot-menu/.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/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/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/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/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/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..bb6b50fd3d 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 = "r3" 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,12 @@ 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}/pm_changes-r1.patch;patch=1 \ ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ @@ -66,6 +70,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/altboot/files/spitz/altboot-menu/Advanced/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/akita/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/altboot/files/spitz/altboot-menu/Advanced/.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/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/borzoi/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnumeric/gnumeric-1.3.1.cvs/.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/gnumeric/gnumeric-1.3.1/.mtn2git_empty b/packages/matchbox-wm/matchbox-wm/spitz/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnumeric/gnumeric-1.3.1/.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/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/gnumeric/gnumeric-1.5.3/.mtn2git_empty b/packages/python/python-2.4.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnumeric/gnumeric-1.5.3/.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/gnumeric/gnumeric-1.5.5/.mtn2git_empty b/packages/qt/qt-x11-free-4.1.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty +++ 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/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_2.3.10.bb b/packages/qte/qte_2.3.10.bb index fc03ca216b..2cc1c06259 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -8,7 +8,7 @@ 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" +PR = "r31" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5sum=af7ad30113afc500cab7f5b2f4dec0d7 \ file://qpe.patch;patch=1 \ @@ -40,14 +40,14 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m 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 \ +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 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_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 \ 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/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/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.0.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty +++ /dev/null diff --git a/packages/python/python-2.4.2/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/python/python-2.4.2/.mtn2git_empty +++ 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/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/wlan-ng/wlan-ng-modules-0.2.2/.mtn2git_empty +++ /dev/null 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/.mtn2git_empty b/packages/zd1211/zd1211-20050822/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/zd1211/zd1211-20050822/.mtn2git_empty +++ /dev/null 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/.mtn2git_empty b/packages/zd1211/zd1211-r52/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/zd1211/zd1211-r52/.mtn2git_empty +++ /dev/null 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/qt/qt-x11-free-4.0.1/.mtn2git_empty b/packages/zd1211/zd1211-r67/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty +++ 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() { |