From a30c93e2af03b28083b0bfea868ad3ba77026fe5 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 9 Jan 2007 17:21:05 +0000 Subject: ttf-sazanami: rprovide virtual/japanese-font, some clean-up --- packages/ttf-fonts/ttf-sazanami_20040629.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb index d1c4882d14..a51036155d 100644 --- a/packages/ttf-fonts/ttf-sazanami_20040629.bb +++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb @@ -1,16 +1,18 @@ +require ttf.inc + DESCRIPTION = "Sazanami Gothic/Mincho Japanese TrueType fonts" DESCRIPTION_ttf-sazanami-gothic = "Sazanami Gothic Japanese TrueType font" DESCRIPTION_ttf-sazanami-mincho = "Sazanami Mincho Japanese TrueType font" -LICENSE = "${PN}" -SRC_DISTRIBUTE_LICENSES += "${PN}" AUTHOR = "Electronic Font Open Laboratory (/efont/)" HOMEPAGE = "http://sourceforge.jp/projects/efont/" +LICENSE = "${PN}" +SRC_DISTRIBUTE_LICENSES += "${PN}" +RPROVIDES = "virtual/japanese-font" +PR = "r1" SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" -require ttf.inc - PACKAGES = "ttf-sazanami-gothic ttf-sazanami-mincho" FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \ ${datadir}/doc/ttf-sazanami-gothic/README" -- cgit v1.2.3 From 1defd953d23c5ed436febd42c88a491d9cf6b508 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 10 Jan 2007 00:42:12 +0000 Subject: qte* 2.3.10: Bump PR for latest changes. --- packages/qte/qte-mt_2.3.10.bb | 2 +- packages/qte/qte_2.3.10.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index f9a6186c6c..a0c8a1dce7 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r5" +PR = "r6" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 8a18de98ae..89674c9341 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r45" +PR = "r46" -- cgit v1.2.3 From ffea61dcf3e4105f73cf083a9c4f7c4c57eedb43 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 10 Jan 2007 00:44:29 +0000 Subject: opie-taskbar: Add background bitmap sizes for couple of VGA devices. --- packages/opie-taskbar/opie-taskbar.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index edc2c7a479..4c357f54b6 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -23,7 +23,9 @@ PIXMAP_SIZE_spitz = "-640x480" PIXMAP_SIZE_akita = "-640x480" PIXMAP_SIZE_tosa = "-480x640" PIXMAP_SIZE_simpad = "-800x600" +PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" +PIXMAP_SIZE_hx4700 = "-480x640" inherit opie update-rc.d -- cgit v1.2.3 From a021c40299b8baa7b647529b24288f5b989c4b20 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 10 Jan 2007 00:45:06 +0000 Subject: opie-taskbar: Bump PR for latest changes. --- packages/opie-taskbar/opie-taskbar_1.2.2.bb | 2 +- packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index 9b1cd8c461..be73fade6b 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 799d8a1d30..0d0dc00e6c 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ -- cgit v1.2.3 From e4d953b836d587233d546c5156a258d8c86682cc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 10 Jan 2007 13:02:48 +0000 Subject: gpm: provide libgpm.so.1 link, use update-rc.d class - close #543 --- packages/gpm/gpm_1.20.1.bb | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) (limited to 'packages') diff --git a/packages/gpm/gpm_1.20.1.bb b/packages/gpm/gpm_1.20.1.bb index 5623ebbf16..c017cafc9a 100644 --- a/packages/gpm/gpm_1.20.1.bb +++ b/packages/gpm/gpm_1.20.1.bb @@ -1,21 +1,25 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "ncurses" DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ for the console and xterm, with sample clients included \ (emacs, etc)." +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "ncurses" -PR="r1" -PARALLEL_MAKE="" +PR = "r2" +PARALLEL_MAKE = "" SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ file://no-docs.patch;patch=1 \ file://init" -inherit autotools +inherit autotools update-rc.d + +INITSCRIPT_NAME = "gpm" +INITSCRIPT_PARAMS = "defaults" export LIBS = "-lm" + do_configure_prepend () { cp aclocal.m4 acinclude.m4 } @@ -29,18 +33,5 @@ do_install () { oe_runmake 'ROOT=${D}' install install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm -} - -pkg_postinst () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D gpm defaults -} - -pkg_prerm () { - if test -n "${D}"; then - D="-r $D" - fi - update-rc.d $D gpm remove + cd ${D}${libdir} && ln -sf libgpm.so.1.19.0 libgpm.so.1 } -- cgit v1.2.3 From 5bbcd1c6647233e8e3ef065a9011320d1b4ceb51 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 10 Jan 2007 13:06:33 +0000 Subject: gconf-osso: DEF_PREF = -1 - should close #1780 --- packages/maemo/gconf-osso_2.6.4-3.1osso13.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb index 6b7eddb03b..72ddfb5613 100644 --- a/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb +++ b/packages/maemo/gconf-osso_2.6.4-3.1osso13.bb @@ -7,6 +7,8 @@ RPROVIDES = "gconf" PR = "r3" +DEFAULT_PREFERENCE = "-1" + SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/g/gconf2/gconf2_${PV}.tar.gz \ file://gconf-update.patch;patch=1;pnum=0 \ file://free-entry-fix.diff;patch=1 \ -- cgit v1.2.3 From 0b09153585d71f41495e91e8c8692a17759f2bba Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 10 Jan 2007 13:13:45 +0000 Subject: ossie : Add PV to ossie _svn bb files. --- packages/ossie/ossie-c-wavloader_svn.bb | 3 ++- packages/ossie/ossie-channeldemo_svn.bb | 3 ++- packages/ossie/ossie-demo_svn.bb | 3 ++- packages/ossie/ossie-gpp-device_svn.bb | 3 ++- packages/ossie/ossie-interpolator_svn.bb | 3 ++- packages/ossie/ossie-modulator_svn.bb | 3 ++- packages/ossie/ossie-nodebooter_svn.bb | 3 ++- packages/ossie/ossie-randombits_svn.bb | 3 ++- packages/ossie/ossie-rxdemo_svn.bb | 3 ++- packages/ossie/ossie-sigproc_svn.bb | 3 ++- packages/ossie/ossie-soundout-device_svn.bb | 3 ++- packages/ossie/ossie-standardinterfaces_svn.bb | 3 ++- packages/ossie/ossie-tx-random-data_svn.bb | 3 ++- packages/ossie/ossie-usrp-device_svn.bb | 3 ++- packages/ossie/ossie-usrp-tx-control_svn.bb | 3 ++- packages/ossie/ossiecf_svn.bb | 4 ++-- 16 files changed, 32 insertions(+), 17 deletions(-) (limited to 'packages') diff --git a/packages/ossie/ossie-c-wavloader_svn.bb b/packages/ossie/ossie-c-wavloader_svn.bb index 5fdc9332cf..8f79f4667e 100644 --- a/packages/ossie/ossie-c-wavloader_svn.bb +++ b/packages/ossie/ossie-c-wavloader_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Waveform Loader" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf expat" diff --git a/packages/ossie/ossie-channeldemo_svn.bb b/packages/ossie/ossie-channeldemo_svn.bb index 93a41b6c3c..ddfab221de 100644 --- a/packages/ossie/ossie-channeldemo_svn.bb +++ b/packages/ossie/ossie-channeldemo_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Demo channel component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-demo_svn.bb b/packages/ossie/ossie-demo_svn.bb index d2777ecc10..c83ec256e8 100644 --- a/packages/ossie/ossie-demo_svn.bb +++ b/packages/ossie/ossie-demo_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Demo waveform" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-channeldemo ossie-rxdemo" RDEPENDS = "ossie-channeldemo ossie-rxdemo" diff --git a/packages/ossie/ossie-gpp-device_svn.bb b/packages/ossie/ossie-gpp-device_svn.bb index 39adc0a74c..f2a563624c 100644 --- a/packages/ossie/ossie-gpp-device_svn.bb +++ b/packages/ossie/ossie-gpp-device_svn.bb @@ -1,9 +1,10 @@ -PR = "r0" DESCRIPTION = "OSSIE General Purpose Processor device" SECTION = "apps" PRIORITY = "optional" MAINTAINER = "Philip Balister philip@balister.org" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-interpolator_svn.bb b/packages/ossie/ossie-interpolator_svn.bb index ca561fe0a1..5efca0b229 100644 --- a/packages/ossie/ossie-interpolator_svn.bb +++ b/packages/ossie/ossie-interpolator_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Interpolator component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc" diff --git a/packages/ossie/ossie-modulator_svn.bb b/packages/ossie/ossie-modulator_svn.bb index c6ac6afe73..4090b671d6 100644 --- a/packages/ossie/ossie-modulator_svn.bb +++ b/packages/ossie/ossie-modulator_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Modulator component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc" diff --git a/packages/ossie/ossie-nodebooter_svn.bb b/packages/ossie/ossie-nodebooter_svn.bb index 5a941550db..0e4a4611d2 100644 --- a/packages/ossie/ossie-nodebooter_svn.bb +++ b/packages/ossie/ossie-nodebooter_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Node Booter" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-randombits_svn.bb b/packages/ossie/ossie-randombits_svn.bb index a3ddc23185..7e9854641a 100644 --- a/packages/ossie/ossie-randombits_svn.bb +++ b/packages/ossie/ossie-randombits_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Random bit generator component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-standardinterfaces ossie-sigproc" diff --git a/packages/ossie/ossie-rxdemo_svn.bb b/packages/ossie/ossie-rxdemo_svn.bb index 34619b3845..8a0d4355d9 100644 --- a/packages/ossie/ossie-rxdemo_svn.bb +++ b/packages/ossie/ossie-rxdemo_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Demo receiver component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-sigproc_svn.bb b/packages/ossie/ossie-sigproc_svn.bb index c8ee73fea5..a8fa03052f 100644 --- a/packages/ossie/ossie-sigproc_svn.bb +++ b/packages/ossie/ossie-sigproc_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Signal Processing routines" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-soundout-device_svn.bb b/packages/ossie/ossie-soundout-device_svn.bb index b70d0f91bb..111a96f493 100644 --- a/packages/ossie/ossie-soundout-device_svn.bb +++ b/packages/ossie/ossie-soundout-device_svn.bb @@ -1,9 +1,10 @@ -PR = "r0" DESCRIPTION = "OSSIE sound playback device" SECTION = "apps" PRIORITY = "optional" MAINTAINER = "Philip Balister philip@balister.org" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "alsa-lib ossiecf ossie-standardinterfaces" diff --git a/packages/ossie/ossie-standardinterfaces_svn.bb b/packages/ossie/ossie-standardinterfaces_svn.bb index 7ed7c0b56f..c00bcd5c6b 100644 --- a/packages/ossie/ossie-standardinterfaces_svn.bb +++ b/packages/ossie/ossie-standardinterfaces_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE Standard port interfaces" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf" diff --git a/packages/ossie/ossie-tx-random-data_svn.bb b/packages/ossie/ossie-tx-random-data_svn.bb index 1597f5ec94..89ffe27a84 100644 --- a/packages/ossie/ossie-tx-random-data_svn.bb +++ b/packages/ossie/ossie-tx-random-data_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE transmit random bits waveform" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device" RDEPENDS = "ossie-randombits ossie-modulator ossie-interpolator ossie-usrp-tx-control ossie-usrp-device ossie-gpp-device" diff --git a/packages/ossie/ossie-usrp-device_svn.bb b/packages/ossie/ossie-usrp-device_svn.bb index 943b53a464..3f29c2c4f2 100644 --- a/packages/ossie/ossie-usrp-device_svn.bb +++ b/packages/ossie/ossie-usrp-device_svn.bb @@ -1,9 +1,10 @@ -PR = "r0" DESCRIPTION = "OSSIE General Purpose Processor device" SECTION = "apps" PRIORITY = "optional" MAINTAINER = "Philip Balister philip@balister.org" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf usrp ossie-standardinterfaces" diff --git a/packages/ossie/ossie-usrp-tx-control_svn.bb b/packages/ossie/ossie-usrp-tx-control_svn.bb index b3fca8fe9b..c3af96c2a3 100644 --- a/packages/ossie/ossie-usrp-tx-control_svn.bb +++ b/packages/ossie/ossie-usrp-tx-control_svn.bb @@ -1,8 +1,9 @@ -PR = "r0" DESCRIPTION = "OSSIE USRP TX side control component" SECTION = "apps" PRIORITY = "optional" LICENSE = "GPL" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" DEPENDS = "ossiecf ossie-standardinterfaces" diff --git a/packages/ossie/ossiecf_svn.bb b/packages/ossie/ossiecf_svn.bb index 76317ac8bd..2c7b27ef7c 100644 --- a/packages/ossie/ossiecf_svn.bb +++ b/packages/ossie/ossiecf_svn.bb @@ -1,10 +1,10 @@ -PR = "r0" DESCRIPTION = "OSSIE Core Framework" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" - DEPENDS = "xerces-c omniorb libtool-cross" +PV = "0.0.0+svn${SRCDATE}" +PR = "r0" S="${WORKDIR}/ossie" -- cgit v1.2.3 From 9d2a68aadee35b8e3cc37597a50c7116057932fe Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 10 Jan 2007 14:16:52 +0000 Subject: linux-handhelds-2.6: Update htcuniversal defconfig. * Closes #1692. --- .../linux-handhelds-2.6/htcuniversal/defconfig | 426 ++++++++++++++++----- 1 file changed, 332 insertions(+), 94 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig index d409f0b3f5..ad5cce380d 100644 --- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig @@ -1,15 +1,21 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-hh1 -# Sun Oct 1 20:32:17 2006 +# Linux kernel version: 2.6.19-hh6 +# Sat Dec 16 20:23:29 2006 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options @@ -25,19 +31,23 @@ CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set +# CONFIG_AUDIT is not set CONFIG_IKCONFIG=y # CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y CONFIG_UID16=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_EMBEDDED is not set +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y @@ -51,6 +61,8 @@ CONFIG_SHMEM=y CONFIG_USELIB=y CONFIG_CORE_DUMP=y CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -68,6 +80,7 @@ CONFIG_KMOD=y # # Block layer # +CONFIG_BLOCK=y # CONFIG_BLK_DEV_IO_TRACE is not set # @@ -86,18 +99,27 @@ CONFIG_DEFAULT_IOSCHED="cfq" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set @@ -105,12 +127,6 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_AT91RM9200 is not set # # Intel PXA2xx Implementations @@ -119,9 +135,11 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set # CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set # CONFIG_ARCH_H1900 is not set # CONFIG_ARCH_H2200 is not set # CONFIG_MACH_H3900 is not set @@ -133,25 +151,29 @@ CONFIG_ARCH_PXA=y CONFIG_MACH_HTCUNIVERSAL=y CONFIG_HTCUNIVERSAL_CORE=y CONFIG_HTCUNIVERSAL_UDC=y -# CONFIG_HTCUNIVERSAL_POWER is not set +CONFIG_HTCUNIVERSAL_POWER=y +CONFIG_HTCUNIVERSAL_BACKLIGHT=y CONFIG_HTCUNIVERSAL_LCD=y CONFIG_HTCUNIVERSAL_TS2=y -CONFIG_HTCUNIVERSAL_KEYPAD=y +CONFIG_HTCUNIVERSAL_BUTTONS=y CONFIG_HTCUNIVERSAL_BLUETOOTH=y -# CONFIG_HTCUNIVERSAL_PHONE is not set +CONFIG_HTCUNIVERSAL_PHONE=y +CONFIG_HTCUNIVERSAL_AK4641=m # CONFIG_MACH_HTCALPINE is not set # CONFIG_MACH_MAGICIAN is not set # CONFIG_MACH_HTCAPACHE is not set # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set -# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_HW6900 is not set # CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set # CONFIG_MACH_X30 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set # CONFIG_MACH_T3XSCALE is not set # CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y # CONFIG_SA1100_H3100 is not set # CONFIG_SA1100_H3600 is not set @@ -171,11 +193,14 @@ CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # # CONFIG_ARM_THUMB is not set +# CONFIG_CPU_DCACHE_DISABLE is not set CONFIG_XSCALE_PMU=y # CONFIG_KEXEC is not set @@ -190,7 +215,6 @@ CONFIG_XSCALE_PMU=y # # Compaq/HP iPAQ Drivers # -# CONFIG_IPAQ_HAMCOP is not set # # Bus support @@ -218,6 +242,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set CONFIG_ALIGNMENT_TRAP=y # @@ -257,6 +282,8 @@ CONFIG_BINFMT_ELF=y CONFIG_PM=y CONFIG_PM_LEGACY=y CONFIG_PM_DEBUG=y +# CONFIG_DISABLE_CONSOLE_SUSPEND is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set CONFIG_APM=y # @@ -271,6 +298,9 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -287,15 +317,20 @@ CONFIG_IP_PNP_DHCP=y # CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_XFRM_TUNNEL is not set -# CONFIG_INET_TUNNEL is not set +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y # CONFIG_INET_DIAG is not set # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # @@ -321,7 +356,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -381,6 +415,7 @@ CONFIG_IRTTY_SIR=m # CONFIG_USB_IRDA is not set # CONFIG_SIGMATEL_FIR is not set CONFIG_PXA_FICP=m +# CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -401,7 +436,7 @@ CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_BCSP=y # CONFIG_BT_HCIBCM203X is not set # CONFIG_BT_HCIBPA10X is not set -CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIBFUSB is not set # CONFIG_BT_HCIVHCI is not set # CONFIG_IEEE80211 is not set CONFIG_WIRELESS_EXT=y @@ -416,6 +451,7 @@ CONFIG_WIRELESS_EXT=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker @@ -459,6 +495,7 @@ CONFIG_BLK_DEV_LOOP=y # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=y +# CONFIG_SCSI_NETLINK is not set # CONFIG_SCSI_PROC_FS is not set # @@ -479,20 +516,25 @@ CONFIG_SCSI=y # CONFIG_SCSI_LOGGING is not set # -# SCSI Transport Attributes +# SCSI Transports # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set # # SCSI low-level drivers # # CONFIG_ISCSI_TCP is not set -# CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DEBUG is not set +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + # # Multi-device support (RAID and LVM) # @@ -528,6 +570,7 @@ CONFIG_NETDEVICES=y # Ethernet (10 or 100Mbit) # # CONFIG_NET_ETHERNET is not set +CONFIG_MII=y # # Ethernet (1000 Mbit) @@ -551,6 +594,7 @@ CONFIG_NET_RADIO=y # Obsolete Wireless cards support (pre-802.11) # # CONFIG_STRIP is not set +# CONFIG_USB_ZD1201 is not set # CONFIG_HOSTAP is not set CONFIG_ACX=m # CONFIG_ACX_USB is not set @@ -571,6 +615,7 @@ CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set CONFIG_PPPOE=m # CONFIG_SLIP is not set +CONFIG_SLHC=m # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -585,14 +630,12 @@ CONFIG_PPPOE=m # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=y @@ -602,11 +645,15 @@ CONFIG_INPUT_EVDEV=y # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_GPIO_KEYS=y +CONFIG_KEYBOARD_ASIC3=y +CONFIG_KEYBOARD_PXA27x=y # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -617,7 +664,7 @@ CONFIG_KEYBOARD_ATKBD=y # CONFIG_SERIO=y # CONFIG_SERIO_SERPORT is not set -CONFIG_SERIO_LIBPS2=y +# CONFIG_SERIO_LIBPS2 is not set # CONFIG_SERIO_RAW is not set # CONFIG_GAMEPORT is not set @@ -627,6 +674,7 @@ CONFIG_SERIO_LIBPS2=y CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -644,6 +692,31 @@ CONFIG_SERIAL_CORE=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +# CONFIG_SA1100_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set + # # I2C support # @@ -653,7 +726,7 @@ CONFIG_I2C_CHARDEV=y # # I2C Algorithms # -# CONFIG_I2C_ALGOBIT is not set +CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_ALGOPCF is not set # CONFIG_I2C_ALGOPCA is not set @@ -661,7 +734,9 @@ CONFIG_I2C_CHARDEV=y # I2C Hardware Bus support # # CONFIG_I2C_ELV is not set -# CONFIG_I2C_PXA is not set +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set @@ -671,52 +746,18 @@ CONFIG_I2C_CHARDEV=y # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set -CONFIG_SENSORS_EEPROM=y +# CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCA9535 is not set # CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set # CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set -# -# L3 serial bus support -# -# CONFIG_L3 is not set - -# -# Mice -# -# CONFIG_BUSMOUSE is not set - -# -# IPMI -# -# CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# -# CONFIG_WATCHDOG is not set -# CONFIG_NVRAM is not set -CONFIG_SA1100_RTC=y -# CONFIG_DTLK is not set -# CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# -# CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# -# CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set - # # SPI support # @@ -741,8 +782,57 @@ CONFIG_SPI_BITBANG=y # # Hardware Monitoring support # -# CONFIG_HWMON is not set +CONFIG_HWMON=y # CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Hardware Monitoring - Battery +# +CONFIG_BATTERY_MONITOR=y + +# +# L3 serial bus support +# +# CONFIG_L3 is not set # # SoC drivers @@ -751,19 +841,23 @@ CONFIG_SPI_BITBANG=y # CONFIG_SOC_T7L66XB is not set # CONFIG_SOC_TC6387XB is not set # CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y # CONFIG_SOC_TSC2101 is not set +# CONFIG_SOC_TSC2200 is not set # # Misc devices # -CONFIG_BATTERY_MONITOR=y # # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_TIFM_CORE is not set # # LED devices @@ -782,7 +876,6 @@ CONFIG_BATTERY_MONITOR=y # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices @@ -793,19 +886,23 @@ CONFIG_VIDEO_V4L2=y # # Graphics support # +CONFIG_FIRMWARE_EDID=y CONFIG_FB=y +# CONFIG_FB_DDC is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set -CONFIG_FB_FIRMWARE_EDID=y +# CONFIG_FB_BACKLIGHT is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set # # Console display driver support @@ -843,7 +940,54 @@ CONFIG_BACKLIGHT_CORGI=y # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +# CONFIG_SND_VERBOSE_PROCFS is not set +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_HTCUNIVERSAL=m +CONFIG_SND_PXA2xx_I2SOUND=m +# CONFIG_SND_PXA2XX_AC97 is not set + +# +# USB devices +# +# CONFIG_SND_USB_AUDIO is not set + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set # # USB support @@ -867,7 +1011,7 @@ CONFIG_USB_DEVICEFS=y # USB Host Controller Drivers # # CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD=m # CONFIG_USB_OHCI_BIG_ENDIAN is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_SL811_HCD is not set @@ -924,15 +1068,16 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET_MII is not set CONFIG_USB_USBNET=y CONFIG_USB_NET_CDCETHER=y # CONFIG_USB_NET_GL620A is not set -CONFIG_USB_NET_NET1080=y +# CONFIG_USB_NET_NET1080 is not set # CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set # CONFIG_USB_NET_RNDIS_HOST is not set # CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_USB_NET_ZAURUS=y -# CONFIG_USB_ZD1201 is not set +# CONFIG_USB_NET_ZAURUS is not set # CONFIG_USB_MON is not set # @@ -942,23 +1087,63 @@ CONFIG_USB_NET_ZAURUS=y # # USB Serial Converter support # -# CONFIG_USB_SERIAL is not set +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +# CONFIG_USB_SERIAL_CP2101 is not set +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set # # USB Miscellaneous drivers # # CONFIG_USB_EMI62 is not set # CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGETKIT is not set -# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_TEST is not set # @@ -988,7 +1173,8 @@ CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set # CONFIG_USB_GADGETFS is not set # CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # @@ -998,6 +1184,7 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y # CONFIG_MMC_PXA is not set +# CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set CONFIG_MMC_ASIC3=y @@ -1006,7 +1193,34 @@ CONFIG_MMC_ASIC3=y # Real Time Clock # CONFIG_RTC_LIB=y -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_CLASS=m + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=m +CONFIG_RTC_INTF_PROC=m +CONFIG_RTC_INTF_DEV=m +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set + +# +# RTC drivers +# +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_M48T86 is not set +CONFIG_RTC_DRV_SA1100=m +# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems @@ -1016,16 +1230,19 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y # CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4DEV_FS is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set CONFIG_ROMFS_FS=y CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set @@ -1046,16 +1263,16 @@ CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=850 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-15" -CONFIG_NTFS_FS=y -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set +# CONFIG_NTFS_FS is not set # # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -1080,8 +1297,20 @@ CONFIG_CRAMFS=y # # Network File Systems # -# CONFIG_NFS_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_DIRECTIO=y # CONFIG_NFSD is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m CONFIG_SMB_NLS_DEFAULT=y CONFIG_SMB_NLS_REMOTE="utf8" @@ -1114,7 +1343,7 @@ CONFIG_NLS_CODEPAGE_850=y # CONFIG_NLS_CODEPAGE_862 is not set # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set +CONFIG_NLS_CODEPAGE_865=y # CONFIG_NLS_CODEPAGE_866 is not set # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set @@ -1150,13 +1379,15 @@ CONFIG_NLS_UTF8=y # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 -CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DEBUG_FS is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set +# CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_USER is not set # @@ -1169,6 +1400,10 @@ CONFIG_FRAME_POINTER=y # Cryptographic options # CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_HMAC=y # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set @@ -1178,6 +1413,8 @@ CONFIG_CRYPTO_SHA1=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set @@ -1207,3 +1444,4 @@ CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y +CONFIG_PLIST=y -- cgit v1.2.3 From 803d7ee05e42c93a905664da11e2e88d8bd2edd2 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 10 Jan 2007 15:06:59 +0000 Subject: linux-handhelds-2.6: Disable CONFIG_AUDIT in defconfigs - it is broken on ARM, neither really needed on handhelds. --- packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig | 2 +- packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig | 2 +- packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig index d409f0b3f5..600a3cbf03 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.16/htcuniversal/defconfig @@ -29,7 +29,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set CONFIG_IKCONFIG=y # CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig index d409f0b3f5..600a3cbf03 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.17/htcuniversal/defconfig @@ -29,7 +29,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set CONFIG_IKCONFIG=y # CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y diff --git a/packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig index d409f0b3f5..600a3cbf03 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.18/htcuniversal/defconfig @@ -29,7 +29,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_SYSCTL=y -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set CONFIG_IKCONFIG=y # CONFIG_MINIMAL_OOPS is not set CONFIG_IKCONFIG_PROC=y -- cgit v1.2.3 From 9dfefd1732270bcca4fb80bf975c5be5fa3164be Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 10 Jan 2007 15:58:52 +0000 Subject: mediatomb: updates --- packages/mediatomb/mediatomb_svn.bb | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/mediatomb/mediatomb_svn.bb b/packages/mediatomb/mediatomb_svn.bb index 2515356b39..3d18717d63 100644 --- a/packages/mediatomb/mediatomb_svn.bb +++ b/packages/mediatomb/mediatomb_svn.bb @@ -19,14 +19,14 @@ EXTRA_OECONF = "--disable-mysql \ --enable-taglib \ --enable-libexif \ --disable-largefile \ - --with-sqlite3-h=${STAGING_DIR}/${TARGET_SYS}/include \ - --with-sqlite3-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-magic-h=${STAGING_DIR}/${TARGET_SYS}/include \ - --with-magic-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-exif-h=${STAGING_DIR}/${TARGET_SYS}/include \ - --with-exif-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-zlib-h=${STAGING_DIR}/${TARGET_SYS}/include \ - --with-zlib-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-js-h=${STAGING_DIR}/${TARGET_SYS}/include/js \ - --with-js-libs=${STAGING_DIR}/${TARGET_SYS}/lib \ - --with-taglib-cfg=${STAGING_DIR}/${BUILD_SYS}/bin/taglib-config" + --with-sqlite3-h=${STAGING_INCDIR} \ + --with-sqlite3-libs=${STAGING_LIBDIR} \ + --with-magic-h=${STAGING_INCDIR} \ + --with-magic-libs=${STAGING_LIBDIR} \ + --with-exif-h=${STAGING_INCDIR} \ + --with-exif-libs=${STAGING_LIBDIR} \ + --with-zlib-h=${STAGING_INCDIR} \ + --with-zlib-libs=${STAGING_LIBDIR} \ + --with-js-h=${STAGING_INCDIR}/js \ + --with-js-libs=${STAGING_LIBDIR} \ + --with-taglib-cfg=${STAGING_BINDIR_CROSS}/taglib-config" -- cgit v1.2.3 From 567171ff6fc5d826f6ad5931939a98eb7aefc6f9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 10 Jan 2007 20:02:04 +0000 Subject: opie-icon-reload: PACKAGE_ARCH = all (it is shell script) --- packages/opie-icon-reload/opie-icon-reload.inc | 4 +++- .../opie-icon-reload/opie-icon-reload_0.0.1.bb | 23 ---------------------- packages/opie-icon-reload/opie-icon-reload_cvs.bb | 5 ----- 3 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 packages/opie-icon-reload/opie-icon-reload_0.0.1.bb delete mode 100644 packages/opie-icon-reload/opie-icon-reload_cvs.bb (limited to 'packages') diff --git a/packages/opie-icon-reload/opie-icon-reload.inc b/packages/opie-icon-reload/opie-icon-reload.inc index 894577b1a4..01f8247f50 100644 --- a/packages/opie-icon-reload/opie-icon-reload.inc +++ b/packages/opie-icon-reload/opie-icon-reload.inc @@ -1,8 +1,10 @@ -SECTION = "opie/settings" DESCRIPTION = "Reload .desktop files on the fly" +SECTION = "opie/settings" PRIORITY = "optional" LICENSE = "GPL" +PACKAGE_ARCH = "all" + SRC_URI = "file://icon-reload.desktop \ file://icon-reload.sh \ file://reload.png" diff --git a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb deleted file mode 100644 index 9d87f74817..0000000000 --- a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb +++ /dev/null @@ -1,23 +0,0 @@ -SECTION = "opie/settings" -DESCRIPTION = "Reload .desktop files on the fly" -PRIORITY = "optional" -LICENSE = "GPL" - -PR = "r3" - -SRC_URI = "file://icon-reload.desktop \ - file://icon-reload.sh \ - file://reload.png" - -FILES_${PN} += "/opt" - -do_install() { - install -d ${D}${palmtopdir}/apps/Settings - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/pics - - install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings - install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin - install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics -} - diff --git a/packages/opie-icon-reload/opie-icon-reload_cvs.bb b/packages/opie-icon-reload/opie-icon-reload_cvs.bb deleted file mode 100644 index 7c49fdd77b..0000000000 --- a/packages/opie-icon-reload/opie-icon-reload_cvs.bb +++ /dev/null @@ -1,5 +0,0 @@ -require ${PN}.inc - -#Remove the dash below when 1.2.1 changes -PV = "1.2.2+cvs-${SRCDATE}" - -- cgit v1.2.3 From f296fa3ce98acf66c4f7c879c567bc9b0ef308aa Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 10 Jan 2007 20:23:37 +0000 Subject: openobex: do not rename openobex/openobex-apps packages (from .oz354x) --- packages/openobex/openobex_1.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb index 0c8d118cff..81f9ff68ed 100644 --- a/packages/openobex/openobex_1.2.bb +++ b/packages/openobex/openobex_1.2.bb @@ -5,7 +5,7 @@ SECTION = "libs" PROVIDES = "openobex-apps" DEPENDS = "libusb bluez-libs" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ file://disable-cable-test.patch;patch=1" \ @@ -30,3 +30,5 @@ PACKAGES += "openobex-apps" FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/openobex-config" FILES_${PN}-apps = "${bindir}/*" +DEBIAN_NOAUTONAME_${PN} = "1" +DEBIAN_NOAUTONAME_${PN}-apps = "1" -- cgit v1.2.3 From 96ba7b944ec4a839e31b62bd67c913bcc307424e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 10 Jan 2007 20:33:03 +0000 Subject: ttf/dejavu: updated to 2.13 --- packages/ttf-fonts/ttf-dejavu_2.12.bb | 18 ------------------ packages/ttf-fonts/ttf-dejavu_2.13.bb | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 packages/ttf-fonts/ttf-dejavu_2.12.bb create mode 100644 packages/ttf-fonts/ttf-dejavu_2.13.bb (limited to 'packages') diff --git a/packages/ttf-fonts/ttf-dejavu_2.12.bb b/packages/ttf-fonts/ttf-dejavu_2.12.bb deleted file mode 100644 index c1b743aa1b..0000000000 --- a/packages/ttf-fonts/ttf-dejavu_2.12.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "DejaVu font - TTF Edition" -LICENSE = "Bitstream Vera" -HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" - -SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2" - -require ttf.inc - -S = "${WORKDIR}/dejavu-ttf-${PV}" - -PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \ - ttf-dejavu-serif ttf-dejavu-serif-condensed" - -FILES_ttf-dejavu-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf" -FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf" -FILES_ttf-dejavu-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf" -FILES_ttf-dejavu-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf" -FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf" diff --git a/packages/ttf-fonts/ttf-dejavu_2.13.bb b/packages/ttf-fonts/ttf-dejavu_2.13.bb new file mode 100644 index 0000000000..c1b743aa1b --- /dev/null +++ b/packages/ttf-fonts/ttf-dejavu_2.13.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "DejaVu font - TTF Edition" +LICENSE = "Bitstream Vera" +HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" + +SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.bz2" + +require ttf.inc + +S = "${WORKDIR}/dejavu-ttf-${PV}" + +PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \ + ttf-dejavu-serif ttf-dejavu-serif-condensed" + +FILES_ttf-dejavu-sans = "${datadir}/fonts/truetype/DejaVuSans.ttf ${datadir}/fonts/truetype/DejaVuSans-*.ttf" +FILES_ttf-dejavu-sans-mono = "${datadir}/fonts/truetype/DejaVuSansMono*.ttf" +FILES_ttf-dejavu-sans-condensed = "${datadir}/fonts/truetype/DejaVuSansCondensed*.ttf" +FILES_ttf-dejavu-serif = "${datadir}/fonts/truetype/DejaVuSerif.ttf ${datadir}/fonts/truetype/DejaVuSerif-*.ttf" +FILES_ttf-dejavu-serif-condensed = "${datadir}/fonts/truetype/DejaVuSerifCondensed*.ttf" -- cgit v1.2.3 From 61972c6400a974b619825fcd9127461c5fad7131 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Wed, 10 Jan 2007 23:38:04 +0000 Subject: packages/parted/parted_1.8.0.bb: Addition of mem allocation patch * Currently parted 1.8.0 doesnt work on ARM devices when using glibc 2.5. This patch although it didnt solve the issue is an update from their maintainer. --- packages/parted/parted_1.8.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/parted/parted_1.8.0.bb b/packages/parted/parted_1.8.0.bb index 8681055855..bff27a62e8 100644 --- a/packages/parted/parted_1.8.0.bb +++ b/packages/parted/parted_1.8.0.bb @@ -5,7 +5,8 @@ SECTION = "console/tools" DEPENDS = "readline e2fsprogs-libs" PR = "r0" -SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \ + file://memory_allocation.patch;patch=0" EXTRA_OECONF = "--disable-Werror" #export CFLAGS = "-mstructure-size-boundary=8" -- cgit v1.2.3 From 2d10e13e0a44ed13b60586b308697fcabb3fd8fd Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Wed, 10 Jan 2007 23:42:33 +0000 Subject: linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch: * For the HP6xx to properly scan keys it needs to first disable all unused scan lines. Without this patch many keys appear dead and doesnt produce any output. * Changes to linux-jlime-jornada6xx_2.6.17.bb to reflect this patch addition. --- .../keyboard-fix-deadkeys.patch | 204 +++++++++++++++++++++ packages/linux/linux-jlime-jornada6xx_2.6.17.bb | 3 +- 2 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch (limited to 'packages') diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch b/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch new file mode 100644 index 0000000000..73923555d4 --- /dev/null +++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/keyboard-fix-deadkeys.patch @@ -0,0 +1,204 @@ +--- linux-2.6.17-linuxsh/drivers/input/keyboard/hp680_keyb.c 2006-12-06 21:56:06.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/hp680_keyb.c 2007-01-10 21:00:34.000000000 +0000 +@@ -5,6 +5,7 @@ + * + * Copyright (C) 2005 Andriy Skulysh + * Copyright (C) 2006 Paul Mundt ++ * Copyright (C) 2007 Kristoffer Ericson + * + * Splited from drivers/input/keyboard/hp600_keyb.c + * +@@ -20,6 +21,10 @@ + #include + #include "scan_keyb.h" + ++#define PCCR 0xa4000104 ++#define PDCR 0xa4000106 ++#define PECR 0xa4000108 ++#define PFCR 0xa400010a + #define PCDR 0xa4000124 + #define PDDR 0xa4000126 + #define PEDR 0xa4000128 +@@ -30,6 +35,24 @@ + #define PKDR 0xa4000132 + #define PLDR 0xa4000134 + ++/*************************************************************** ++HP Jornada 680(SWEDISH version) keyboard ++[!] indicates Special Characters ++ ++_______________________________________________________________________ ++| ESC F1 F2 F3 F4 F5 F6 F7 F8 F9 F10 POWER| ++| 1 2 3 4 5 6 7 8 9 0 + ` BKPSPACE| ++|* Q W E R T Y U I O P ! ^ ENTER| ++| TAB A S D F G H J K L ! ! ' ENTER| ++| SHIFT Z X C V B N M , . - UP SHIFT| ++| CTRL WIN ALT ? =======SPACE======== ALTG DEL LEF DO RI ] ++----------------------------------------------------------------------- ++ ++ ++****************************************************************/ ++ ++ ++ + /**************************************************************** + HP Jornada 690(Japanese version) keyboard scan matrix + +@@ -71,31 +94,56 @@ + ****************************************************************/ + + static const unsigned char hp680_japanese_table[] = { +- /* PTD1 */ ++/* ++ /* PTD1 */ ++ /* ? ? ? ? Esc ? ? ? */ + 0x3a, 0x70, 0x29, 0x00, 0x01, 0x00, 0x00, 0x00, ++ /* F1 F2 F3 F8 F7 F6 F4 F5 */ + 0x3b, 0x3c, 0x3d, 0x42, 0x41, 0x40, 0x3e, 0x3f, +- /* PTD5 */ ++ ++ /* PTD5 */ ++ /* / : Enter ? Z ? ? ? */ + 0x35, 0x28, 0x1c, 0x00, 0x2c, 0x00, 0x00, 0x00, ++ /* X C V . , M B N */ + 0x2d, 0x2e, 0x2f, 0x34, 0x33, 0x32, 0x30, 0x31, +- /* PTD7 */ +- 0x50, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +- 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x38, 0x7b, +- /* PTE0 */ ++ ++ /* PTD7 */ ++ /* Down Right ? ? ? ? ? ? */ ++ 0x50, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ /* ? ? ? Left ? ? Alt ? */ ++ 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x38, 0x7b, ++ ++ /* PTE0 */ ++ /* ? ? ? ? Win ? ? ? */ + 0x00, 0x00, 0x00, 0x00, 0xdb, 0x00, 0x00, 0x00, ++ /* Ctrl ? Space Del _ ? ? ? */ + 0x1d, 0x00, 0x39, 0x53, 0x73, 0xf9, 0x00, 0x00, +- /* PTE1 */ ++ ++ /* PTE1 */ ++ /* ; [ ] ? A ? ? ? */ + 0x27, 0x1b, 0x2b, 0x00, 0x1e, 0x00, 0x00, 0x00, ++ /* S D F L K J G H */ + 0x1f, 0x20, 0x21, 0x26, 0x25, 0x24, 0x22, 0x23, +- /* PTE3 */ +- 0x48, 0x7d, 0x36, 0x00, 0x0f, 0x00, 0x00, 0x00, +- 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +- /* PTE6 */ ++ ++ /* PTE3 */ ++ /* Up \ ShiftR ? Q ? ? ? */ ++ 0x48, 0x7d, 0x36, 0x00, 0x0f, 0x00, 0x00, 0x00, ++ /* ? ShiftL ? ? ? ? ? ? */ ++ 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, ++ ++ /* PTE6 */ ++ /* P @ BS ? Q ? ? ? */ + 0x19, 0x1a, 0x0e, 0x00, 0x10, 0x00, 0x00, 0x00, ++ /* W E R O I U T Y */ + 0x11, 0x12, 0x13, 0x18, 0x17, 0x16, 0x14, 0x15, +- /* PTE7 */ +- 0x0b, 0x0c, 0x0d, 0x00, 0x02, 0x00, 0x00, 0x00, +- 0x03, 0x04, 0x05, 0x0a, 0x09, 0x08, 0x06, 0x07, +- /* **** */ ++ ++ /* PTE7 */ ++ /* 0 + = ? 1 ? ? ? */ ++ 0x0b, 0x0c, 0x0d, 0x00, 0x02, 0x00, 0x00, 0x00, ++ /* 2 3 4 9 8 7 5 6 */ ++ 0x03, 0x04, 0x05, 0x0a, 0x09, 0x08, 0x06, 0x07, ++ ++ /* **** */ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; +@@ -103,37 +151,72 @@ + static int hp680_japanese_scan_kbd(unsigned char *s) + { + int i; +- unsigned char matrix_switch[] = { +- 0xfd, 0xff, /* PTD1 */ +- 0xdf, 0xff, /* PTD5 */ +- 0x7f, 0xff, /* PTD7 */ +- 0xff, 0xfe, /* PTE0 */ +- 0xff, 0xfd, /* PTE1 */ +- 0xff, 0xf7, /* PTE3 */ +- 0xff, 0xbf, /* PTE6 */ +- 0xff, 0x7f, /* PTE7 */ ++ unsigned short ec_static,dc_static; /* = UINT16_t */ ++ unsigned char matrix_switch[] = { ++ 0xfd, 0xff, /* PTD1 PD(1) */ ++ 0xdf, 0xff, /* PTD5 PD(5) */ ++ 0x7f, 0xff, /* PTD7 PD(7) */ ++ 0xff, 0xfe, /* PTE0 PE(0) */ ++ 0xff, 0xfd, /* PTE1 PE(1) */ ++ 0xff, 0xf7, /* PTE3 PE(3) */ ++ 0xff, 0xbf, /* PTE6 PE(6) */ ++ 0xff, 0x7f, /* PTE7 PE(7) */ + }, *t=matrix_switch; ++ /* PD(x) : ++ 1. 0xcc0c & (1~(1 << (2*(x)+1))))) ++ 2. (0xf0cf & 0xfffff) */ ++ /* PE(x) : ++ 1. 0xcc0c & 0xffff ++ 2. 0xf0cf & (1~(1 << (2*(x)+1))))) */ ++ unsigned short matrix_PDE[] = { ++ 0xcc04, 0xf0cf, /* PD(1) */ ++ 0xc40c, 0xf0cf, /* PD(5) */ ++ 0x4c0c, 0xf0cf, /* PD(7) */ ++ 0xcc0c, 0xf0cd, /* PE(0) */ ++ 0xcc0c, 0xf0c7, /* PE(1) */ ++ 0xcc0c, 0xf04f, /* PE(3) */ ++ 0xcc0c, 0xd0cf, /* PE(6) */ ++ 0xcc0c, 0x70cf, /* PE(7) */ ++ } ++ , *y=matrix_PDE; ++ /* Save these control reg bits */ ++ dc_static = (ctrl_inw(PDCR) & (~0xcc0c)); ++ ec_static = (ctrl_inw(PECR) & (~0xf0cf)); + + for(i=0; i<8; i++) { +- ctrl_outb(*t++, PDDR); ++ /* disable output for all but the one we want to scan */ ++ ctrl_outw((dc_static | *y++), PDCR); ++ ctrl_outw((ec_static | *y++), PECR); ++ udelay(5); ++ ++ /* Get scanline row */ ++ ctrl_outb(*t++, PDDR); + ctrl_outb(*t++, PEDR); ++ udelay(50); ++ ++ /* Read data */ + *s++=ctrl_inb(PCDR); + *s++=ctrl_inb(PFDR); + } +- ++ /* Scan no lines */ + ctrl_outb(0xff, PDDR); + ctrl_outb(0xff, PEDR); ++ ++ /* Enable all scanlines */ ++ ctrl_outw((dc_static | (0x5555 & 0xcc0c)),PDCR); ++ ctrl_outw((ec_static | (0x5555 & 0xf0cf)),PECR); ++ /* Ignore extra keys and events */ + + *s++=ctrl_inb(PGDR); + *s++=ctrl_inb(PHDR); +- ++ + return 0; + } + + static struct scan_keyboard hp680_kbd = { + .scan = hp680_japanese_scan_kbd, + .table = hp680_japanese_table, +- .length = 18, ++ .length = 16, + }; + + static int __init hp680_kbd_init_hw(void) diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb index 1c22e230e1..4fdeb52fc4 100644 --- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb +++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb @@ -11,7 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.17.tar.gz \ file://LinuxSH-2.6.17.patch;patch=0 \ file://unexpected-int-fix.patch;patch=0 \ file://keymap-fix.patch;patch=0 \ - file://io.h-fix.patch;patch=0" + file://io.h-fix.patch;patch=0 \ + file://keyboard-fix-deadkeys.patch;patch=0" S = "${WORKDIR}/linux-${PV}" -- cgit v1.2.3 From 716f9c86f3b19f5e62207f09cf884bf1bca3715e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 10 Jan 2007 23:59:14 +0000 Subject: qte-common 2.3.10: Add better support for few htcuniversal, htcblueangel, magician machines. --- packages/qte/qte-common_2.3.10.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index df00cbf85e..422bb235b5 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -122,6 +122,9 @@ EXTRA_DEFINES_hx2000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_hx4700 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_asus716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_asus730 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_htcuniversal = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_htcblueangel = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_magician = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -- cgit v1.2.3 From 82aed0d1e65030033533bff07341ce21431cf5f8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 11 Jan 2007 00:24:50 +0000 Subject: diet-x11: enable xcms to fix rxvt and icewm, should close #1658 --- packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb index e2b6e442ba..52e01dde75 100644 --- a/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/diet-x11_X11R7.1-1.0.1.bb @@ -1,10 +1,10 @@ SECTION = "x11/base" require libx11_${PV}.bb -EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +EXTRA_OECONF += "--disable-udc --enable-xcms --disable-xlocale --disable-xkb" CFLAGS += "-D_GNU_SOURCE" -PR = "r2" +PR = "r4" SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ file://fix-disable-xlocale.diff;patch=1 \ -- cgit v1.2.3 From 4cd0121af3b189fa36a7997a1a02c48be6a97d00 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 00:40:45 +0000 Subject: qte-common 2.3.10: Add better support for htchimalaya, rx3000 machines. --- packages/qte/qte-common_2.3.10.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 422bb235b5..7f27b5326d 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -120,10 +120,12 @@ EXTRA_DEFINES_h5000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h6300 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_hx2000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_hx4700 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_rx3000 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_asus716 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_asus730 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_htcuniversal = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_htcblueangel = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_htchimalaya = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_magician = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -- cgit v1.2.3 From f7be60f96e682abaa431399bb512379e253daa0d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 00:43:24 +0000 Subject: qte-common 2.3.10: Sort EXTRA_DEFINES per device families --- packages/qte/qte-common_2.3.10.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 7f27b5326d..37b9c1b70b 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -104,11 +104,8 @@ EXTRA_OEMAKE = "-e" # add device flags here # EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" -EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_a780 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX" EXTRA_DEFINES_e680 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX" -EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" EXTRA_DEFINES_h1910 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h1940 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h2200 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" @@ -131,9 +128,12 @@ EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" -EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX" -EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" -EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX -DQT_QWS_SLCXK" +EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700" +EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" +EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" +EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" +EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" +EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" # -- cgit v1.2.3 From 11973b641c7679c198a03fa3aff75196c06cecc3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 00:45:08 +0000 Subject: qte-common 2.3.10: Add support for palmld, palmtx machines. --- packages/qte/qte-common_2.3.10.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 37b9c1b70b..247b428a4e 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -127,6 +127,8 @@ EXTRA_DEFINES_magician = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada56x = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada6xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_jornada7xx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_palmld = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_palmtx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS" EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700" EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" -- cgit v1.2.3 From 64cdee9c1cd6b12741ba7fda490a0be018858ed3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 00:48:33 +0000 Subject: qte* 2.3.10: Bump PR for latest changes. --- packages/qte/qte-mt_2.3.10.bb | 2 +- packages/qte/qte_2.3.10.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index a0c8a1dce7..4db61bb646 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r6" +PR = "r7" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 89674c9341..c789358f2a 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r46" +PR = "r47" -- cgit v1.2.3 From dd58586ec141a282cd502acfe6aba9b343f29b09 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 02:03:50 +0000 Subject: opie-pics: Use @base_conditional() instead of doubel indirection for GUI_MACHINE_CLASS testing. --- packages/opie-pics/opie-pics.inc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc index 78747b9147..1bd67a8077 100644 --- a/packages/opie-pics/opie-pics.inc +++ b/packages/opie-pics/opie-pics.inc @@ -2,13 +2,12 @@ DESCRIPTION = "Common Opie pictures usable from all applications" SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" S = "${WORKDIR}" SHIP_INLINE_PICS = "yes" -INLINE_PICS_smallscreen = "pics/inline" -INLINE_PICS_bigscreen = "pics-hires/inline" +INLINE_PICS = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "pics-hires/inline", "pics/inline", d)}' do_install() { install -d ${D}${palmtopdir}/pics/addressbook/ @@ -20,7 +19,7 @@ do_install() { install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/ if [ "${SHIP_INLINE_PICS}" == "yes" ]; then - install -m 0664 ${INLINE_PICS_${GUI_MACHINE_CLASS}}/*.png ${D}${palmtopdir}/pics/ + install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/ fi } -- cgit v1.2.3 From faa02411a5201b911b992d1487577041d20732df Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 04:03:11 +0000 Subject: gpe-bootsplash: Add missing portrait bootsplash for Angstrom. * Based on splash-l.svg plus GPE logo (mostly to make it "portrait" orientation so gpe-bootsplash render it correctly). * Yeah, it's understood it's all temporary, etc. But let's not sure users something badly rendered/inconsistent anyway. --- .../gpe-bootsplash/files/angstrom/splash-p.svg | 266 +++++++++++++++++++++ 1 file changed, 266 insertions(+) create mode 100644 packages/gpe-bootsplash/files/angstrom/splash-p.svg (limited to 'packages') diff --git a/packages/gpe-bootsplash/files/angstrom/splash-p.svg b/packages/gpe-bootsplash/files/angstrom/splash-p.svg new file mode 100644 index 0000000000..45383e2072 --- /dev/null +++ b/packages/gpe-bootsplash/files/angstrom/splash-p.svg @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + Embedded power + + + + + + + + + + + + + + -- cgit v1.2.3 From 5b2f103f75078174c1c7ba9dce7d9a9f6930e93c Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 04:06:04 +0000 Subject: gpe-bootsplash: Fix up Angstrom's splash-l.svg, move graphics a bit up, so it wasn't overwritten by psplash's progress indicator. --- .../gpe-bootsplash/files/angstrom/splash-l.svg | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'packages') diff --git a/packages/gpe-bootsplash/files/angstrom/splash-l.svg b/packages/gpe-bootsplash/files/angstrom/splash-l.svg index 9aad9bbf6e..5af0402cb9 100644 --- a/packages/gpe-bootsplash/files/angstrom/splash-l.svg +++ b/packages/gpe-bootsplash/files/angstrom/splash-l.svg @@ -7,16 +7,16 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="841.88977pt" height="595.27557pt" id="svg2" sodipodi:version="0.32" - inkscape:version="0.43" + inkscape:version="0.43+0.44pre4" version="1.0" - sodipodi:docbase="/Users/koen/Projects/AÌŠngström" - sodipodi:docname="angstrom-background.svg" + sodipodi:docbase="J:\" + sodipodi:docname="foo.svg" inkscape:export-filename="/Users/koen/Projects/AÌŠngström/angstrom-background.png" inkscape:export-xdpi="55.049999" inkscape:export-ydpi="55.049999"> @@ -150,7 +150,7 @@ fx="202.1609" fy="581.95923" r="161.44482" - gradientTransform="matrix(0.404735,2.39512e-7,-2.549551e-7,0.430831,83.00297,330.5175)" + gradientTransform="matrix(0.404735,2.39512e-7,-2.549551e-7,0.430831,83.00297,226.5175)" gradientUnits="userSpaceOnUse" /> + inkscape:window-x="121" + inkscape:window-y="262" /> @@ -205,24 +205,24 @@ xml:space="preserve" style="font-size:66.54315948px;font-style:normal;font-weight:normal;fill:#3d74c0;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" id="text2249" - y="813.42664" + y="709.42664" x="555.96344">Embedded power -- cgit v1.2.3 From a027f653cc07ce7c844c20c769b4b4d0f5b56e01 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 04:07:11 +0000 Subject: gpe-bootsplash 1.15: Bump PR for Ansgtrom bootsplash changes. --- packages/gpe-bootsplash/gpe-bootsplash_1.15.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb index d9b4141204..fdb73492db 100644 --- a/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb +++ b/packages/gpe-bootsplash/gpe-bootsplash_1.15.bb @@ -4,7 +4,7 @@ DEPENDS = "gtk+ libsvg-cairo" SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -PR = "r6" +PR = "r7" SRC_URI += "file://splash-p.svg \ file://splash-l.svg \ -- cgit v1.2.3 From a5bfba15d1d4bfb1f2691d1d8fa47a6511dcccf7 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 05:01:28 +0000 Subject: opie-taskbar: OPIE startup: if touchscreen device is not available, use mouse. * Tested on qemuarm vs h3900. --- packages/opie-taskbar/opie-taskbar/opie | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'packages') diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie index 3320dbe7c5..bfcfec2785 100755 --- a/packages/opie-taskbar/opie-taskbar/opie +++ b/packages/opie-taskbar/opie-taskbar/opie @@ -16,6 +16,10 @@ fi . /etc/profile +if [ ! -e $TSLIB_TSDEVICE ]; then + export QWS_MOUSE_PROTO=MouseMan:/dev/input/mice +fi + for conf in $OPIEDIR/etc/skel/*.conf; do conf_basename=`basename $conf` if [ ! -e "$HOME/Settings/$conf_basename" ] ; then -- cgit v1.2.3 From 113e0ce1af9ea499947a9aa7e70e734782822b1d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 05:02:48 +0000 Subject: opie-taskbar: Bump PR for mouse support in startup script. --- packages/opie-taskbar/opie-taskbar_1.2.2.bb | 2 +- packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index be73fade6b..d5d947783c 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 0d0dc00e6c..3d770a55dc 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ -- cgit v1.2.3 From d8059daeb3ea904528c4f2f3216194398bc869e9 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 05:08:52 +0000 Subject: opie-taskbar: OPIE startup: Run OPIE on VT 3, as a workaround for psplash issues. * psplash is finished properly before starting OPIE, it just leaves VTs in weird state. It seems that actually OPIE cannot change VT to 2 after psplash, and instead starts on VT 1, with console input activated, etc (i.e. user can type over graphical framebuffer). Using VT 3 works ok. --- packages/opie-taskbar/opie-taskbar/opie | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie index bfcfec2785..b2677ddc0d 100755 --- a/packages/opie-taskbar/opie-taskbar/opie +++ b/packages/opie-taskbar/opie-taskbar/opie @@ -44,7 +44,7 @@ case $1 in if [ -x "$OPIEDIR/bin/opie-login" ]; then echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 2 + $OPIEDIR/bin/opie-login -terminal 3 else $OPIEDIR/bin/opie-reorgfiles if [ -x /usr/bin/ssh-agent ]; then @@ -57,7 +57,7 @@ case $1 in export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh fi echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 + $SSHAGENT $OPIEDIR/bin/qpe -terminal 3 fi ;; -- cgit v1.2.3 From 63bf0bfee6b1a9644093735b8e9b53d1d1867e2d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 11 Jan 2007 07:49:06 +0000 Subject: perl: cleaned config.sh-x86-64 from paths of my build --- packages/perl/perl-5.8.7/config.sh-x86_64-linux | 241 +++++++++++------------- 1 file changed, 112 insertions(+), 129 deletions(-) (limited to 'packages') diff --git a/packages/perl/perl-5.8.7/config.sh-x86_64-linux b/packages/perl/perl-5.8.7/config.sh-x86_64-linux index 89c830e79a..06a5f0f621 100644 --- a/packages/perl/perl-5.8.7/config.sh-x86_64-linux +++ b/packages/perl/perl-5.8.7/config.sh-x86_64-linux @@ -30,30 +30,30 @@ afs='false' afsroot='/afs' alignbytes='8' ansi2knr='' -aphostname='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/hostname' +aphostname='/bin/hostname' api_revision='5' api_subversion='0' api_version='8' api_versionstring='5.8.0' ar='ar' -archlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi' -archlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi' +archlib='/usr/lib/perl5/5.8.7/x86_64-linux-thread-multi' +archlibexp='/usr/lib/perl5/5.8.7/x86_64-linux-thread-multi' archname64='' archname='x86_64-linux-thread-multi' archobjs='' -asctime_r_proto='REENTRANT_PROTO_B_SB' +asctime_r_proto='0' awk='awk' baserev='5.0' bash='' -bin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' -binexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' +bin='/usr/bin' +binexp='/usr/bin' bison='bison' byacc='byacc' byteorder='12345678' c='' castflags='0' cat='cat' -cc='ccache gcc ' +cc='cc' cccdlflags='-fpic' ccdlflags='-Wl,-E' ccflags='-D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' @@ -83,11 +83,11 @@ cppminus='-' cpprun='ccache gcc -E' cppstdin='ccache gcc -E' cppsymbols='__ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=3 __GNUC__=4 __GNUC_MINOR__=1 __GNU_LIBRARY__=6 _GNU_SOURCE=1 _LARGEFILE64_SOURCE=1 _LARGEFILE_SOURCE=1 _LP64=1 __LP64__=1 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 _REENTRANT=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_GNU=1 __USE_LARGEFILE=1 __USE_LARGEFILE64=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_REENTRANT=1 __USE_SVID=1 __USE_UNIX98=1 __USE_XOPEN=1 __USE_XOPEN_EXTENDED=1 _XOPEN_SOURCE=600 _XOPEN_SOURCE_EXTENDED=1 __amd64=1 __amd64__=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1' -crypt_r_proto='REENTRANT_PROTO_B_CCS' +crypt_r_proto='0' cryptlib='' csh='csh' ctermid_r_proto='0' -ctime_r_proto='REENTRANT_PROTO_B_SB' +ctime_r_proto='0' d_Gconvert='gcvt((x),(n),(b))' d_PRIEUldbl='define' d_PRIFUldbl='define' @@ -503,7 +503,7 @@ dlext='so' dlsrc='dl_dlopen.xs' doublesize='8' drand01='drand48()' -drand48_r_proto='REENTRANT_PROTO_I_ST' +drand48_r_proto='0' dynamic_ext='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' eagain='EAGAIN' ebcdic='undef' @@ -536,33 +536,33 @@ full_sed='/bin/sed' gccansipedantic='' gccosandvers='' gccversion='4.1.2 20061028 (prerelease) (Debian 4.1.1-19)' -getgrent_r_proto='REENTRANT_PROTO_I_SBWR' -getgrgid_r_proto='REENTRANT_PROTO_I_TSBWR' -getgrnam_r_proto='REENTRANT_PROTO_I_CSBWR' -gethostbyaddr_r_proto='REENTRANT_PROTO_I_TsISBWRE' -gethostbyname_r_proto='REENTRANT_PROTO_I_CSBWRE' -gethostent_r_proto='REENTRANT_PROTO_I_SBWRE' -getlogin_r_proto='REENTRANT_PROTO_I_BW' -getnetbyaddr_r_proto='REENTRANT_PROTO_I_uISBWRE' -getnetbyname_r_proto='REENTRANT_PROTO_I_CSBWRE' -getnetent_r_proto='REENTRANT_PROTO_I_SBWRE' -getprotobyname_r_proto='REENTRANT_PROTO_I_CSBWR' -getprotobynumber_r_proto='REENTRANT_PROTO_I_ISBWR' -getprotoent_r_proto='REENTRANT_PROTO_I_SBWR' -getpwent_r_proto='REENTRANT_PROTO_I_SBWR' -getpwnam_r_proto='REENTRANT_PROTO_I_CSBWR' -getpwuid_r_proto='REENTRANT_PROTO_I_TSBWR' -getservbyname_r_proto='REENTRANT_PROTO_I_CCSBWR' -getservbyport_r_proto='REENTRANT_PROTO_I_ICSBWR' -getservent_r_proto='REENTRANT_PROTO_I_SBWR' -getspnam_r_proto='REENTRANT_PROTO_I_CSBWR' +getgrent_r_proto='0' +getgrgid_r_proto='0' +getgrnam_r_proto='0' +gethostbyaddr_r_proto='0' +gethostbyname_r_proto='0' +gethostent_r_proto='0' +getlogin_r_proto='0' +getnetbyaddr_r_proto='0' +getnetbyname_r_proto='0' +getnetent_r_proto='0' +getprotobyname_r_proto='0' +getprotobynumber_r_proto='0' +getprotoent_r_proto='0' +getpwent_r_proto='0' +getpwnam_r_proto='0' +getpwuid_r_proto='0' +getservbyname_r_proto='0' +getservbyport_r_proto='0' +getservent_r_proto='0' +getspnam_r_proto='0' gidformat='"u"' gidsign='1' gidsize='4' gidtype='gid_t' glibpth='/usr/shlib /lib /usr/lib /lib64 /usr/lib64 /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib ' gmake='gmake' -gmtime_r_proto='REENTRANT_PROTO_S_TS' +gmtime_r_proto='0' gnulibc_version='2.3.6' grep='grep' groupcat='cat /etc/group' @@ -671,64 +671,62 @@ inc_version_list=' ' inc_version_list_init='0' incpath='' inews='' -installarchlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7/x86_64-linux-thread-multi' -installbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' +installarchlib='./install_me_here/usr/lib/perl5/5.8.7/x86_64-linux-thread-multi' +installbin='./install_me_here/usr/bin' installhtml1dir='' installhtml3dir='' -installman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1' -installman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3' -installprefix='/home/hrw/devel/build/native/tmp/staging' -installprefixexp='/home/hrw/devel/build/native/tmp/staging' -installprivlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7' -installscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' -installsitearch='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi' -installsitebin='/home/hrw/devel/build/native/tmp/staging/local/bin' +installman1dir='./install_me_here/usr/share/man/man1' +installman3dir='./install_me_here/usr/share/man/man3' +installprefix='./install_me_here/usr' +installprefixexp='./install_me_here/usr' +installprivlib='./install_me_here/usr/lib/perl5/5.8.7' +installscript='./install_me_here/usr/bin' installsitehtml1dir='' installsitehtml3dir='' -installsitelib='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7' -installsiteman1dir='/home/hrw/devel/build/native/tmp/staging/local/man/man1' -installsiteman3dir='/home/hrw/devel/build/native/tmp/staging/local/man/man3' -installsitescript='/home/hrw/devel/build/native/tmp/staging/local/bin' +installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.8.7' +installsiteman1dir='./install_me_here/usr/share/man/man1' +installsiteman3dir='./install_me_here/usr/share/man/man3' +installsitescript='./install_me_here/usr/bin' installstyle='lib/perl5' installusrbinperl='undef' -installvendorarch='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi' -installvendorbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' +installvendorarch='' +installvendorbin='' installvendorhtml1dir='' installvendorhtml3dir='' -installvendorlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7' -installvendorman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1' -installvendorman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3' -installvendorscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' +installvendorlib='' +installvendorman1dir='' +installvendorman3dir='' +installvendorscript='' intsize='4' -issymlink='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/test -h' +issymlink='/bin/test -h' ivdformat='"ld"' ivsize='8' ivtype='long' known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' ksh='' -ld='ccache gcc ' -lddlflags='-shared -L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -L/usr/local/lib' -ldflags='-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1} -L/usr/local/lib' +ld='cc' +lddlflags='-shared' +ldflags='' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' lib_ext='.a' libc='/lib/libc-2.3.6.so' libperl='libperl.a' -libpth='/usr/local/lib /lib /usr/lib /lib64 /usr/lib64' +libpth='/lib /usr/lib /lib64 /usr/lib64' libs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc' libsdirs=' /usr/lib' libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libpthread.so libc.so' -libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libpthread.so /usr/lib/libc.so' -libspath=' /usr/local/lib /lib /usr/lib /lib64 /usr/lib64' +libsfound='' +libspath=' /lib /usr/lib /lib64 /usr/lib64' libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util pthread c cposix posix ucb BSD' libswanted_uselargefiles='' line='' lint='' lkflags='' ln='ln' -lns='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/ln -s' -localtime_r_proto='REENTRANT_PROTO_S_TS' +lns='/bin/ln -s' +localtime_r_proto='0' locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' longdblsize='16' @@ -746,12 +744,12 @@ make_set_make='#' mallocobj='' mallocsrc='' malloctype='void *' -man1dir='/home/hrw/devel/build/native/tmp/staging/man/man1' -man1direxp='/home/hrw/devel/build/native/tmp/staging/man/man1' +man1dir='/usr/share/man/man1' +man1direxp='/usr/share/man/man1' man1ext='1' -man3dir='/home/hrw/devel/build/native/tmp/staging/man/man3' -man3direxp='/home/hrw/devel/build/native/tmp/staging/man/man3' -man3ext='3perl' +man3dir='/usr/share/man/man3' +man3direxp='/usr/share/man/man3' +man3ext='3' mips_type='' mistrustnm='' mkdir='mkdir' @@ -802,17 +800,17 @@ perl='' perl_patchlevel='' perladmin='hrw@home.lan' perllibs='-lnsl -ldl -lm -lcrypt -lutil -lpthread -lc' -perlpath='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/perl' +perlpath='/usr/bin/perl' pg='pg' phostname='hostname' pidtype='pid_t' plibpth='' pmake='' pr='' -prefix='/home/hrw/devel/build/native/tmp/staging' -prefixexp='/home/hrw/devel/build/native/tmp/staging' -privlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7' -privlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/5.8.7' +prefix='/usr' +prefixexp='/usr' +privlib='/usr/lib/perl5/5.8.7' +privlibexp='/usr/lib/perl5/5.8.7' procselfexe='"/proc/self/exe"' prototype='define' ptrsize='8' @@ -820,12 +818,12 @@ quadkind='2' quadtype='long' randbits='48' randfunc='drand48' -random_r_proto='REENTRANT_PROTO_I_St' +random_r_proto='0' randseedtype='long' ranlib=':' rd_nodata='-1' -readdir64_r_proto='REENTRANT_PROTO_I_TSR' -readdir_r_proto='REENTRANT_PROTO_I_TSR' +readdir64_r_proto='0' +readdir_r_proto='0' revision='5' rm='rm' rmail='' @@ -845,8 +843,8 @@ sPRIu64='"lu"' sPRIx64='"lx"' sSCNfldbl='"Lf"' sched_yield='sched_yield()' -scriptdir='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' -scriptdirexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' +scriptdir='/usr/bin' +scriptdirexp='/usr/bin' sed='sed' seedfunc='srand48' selectminbits='64' @@ -873,25 +871,25 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0' sig_size='69' signal_t='void' -sitearch='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi' -sitearchexp='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi' -sitebin='/home/hrw/devel/build/native/tmp/staging/local/bin' -sitebinexp='/home/hrw/devel/build/native/tmp/staging/local/bin' +sitearch='/usr/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi' +sitearchexp='/usr/lib/perl5/site_perl/5.8.7/x86_64-linux-thread-multi' +sitebin='/usr/bin' +sitebinexp='/usr/bin' sitehtml1dir='' sitehtml1direxp='' sitehtml3dir='' sitehtml3direxp='' -sitelib='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7' -sitelib_stem='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl' -sitelibexp='/home/hrw/devel/build/native/tmp/staging/local/lib/perl5/site_perl/5.8.7' -siteman1dir='/home/hrw/devel/build/native/tmp/staging/local/man/man1' -siteman1direxp='/home/hrw/devel/build/native/tmp/staging/local/man/man1' -siteman3dir='/home/hrw/devel/build/native/tmp/staging/local/man/man3' -siteman3direxp='/home/hrw/devel/build/native/tmp/staging/local/man/man3' -siteprefix='/home/hrw/devel/build/native/tmp/staging/local' -siteprefixexp='/home/hrw/devel/build/native/tmp/staging/local' -sitescript='/home/hrw/devel/build/native/tmp/staging/local/bin' -sitescriptexp='/home/hrw/devel/build/native/tmp/staging/local/bin' +sitelib='/usr/lib/perl5/site_perl/5.8.7' +sitelib_stem='/usr/lib/perl5/site_perl' +sitelibexp='/usr/lib/perl5/site_perl/5.8.7' +siteman1dir='/usr/share/man/man1' +siteman1direxp='/usr/share/man/man1' +siteman3dir='/usr/share/man/man3' +siteman3direxp='/usr/share/man/man3' +siteprefix='/usr' +siteprefixexp='/usr' +sitescript='/usr/bin' +sitescriptexp='/usr/bin' sizesize='8' sizetype='size_t' sleep='' @@ -903,11 +901,11 @@ socksizetype='socklen_t' sort='sort' spackage='Perl5' spitshell='cat' -srand48_r_proto='REENTRANT_PROTO_I_LS' -srandom_r_proto='REENTRANT_PROTO_I_TS' +srand48_r_proto='0' +srandom_r_proto='0' src='.' ssizetype='ssize_t' -startperl='#!/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin/perl' +startperl='#!/usr/bin/perl' startsh='#!/bin/sh' static_ext=' ' stdchar='char' @@ -917,7 +915,7 @@ stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)' stdio_filbuf='' stdio_ptr='((fp)->_IO_read_ptr)' stdio_stream_array='' -strerror_r_proto='REENTRANT_PROTO_B_IBW' +strerror_r_proto='0' strings='/usr/include/string.h' submit='' subversion='7' @@ -930,13 +928,13 @@ tee='' test='test' timeincl='/usr/include/sys/time.h /usr/include/time.h ' timetype='time_t' -tmpnam_r_proto='REENTRANT_PROTO_B_B' +tmpnam_r_proto='0' to=':' touch='touch' tr='tr' trnl='\n' troff='' -ttyname_r_proto='REENTRANT_PROTO_I_IBW' +ttyname_r_proto='0' u16size='2' u16type='unsigned short' u32size='4' @@ -985,25 +983,25 @@ uvsize='8' uvtype='unsigned long' uvuformat='"lu"' uvxformat='"lx"' -vendorarch='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi' -vendorarchexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7/x86_64-linux-thread-multi' -vendorbin='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' -vendorbinexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' +vendorarch='' +vendorarchexp='' +vendorbin='' +vendorbinexp='' vendorhtml1dir=' ' vendorhtml1direxp='' vendorhtml3dir=' ' vendorhtml3direxp='' -vendorlib='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7' -vendorlib_stem='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl' -vendorlibexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib/perl5/vendor_perl/5.8.7' -vendorman1dir='/home/hrw/devel/build/native/tmp/staging/man/man1' -vendorman1direxp='/home/hrw/devel/build/native/tmp/staging/man/man1' -vendorman3dir='/home/hrw/devel/build/native/tmp/staging/man/man3' -vendorman3direxp='/home/hrw/devel/build/native/tmp/staging/man/man3' -vendorprefix='/home/hrw/devel/build/native/tmp/staging' -vendorprefixexp='/home/hrw/devel/build/native/tmp/staging' -vendorscript='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' -vendorscriptexp='/home/hrw/devel/build/native/tmp/staging/x86_64-linux/bin' +vendorlib='/usr/lib/perl5/vendor_perl/5.8.7' +vendorlib_stem='/usr/lib/perl5/vendor_perl' +vendorlibexp='/usr/lib/perl5/vendor_perl/5.8.7' +vendorman1dir='/usr/share/man/man1' +vendorman1direxp='/usr/share/man/man1' +vendorman3dir='/usr/share/man/man3' +vendorman3direxp='/usr/share/man/man3' +vendorprefix='' +vendorprefixexp='' +vendorscript='/usr/bin' +vendorscriptexp='/usr/bin' version='5.8.7' version_patchlevel_string='version 8 subversion 7' versiononly='undef' @@ -1015,24 +1013,9 @@ yaccflags='' zcat='' zip='zip' # Configure command line arguments. -config_arg0='./Configure' -config_args='-Dcc=ccache gcc -Dcflags=-isystem/home/hrw/devel/build/native/tmp/staging/x86_64-linux/include -O2 -Dldflags=-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1} -Dusethreads -Duselargefiles -Dprefix=/home/hrw/devel/build/native/tmp/staging -Dvendorprefix=/home/hrw/devel/build/native/tmp/staging -Dsiteprefix=/home/hrw/devel/build/native/tmp/staging/local -Dman1ext=1 -Dman3ext=3perl -Uafs -Ud_csh -Uusesfio -Uusenm -des' -config_argc=15 -config_arg1='-Dcc=ccache gcc ' -config_arg2='-Dcflags=-isystem/home/hrw/devel/build/native/tmp/staging/x86_64-linux/include -O2' -config_arg3='-Dldflags=-L/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath-link,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-rpath,/home/hrw/devel/build/native/tmp/staging/x86_64-linux/lib -Wl,-O1}' -config_arg4='-Dusethreads' -config_arg5='-Duselargefiles' -config_arg6='-Dprefix=/home/hrw/devel/build/native/tmp/staging' -config_arg7='-Dvendorprefix=/home/hrw/devel/build/native/tmp/staging' -config_arg8='-Dsiteprefix=/home/hrw/devel/build/native/tmp/staging/local' -config_arg9='-Dman1ext=1' -config_arg10='-Dman3ext=3perl' -config_arg11='-Uafs' -config_arg12='-Ud_csh' -config_arg13='-Uusesfio' -config_arg14='-Uusenm' -config_arg15='-des' +config_arg0='Configure' +config_args='' +config_argc=0 PERL_REVISION=5 PERL_VERSION=8 PERL_SUBVERSION=7 -- cgit v1.2.3 From 834b5357bc651acf92ead42108387ce4adddaa08 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 11 Jan 2007 10:05:52 +0000 Subject: esound gpe: use revision instead of date, fix path --- packages/esound/esound-gpe_20070109.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/esound/esound-gpe_20070109.bb b/packages/esound/esound-gpe_20070109.bb index e48108d530..790462f5e8 100644 --- a/packages/esound/esound-gpe_20070109.bb +++ b/packages/esound/esound-gpe_20070109.bb @@ -7,7 +7,7 @@ PROVIDES += "esound" RPROVIDES += "esound" SRCDATE = "${PV}" -SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra/;module=esound;date=20070109 \ +SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk;module=extra/esound;rev=8935 \ file://audiofile-please.patch;patch=1 \ file://configure.patch;patch=1" -- cgit v1.2.3 From c3457ebed62397fd630530efe473bbbbefd3daa6 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 11 Jan 2007 11:40:18 +0000 Subject: gpe-conf: Add new release 0.2.3 --- packages/gpe-conf/gpe-conf_0.2.3.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/gpe-conf/gpe-conf_0.2.3.bb (limited to 'packages') diff --git a/packages/gpe-conf/gpe-conf_0.2.3.bb b/packages/gpe-conf/gpe-conf_0.2.3.bb new file mode 100644 index 0000000000..c26938cb7b --- /dev/null +++ b/packages/gpe-conf/gpe-conf_0.2.3.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Configuration applets for GPE" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +MAINTAINER = "Florian Boor " + +DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" +RDEPENDS_gpe-conf-panel = "gpe-conf" + +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + +PACKAGES += "gpe-conf-panel" + +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications/gpe-conf-* ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" +FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop" -- cgit v1.2.3 From 99027265fbc20cecd8e4674d38a81f15ec98a894 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 11 Jan 2007 11:59:06 +0000 Subject: blueprobe: Add 0.18 --- packages/blueprobe/blueprobe_0.18.bb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 packages/blueprobe/blueprobe_0.18.bb (limited to 'packages') diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb new file mode 100644 index 0000000000..2c0650511a --- /dev/null +++ b/packages/blueprobe/blueprobe_0.18.bb @@ -0,0 +1,3 @@ +require blueprobe.inc + +PR = "r0" -- cgit v1.2.3 From 9d5edb637caf0d299da84763511f4cf78a882b90 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 11 Jan 2007 12:16:04 +0000 Subject: gpe-conf: Remove obsolete MAINTAINERS field --- packages/gpe-conf/gpe-conf_0.2.3.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'packages') diff --git a/packages/gpe-conf/gpe-conf_0.2.3.bb b/packages/gpe-conf/gpe-conf_0.2.3.bb index c26938cb7b..3f8ae1e9d5 100644 --- a/packages/gpe-conf/gpe-conf_0.2.3.bb +++ b/packages/gpe-conf/gpe-conf_0.2.3.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Configuration applets for GPE" SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" -MAINTAINER = "Florian Boor " DEPENDS = "gtk+ esound audiofile libgpewidget libxsettings libxsettings-client" RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons timezones" -- cgit v1.2.3 From 668aeeab34c5582b9aa8f6dec82867c5f14f8348 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 11 Jan 2007 16:41:52 +0000 Subject: libmimedir: Add patch by Jan Arne Petersen to support parsing of Google Calendar files. --- .../files/libmimedir-0.4.0-duration-wkst.patch | 258 +++++++++++++++++++++ packages/libmimedir/libmimedir_0.4.0-20060804.bb | 5 +- 2 files changed, 261 insertions(+), 2 deletions(-) create mode 100644 packages/libmimedir/files/libmimedir-0.4.0-duration-wkst.patch (limited to 'packages') diff --git a/packages/libmimedir/files/libmimedir-0.4.0-duration-wkst.patch b/packages/libmimedir/files/libmimedir-0.4.0-duration-wkst.patch new file mode 100644 index 0000000000..10843182e9 --- /dev/null +++ b/packages/libmimedir/files/libmimedir-0.4.0-duration-wkst.patch @@ -0,0 +1,258 @@ +diff -uNr libmimedir-0.4.0/bin/ical-dump.c libmimedir-0.4.0cvs20061111/bin/ical-dump.c +--- libmimedir-0.4.0/bin/ical-dump.c 2005-09-01 17:36:27.000000000 +0200 ++++ libmimedir-0.4.0cvs20061111/bin/ical-dump.c 2006-11-11 19:14:19.000000000 +0100 +@@ -144,7 +144,7 @@ + print_component (MIMEDirVComponent *component) + { + gchar *s, *summary, *categories, *uid; +- guint priority, seq; ++ guint priority, seq, duration; + MIMEDirDateTime *dtstart, *dtend, *due; + MIMEDirRecurrence *recur; + +@@ -161,6 +161,7 @@ + + "dtstart", &dtstart, + "dtend", &dtend, ++ "duration", &duration, + "due", &due, + "recurrence", &recur, + +@@ -207,6 +208,9 @@ + + } + } ++ if (duration) { ++ printf (_(" Duration: %ds\n"), duration); ++ } + if (due && mimedir_datetime_is_valid (due)) { + s = mimedir_datetime_to_string (due); + if (s) { +diff -uNr libmimedir-0.4.0/mimedir/mimedir-recurrence.c libmimedir-0.4.0cvs20061111/mimedir/mimedir-recurrence.c +--- libmimedir-0.4.0/mimedir/mimedir-recurrence.c 2005-10-08 08:46:36.000000000 +0200 ++++ libmimedir-0.4.0cvs20061111/mimedir/mimedir-recurrence.c 2006-11-11 15:47:28.000000000 +0100 +@@ -56,7 +56,8 @@ + PROP_COUNT, + PROP_INTERVAL, + PROP_UNIT, +- PROP_UNITLIST ++ PROP_UNITLIST, ++ PROP_WKST + }; + + struct _MIMEDirRecurrencePriv { +@@ -67,6 +68,7 @@ + + MIMEDirRecurrenceUnit unit; + gchar *units; ++ guint8 wkst; + }; + + static GObjectClass *parent_class = NULL; +@@ -167,6 +169,50 @@ + return -1; + } + ++static const gchar * ++weekday_to_string (GDateWeekday weekday) ++{ ++ switch (weekday) { ++ case G_DATE_MONDAY: ++ return "MO"; ++ case G_DATE_TUESDAY: ++ return "TU"; ++ case G_DATE_WEDNESDAY: ++ return "WE"; ++ case G_DATE_THURSDAY: ++ return "TH"; ++ case G_DATE_FRIDAY: ++ return "FR"; ++ case G_DATE_SATURDAY: ++ return "SA"; ++ case G_DATE_SUNDAY: ++ return "SU"; ++ default: ++ g_return_val_if_reached (NULL); ++ } ++} ++ ++static GDateWeekday ++string_to_weekday (const gchar *s) ++{ ++ if (strcmp (s, "MO") == 0) ++ return G_DATE_MONDAY; ++ else if (strcmp (s, "TU") == 0) ++ return G_DATE_TUESDAY; ++ else if (strcmp (s, "WE") == 0) ++ return G_DATE_WEDNESDAY; ++ else if (strcmp (s, "TH") == 0) ++ return G_DATE_THURSDAY; ++ else if (strcmp (s, "FR") == 0) ++ return G_DATE_FRIDAY; ++ else if (strcmp (s, "SA") == 0) ++ return G_DATE_SATURDAY; ++ else if (strcmp (s, "SU") == 0) ++ return G_DATE_SUNDAY; ++ else ++ return G_DATE_BAD_WEEKDAY; ++} ++ + /* + * Class and Object Management + */ +@@ -261,6 +307,14 @@ + NULL, + G_PARAM_READWRITE); + g_object_class_install_property (gobject_class, PROP_UNITLIST, pspec); ++ pspec = g_param_spec_uint ("wkst", ++ _("Workweek start"), ++ _("The day on which the workweek starts"), ++ G_DATE_BAD_WEEKDAY, ++ G_DATE_SUNDAY, ++ G_DATE_BAD_WEEKDAY, ++ G_PARAM_READWRITE); ++ g_object_class_install_property (gobject_class, PROP_WKST, pspec); + } + + +@@ -273,6 +327,7 @@ + recurrence->priv = g_new0 (MIMEDirRecurrencePriv, 1); + recurrence->priv->freq = RECURRENCE_DAILY; + recurrence->priv->unit = RECURRENCE_UNIT_NONE; ++ recurrence->priv->wkst = G_DATE_BAD_WEEKDAY; + } + + +@@ -335,6 +390,9 @@ + case PROP_UNITLIST: + mimedir_utils_set_property_string (&priv->units, value); + break; ++ case PROP_WKST: ++ priv->wkst = g_value_get_uint (value); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; +@@ -375,6 +433,9 @@ + case PROP_UNITLIST: + g_value_set_string (value, priv->units); + break; ++ case PROP_WKST: ++ g_value_set_uint (value, priv->wkst); ++ break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + return; +@@ -512,6 +573,17 @@ + g_object_set (G_OBJECT (recurrence), "unit", unit, NULL); + g_object_set (G_OBJECT (recurrence), "units", value, NULL); + } ++ else if (!strcasecmp (name, "WKST")) { ++ GDateWeekday weekday; ++ ++ weekday = string_to_weekday (value); ++ if (!g_date_valid_weekday (weekday)) { ++ ret = FALSE; ++ break; ++ } ++ ++ g_object_set (G_OBJECT (recurrence), "wkst", weekday, NULL); ++ } + else { + ret = FALSE; + break; +@@ -571,5 +643,11 @@ + g_string_append_printf (string, ";%s=%s", unit, priv->units); + } + ++ if (g_date_valid_weekday (priv->wkst)) { ++ const gchar *weekday; ++ weekday = weekday_to_string (priv->wkst); ++ g_string_append_printf (string, ";WKST=%s", weekday); ++ } ++ + return g_string_free (string, FALSE); + } + +--- libmimedir-0.4.0/mimedir/mimedir-vcomponent.c 2006-12-01 12:53:26.000000000 +0100 ++++ libmimedir-0.4.0cvs20061111/mimedir/mimedir-vcomponent.c 2006-11-11 19:08:26.000000000 +0100 +@@ -908,6 +905,7 @@ + const gchar *s; + gint duration = 0; + gboolean neg = FALSE; ++ gboolean dur_week = FALSE; + + g_return_val_if_fail (error == NULL || *error == NULL, 0); + +@@ -939,48 +937,52 @@ + + if (s[0] == 'D' || s[0] == 'd') + duration = num * SECS_PER_DAY; +- else if (s[0] == 'W' || s[0] == 'w') ++ else if (s[0] == 'W' || s[0] == 'w') { + duration = num * SECS_PER_WEEK; +- else { ++ dur_week = TRUE; ++ } else { + g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); + return 0; + } + s++; + } + +- if (s[0] == 'T' || s[0] == 't') { +- GError *err = NULL; +- guint num; ++ if ((s[0] == 'T' || s[0] == 't') && !dur_week) { ++ guint state = 0; + + s++; + +- while (s[0] != '\0') { ++ while (state < 3) { ++ GError *err = NULL; ++ guint num; ++ + num = mimedir_vcomponent_parse_number (name, "DURATION", &s, &err); + if (err) { + g_propagate_error (error, err); + return 0; + } +- +- switch (s[0]) { +- case 'H': +- s++; ++ if (s[0] == 'H' && state < 1) { + duration += num * SECS_PER_HOUR; +- break; +- case 'M': +- s++; ++ state = 1; ++ } else if (s[0] == 'M' && state < 2) { + duration += num * SECS_PER_MINUTE; +- break; +- case 'S': +- s++; +- duration += num; +- break; +- default: ++ state = 2; ++ } else if (s[0] == 'S' && state < 3) { ++ duration += num ; ++ state = 3; ++ } else { + g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); + return 0; + } ++ s++; + } + } + ++ if (s[0] != '\0') { ++ g_set_error (error, MIMEDIR_ATTRIBUTE_ERROR, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT, MIMEDIR_ATTRIBUTE_ERROR_INVALID_FORMAT_STR, "DURATION", name); ++ return 0; ++ } ++ + return neg ? -duration : duration; + } + diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb index 5249157590..f2d29d4fc0 100644 --- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native glib-2.0" -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "5" SRCDATE = "20060804" PV = "0.4.0+cvs${SRCDATE}" @@ -11,7 +11,8 @@ PV = "0.4.0+cvs${SRCDATE}" SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=libmimedir \ file://mimedir-update.patch;patch=1 \ file://mimedir-write-sequence.patch;patch=1;pnum=0 \ - file://gslist-fix.patch;patch=1;maxdate=20060814" + file://gslist-fix.patch;patch=1;maxdate=20060814 \ + file://libmimedir-0.4.0-duration-wkst.patch" S = "${WORKDIR}/libmimedir" -- cgit v1.2.3 From 0d6071faa667407505bec2d35d9b7f533b62f7cb Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 11 Jan 2007 18:18:04 +0000 Subject: gpe-beam: unify --- packages/gpe-beam/gpe-beam.inc | 5 +++++ packages/gpe-beam/gpe-beam_0.2.3.bb | 10 ++++------ packages/gpe-beam/gpe-beam_0.2.6.bb | 12 ++++-------- packages/gpe-beam/gpe-beam_0.2.7.bb | 12 ++++-------- packages/gpe-beam/gpe-beam_0.2.8.bb | 11 +++-------- packages/gpe-beam/gpe-beam_0.2.9.bb | 7 ++----- 6 files changed, 22 insertions(+), 35 deletions(-) create mode 100644 packages/gpe-beam/gpe-beam.inc (limited to 'packages') diff --git a/packages/gpe-beam/gpe-beam.inc b/packages/gpe-beam/gpe-beam.inc new file mode 100644 index 0000000000..5ca6df0b03 --- /dev/null +++ b/packages/gpe-beam/gpe-beam.inc @@ -0,0 +1,5 @@ +DESCRIPTION = "GPE infrared communication applet" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" diff --git a/packages/gpe-beam/gpe-beam_0.2.3.bb b/packages/gpe-beam/gpe-beam_0.2.3.bb index b009b10372..e5861f069a 100644 --- a/packages/gpe-beam/gpe-beam_0.2.3.bb +++ b/packages/gpe-beam/gpe-beam_0.2.3.bb @@ -1,7 +1,5 @@ -inherit gpe pkgconfig -LICENSE = "GPL" -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex" +require ${PN}.inc + RDEPENDS = "libopenobex-1.0-1" -SECTION = "gpe" -PRIORITY = "optional" + +inherit gpe pkgconfig diff --git a/packages/gpe-beam/gpe-beam_0.2.6.bb b/packages/gpe-beam/gpe-beam_0.2.6.bb index 71af4db7e6..89f8e8230a 100644 --- a/packages/gpe-beam/gpe-beam_0.2.6.bb +++ b/packages/gpe-beam/gpe-beam_0.2.6.bb @@ -1,12 +1,8 @@ -PR = "r1" - -inherit gpe +require ${PN}.inc -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "libopenobex-1.0-1 irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r1" SRC_URI += "file://vcard-send.patch;patch=1;pnum=0" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.7.bb b/packages/gpe-beam/gpe-beam_0.2.7.bb index 51b99fcfc6..f19b64d933 100644 --- a/packages/gpe-beam/gpe-beam_0.2.7.bb +++ b/packages/gpe-beam/gpe-beam_0.2.7.bb @@ -1,12 +1,8 @@ -PR = "r1" - -inherit gpe +require ${PN}.inc -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "libopenobex-1.0-1 irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" +PR = "r1" SRC_URI += "file://decl.patch;patch=1;pnum=0" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.8.bb b/packages/gpe-beam/gpe-beam_0.2.8.bb index f68b50341a..9795827aa8 100644 --- a/packages/gpe-beam/gpe-beam_0.2.8.bb +++ b/packages/gpe-beam/gpe-beam_0.2.8.bb @@ -1,12 +1,7 @@ -PR = "r0" +require ${PN}.inc -inherit gpe - -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" RDEPENDS = "irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" SRC_URI += "file://dbus-new-api.patch;patch=1" + +inherit gpe diff --git a/packages/gpe-beam/gpe-beam_0.2.9.bb b/packages/gpe-beam/gpe-beam_0.2.9.bb index 8275cf6c3a..b96bed4a2f 100644 --- a/packages/gpe-beam/gpe-beam_0.2.9.bb +++ b/packages/gpe-beam/gpe-beam_0.2.9.bb @@ -1,9 +1,6 @@ -DESCRIPTION = "GPE infrared communication applet" -DEPENDS = "gtk+ libgpewidget libmimedir libgpevtype openobex irda-utils dbus-glib" +require ${PN}.inc + RDEPENDS = "irda-utils" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" inherit gpe -- cgit v1.2.3 From 3b01a13a70b1c071f29a0ba70f26dbdb335dced9 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Thu, 11 Jan 2007 19:42:20 +0000 Subject: parted/parted-1.8.0/memory_allocation.patch : Addition of patch * Parted doesnt work on ARM when used with glibc 2.5 This patch although not fixing the issue adds some cleanups. Supplied by maintainers. --- packages/parted/parted-1.8.0/.mtn2git_empty | 0 .../parted/parted-1.8.0/memory_allocation.patch | 42 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 packages/parted/parted-1.8.0/.mtn2git_empty create mode 100644 packages/parted/parted-1.8.0/memory_allocation.patch (limited to 'packages') diff --git a/packages/parted/parted-1.8.0/.mtn2git_empty b/packages/parted/parted-1.8.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/parted/parted-1.8.0/memory_allocation.patch b/packages/parted/parted-1.8.0/memory_allocation.patch new file mode 100644 index 0000000000..ba3709680b --- /dev/null +++ b/packages/parted/parted-1.8.0/memory_allocation.patch @@ -0,0 +1,42 @@ +--- parted-1.8.0/libparted/exception.c_orig 2006-12-11 19:44:23.000000000 +0000 ++++ parted-1.8.0/libparted/exception.c 2006-12-11 19:47:53.000000000 +0000 +@@ -231,6 +231,9 @@ + PedExceptionOption ex_opts, const char* message, ...) + { + va_list arg_list; ++ int result; ++ static int size = 1000; ++ + + if (ex) + ped_exception_catch (); +@@ -239,16 +242,22 @@ + if (!ex) + goto no_memory; + +- ex->message = (char*) malloc (8192); +- if (!ex->message) +- goto no_memory; +- + ex->type = ex_type; + ex->options = ex_opts; + +- va_start (arg_list, message); +- vsnprintf (ex->message, 8192, message, arg_list); +- va_end (arg_list); ++ while (1) { ++ ex->message = (char*) malloc (size); ++ if (!ex->message) ++ goto no_memory; ++ va_start (arg_list, message); ++ result = vsnprintf (ex->message, size, message, arg_list); ++ va_end (arg_list); ++ ++ if (result > -1 && result < size) ++ break; ++ size += 10; ++ } ++ + + return do_throw (); + -- cgit v1.2.3 From 5945879560ddcab62e91dec5fa58ff786c072bf3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 19:13:58 +0000 Subject: linux-handhelds-2.6 2.6.19-hh8: Add latest subrelease (drop -hh5). * Changes since -hh7 include: 1. Lab revamped somewhat, h3900 support for using LAB as 1st stage bootloader completed (well, so far it was tested to boot at least from HaRET, not as 1st stage bootloader). 2. Further cleanup/restructuring of the tree. 3. h5000, htcbeeltes, htcsable, htcmagician, htchermes updates. 4. htcuniversal full LEDs support and sound support elaboration. 5. htctrinity port added. 6. "[ARM] 4078/1: Fix ARM copypage cache coherency problems" backported from git-head. 7. soc-core address bus shift support (for ASIC3, etc.) 8. ASoC upgraded to 0.13pre1. --- packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb | 11 ----------- packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb create mode 100644 packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb deleted file mode 100644 index b34d4630a0..0000000000 --- a/packages/linux/linux-handhelds-2.6_2.6.19-hh5.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "kernel" -DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." -LICENSE = "GPL" -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ - file://defconfig" - -require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb new file mode 100644 index 0000000000..b34d4630a0 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh8.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc -- cgit v1.2.3 From 0762834c173875d1f13b9a5eede16dbaeb184761 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 20:53:12 +0000 Subject: opie-sysinfo: Make jornada-6xx-7xx.patch jlime-local. * It requires corresponding patch for libopie2, but that in turn fails to apply to CVS HEAD. These two patches should be submitted upstream. --- packages/opie-sysinfo/opie-sysinfo_1.2.2.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb index 597f28970d..3a8954bebe 100644 --- a/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb +++ b/packages/opie-sysinfo/opie-sysinfo_1.2.2.bb @@ -1,9 +1,10 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/sysinfo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ - file://jornada-6xx-7xx.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/share" + +SRC_URI_append_jlime = "file://jornada-6xx-7xx.patch;patch=1" -- cgit v1.2.3 From 25bc6058c04c13aa2485d83b7fc9cc474437ab26 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 21:17:01 +0000 Subject: libopie2 cvs: keyboardless-buttonmap.patch was accepted upstream, drop. * Recommended SRCDATE for this recipe: 20061220 --- packages/libopie/libopie2_cvs.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 78cc00e619..d8385ceea6 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,13 +1,12 @@ require ${PN}.inc PV = "1.2.2+cvs${SRCDATE}" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ file://ipaq-2.6-sys-class-backlight-support.patch;patch=1 \ - file://keyboardless-buttonmap.patch;patch=1 \ file://include.pro" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" -- cgit v1.2.3 From 2191226b11b0884e4256250dad892e7ec48f16ca Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 11 Jan 2007 21:39:30 +0000 Subject: opie-multikey: Rename buttons to add/remove custom keymap to be more clear. * opie-multikey needs usability improvements at all - it may take a user some effort to figure out that to change language layout, one needs to call config (which lives on a key marked as shift), select language, and tap OK at window top. Most people would tap "Add" and present with file selection dialog with unknown to them purpose. So, name buttons "Add custom..." and "Remove custom", to correspond to their function. --- packages/opie-multikey/files/.mtn2git_empty | 0 packages/opie-multikey/files/friendly-button-names.patch | 16 ++++++++++++++++ packages/opie-multikey/opie-multikey_1.2.2.bb | 5 +++-- packages/opie-multikey/opie-multikey_cvs.bb | 4 +++- 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 packages/opie-multikey/files/.mtn2git_empty create mode 100644 packages/opie-multikey/files/friendly-button-names.patch (limited to 'packages') diff --git a/packages/opie-multikey/files/.mtn2git_empty b/packages/opie-multikey/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-multikey/files/friendly-button-names.patch b/packages/opie-multikey/files/friendly-button-names.patch new file mode 100644 index 0000000000..148204e5b3 --- /dev/null +++ b/packages/opie-multikey/files/friendly-button-names.patch @@ -0,0 +1,16 @@ +--- multikey/configdlg.cpp.org 2005-06-15 22:54:50.000000000 +0000 ++++ multikey/configdlg.cpp 2007-01-11 19:51:09.000000000 +0000 +@@ -144,11 +144,11 @@ + add_remove_grid->setMargin(3); + add_remove_grid->setSpacing(3); + +- add_button = new QPushButton(tr("Add"), add_remove_grid); ++ add_button = new QPushButton(tr("Add custom..."), add_remove_grid); + add_button->setFlat(TRUE); + connect(add_button, SIGNAL(clicked()), SLOT(addMap())); + +- remove_button = new QPushButton(tr("Remove"), add_remove_grid); ++ remove_button = new QPushButton(tr("Remove custom"), add_remove_grid); + remove_button->setFlat(TRUE); + if (keymaps->currentItem() == 0 || default_maps.find(QFileInfo(current_map).fileName()) != default_maps.end()) + remove_button->setDisabled(true); diff --git a/packages/opie-multikey/opie-multikey_1.2.2.bb b/packages/opie-multikey/opie-multikey_1.2.2.bb index 7cd1ac6914..702dda05e9 100644 --- a/packages/opie-multikey/opie-multikey_1.2.2.bb +++ b/packages/opie-multikey/opie-multikey_1.2.2.bb @@ -1,6 +1,7 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/multikey \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/share" + ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ + file://friendly-button-names.patch;patch=1" diff --git a/packages/opie-multikey/opie-multikey_cvs.bb b/packages/opie-multikey/opie-multikey_cvs.bb index 93d37edfac..5080a4d984 100644 --- a/packages/opie-multikey/opie-multikey_cvs.bb +++ b/packages/opie-multikey/opie-multikey_cvs.bb @@ -1,6 +1,8 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/inputmethods/multikey \ - ${HANDHELDS_CVS};module=opie/share" + ${HANDHELDS_CVS};module=opie/share \ + file://friendly-button-names.patch;patch=1" -- cgit v1.2.3 From bb77ce802e307ef58a2fe725f33ad181b025f16a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 11 Jan 2007 22:46:48 +0000 Subject: portmap: use DEBIAN_MIRROR instead of hardcoding one --- packages/portmap/portmap-unslung_5-9.bb | 7 +++---- packages/portmap/portmap.inc | 15 +++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'packages') diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb index ee6c648e9b..c86ae1e892 100644 --- a/packages/portmap/portmap-unslung_5-9.bb +++ b/packages/portmap/portmap-unslung_5-9.bb @@ -4,8 +4,8 @@ LICENSE = "GPL" PR = "r2" COMPATIBLE_MACHINE = "nslu2" -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init \ file://make.patch;patch=1" @@ -18,6 +18,5 @@ do_compile() { } do_install() { - oe_runmake 'docdir=${datadir}/doc/portmap' \ - 'DESTDIR=${D}' install + oe_runmake 'docdir=${datadir}/doc/portmap' 'DESTDIR=${D}' install } diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc index ad477828fb..e7e7673001 100644 --- a/packages/portmap/portmap.inc +++ b/packages/portmap/portmap.inc @@ -2,17 +2,13 @@ DESCRIPTION = "RPC program number mapper." SECTION = "console/network" LICENSE = "GPL" -SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \ - http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ + http://${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init \ file://make.patch;patch=1" S = "${WORKDIR}/portmap_5beta" -PACKAGES =+ "portmap-utils" -FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" -FILES_${PN}-doc += "${docdir}" - INITSCRIPT_NAME = "portmap" INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." @@ -27,6 +23,9 @@ do_compile() { do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap - oe_runmake 'docdir=${docdir}/portmap' \ - 'DESTDIR=${D}' install + oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install } + +PACKAGES =+ "portmap-utils" +FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump" +FILES_${PN}-doc += "${docdir}" -- cgit v1.2.3 From 728c092cf428c00b2ade017e8b0a49b69f72dce4 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 12 Jan 2007 03:39:43 +0000 Subject: linux-handhelds-2.6.inc: Order list of supported machines a bit. --- packages/linux/linux-handhelds-2.6.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index b2e90c6620..bcca0934ba 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE ?= '(asus730|h1910|h2200|h3600|h3900|h4000|h5000|htcblueangel|htcuniversal|hx4700|jornada56x|magician|simpad|rx3000|h3800)' +COMPATIBLE_MACHINE ?= '(asus730|h1910|h2200|h3600|h3800|h3900|h4000|h5000|htcblueangel|htcuniversal|hx4700|jornada56x|magician|simpad|rx3000)' # SRC_URI *must* be overriden in includer, but this is a good reference SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ -- cgit v1.2.3 From e43442f1e0eb7d971e6fd91d4b764631be692819 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 12 Jan 2007 03:53:02 +0000 Subject: linux-handhelds-2.6 2.6.16: Add defconfig for h1910. --- .../h1910/.mtn2git_empty | 0 .../linux-handhelds-2.6-2.6.16/h1910/defconfig | 1201 ++++++++++++++++++++ 2 files changed, 1201 insertions(+) create mode 100644 packages/linux/linux-handhelds-2.6-2.6.16/h1910/.mtn2git_empty create mode 100644 packages/linux/linux-handhelds-2.6-2.6.16/h1910/defconfig (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h1910/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.16/h1910/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h1910/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/h1910/defconfig new file mode 100644 index 0000000000..c299fd95c7 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6-2.6.16/h1910/defconfig @@ -0,0 +1,1201 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.16-hh9 +# Fri Jan 12 03:26:16 2007 +# +CONFIG_ARM=y +CONFIG_MMU=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y + +# +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + +# +# General setup +# +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +# CONFIG_MINIMAL_OOPS is not set +CONFIG_IKCONFIG_PROC=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_UID16=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y +CONFIG_USELIB=y +CONFIG_CORE_DUMP=y +CONFIG_CC_ALIGN_FUNCTIONS=0 +CONFIG_CC_ALIGN_LABELS=0 +CONFIG_CC_ALIGN_LOOPS=0 +CONFIG_CC_ALIGN_JUMPS=0 +CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_SLOB is not set + +# +# Loadable module support +# +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y + +# +# Block layer +# + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_DEADLINE is not set +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="anticipatory" + +# +# System Type +# +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_L7200 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_AT91RM9200 is not set + +# +# Intel PXA2xx Implementations +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_ESERIES is not set +# CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set +CONFIG_ARCH_H1900=y +CONFIG_IPAQ_H1900_LCD=y +CONFIG_IPAQ_H1900_BUTTONS=y +# CONFIG_ARCH_H2200 is not set +# CONFIG_ARCH_H3900 is not set +# CONFIG_MACH_H4000 is not set +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_HX2750 is not set +# CONFIG_ARCH_H5400 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_HTCUNIVERSAL is not set +# CONFIG_MACH_HTCALPINE is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_HTCAPACHE is not set +# CONFIG_MACH_BLUEANGEL is not set +# CONFIG_MACH_HTCBEETLES is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_ARCH_AXIMX3 is not set +# CONFIG_MACH_X30 is not set +# CONFIG_ARCH_ROVERP1 is not set +# CONFIG_ARCH_ROVERP5P is not set +# CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_T3XSCALE is not set +# CONFIG_PXA_SHARPSL is not set +CONFIG_PXA25x=y +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set + +# +# Linux As Bootloader +# +# CONFIG_LAB is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +CONFIG_XSCALE_PMU=y +CONFIG_KEXEC=y + +# +# Compaq/iPAQ Platforms +# +CONFIG_PXA_IPAQ=y + +# +# XScale-based iPAQ +# +CONFIG_IPAQ_HANDHELD=y + +# +# Compaq/iPAQ Drivers +# + +# +# Compaq/HP iPAQ Drivers +# +# CONFIG_IPAQ_SLEEVE is not set +# CONFIG_IPAQ_SAMCOP is not set +# CONFIG_IPAQ_HAMCOP is not set + +# +# Bus support +# + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +CONFIG_PCMCIA_DEBUG=y +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y + +# +# PC-card bridges +# +CONFIG_PCMCIA_PXA2XX=y + +# +# Kernel Features +# +# CONFIG_PREEMPT is not set +CONFIG_NO_IDLE_HZ=y +# CONFIG_AEABI is not set +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="keepinitrd" +# CONFIG_XIP_KERNEL is not set + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_DEBUG=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_PXA=y +CONFIG_PXA25x_ALTERNATE_FREQS=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set +# CONFIG_ARTHUR is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_LEGACY is not set +CONFIG_PM_DEBUG=y +CONFIG_APM=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +# CONFIG_NETDEBUG is not set +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +# CONFIG_NET_KEY is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_FIB_HASH=y +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_BIC=y + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_IPV6_TUNNEL is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_CONNTRACK=m +# CONFIG_IP_NF_CT_ACCT is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_CONNTRACK_EVENTS is not set +# CONFIG_IP_NF_CT_PROTO_SCTP is not set +CONFIG_IP_NF_FTP=m +CONFIG_IP_NF_IRC=m +# CONFIG_IP_NF_NETBIOS_NS is not set +# CONFIG_IP_NF_TFTP is not set +# CONFIG_IP_NF_AMANDA is not set +# CONFIG_IP_NF_PPTP is not set +# CONFIG_IP_NF_QUEUE is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +# CONFIG_IP6_NF_QUEUE is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set + +# +# DCCP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_DCCP is not set + +# +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set + +# +# TIPC Configuration (EXPERIMENTAL) +# +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=m +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_NET_DIVERT is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set + +# +# QoS and/or fair queueing +# +# CONFIG_NET_SCHED is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_IRDA=y + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRCOMM=y +# CONFIG_IRDA_ULTRA is not set + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +CONFIG_IRDA_DEBUG=y + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set + +# +# Old SIR device drivers +# +# CONFIG_IRPORT_SIR is not set + +# +# Old Serial dongle support +# + +# +# FIR device drivers +# +CONFIG_PXA_FICP=y +# CONFIG_BT is not set +# CONFIG_IEEE80211 is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_DEBUG_DRIVER is not set + +# +# Connector - unified userspace <-> kernelspace linker +# +# CONFIG_CONNECTOR is not set + +# +# Memory Technology Devices (MTD) +# +# CONFIG_MTD is not set + +# +# Parallel port support +# +# CONFIG_PARPORT is not set + +# +# Plug and Play support +# + +# +# Block devices +# +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=6 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set + +# +# ATA/ATAPI/MFM/RLL support +# +CONFIG_IDE=m +CONFIG_BLK_DEV_IDE=m + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=m +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECS=m +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_BLK_DEV_IDEFLOPPY is not set +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +# CONFIG_IDE_GENERIC is not set +# CONFIG_IDE_ARM is not set +# CONFIG_BLK_DEV_IDEDMA is not set +# CONFIG_IDEDMA_AUTO is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +# CONFIG_SCSI is not set + +# +# Multi-device support (RAID and LVM) +# +# CONFIG_MD is not set + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# + +# +# I2O device support +# + +# +# Network device support +# +CONFIG_NETDEVICES=y +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set +# CONFIG_TUN is not set + +# +# PHY device support +# + +# +# Ethernet (10 or 100Mbit) +# +# CONFIG_NET_ETHERNET is not set + +# +# Ethernet (1000 Mbit) +# + +# +# Ethernet (10000 Mbit) +# + +# +# Token Ring devices +# + +# +# Wireless LAN (non-hamradio) +# +# CONFIG_NET_RADIO is not set + +# +# PCMCIA network device support +# +# CONFIG_NET_PCMCIA is not set + +# +# Wan interfaces +# +# CONFIG_WAN is not set +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set + +# +# ISDN subsystem +# +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=240 +CONFIG_INPUT_TSDEV_SCREEN_Y=320 +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_PXA_COUNT=4 +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=32 + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ELV is not set +CONFIG_I2C_PXA=y +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_RTC_X1205_I2C is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set + +# +# IPMI +# +# CONFIG_IPMI_HANDLER is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_NVRAM is not set +CONFIG_SA1100_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set + +# +# Ftape, the floppy tape device driver +# + +# +# PCMCIA character devices +# +# CONFIG_SYNCLINK_CS is not set +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set + +# +# TPM devices +# +# CONFIG_TCG_TPM is not set +# CONFIG_TELCLOCK is not set + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set + +# +# SPI Protocol Masters +# + +# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set + +# +# Hardware Monitoring support +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# SoC drivers +# +# CONFIG_SOC_MQ11XX is not set +# CONFIG_SOC_T7L66XB is not set +# CONFIG_SOC_TC6387XB is not set +# CONFIG_SOC_TC6393XB is not set +# CONFIG_HTC_ASIC2 is not set +CONFIG_HTC_ASIC3=y +# CONFIG_SOC_TSC2101 is not set + +# +# Misc devices +# +CONFIG_BATTERY_MONITOR=y + +# +# Multimedia Capabilities Port drivers +# +# CONFIG_MCP is not set + +# +# Multimedia Capabilities Port drivers +# + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set + +# +# Graphics support +# +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_MODE_HELPERS is not set +CONFIG_FB_TILEBLITTING=y +# CONFIG_FB_IMAGEON is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_PXA=y +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +CONFIG_FONT_MINI_4x6=y +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set + +# +# Logo configuration +# +# CONFIG_LOGO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_DEVICE=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_DEVICE=y + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PRINTK=y +CONFIG_SND_DEBUG=y +CONFIG_SND_DEBUG_DETECT=y + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_A716 is not set +CONFIG_SND_H1910=y +# CONFIG_SND_H2200 is not set +# CONFIG_SND_H4000 is not set +# CONFIG_SND_HTCMAGICIAN is not set +# CONFIG_SND_HX4700 is not set +# CONFIG_SND_HTCUNIVERSAL is not set +# CONFIG_SND_H5XXX_AK4535 is not set +CONFIG_SND_PXA2xx_I2SOUND=y +# CONFIG_SND_PXA2XX_AC97 is not set + +# +# PCMCIA devices +# +CONFIG_SND_UDA1380=y + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set + +# +# USB support +# +CONFIG_USB_ARCH_HAS_HCD=y +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USB is not set + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG_FILES=y +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_NET2280 is not set +CONFIG_USB_GADGET_PXA2XX=y +CONFIG_USB_PXA2XX=y +# CONFIG_USB_PXA2XX_SMALL is not set +# CONFIG_USB_GADGET_PXA27X is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_MQ11XX is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +# CONFIG_USB_ETH_RNDIS is not set +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_G_CHAR is not set + +# +# MMC/SD Card support +# +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_BLOCK=y +# CONFIG_MMC_PXA is not set +# CONFIG_MMC_TMIO is not set +# CONFIG_MMC_SAMCOP is not set +CONFIG_MMC_ASIC3=y + +# +# LED devices +# +CONFIG_CLASS_LEDS=y + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +# CONFIG_EXT3_FS is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_FS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_NTFS_FS is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_RELAYFS_FS is not set +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +# CONFIG_NFSD is not set +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +# CONFIG_9P_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +CONFIG_NLS_CODEPAGE_1250=y +CONFIG_NLS_CODEPAGE_1251=y +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=y + +# +# Profiling support +# +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +# CONFIG_MAGIC_SYSRQ is not set +CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=15 +CONFIG_DETECT_SOFTLOCKUP=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_VM=y +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_RCU_TORTURE_TEST is not set +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_WAITQ is not set +CONFIG_DEBUG_ERRORS=y +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set + +# +# Cryptographic options +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Hardware crypto devices +# + +# +# Library routines +# +CONFIG_CRC_CCITT=y +# CONFIG_CRC16 is not set +CONFIG_CRC32=y +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y -- cgit v1.2.3 From 68468c0d2a3b5c7f5cd67d37116758b5cb1d6dd1 Mon Sep 17 00:00:00 2001 From: Andrew Paulsen Date: Fri, 12 Jan 2007 09:51:35 +0000 Subject: libx11: fix makekeys compilation, close #1447 --- packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index 7ed04075c8..463312d017 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -17,7 +17,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} makekeys.c -o makekeys + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys ) || exit 1 rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake -- cgit v1.2.3 From ad6297e2bdb9bf190b8d89f755ea265b21d589cb Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 12 Jan 2007 09:51:53 +0000 Subject: initscripts: fix populate-volatile.sh file and directory creation - now chmod gets called do set the correct permissions --- packages/initscripts/initscripts-1.0/populate-volatile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh index a60cc0d420..c5692fea7f 100755 --- a/packages/initscripts/initscripts-1.0/populate-volatile.sh +++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh @@ -11,7 +11,7 @@ COREDEF="00_core" create_file() { EXEC=" touch \"$1\"; - chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache @@ -26,7 +26,7 @@ create_file() { mk_dir() { EXEC=" mkdir -p \"$1\"; - chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1 + chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache -- cgit v1.2.3 From ea70670c7912cfc80816dba019f44e8815e6a5c3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 12:59:46 +0000 Subject: qiv: fix do_install --- packages/qiv/qiv_1.9.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/qiv/qiv_1.9.bb b/packages/qiv/qiv_1.9.bb index c3aeb05bd2..17138452a5 100644 --- a/packages/qiv/qiv_1.9.bb +++ b/packages/qiv/qiv_1.9.bb @@ -12,6 +12,9 @@ inherit pkgconfig binconfig CFLAGS += " -lSM -lICE -lXdmcp" do_install() { - install -s -m 0755 qiv ${D}${bindir}/qiv + install -d ${D}${bindir} + install -d ${D}${mandir}/man1/ + + install -s -m 0755 qiv ${D}${bindir}/qiv install -m 0644 qiv.1 ${D}${mandir}/man1/qiv.1 } -- cgit v1.2.3 From 96610be7f09973209825a518a18f24282b35b162 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 13:04:43 +0000 Subject: povray: fix do_configure --- packages/povray/povray_3.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/povray/povray_3.6.1.bb b/packages/povray/povray_3.6.1.bb index 914d2eaad6..e1c60570be 100644 --- a/packages/povray/povray_3.6.1.bb +++ b/packages/povray/povray_3.6.1.bb @@ -19,7 +19,7 @@ PARALLEL_MAKE = "" #autoreconf breaks, so we'll skip that. The added advantage is that the patch to ./configure actually has effect do_configure() { - oe_runconf + oe_runconf COMPILED_BY="${MAINTAINER}" } PACKAGES += "${PN}-scenes ${PN}-ini ${PN}-icons ${PN}-scripts ${PN}-includes" -- cgit v1.2.3 From bf35832f54f88a44211080455a9b1acdc2f797ba Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 12 Jan 2007 16:47:19 +0000 Subject: ruby: added forgotten patches --- packages/ruby/ruby-1.8.5/.mtn2git_empty | 0 .../ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch | 16 ++++++++++++++++ packages/ruby/ruby-1.8.5/extmk_run.patch | 15 +++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 packages/ruby/ruby-1.8.5/.mtn2git_empty create mode 100644 packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch create mode 100644 packages/ruby/ruby-1.8.5/extmk_run.patch (limited to 'packages') diff --git a/packages/ruby/ruby-1.8.5/.mtn2git_empty b/packages/ruby/ruby-1.8.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch new file mode 100644 index 0000000000..82137896b9 --- /dev/null +++ b/packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch @@ -0,0 +1,16 @@ +--- packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 ++++ packages/ruby/ruby-1.8.5/disable_wide_getaddrinfo_check.patch f667776fd8760b7048cc9617930112347b0ef2c0 +@@ -0,0 +1,13 @@ ++--- ruby-1.8.5/ext/socket/extconf.rb.orig 2006-12-30 15:12:31.000000000 +1100 +++++ ruby-1.8.5/ext/socket/extconf.rb 2006-12-30 15:16:24.000000000 +1100 ++@@ -216,6 +216,10 @@ ++ } ++ EOF ++ end +++# Ignore the actual result of the above test and assume that +++# everything is OK. +++getaddr_info_ok = true +++ ++ if ipv6 and not getaddr_info_ok ++ abort < Date: Fri, 12 Jan 2007 18:19:07 +0000 Subject: mark fonts that rprovide "virtual/japanese-font" --- packages/qpf-fonts/qpf-qte_2.3.10.bb | 2 ++ packages/qpf-fonts/qpf-unifont_1.0.bb | 1 + 2 files changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/qpf-fonts/qpf-qte_2.3.10.bb b/packages/qpf-fonts/qpf-qte_2.3.10.bb index 33e7d87e32..4d7d739f79 100644 --- a/packages/qpf-fonts/qpf-qte_2.3.10.bb +++ b/packages/qpf-fonts/qpf-qte_2.3.10.bb @@ -20,6 +20,8 @@ PROVIDES += "qte-font-smoothserif-140 qte-font-smoothserif-180 qte-font-smooths PROVIDES += "qte-font-smoothtimes-100 qte-font-smoothtimes-160 qte-font-smoothtimes-170" PROVIDES += "qte-font-smoothtimes-220 qte-font-smoothtimes-250 qte-font-smoothtimes-440" PROVIDES += "qte-font-unifont" +RPROVIDES_qte-font-unifont += "virtual/japanese-font" +RPROVIDES_qte-font-japanese += "virtual/japanese-font" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz" S = "${WORKDIR}/qt-${PV}" diff --git a/packages/qpf-fonts/qpf-unifont_1.0.bb b/packages/qpf-fonts/qpf-unifont_1.0.bb index 6eefff1c20..ec3a9de4ca 100644 --- a/packages/qpf-fonts/qpf-unifont_1.0.bb +++ b/packages/qpf-fonts/qpf-unifont_1.0.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Unicode fonts - QPF Edition" LICENSE = "GPL QPL" SECTION = "opie/fonts" PRIORITY = "optional" +RPROVIDES = "virtual/japanese-font" PACKAGE_ARCH = "all" PR = "r1" -- cgit v1.2.3 From 9b6534ba102d9b548d31665f1afa9149128a55b7 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Fri, 12 Jan 2007 19:20:12 +0000 Subject: packages/parted/parted_1.8.2.bb : New parted Version * Update to newest parted. Includes many bugfixes and improvments. --- packages/parted/parted_1.8.2.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/parted/parted_1.8.2.bb (limited to 'packages') diff --git a/packages/parted/parted_1.8.2.bb b/packages/parted/parted_1.8.2.bb new file mode 100644 index 0000000000..1185014aa3 --- /dev/null +++ b/packages/parted/parted_1.8.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "parted, the GNU partition resizing program" +HOMEPAGE = "http://www.gnu.org/software/parted/parted.html" +LICENSE = "GPLv2" +SECTION = "console/tools" +DEPENDS = "readline e2fsprogs-libs" +PR = "r0" + +SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz" + +#EXTRA_OECONF = "--disable-Werror" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 9f467916a1df9897c703e59fc6c979e3fc277491 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 12 Jan 2007 22:59:24 +0000 Subject: add gtk-theme-torturer, a stress test and benchmark utility for gtk themes --- packages/gtk-theme-torturer/.mtn2git_empty | 0 packages/gtk-theme-torturer/gtk-theme-torturer_git.bb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/gtk-theme-torturer/.mtn2git_empty create mode 100644 packages/gtk-theme-torturer/gtk-theme-torturer_git.bb (limited to 'packages') diff --git a/packages/gtk-theme-torturer/.mtn2git_empty b/packages/gtk-theme-torturer/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb b/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb new file mode 100644 index 0000000000..e62ef592be --- /dev/null +++ b/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Gtk+ Theme Benchmark Program" +DEPENDS = "gtk+-2.0" +HOMEPAGE = "http://wiki.laptop.org/go/GTK_for_OLPC" +SECTION = "devel" +LICENSE = "GPL" + +PV = "0.0.0+git${SRCDATE}" + +SRC_URI = "git://dev.laptop.org/projects/soc-gtk/;protocol=git" +S = "${WORKDIR}/git/gtk-theme-torturer" + +CFLAGS += "-Wl,-rpath-link,${STAGING_LIBDIR}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 torturer ${D}${bindir} +} + + -- cgit v1.2.3 From 166df77a23b560e238d0e7df4065ff638ad8ea52 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Fri, 12 Jan 2007 23:21:33 +0000 Subject: flac: Fix build for powerpc. Closes #1775. --- packages/flac/flac_1.1.2.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'packages') diff --git a/packages/flac/flac_1.1.2.bb b/packages/flac/flac_1.1.2.bb index cdd96bbf2d..85ffc9beb9 100644 --- a/packages/flac/flac_1.1.2.bb +++ b/packages/flac/flac_1.1.2.bb @@ -31,6 +31,9 @@ do_configure () { install -d ${S}/m4 install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/ autotools_do_configure + # removes '-read-only-relocs' which is enabled for PowerPC builds. + # It makes the build fail, other archs are not affected. Fixes #1775. + sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile } do_stage () { -- cgit v1.2.3 From fa84eb905e96de1c08d6d6540c024dabcbb6be72 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 12 Jan 2007 23:53:40 +0000 Subject: packages/esound/esound-gpe_20070109.bb : fix svn checkout problems. --- packages/esound/esound-gpe_20070109.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/esound/esound-gpe_20070109.bb b/packages/esound/esound-gpe_20070109.bb index 790462f5e8..0cf1e5bc23 100644 --- a/packages/esound/esound-gpe_20070109.bb +++ b/packages/esound/esound-gpe_20070109.bb @@ -7,7 +7,7 @@ PROVIDES += "esound" RPROVIDES += "esound" SRCDATE = "${PV}" -SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk;module=extra/esound;rev=8935 \ +SRC_URI = "svn://projects.linuxtogo.org/svn/gpe/trunk/extra;module=esound;rev=8935 \ file://audiofile-please.patch;patch=1 \ file://configure.patch;patch=1" -- cgit v1.2.3 From 604930f9ea5d458c763aea91d6ed45695b8f1166 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 13 Jan 2007 00:10:06 +0000 Subject: qte 2.3.10: simpad.patch contains few hunks with white-space only changes, remove them, as they complicate review and further patching. --- packages/qte/qte-2.3.10/simpad.patch | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-2.3.10/simpad.patch b/packages/qte/qte-2.3.10/simpad.patch index bdca2e79a0..bbce63592b 100644 --- a/packages/qte/qte-2.3.10/simpad.patch +++ b/packages/qte/qte-2.3.10/simpad.patch @@ -74,39 +74,6 @@ #ifdef QT_QWS_SL5XXX #include #endif -@@ -165,9 +220,9 @@ - current = 0; - } - -- void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d; -+ void setAutoRepeat(int d, int p) { if ( d > 0 ) repeatdelay=d; - if ( p > 0 ) repeatperiod=p;} -- void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay; -+ void getAutoRepeat(int *d ,int *p ) { if (d) *d=repeatdelay; - if (p) *p=repeatperiod; } - - void stop() -@@ -551,9 +606,9 @@ - - void doKey(uchar scancode); - -- -+ - void restoreLeds(); -- -+ - private: - bool shift; - bool alt; -@@ -809,7 +864,7 @@ - - #if !defined(QT_QWS_SL5XXX) - if (code == 224 --#if defined(QT_QWS_IPAQ) -+#if defined(QT_QWS_IPAQ) - && !ipaq_return_pressed - #endif - ) { @@ -1775,9 +1830,11 @@ } else { type = spec; -- cgit v1.2.3 From 992d24fd69bfcc7be1baae6925da0caf64c24807 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 13 Jan 2007 01:30:23 +0000 Subject: qte 2.3.10: Use QT_QWS_CUSTOM consistently. * QT_QWS_CUSTOM does *not* exist in qte 2.3.10 at all. It's hello from 2.3.7-or-something era. Before killing it completely, let's apply it consistently to ease looking at config. QT_QWS_CUSTOM is referenced at all *once* in entire OPIE codebase, in opie-launcher, and if its defined, there will F11 key checked. Doing so not going to kill tosa. --- packages/qte/qte-common_2.3.10.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 247b428a4e..06da5928c6 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -135,7 +135,7 @@ EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_ EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK" EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" +EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SL6000" EXTRA_DEFINES_mnci = " -DQT_QWS_RAMSES -DQT_QWS_DEVFS" # -- cgit v1.2.3 From 479127b54ebb3d2b462da41e6fd2ec2f758eedd6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 13 Jan 2007 01:40:03 +0000 Subject: qte 2.3.10: QT_QWS_EZX: remove bogus define. * Such define is not referenced in qte codebase or any patches. --- packages/qte/qte-common_2.3.10.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 06da5928c6..29b94db2b1 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -104,8 +104,8 @@ EXTRA_OEMAKE = "-e" # add device flags here # EXTRA_DEFINES = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" -EXTRA_DEFINES_a780 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX" -EXTRA_DEFINES_e680 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_EZX" +EXTRA_DEFINES_a780 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" +EXTRA_DEFINES_e680 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h1910 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h1940 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" EXTRA_DEFINES_h2200 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ" -- cgit v1.2.3 From 4391f78219df60df8ed3a99815c6fc351ba5f947 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 13 Jan 2007 02:39:01 +0000 Subject: qte 2.3.10: Rethink hardware platform defines. * Let there be two major platforms, Zaurus and Wince. Let there be two defines, QT_QWS_SL5XXX and QT_QWS_IPAQ, to define generic device of the corresponding platform. * Let there be also possibility to specialize for specific device of the platform. But corresponding define must be always used bu the generic platform device above. * For example, QT_QWS_SLC700 is a Zaurus C7x0 device, and it always must be defined together with QT_QWS_SL5XXX. Or QT_QWS_SIMPAD, an QT_QWS_IPAQ specialization. * As generic define is implied by specific, if we somewhere have test for generic define, we don't need to additionally test for "specific" define. * Thus, bunch of hunks in device-specific patches are superflous and can be dropped. --- packages/qte/qte-2.3.10/c700-hardware.patch | 83 ----------------------------- packages/qte/qte-2.3.10/simpad.patch | 27 ---------- packages/qte/qte-mt_2.3.10.bb | 2 +- packages/qte/qte_2.3.10.bb | 2 +- 4 files changed, 2 insertions(+), 112 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-2.3.10/c700-hardware.patch b/packages/qte/qte-2.3.10/c700-hardware.patch index 5527ab4a88..fa4bd25f37 100644 --- a/packages/qte/qte-2.3.10/c700-hardware.patch +++ b/packages/qte/qte-2.3.10/c700-hardware.patch @@ -3,26 +3,6 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~c700-hardware -+++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp -@@ -178,7 +178,7 @@ - static QRect maxwindow_rect; - extern Q_EXPORT QRect qt_maxWindowRect; - static const char *defaultMouse = --#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) -+#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) - "TPanel" - #elif defined(QT_KEYPAD_MODE) - "None" -@@ -3308,7 +3308,7 @@ - void QWSServer::screenSaverSleep() - { - qt_screen->blank(TRUE); --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLC700) - d->screensavertimer->stop(); - #else - if ( screensaverinterval ) { --- qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp~c700-hardware +++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp @@ -87,6 +87,19 @@ @@ -45,66 +25,3 @@ #endif #ifndef QT_QWS_TP_SAMPLE_SIZE -@@ -592,7 +605,7 @@ - sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); - notify(fd); - } --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2) && !defined(QT_QWS_SLC700) - char fn[] = "/dev/ttyS?"; - for (int ch='0'; ch<='3'; ch++) { - fn[9] = ch; -@@ -1274,7 +1287,7 @@ - numSamples(0), skipCount(0) - { - Q_UNUSED(dev); --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - #if defined(QT_QWS_IPAQ) - # ifdef QT_QWS_IPAQ_RAW - if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1284,7 +1297,7 @@ - qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); - return; - } --#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - //# ifdef QT_QWS_SL5XXX_TSRAW - # if 0 - if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1310,7 +1323,7 @@ - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - if (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1318,7 +1331,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - if(!qt_screen) - return; - -@@ -1337,7 +1350,7 @@ - uchar *mb = mouseBuf+idx; - data = (TS_EVENT *) mb; - if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) { --#ifdef QT_QWS_SL5XXX -+#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - samples[currSample] = QPoint( 1000 - data->x, data->y ); - #else - samples[currSample] = QPoint( data->x, data->y ); -@@ -1997,7 +2010,7 @@ - handler = new QTSLibHandlerPrivate(); - #elif defined(QT_QWS_YOPY) - handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); --#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) - handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/packages/qte/qte-2.3.10/simpad.patch b/packages/qte/qte-2.3.10/simpad.patch index bbce63592b..8a728ef74a 100644 --- a/packages/qte/qte-2.3.10/simpad.patch +++ b/packages/qte/qte-2.3.10/simpad.patch @@ -338,30 +338,3 @@ #endif QSocketNotifier *mouseNotifier; -@@ -1323,7 +1330,7 @@ - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - if (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1331,7 +1338,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - if(!qt_screen) - return; - -@@ -2013,7 +2020,7 @@ - handler = new QTSLibHandlerPrivate(); - #elif defined(QT_QWS_YOPY) - handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); --#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD) - handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 4db61bb646..5548007e42 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r7" +PR = "r8" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index c789358f2a..44db311bff 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r47" +PR = "r48" -- cgit v1.2.3 From 523046e1f5dfe45d8f88c589254e300ea3c891e8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 13 Jan 2007 13:07:41 +0000 Subject: eds-dbus: add intltool-native to DEPENDS, closes #1786 --- packages/eds/eds-dbus_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index b97ed984bc..3cffebc37e 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Evolution database backend server" HOMEPAGE = "http://projects.o-hand.com/eds" LICENSE = "LGPL" -DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool" +DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common libglade virtual/libiconv zlib intltool" PV = "1.4.0+svn${SRCDATE}" -- cgit v1.2.3 From 8f0b491e11744e54962c390a2725abb8955b983d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 13 Jan 2007 13:42:26 +0000 Subject: gtk-theme-torturer: fix DEPENS --- packages/gtk-theme-torturer/gtk-theme-torturer_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb b/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb index e62ef592be..adcdf2ed2e 100644 --- a/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb +++ b/packages/gtk-theme-torturer/gtk-theme-torturer_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Gtk+ Theme Benchmark Program" -DEPENDS = "gtk+-2.0" +DEPENDS = "gtk+" HOMEPAGE = "http://wiki.laptop.org/go/GTK_for_OLPC" SECTION = "devel" LICENSE = "GPL" -- cgit v1.2.3 From 4409b2e63351c116a61cae3400abd82bb1820cb2 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Sat, 13 Jan 2007 17:11:21 +0000 Subject: libg15: added new package --- packages/libg15/.mtn2git_empty | 0 packages/libg15/libg15_1.2.1.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/libg15/.mtn2git_empty create mode 100644 packages/libg15/libg15_1.2.1.bb (limited to 'packages') diff --git a/packages/libg15/.mtn2git_empty b/packages/libg15/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libg15/libg15_1.2.1.bb b/packages/libg15/libg15_1.2.1.bb new file mode 100644 index 0000000000..520c9441b8 --- /dev/null +++ b/packages/libg15/libg15_1.2.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "This is a library to handle the LCD and extra keys on the Logitech G15 Gaming Keyboard." +HOMEPAGE = "http://g15tools.sourceforge.net" +LICENSE = "GPLv2" +SECTION = "console/utils" +PRIORITY = "optional" +DEPENDS = "libusb" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15-${PV}.tar.bz2" + +inherit autotools + -- cgit v1.2.3 From 1678762e9bdf9c49015bd398d6ae1a4c190b67e6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 14 Jan 2007 09:57:19 +0000 Subject: qte 2.3.10: Fix kernel-keymap.patch, was made as -p0 instead of -p1. --- packages/qte/qte-2.3.10/kernel-keymap.patch | 8 ++++---- packages/qte/qte-mt_2.3.10.bb | 2 +- packages/qte/qte_2.3.10.bb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-2.3.10/kernel-keymap.patch b/packages/qte/qte-2.3.10/kernel-keymap.patch index 79c0bd07ad..a17362ba87 100644 --- a/packages/qte/qte-2.3.10/kernel-keymap.patch +++ b/packages/qte/qte-2.3.10/kernel-keymap.patch @@ -1,7 +1,7 @@ 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 ++++ qte/src/kernel/kernelkeyboard.cpp 2006-04-01 23:42:35.154645456 +0200 @@ -0,0 +1,701 @@ +/* + @@ -706,8 +706,8 @@ Index: src/kernel/kernelkeyboard.cpp +} 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 +--- qte/src/kernel/qkeyboard_qws.cpp.orig 2006-04-01 23:36:22.499297680 +0200 ++++ qte/src/kernel/qkeyboard_qws.cpp 2006-04-01 23:38:19.913448016 +0200 @@ -45,15 +45,18 @@ #include @@ -960,7 +960,7 @@ Index: src/kernel/qkeyboard_qws.cpp 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 ++++ qte/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 diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 5548007e42..87eccb7e1a 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r8" +PR = "r9" EXTRA_OECONF += "-thread" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index 44db311bff..3304868768 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -1,3 +1,3 @@ require qte-common_${PV}.inc -PR = "r48" +PR = "r49" -- cgit v1.2.3 From 23a152887750570b91dd0799a94cdf235b99deef Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 14 Jan 2007 10:05:15 +0000 Subject: opie-taskbar: Remove overriden opie startup file for htcuinversal * This contained (comparing to the default) only explicit QWS_MOUSE_PROTO & QWS_KEYBOARD assignments, and it htcuinversal was confirmed to work without them. --- .../opie-taskbar/opie-taskbar/htcuniversal/opie | 82 ---------------------- packages/opie-taskbar/opie-taskbar_1.2.2.bb | 2 +- packages/opie-taskbar/opie-taskbar_cvs.bb | 2 +- 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 packages/opie-taskbar/opie-taskbar/htcuniversal/opie (limited to 'packages') diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie deleted file mode 100644 index ac8cf18df4..0000000000 --- a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# -[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root -[ -z $HOME ] && export HOME=/home/$LOGNAME - -export QTDIR=/opt/QtPalmtop -export OPIEDIR=/opt/QtPalmtop -export QPEDIR=/opt/QtPalmtop -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib -export PATH=$PATH:$OPIEDIR/bin -export QWS_MOUSE_PROTO=TPanel:`detect-stylus --device` -export QWS_KEYBOARD=USB:/dev/input/event1 - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -for conf in $OPIEDIR/etc/skel/*.conf; do - conf_basename=`basename $conf` - if [ ! -e "$HOME/Settings/$conf_basename" ] ; then - echo "Copying default $conf_basename into $HOME/Settings/" - mkdir -p $HOME/Settings/ - cat $conf >$HOME/Settings/$conf_basename - fi -done - -if [ ! -e "$HOME/systeminfo/linkver" ] ; then - mkdir -p $HOME/systeminfo/ - echo "1.13" >$HOME/systeminfo/linkver -fi - -if [ ! -e "/opt/Qtopia" ] ; then - ln -sf /opt/QtPalmtop /opt/Qtopia -fi - -case $1 in -'start') - #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 - - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 2 - else - $OPIEDIR/bin/opie-reorgfiles - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi - - if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then - export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh - fi - echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 - fi - - ;; - -'stop') - echo "Stopping Opie..." - killall qpe 2>/dev/null - killall opie-login 2>/dev/null - killall quicklauncher 2>/dev/null - - ;; - -'restart') - $0 stop && $0 start - - ;; - -*) - echo "usage: $0 { start | stop | restart }" - - ;; - -esac - diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index d5d947783c..384fbd0ec8 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 3d770a55dc..38172af970 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ -- cgit v1.2.3 From c66af6070aa452685b023d9d9c04a2a7f705221d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 14 Jan 2007 10:23:02 +0000 Subject: linux-handhelds-2.6: Update defconfig for rx3000. * P.S. Please always lart linux kernel mainline for any Kbuild breakages like endless loops during make oldconfig. --- .../linux/linux-handhelds-2.6/rx3000/defconfig | 183 +++++++++++++++++---- 1 file changed, 153 insertions(+), 30 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-handhelds-2.6/rx3000/defconfig b/packages/linux/linux-handhelds-2.6/rx3000/defconfig index 3d915d7f8f..35ae57e8ac 100644 --- a/packages/linux/linux-handhelds-2.6/rx3000/defconfig +++ b/packages/linux/linux-handhelds-2.6/rx3000/defconfig @@ -1,11 +1,13 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.18-hh1 -# Wed Nov 29 21:13:14 2006 +# Linux kernel version: 2.6.19-hh4 +# Sat Dec 16 17:40:31 2006 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -28,9 +30,11 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y # CONFIG_MINIMAL_OOPS is not set @@ -38,9 +42,10 @@ CONFIG_IKCONFIG_PROC=y # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y # CONFIG_EMBEDDED is not set CONFIG_UID16=y -CONFIG_SYSCTL=y +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y @@ -73,6 +78,7 @@ CONFIG_KMOD=y # # Block layer # +CONFIG_BLOCK=y # CONFIG_BLK_DEV_IO_TRACE is not set # @@ -105,7 +111,8 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_ARCH_NETX is not set # CONFIG_ARCH_H720X is not set # CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set @@ -125,9 +132,11 @@ CONFIG_ARCH_S3C2410=y # # S3C24XX Implementations # +# CONFIG_MACH_AML_M5900 is not set # CONFIG_MACH_ANUBIS is not set # CONFIG_MACH_OSIRIS is not set # CONFIG_ARCH_BAST is not set +CONFIG_PM_H1940=y # CONFIG_ARCH_H1940 is not set # CONFIG_MACH_N30 is not set # CONFIG_ARCH_SMDK2410 is not set @@ -135,9 +144,14 @@ CONFIG_ARCH_S3C2410=y # CONFIG_MACH_SMDK2413 is not set # CONFIG_MACH_VR1000 is not set CONFIG_MACH_RX3715=y +CONFIG_RX3715_LEDS=m +CONFIG_RX3715_BLUETOOTH=m +CONFIG_RX3715_DS1WM=m # CONFIG_MACH_OTOM is not set # CONFIG_MACH_NEXCODER_2440 is not set +# CONFIG_MACH_VSTMS is not set CONFIG_S3C2410_CLOCK=y +CONFIG_S3C2410_PM=y CONFIG_CPU_S3C244X=y CONFIG_CPU_S3C2440=y @@ -172,6 +186,8 @@ CONFIG_CPU_CACHE_V4WT=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_COPY_V4WB=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features @@ -225,9 +241,9 @@ CONFIG_ALIGNMENT_TRAP=y # # Boot options # -CONFIG_ZBOOT_ROM_TEXT=0 -CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_CMDLINE="root=/dev/mmcblk0p2" +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="" # CONFIG_XIP_KERNEL is not set # @@ -255,6 +271,8 @@ CONFIG_BINFMT_MISC=y CONFIG_PM=y CONFIG_PM_LEGACY=y CONFIG_PM_DEBUG=y +# CONFIG_DISABLE_CONSOLE_SUSPEND is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set CONFIG_APM=y # @@ -271,6 +289,7 @@ CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y @@ -289,10 +308,12 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_TUNNEL is not set CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" # # IP: Virtual Server Configuration @@ -389,7 +410,7 @@ CONFIG_IRDA_FAST_RR=y # # SIR device drivers # -CONFIG_IRTTY_SIR=y +CONFIG_IRTTY_SIR=m # # Dongle support @@ -421,11 +442,12 @@ CONFIG_BT_HIDP=m # # Bluetooth device drivers # -CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_H4=y -# CONFIG_BT_HCIUART_BCSP is not set +CONFIG_BT_HCIUART_BCSP=y # CONFIG_BT_HCIVHCI is not set # CONFIG_IEEE80211 is not set +CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -465,6 +487,7 @@ CONFIG_MTD_BLOCK=y # CONFIG_NFTL is not set # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set # # RAM/ROM/Flash chip drivers @@ -560,6 +583,12 @@ CONFIG_BLK_DEV_INITRD=y # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set # # Multi-device support (RAID and LVM) @@ -612,7 +641,17 @@ CONFIG_NETDEVICES=y # # Wireless LAN (non-hamradio) # -# CONFIG_NET_RADIO is not set +CONFIG_NET_RADIO=y +# CONFIG_NET_WIRELESS_RTNETLINK is not set + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_HOSTAP is not set +CONFIG_ACX=m +CONFIG_ACX_MEM=y +CONFIG_ACX_RX3715=m # # Wan interfaces @@ -628,6 +667,7 @@ CONFIG_PPP_BSDCOMP=y # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set +CONFIG_SLHC=y # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -642,12 +682,13 @@ CONFIG_PPP_BSDCOMP=y # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # CONFIG_INPUT_JOYDEV is not set @@ -666,19 +707,24 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_LKKBD is not set # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set CONFIG_GPIO_KEYS=y CONFIG_KEYBOARD_ASIC3=y -CONFIG_INPUT_MOUSE=y -# CONFIG_MOUSE_PS2 is not set -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_NAVPOINT is not set -# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_S3C2410=y +# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_WM9705 is not set +# CONFIG_TOUCHSCREEN_WM9712 is not set +# CONFIG_TOUCHSCREEN_WM9713 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_INPUT_MISC is not set # @@ -732,7 +778,6 @@ CONFIG_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y CONFIG_HW_RANDOM=y # CONFIG_NVRAM is not set -# CONFIG_S3C2410_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set @@ -745,13 +790,12 @@ CONFIG_HW_RANDOM=y # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set # # I2C support # CONFIG_I2C=y -CONFIG_I2C_CHARDEV=m +CONFIG_I2C_CHARDEV=y # # I2C Algorithms @@ -783,7 +827,7 @@ CONFIG_I2C_S3C2410=m # CONFIG_SENSORS_MAX6875 is not set # CONFIG_I2C_DEBUG_CORE is not set # CONFIG_I2C_DEBUG_ALGO is not set -CONFIG_I2C_DEBUG_BUS=y +# CONFIG_I2C_DEBUG_BUS is not set # CONFIG_I2C_DEBUG_CHIP is not set # @@ -817,7 +861,12 @@ CONFIG_W1_DS2760=m # # CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set -CONFIG_BATTERY_MONITOR=y + +# +# Hardware Monitoring - Battery +# +CONFIG_BATTERY_MONITOR=m +CONFIG_RX3715_BATTERY=m # # L3 serial bus support @@ -834,6 +883,7 @@ CONFIG_BATTERY_MONITOR=y # CONFIG_HTC_ASIC2 is not set CONFIG_HTC_ASIC3=y # CONFIG_SOC_TSC2101 is not set +# CONFIG_SOC_TSC2200 is not set # # Misc devices @@ -843,6 +893,8 @@ CONFIG_HTC_ASIC3=y # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_TIFM_CORE is not set # # LED devices @@ -854,21 +906,21 @@ CONFIG_LEDS_CLASS=y # LED drivers # # CONFIG_LEDS_S3C24XX is not set -# CONFIG_LEDS_ASIC3 is not set +CONFIG_LEDS_ASIC3=y # # LED Triggers # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_TIMER_ASIC3=y # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set -# CONFIG_LEDS_TRIGGER_SHARED is not set +CONFIG_LEDS_TRIGGER_SHARED=y # # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices @@ -892,6 +944,7 @@ CONFIG_FB_TILEBLITTING=y CONFIG_FB_S3C2410=y # CONFIG_FB_S3C2410_DEBUG is not set # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set # # Console display driver support @@ -925,11 +978,56 @@ CONFIG_BACKLIGHT_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_DEVICE=y # CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_S3C2410=y # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +CONFIG_SND_RX3715=m +CONFIG_SND_S3C2410=m +# CONFIG_SND_S3C2410_DBG is not set +# CONFIG_SND_S3C2410_DBG_DMA is not set + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set +CONFIG_SND_UDA1380=m + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set # # USB support @@ -946,8 +1044,9 @@ CONFIG_USB_ARCH_HAS_OHCI=y # # USB Gadget Support # -CONFIG_USB_GADGET=m +CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_PXA27X is not set @@ -955,9 +1054,20 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +CONFIG_USB_GADGET_S3C2410=y +CONFIG_USB_S3C2410=y +# CONFIG_USB_S3C2410_DEBUG is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_CHAR is not set # # MMC/SD Card support @@ -965,6 +1075,7 @@ CONFIG_USB_GADGET=m CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y +# CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set CONFIG_MMC_ASIC3=y @@ -976,6 +1087,7 @@ CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set # # RTC interfaces @@ -1009,10 +1121,12 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set @@ -1044,8 +1158,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -1082,7 +1198,8 @@ CONFIG_JFFS2_RTIME=y # # CONFIG_NFS_FS is not set # CONFIG_NFSD is not set -# CONFIG_SMB_FS is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -1164,6 +1281,7 @@ CONFIG_OPROFILE=y # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set # CONFIG_UNUSED_SYMBOLS is not set # CONFIG_DEBUG_KERNEL is not set @@ -1171,7 +1289,7 @@ CONFIG_LOG_BUF_SHIFT=14 CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_FS is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set +# CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_USER is not set CONFIG_DEBUG_S3C2410_UART=2 @@ -1185,6 +1303,9 @@ CONFIG_DEBUG_S3C2410_UART=2 # Cryptographic options # CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_MANAGER=m # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set @@ -1194,6 +1315,8 @@ CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set -- cgit v1.2.3 From 09a309304ed0ca5fda7c2e7df5b48536812c8e2d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 14 Jan 2007 19:49:17 +0000 Subject: libsql-qpe: move it to packages/obsolete. The main reason for this is the thread on the mailinglist, the secondary reason is the the opie people decided to b0rk their patches so they don't apply anymore. --- packages/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty | 0 packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch | 37 - packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4 | 189 -- .../libsdl-qpe-1.2.7/agawa-piro-mickey.patch | 2065 -------------------- packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch | 25 - packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch | 176 -- packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch | 143 -- packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch | 408 ---- packages/libsdl/libsdl-qpe-1.2.7/mouse.patch | 47 - packages/libsdl/libsdl-qpe-1.2.7/pygame.patch | 196 -- packages/libsdl/libsdl-qpe_1.2.7.bb | 57 - packages/obsolete/libsdl/.mtn2git_empty | 0 .../libsdl/libsdl-qpe-1.2.7/.mtn2git_empty | 0 .../libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch | 37 + .../obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4 | 189 ++ .../libsdl-qpe-1.2.7/agawa-piro-mickey.patch | 2065 ++++++++++++++++++++ .../obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch | 25 + .../obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch | 176 ++ .../obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch | 143 ++ .../libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch | 408 ++++ .../obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch | 47 + .../obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch | 196 ++ packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb | 57 + 23 files changed, 3343 insertions(+), 3343 deletions(-) delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4 delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/mouse.patch delete mode 100644 packages/libsdl/libsdl-qpe-1.2.7/pygame.patch delete mode 100644 packages/libsdl/libsdl-qpe_1.2.7.bb create mode 100644 packages/obsolete/libsdl/.mtn2git_empty create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4 create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch create mode 100644 packages/obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch create mode 100644 packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb (limited to 'packages') diff --git a/packages/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty b/packages/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch b/packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch deleted file mode 100644 index b47a127398..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc.orig 2005-07-23 14:31:20.060123510 +0200 -+++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-07-23 14:38:49.000000000 +0200 -@@ -109,6 +109,7 @@ - MACHINE_SHARP_SLC760, - MACHINE_SHARP_SLC860, - MACHINE_SHARP_SL6000, -+ MACHINE_SHARP_SLC1000, - MACHINE_IPAQ, - MACHINE_MAX - } machine_t; -@@ -123,6 +124,7 @@ - { "Sharp", "SL-C760", 0 }, - { "Sharp", "SL-C860", 0 }, - { "Sharp", "SL-6000", 0 }, -+ { "Sharp", "SL-C1000", 0 }, - { "HP", "HP IPAQ", 0 }, - }; - -@@ -428,6 +430,8 @@ - machine = MACHINE_SHARP_SLC760; - else if (strstr(buf, "SHARP Boxer") != NULL) - machine = MACHINE_SHARP_SLC860; -+ else if (strstr(buf, "SHARP Akita") != NULL) -+ machine = MACHINE_SHARP_SLC1000; - else if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) - machine = MACHINE_IPAQ; - else -@@ -523,7 +527,8 @@ - machine == MACHINE_SHARP_SLC750 || - machine == MACHINE_SHARP_SLC760 || - machine == MACHINE_SHARP_SLC860 || // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º -- machine == MACHINE_SHARP_SL6000 ) { // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º -+ machine == MACHINE_SHARP_SL6000 || -+ machine == MACHINE_SHARP_SLC1000 ) { // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º - is_VGA_machine = true; - }else { - is_VGA_machine = false; diff --git a/packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4 b/packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4 deleted file mode 100644 index ca2df9d5e5..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/acinclude.m4 +++ /dev/null @@ -1,189 +0,0 @@ -# Local macros for the SDL configure.in script - -dnl Function to link an architecture specific file -dnl LINK_ARCH_SRC(source_dir, arch, source_file) -AC_DEFUN([COPY_ARCH_SRC], -[ - old="$srcdir/$1/$2/$3" - new="$1/$3" - if test ! -d $1; then - echo "Creating directory $1" - mkdir -p $1 - fi - echo "Copying $old -> $new" - cat >$new <<__EOF__ -/* WARNING: This file was automatically generated! - * Original: $old - */ -__EOF__ - cat >>$new <$old -]) - -# -# --- esd.m4 --- -# -# Configure paths for ESD -# Manish Singh 98-9-30 -# stolen back from Frank Belew -# stolen from Manish Singh -# Shamelessly stolen from Owen Taylor - -dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS -dnl -AC_DEFUN([AM_PATH_ESD], -[dnl -dnl Get the cflags and libraries from the esd-config script -dnl -AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)], - esd_prefix="$withval", esd_prefix="") -AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)], - esd_exec_prefix="$withval", esd_exec_prefix="") -AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program], - , enable_esdtest=yes) - - if test x$esd_exec_prefix != x ; then - esd_args="$esd_args --exec-prefix=$esd_exec_prefix" - if test x${ESD_CONFIG+set} != xset ; then - ESD_CONFIG=$esd_exec_prefix/bin/esd-config - fi - fi - if test x$esd_prefix != x ; then - esd_args="$esd_args --prefix=$esd_prefix" - if test x${ESD_CONFIG+set} != xset ; then - ESD_CONFIG=$esd_prefix/bin/esd-config - fi - fi - - AC_PATH_PROG(ESD_CONFIG, esd-config, no) - min_esd_version=ifelse([$1], ,0.2.7,$1) - AC_MSG_CHECKING(for ESD - version >= $min_esd_version) - no_esd="" - if test "$ESD_CONFIG" = "no" ; then - no_esd=yes - else - ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` - ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` - - esd_major_version=`$ESD_CONFIG $esd_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - esd_minor_version=`$ESD_CONFIG $esd_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_esdtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $ESD_CFLAGS" - LIBS="$LIBS $ESD_LIBS" -dnl -dnl Now check if the installed ESD is sufficiently new. (Also sanity -dnl checks the results of esd-config to some extent -dnl - rm -f conf.esdtest - AC_TRY_RUN([ -#include -#include -#include -#include - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.esdtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_esd_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_esd_version"); - exit(1); - } - - if (($esd_major_version > major) || - (($esd_major_version == major) && ($esd_minor_version > minor)) || - (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); - printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); - printf("*** to point to the correct copy of esd-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_esd" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$ESD_CONFIG" = "no" ; then - echo "*** The esd-config script installed by ESD could not be found" - echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the ESD_CONFIG environment variable to the" - echo "*** full path to esd-config." - else - if test -f conf.esdtest ; then - : - else - echo "*** Could not run ESD test program, checking why..." - CFLAGS="$CFLAGS $ESD_CFLAGS" - LIBS="$LIBS $ESD_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding ESD or finding the wrong" - echo "*** version of ESD. If it is not finding ESD, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means ESD was incorrectly installed" - echo "*** or that you have moved ESD since it was installed. In the latter case, you" - echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - ESD_CFLAGS="" - ESD_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(ESD_CFLAGS) - AC_SUBST(ESD_LIBS) - rm -f conf.esdtest -]) - diff --git a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch b/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch deleted file mode 100644 index 7f3622ea4c..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch +++ /dev/null @@ -1,2065 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - -Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.cc -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/SDL_QWin.cc 2005-03-02 22:24:43.457491622 +0100 -+++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-03-02 22:24:46.867009932 +0100 -@@ -1,3 +1,4 @@ -+ - /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2004 Sam Lantinga -@@ -27,15 +28,24 @@ - - #include "SDL_QWin.h" - #include -+#include - #include - -+extern int fb_hwrot; -+extern int fb_direct; -+extern bool is_VGA_machine; -+static int mouse_button_mode=1; -+ - screenRotationT screenRotation = SDL_QT_NO_ROTATION; - - SDL_QWin::SDL_QWin(const QSize& size) - : QWidget(0, "SDL_main"), my_painter(0), my_image(0), - my_inhibit_resize(false), my_mouse_pos(-1,-1), my_flags(0), -- my_has_fullscreen(false), my_locked(0) -+ my_has_fullscreen(false), my_locked(0), -+ rotation_(0), qteRotation_(0), keyRotation_(0), qteKeyRotation_(0), -+ isSLA300InputFix_(0) - { -+ for (int i = 0; i < 5; i++) curAxis_[i] = 0; - setBackgroundMode(NoBackground); - } - -@@ -84,6 +94,7 @@ - } - - void SDL_QWin::setMousePos(const QPoint &pos) { -+#if 0 - if(my_image->width() == height()) { - if (screenRotation == SDL_QT_ROTATION_90) - my_mouse_pos = QPoint(height()-pos.y(), pos.x()); -@@ -92,6 +103,66 @@ - } else { - my_mouse_pos = pos; - } -+#else -+ QPoint realPos; -+ -+ if (is_VGA_machine) { -+ realPos = pos; -+ my_mouse_pos = realPos; -+ }else { -+ switch (qteRotation_) { -+ case 0: -+ realPos = pos; -+ break; -+ case 1: -+ realPos.setX(pos.y()); -+ realPos.setY(fbSize_.height() - 1 - pos.x()); -+ break; -+ case 2: -+ realPos.setX(fbSize_.width() - 1 - pos.x()); -+ realPos.setY(fbSize_.height() - 1 - pos.y()); -+ break; -+ case 3: -+ realPos.setX(fbSize_.width() - 1 - pos.y()); -+ realPos.setY(pos.x()); -+ break; -+ }; -+ -+ // fprintf(stderr, "setMousePos: realPos(%d, %d)\n", realPos.x(), realPos.y()); -+ -+ int borderWidth = (fbSize_.width() - my_image->width()) >> 1; -+ int borderHeight = (fbSize_.height() - my_image->height()) >> 1; -+ if ( rotation_ & 1 ){ -+ borderWidth = (fbSize_.height() - my_image->width()) >> 1; -+ borderHeight = (fbSize_.width() - my_image->height()) >> 1; -+ } -+ realPos.setX(realPos.x() - borderWidth); -+ realPos.setY(realPos.y() - borderHeight); -+ -+ fprintf(stderr, "setMousePos: realPos2(%d, %d)\n", realPos.x(), realPos.y()); -+ -+ switch (rotation_) { -+ case 0: -+ my_mouse_pos = realPos; -+ break; -+ case 1: -+ my_mouse_pos.setX(realPos.y()); -+ my_mouse_pos.setY(my_image->height() - 1 - realPos.x()); -+ break; -+ case 2: -+ my_mouse_pos.setX(my_image->width() - 1 - realPos.x()); -+ my_mouse_pos.setY(my_image->height() - 1 - realPos.y()); -+ break; -+ case 3: -+ my_mouse_pos.setX(realPos.y());//my_image->width() - 1 - realPos.y()); -+ my_mouse_pos.setY(my_image->height() - realPos.x()); -+ break; -+ } -+ } -+ -+// fprintf(stderr, "setMousePos: mymousePos(%d, %d)\n", (short)my_mouse_pos.x(), (short)my_mouse_pos.y()); -+ -+#endif - } - - void SDL_QWin::mouseMoveEvent(QMouseEvent *e) { -@@ -113,269 +184,318 @@ - void SDL_QWin::mousePressEvent(QMouseEvent *e) { - mouseMoveEvent(e); - Qt::ButtonState button = e->button(); -- SDL_PrivateMouseButton(SDL_PRESSED, -- (button & Qt::LeftButton) ? 1 : -- ((button & Qt::RightButton) ? 2 : 3), -+ SDL_PrivateMouseButton(SDL_PRESSED,mouse_button_mode, - my_mouse_pos.x(), my_mouse_pos.y()); - } - - void SDL_QWin::mouseReleaseEvent(QMouseEvent *e) { - setMousePos(e->pos()); - Qt::ButtonState button = e->button(); -- SDL_PrivateMouseButton(SDL_RELEASED, -- (button & Qt::LeftButton) ? 1 : -- ((button & Qt::RightButton) ? 2 : 3), -+ SDL_PrivateMouseButton(SDL_RELEASED,mouse_button_mode, - my_mouse_pos.x(), my_mouse_pos.y()); - my_mouse_pos = QPoint(-1, -1); - } - --static inline void --gs_fastRotateBlit_3 ( unsigned short *fb, -- unsigned short *bits, -- const QRect& rect ) -+#ifndef __i386__ -+ -+static void -+blitRotate3(Uint16 *dstBits, const QSize& dstSize, -+ const Uint16 *srcBits, const QSize& srcSize, -+ const QRect& srcBlitRect); -+ -+static void -+blitRotate0(Uint16 *dstBits, const QSize& dstSize, -+ const Uint16 *srcBits, const QSize& srcSize, -+ const QRect& srcBlitRect) - { -- // FIXME: this only works correctly for 240x320 displays -- int startx, starty; -- int width, height; -- -- startx = rect.left() >> 1; -- starty = rect.top() >> 1; -- width = ((rect.right() - rect.left()) >> 1) + 2; -- height = ((rect.bottom() - rect.top()) >> 1) + 2; -- -- if((startx+width) > 120) { -- width = 120 - startx; // avoid horizontal overflow -- } -- if((starty+height) > 160) { -- height = 160 - starty; // avoid vertical overflow -- } -- -- ulong *sp1, *sp2, *dp1, *dp2; -- ulong stop, sbot, dtop, dbot; -- -- sp1 = (ulong*)bits + startx + starty*240; -- sp2 = sp1 + 120; -- dp1 = (ulong *)fb + (159 - starty) + startx*320; -- dp2 = dp1 + 160; -- int rowadd = (-320*width) - 1; -- int rowadd2 = 240 - width; -- // transfer in cells of 2x2 pixels in words -- for (int y=0; y>16) + (stop & 0xffff0000); -- // write to framebuffer -- *dp1 = dtop; -- *dp2 = dbot; -- // update source ptrs -- sp1++; sp2++; -- // update dest ptrs - 2 pix at a time -- dp1 += 320; -- dp2 += 320; -- } -- // adjust src ptrs - skip a row as we work in pairs -- sp1 += rowadd2; -- sp2 += rowadd2; -- // adjust dest ptrs for rotation -- dp1 += rowadd; -- dp2 += rowadd; -+ srcBits += srcBlitRect.left() + srcBlitRect.top() * srcSize.width(); -+ dstBits += ((dstSize.width() - srcSize.width()) >> 1) -+ + (((dstSize.height() - srcSize.height()) >> 1) * dstSize.width()); -+ dstBits += srcBlitRect.left() + srcBlitRect.top() * dstSize.width(); -+ int w = srcBlitRect.width() << 1; -+ int h = srcBlitRect.height(); -+ -+ while (h--) { -+ memcpy(dstBits, srcBits, w); -+ dstBits += dstSize.width(); -+ srcBits += srcSize.width(); - } - } - --static inline void --gs_fastRotateBlit_1 ( unsigned short *fb, -- unsigned short *bits, -- const QRect& rect ) { -- // FIXME: this only works correctly for 240x320 displays -- int startx, starty; -- int width, height; -- -- startx = rect.left() >> 1; -- starty = rect.top() >> 1; -- width = ((rect.right() - rect.left()) >> 1) + 2; -- height = ((rect.bottom() - rect.top()) >> 1) + 2; -- -- if((startx+width) > 120) { -- width = 120 - startx; // avoid horizontal overflow -- } -- if((starty+height) > 160) { -- height = 160 - starty; // avoid vertical overflow -- } -- -- ulong *sp1, *sp2, *dp1, *dp2; -- ulong stop, sbot, dtop, dbot; -- fb += 320*239; // Move "fb" to top left corner -- sp1 = (ulong*)bits + startx + starty*240; -- sp2 = sp1 + 120; -- dp1 = (ulong*)fb - startx * 320 - starty; -- dp2 = dp1 - 160; -- int rowadd = (320*width) + 1; -- int rowadd2 = 240 - width; -- // transfer in cells of 2x2 pixels in words -- for (int y=0; y>16) + (sbot & 0xffff0000); -- // write -- *dp1 = dtop; -- *dp2 = dbot; -- // update source ptrs -- sp1++; sp2++; -- // update dest ptrs - 2 pix at a time -- dp1 -= 320; -- dp2 -= 320; -- } -- // adjust src ptrs - skip a row as we work in pairs -- sp1 += rowadd2; -- sp2 += rowadd2; -- // adjust dest ptrs for rotation -- dp1 += rowadd; -- dp2 += rowadd; -- } -+static void -+blitRotate1(Uint16 *dstBits, const QSize& dstSize, -+ const Uint16 *srcBits, const QSize& srcSize, -+ const QRect& srcBlitRect) -+{ -+// fprintf(stdout, "SDL_QT_ROTATION (1) is not implemented.\n"); -+ blitRotate3(dstBits, dstSize, srcBits, srcSize, srcBlitRect); - } - --// desktop, SL-A300 etc --bool SDL_QWin::repaintRotation0(const QRect& rect) { -- if(my_image->width() == width()) { -- uchar *fb = (uchar*)my_painter->frameBuffer(); -- uchar *buf = (uchar*)my_image->bits(); -- if(rect == my_image->rect()) { -- memcpy(fb, buf, width()*height()*2); -- } else { -- int h = rect.height(); -- int wd = rect.width()<<1; -- int fblineadd = my_painter->lineStep(); -- int buflineadd = my_image->bytesPerLine(); -- fb += (rect.left()<<1) + rect.top() * my_painter->lineStep(); -- buf += (rect.left()<<1) + rect.top() * my_image->bytesPerLine(); -- while(h--) { -- memcpy(fb, buf, wd); -- fb += fblineadd; -- buf += buflineadd; -- } -+static void -+blitRotate2(Uint16 *dstBits, const QSize& dstSize, -+ const Uint16 *srcBits, const QSize& srcSize, -+ QRect srcBlitRect) -+{ -+// if (srcBlitRect.left() & 1) -+// srcBlitRect.setLeft(srcBlitRect.left() - 1); -+// if (srcBlitRect.right() & 1) -+// srcBlitRect.setRight(srcBlitRect.right() - 1); -+ -+ int dstBorderLeftRight = (dstSize.width() - srcSize.width()) >>1; -+ int dstBorderTopBottom = (dstSize.height() - srcSize.height()) >>1; -+ int dstStartOffsetX = dstSize.width() - dstBorderLeftRight - 2; -+ int dstStartOffsetY = dstSize.height() - dstBorderTopBottom - 1; -+ int left = srcBlitRect.left() & ~(int)1; // to be 32bit aligned -+ srcBits += left + srcBlitRect.top() * srcSize.width(); -+ dstBits += dstStartOffsetY * dstSize.width() + dstStartOffsetX; -+ dstBits -= left; -+ dstBits -= srcBlitRect.top() * dstSize.width(); -+ -+ Uint32 *pSrc = (Uint32 *)srcBits; -+ Uint32 *pDst = (Uint32 *)dstBits; -+ -+ int width = srcBlitRect.width(), width2 = srcBlitRect.width(), w; -+ if ( srcBlitRect.left() & 1 ){ -+ width--; width2++; -+ } -+ if ( (srcBlitRect.left()+srcBlitRect.width()) & 1 ){ -+ width--; width2++; -+ } -+ width >>= 1; -+ int height = srcBlitRect.height(); -+ int srcYAdd = srcSize.width() - width2; -+ int dstYSub = dstSize.width() - width2; -+ -+ while (height--) { -+ w = width; -+ if (srcBlitRect.left() & 1){ -+ *((Uint16 *)pDst) = *(((Uint16 *)pSrc) + 1); -+ pDst--; pSrc++; - } -- } else { -- return false; // FIXME: Landscape -+ while (w--) { -+ *pDst-- = (*pSrc << 16) | (*pSrc >> 16); -+ ++pSrc; -+ } -+ if ((srcBlitRect.left()+srcBlitRect.width()) & 1){ -+ *(((Uint16 *)pDst) + 1) = *((Uint16 *)pSrc); -+ pDst--; pSrc++; -+ } -+ pSrc += srcYAdd; -+ pDst -= dstYSub; - } --#ifdef __i386__ -- my_painter->fillRect( rect, QBrush( Qt::NoBrush ) ); --#endif -- return true; - } - -- --// Sharp Zaurus SL-5500 etc --bool SDL_QWin::repaintRotation3(const QRect& rect) { -- if(my_image->width() == width()) { -- ushort *fb = (ushort*)my_painter->frameBuffer(); -- ushort *buf = (ushort*)my_image->bits(); -- gs_fastRotateBlit_3(fb, buf, rect); -+#define BLIT_ROTATE_3_MOV32 -+ -+static void -+blitRotate3(Uint16 *dstBits, const QSize& dstSize, -+ const Uint16 *srcBits, const QSize& srcSize, -+ const QRect& srcBlitRect) -+{ -+ if (srcBlitRect.width() != dstSize.height() || -+ srcBlitRect.height() != dstSize.width()) { -+ // partial update -+ const Uint16 *pSrc = srcBits + -+ (srcBlitRect.left() + srcBlitRect.top() * srcSize.width()); -+ -+ int dstBorderLeftRight = (dstSize.width() - srcSize.height()) >>1; -+ int dstBorderTopBottom = (dstSize.height() - srcSize.width()) >>1; -+ int dstStartOffsetX = dstSize.width() - dstBorderLeftRight - 1; -+ int dstStartOffsetY = dstBorderTopBottom; -+ Uint16 *pDst = dstBits + -+ (dstStartOffsetY * dstSize.width() + dstStartOffsetX); -+ pDst += srcBlitRect.left() * dstSize.width(); -+ pDst -= srcBlitRect.top(); -+ -+ int width = srcBlitRect.width(), height = srcBlitRect.height(), w; -+ int srcYAdd = srcSize.width() - srcBlitRect.width(); -+ int dstXAdd = dstSize.width(); -+ int dstYSub = (dstSize.width() * srcBlitRect.width()) + 1; -+ -+#if 0 -+ fprintf(stderr, "---- Blit begin\n"); -+ fprintf(stderr, "srcSize.width: %d srcSize.height:%d\n", -+ srcSize.width(), srcSize.height()); -+ fprintf(stderr, "srcBlitRect.left:%d srcBlitRect.right:%d srcBlitRect.top:%d srcBlitRect.bottom:%d srcBlitRect.width:%d srcBlitRect.height:%d\n", -+ srcBlitRect.left(), srcBlitRect.right(), srcBlitRect.top(), srcBlitRect.bottom(), srcBlitRect.width(), srcBlitRect.height()); -+ -+ fprintf(stderr, "dstSize.width: %d dstSize.height:%d\n", -+ dstSize.width(), dstSize.height()); -+ fprintf(stderr, "dstBorderLeftRight:%d dstBorderTopBottom:%d dstStartOffsetX:%d dstStartOffsetY:%d\n", -+ dstBorderLeftRight, dstBorderTopBottom, dstStartOffsetX, dstStartOffsetY); -+ fprintf(stderr, "srcYAdd:%d dstXAdd:%d dstYSub:%d\n", srcYAdd, dstXAdd, dstYSub); -+#endif -+ -+ while (height--) { -+ w = width; -+ while (w--) { -+ *pDst = *pSrc ++; -+ pDst += dstXAdd; -+ } -+ pSrc += srcYAdd; -+ pDst -= dstYSub; -+ } -+ // fprintf(stderr, "---- Blit end\n"); - } else { -- // landscape mode -- if (screenRotation == SDL_QT_ROTATION_90) { -- uchar *fb = (uchar*)my_painter->frameBuffer(); -- uchar *buf = (uchar*)my_image->bits(); -- if(rect == my_image->rect()) { -- memcpy(fb, buf, width()*height()*2); -- } else { -- int h = rect.height(); -- int wd = rect.width()<<1; -- int fblineadd = my_painter->lineStep(); -- int buflineadd = my_image->bytesPerLine(); -- fb += (rect.left()<<1) + rect.top() * my_painter->lineStep(); -- buf += (rect.left()<<1) + rect.top() * my_image->bytesPerLine(); -- while(h--) { -- memcpy(fb, buf, wd); -- fb += fblineadd; -- buf += buflineadd; -- } -+ // full update -+#if !defined(BLIT_ROTATE_3_MOV32) -+ const Uint16 *src = srcBits; -+ Uint16 *dst = dstBits + (dstSize.width() - 1); -+ int w = srcBlitRect.width(); -+ int h = srcBlitRect.height(); -+ int i, dstSub = dstSize.width() * w + 1; -+ int dstAdd = dstSize.width(); -+ -+ while (h--) { -+ i = w; -+ while (i--) { -+ *dst = *src ++; -+ dst += dstAdd; - } -- } else if (screenRotation == SDL_QT_ROTATION_270) { -- int h = rect.height(); -- int wd = rect.width(); -- int fblineadd = my_painter->lineStep() - (rect.width() << 1); -- int buflineadd = my_image->bytesPerLine() - (rect.width() << 1); -- int w; -- -- uchar *fb = (uchar*)my_painter->frameBuffer(); -- uchar *buf = (uchar*)my_image->bits(); -- -- fb += ((my_painter->width() - (rect.top() + rect.height())) * -- my_painter->lineStep()) + ((my_painter->height() - ((rect.left() + -- rect.width()))) << 1); -- -- buf += my_image->bytesPerLine() * (rect.top() + rect.height()) - -- (((my_image->width() - (rect.left() + rect.width())) << 1) + 2); -- -- while(h--) { -- w = wd; -- while(w--) *((unsigned short*)fb)++ = *((unsigned short*)buf)--; -- fb += fblineadd; -- buf -= buflineadd; -+ dst -= dstSub; -+ } -+#else // BLIT_ROTATE_3_MOV32 -+ Uint32 *src1 = (Uint32 *)(srcBits); -+ Uint32 *src2 = (Uint32 *)(srcBits + srcSize.width()); -+ Uint32 *dst1 = (Uint32 *)(dstBits + (dstSize.width() - 2)); -+ Uint32 *dst2 = (Uint32 *)(dstBits + (dstSize.width() + dstSize.width() - 2)); -+ int w = srcBlitRect.width() >> 3; -+ int h = srcBlitRect.height() >> 1; -+ int i, dstSub = ((dstSize.width() * srcBlitRect.width()) >> 1) + 1; -+ int dstAdd = dstSize.width(); -+ -+ Uint32 a, b; -+ while (h--) { -+ i = w; -+ while (i--) { -+ a = *src1 ++; -+ b = *src2 ++; -+ *dst1 = (a << 16) | (b & 0xFFFF); -+ *dst2 = (a & 0xFFFF0000) | (b >> 16); -+ dst1 += dstAdd; -+ dst2 += dstAdd; -+ -+ a = *src1 ++; -+ b = *src2 ++; -+ *dst1 = (a << 16) | (b & 0xFFFF); -+ *dst2 = (a & 0xFFFF0000) | (b >> 16); -+ dst1 += dstAdd; -+ dst2 += dstAdd; -+ -+ a = *src1 ++; -+ b = *src2 ++; -+ *dst1 = (a << 16) | (b & 0xFFFF); -+ *dst2 = (a & 0xFFFF0000) | (b >> 16); -+ dst1 += dstAdd; -+ dst2 += dstAdd; -+ -+ a = *src1 ++; -+ b = *src2 ++; -+ *dst1 = (a << 16) | (b & 0xFFFF); -+ *dst2 = (a & 0xFFFF0000) | (b >> 16); -+ dst1 += dstAdd; -+ dst2 += dstAdd; - } -+ src1 += srcSize.width() >> 1; -+ src2 += srcSize.width() >> 1; -+ dst1 -= dstSub; -+ dst2 -= dstSub; - } -+#endif // BLIT_ROTATE_3_MOV32 - } -- return true; - } - --// ipaq 3800... --bool SDL_QWin::repaintRotation1(const QRect& rect) { -- if(my_image->width() == width()) { -- ushort *fb = (ushort*)my_painter->frameBuffer(); -- ushort *buf = (ushort*)my_image->bits(); -- gs_fastRotateBlit_1(fb, buf, rect); -- } else { -- return false; // FIXME: landscape mode -- } -- return true; --} -+#endif // __i386__ - - void SDL_QWin::repaintRect(const QRect& rect) { - if(!my_painter || !rect.width() || !rect.height()) { - return; - } -- -- if(QPixmap::defaultDepth() == 16) { -- switch(my_painter->transformOrientation()) { -- case 3: -- if(repaintRotation3(rect)) { return; } -+#ifndef __i386__ -+ if (QPixmap::defaultDepth() == 16 && my_painter->numRects() >= 0) { -+ Uint16 *fb = (Uint16*)my_painter->frameBuffer(); -+ Uint16 *buf = (Uint16*)my_image->bits(); -+ switch (rotation_) { -+ case 0: -+ blitRotate0(fb, fbSize_, -+ buf, QSize(my_image->width(), my_image->height()), -+ rect); - break; - case 1: -- if(repaintRotation1(rect)) { return; } -+ blitRotate1(fb, fbSize_, -+ buf, QSize(my_image->width(), my_image->height()), -+ rect); - break; -- case 0: -- if(repaintRotation0(rect)) { return; } -+ case 2: -+ blitRotate2(fb, fbSize_, -+ buf, QSize(my_image->width(), my_image->height()), -+ rect); -+ break; -+ case 3: -+ blitRotate3(fb, fbSize_, -+ buf, QSize(my_image->width(), my_image->height()), -+ rect); - break; - } -- } -- my_painter->drawImage(rect.topLeft(), *my_image, rect); -+ } else { -+#endif // __i386__ -+ QDirectPainter pp(this); -+ pp.drawImage(rect.topLeft(), *my_image, rect); -+// pp.end(); -+#ifndef __i386__ -+ } -+#endif // __i386__ - } - - // This paints the current buffer to the screen, when desired. - void SDL_QWin::paintEvent(QPaintEvent *ev) { -- if(my_image) { -+ if(my_image && isVisible() && isActiveWindow()) { -+ // TODO: better handling - lockScreen(true); - repaintRect(ev->rect()); - unlockScreen(); - } - } - -+int SDL_QWin::ApplyKeyRotation(int key) -+{ -+ int c; -+ int sdlScancode[] = { SDLK_LEFT, SDLK_DOWN, SDLK_RIGHT, SDLK_UP }; -+ -+ switch (key) { -+ case Qt::Key_Left: -+ c = 0; -+ break; -+ case Qt::Key_Down: -+ c = 1; -+ break; -+ case Qt::Key_Right: -+ c = 2; -+ break; -+ case Qt::Key_Up: -+ c = 3; -+ break; -+ default: -+ return 0; -+ } -+ -+// c = (c + qteKeyRotation_) & 3; -+// return sdlScancode[(c - keyRotation_) & 3]; -+ return sdlScancode[(c + qteKeyRotation_ - keyRotation_) & 3]; -+} -+ - /* Function to translate a keyboard transition and queue the key event - * This should probably be a table although this method isn't exactly - * slow. - */ - void SDL_QWin::QueueKey(QKeyEvent *e, int pressed) --{ -+{ -+ if (e->isAutoRepeat()) -+ return; -+ - SDL_keysym keysym; - int scancode = e->key(); -+ - /* Set the keysym information */ - if(scancode >= 'A' && scancode <= 'Z') { - // Qt sends uppercase, SDL wants lowercase -@@ -396,26 +516,12 @@ - case Qt::Key_Home: scancode = SDLK_HOME; break; - case Qt::Key_End: scancode = SDLK_END; break; - // We want the control keys to rotate with the screen -- case Qt::Key_Left: -- if (screenRotation == SDL_QT_ROTATION_90) scancode = SDLK_UP; -- else if (screenRotation == SDL_QT_ROTATION_270) scancode = SDLK_DOWN; -- else scancode = SDLK_LEFT; -- break; -- case Qt::Key_Up: -- if (screenRotation == SDL_QT_ROTATION_90) scancode = SDLK_RIGHT; -- else if (screenRotation == SDL_QT_ROTATION_270) scancode = SDLK_LEFT; -- else scancode = SDLK_UP; -- break; -- case Qt::Key_Right: -- if (screenRotation == SDL_QT_ROTATION_90) scancode = SDLK_DOWN; -- else if (screenRotation == SDL_QT_ROTATION_270) scancode = SDLK_UP; -- else scancode = SDLK_RIGHT; -- break; -+ case Qt::Key_Left: -+ case Qt::Key_Up: -+ case Qt::Key_Right: - case Qt::Key_Down: -- if (screenRotation == SDL_QT_ROTATION_90) scancode = SDLK_LEFT; -- else if (screenRotation == SDL_QT_ROTATION_270) scancode = SDLK_RIGHT; -- else scancode = SDLK_DOWN; -- break; -+ scancode = ApplyKeyRotation(scancode); -+ break; - case Qt::Key_Prior: scancode = SDLK_PAGEUP; break; - case Qt::Key_Next: scancode = SDLK_PAGEDOWN; break; - case Qt::Key_Shift: scancode = SDLK_LSHIFT; break; -@@ -434,9 +540,18 @@ - case Qt::Key_F7: scancode = SDLK_F7; break; - case Qt::Key_F8: scancode = SDLK_F8; break; - case Qt::Key_F9: scancode = SDLK_F9; break; -- case Qt::Key_F10: scancode = SDLK_F10; break; -- case Qt::Key_F11: scancode = SDLK_F11; break; -- case Qt::Key_F12: scancode = SDLK_F12; break; -+ case Qt::Key_F10: -+ scancode = SDLK_F10; -+ mouse_button_mode=1; -+ break; -+ case Qt::Key_F11: -+ scancode = SDLK_F11; -+ mouse_button_mode=3; -+ break; -+ case Qt::Key_F12: -+ scancode = SDLK_F12; -+ mouse_button_mode=2; -+ break; - case Qt::Key_F13: scancode = SDLK_F13; break; - case Qt::Key_F14: scancode = SDLK_F14; break; - case Qt::Key_F15: scancode = SDLK_F15; break; -@@ -452,13 +567,14 @@ - // david@hedbor.org - scancode = SDLK_RETURN; - break; -+ - default: - scancode = SDLK_UNKNOWN; - break; - } -- keysym.sym = static_cast(scancode); -+ keysym.sym = static_cast(scancode); - } else { -- keysym.sym = static_cast(scancode); -+ keysym.sym = static_cast(scancode); - } - keysym.scancode = scancode; - keysym.mod = KMOD_NONE; -@@ -478,11 +594,82 @@ - // pressed = 1; - // } - -+ if (isSLA300InputFix_ && -+ (keysym.sym == SDLK_SPACE || (keysym.sym >= 273 && keysym.sym <= 276))) { -+ if (keysym.sym >= 273) curAxis_[keysym.sym-273] = pressed; -+ else curAxis_[4] = pressed; -+ } -+ - /* Queue the key event */ - if ( pressed ) { -- SDL_PrivateKeyboard(SDL_PRESSED, &keysym); -+ /* fprintf(stderr, "press %d\n", keysym.sym); */ -+ SDL_PrivateKeyboard(SDL_PRESSED, &keysym); -+ if (isSLA300InputFix_ && -+ (keysym.sym >= 273 && keysym.sym <= 276)) { -+ if (keysym.sym == SDLK_UP) { -+ if (curAxis_[1]) { -+ keysym.sym = SDLK_DOWN; -+ keysym.scancode = Qt::Key_Down; -+ curAxis_[1] = 0; -+ /* fprintf(stderr, "force release %d\n", keysym.sym); */ -+ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); -+ } -+ } -+ else if (keysym.sym == SDLK_DOWN) { -+ if (curAxis_[0]) { -+ keysym.sym = SDLK_UP; -+ keysym.scancode = Qt::Key_Up; -+ curAxis_[0] = 0; -+ /* fprintf(stderr, "force release %d\n", keysym.sym); */ -+ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); -+ } -+ } -+ else if (keysym.sym == SDLK_RIGHT) { -+ if (curAxis_[3]) { -+ keysym.sym = SDLK_LEFT; -+ keysym.scancode = Qt::Key_Left; -+ curAxis_[3] = 0; -+ /* fprintf(stderr, "force release %d\n", keysym.sym); */ -+ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); -+ } -+ } -+ else if (keysym.sym == SDLK_LEFT) { -+ if (curAxis_[2]) { -+ keysym.sym = SDLK_RIGHT; -+ keysym.scancode = Qt::Key_Right; -+ curAxis_[2] = 0; -+ /* fprintf(stderr, "force release %d\n", keysym.sym); */ -+ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); -+ } -+ } -+ } - } else { -- SDL_PrivateKeyboard(SDL_RELEASED, &keysym); -+ /* fprintf(stderr, "release %d\n", keysym.sym); */ -+ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); -+ -+ if (isSLA300InputFix_ && -+ (keysym.sym == SDLK_SPACE || -+ (keysym.sym >= 273 && keysym.sym <= 276))) { -+ for (int i = 0; i < 4; i++) { -+ if (curAxis_[i]) { -+ int sym = i+273; -+ keysym.sym = static_cast(sym); -+ if (sym == SDLK_UP) keysym.scancode = Qt::Key_Up; -+ else if (sym == SDLK_RIGHT) keysym.scancode = Qt::Key_Right; -+ else if (sym == SDLK_DOWN) keysym.scancode = Qt::Key_Down; -+ else if (sym == SDLK_LEFT) keysym.scancode = Qt::Key_Left; -+ curAxis_[i] = 0; -+ /* fprintf(stderr, "force release %d\n", keysym.sym); */ -+ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); -+ } -+ } -+ if (curAxis_[4]) { -+ keysym.scancode = keysym.sym = SDLK_SPACE; -+ curAxis_[4] = 0; -+ /* fprintf(stderr, "force release %d\n", keysym.sym); */ -+ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); -+ } -+ } - } - } - -@@ -524,7 +711,7 @@ - my_locked--; // decrease lock refcount; - } - if(!my_locked && my_painter) { -- my_painter->end(); -+// my_painter->end(); - delete my_painter; - my_painter = 0; - } -Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.h -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/SDL_QWin.h 2005-03-02 22:24:43.457491622 +0100 -+++ SDL-1.2.7/src/video/qtopia/SDL_QWin.h 2005-03-02 22:24:46.868009791 +0100 -@@ -1,3 +1,4 @@ -+ - /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2004 Sam Lantinga -@@ -52,6 +53,7 @@ - class SDL_QWin : public QWidget - { - void QueueKey(QKeyEvent *e, int pressed); -+ int ApplyKeyRotation(int key); - public: - SDL_QWin(const QSize& size); - virtual ~SDL_QWin(); -@@ -71,7 +73,7 @@ - y = my_offset.y(); - } - QImage *image(void) { return my_image; } -- -+ - void setWFlags(WFlags flags) { - QWidget::setWFlags(flags); - my_flags = flags; -@@ -83,6 +85,15 @@ - bool lockScreen(bool force=false); - void unlockScreen(); - void repaintRect(const QRect& rect); -+ void setScreenRotation(int sdlr, int qter) { -+ rotation_ = sdlr; qteRotation_ = qter; -+ } -+ void setKeyRotation(int sdlr, int qter) { -+ keyRotation_ = sdlr; qteKeyRotation_ = qter; -+ } -+ void setFBSize(QSize& s) { fbSize_ = s; } -+// void setSLC700InputFix(bool isEnable) { isSLC700InputFix_ = isEnable; } -+ void setSLA300InputFix(bool isEnable) { isSLA300InputFix_ = isEnable; } - protected: - /* Handle resizing of the window */ - virtual void resizeEvent(QResizeEvent *e); -@@ -95,10 +106,8 @@ - void paintEvent(QPaintEvent *ev); - void keyPressEvent(QKeyEvent *e) { QueueKey(e, 1); } - void keyReleaseEvent(QKeyEvent *e) { QueueKey(e, 0); } -+ - private: -- bool repaintRotation0(const QRect& rect); -- bool repaintRotation1(const QRect& rect); -- bool repaintRotation3(const QRect& rect); - void enableFullscreen(); - QDirectPainter *my_painter; - QImage *my_image; -@@ -108,6 +117,12 @@ - WFlags my_flags; - WFlags my_has_fullscreen; - unsigned int my_locked; -+ int rotation_, qteRotation_; -+ int keyRotation_, qteKeyRotation_; -+ QSize fbSize_; -+// bool isSLC700InputFix_; -+ bool isSLA300InputFix_; -+ int curAxis_[5]; // 0: up, 1: down, 2: right, 3: left, 4: center - }; - - #endif /* _SDL_QWin_h */ -Index: SDL-1.2.7/src/video/qtopia/SDL_sysmouse.cc -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/SDL_sysmouse.cc 2005-03-02 22:24:43.457491622 +0100 -+++ SDL-1.2.7/src/video/qtopia/SDL_sysmouse.cc 2005-03-02 22:24:46.868009791 +0100 -@@ -60,6 +60,7 @@ - void QT_WarpWMCursor(_THIS, Uint16 x, Uint16 y) - { - SDL_Win->setMousePos(QPoint(x, y)); -+ SDL_PrivateMouseMotion( 0, 0, x, y ); - } - - }; /* Extern C */ -Index: SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/SDL_sysvideo.cc 2005-03-02 22:24:43.458491481 +0100 -+++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-03-02 22:24:46.873009084 +0100 -@@ -1,3 +1,4 @@ -+ - /* - SDL - Simple DirectMedia Layer - Copyright (C) 1997-2004 Sam Lantinga -@@ -29,17 +30,32 @@ - - #include - #include -+#include -+#include -+#include - - #include - #include -+#include -+#include -+#include -+#include -+#include - - #include - #include -+#include -+#include -+#include -+#include -+#include -+#include - - #include "SDL.h" - #include "SDL_timer.h" - - #include "SDL_QWin.h" -+#include "SDL_sysvideo.h" - - extern "C" { - -@@ -51,14 +67,67 @@ - #include "SDL_lowvideo.h" - - //#define QTOPIA_DEBUG -+#define QTOPIA_LOG - #define QT_HIDDEN_SIZE 32 /* starting hidden window size */ - -+#ifdef QTOPIA_LOG -+ static FILE *st_logfp = NULL; -+#endif -+ static inline void LOG(char *fmt, ...) -+ { -+#ifdef QTOPIA_LOG -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vfprintf(st_logfp, fmt, ap); -+ if (st_logfp != stderr) { -+ fflush(st_logfp); -+ vfprintf(stderr, fmt, ap); -+ } -+ va_end(ap); -+#endif -+ } -+ -+ typedef struct machine_spec { -+ const char *manif; -+ const char *name; -+ int qpe_server_rotation; -+ int init_screen_rot; -+ int init_key_rot; -+ } machine_spec_t; -+ -+ typedef enum { -+ MACHINE_SHARP_SL5000D, -+ MACHINE_SHARP_SL5500, -+ MACHINE_SHARP_SLA300, -+ MACHINE_SHARP_SLB500, -+ MACHINE_SHARP_SLC700, -+ MACHINE_SHARP_SLC750, -+ MACHINE_SHARP_SLC760, -+ MACHINE_SHARP_SLC860, -+ MACHINE_SHARP_SL6000, -+ MACHINE_MAX -+ } machine_t; -+ -+ static const machine_spec_t st_machine_spec[] = { -+ { "Sharp", "SL-5000D", 0 }, -+ { "Sharp", "SL-5500", 0 }, -+ { "Sharp", "SL-A300", 0 }, -+ { "Sharp", "SL-B500", 0 }, -+ { "Sharp", "SL-C700", 0 }, -+ { "Sharp", "SL-C750", 0 }, -+ { "Sharp", "SL-C760", 0 }, -+ { "Sharp", "SL-C860", 0 }, -+ { "Sharp", "SL-6000", 0 }, -+ }; -+ - /* Name of the environment variable used to invert the screen rotation or not: - Possible values: -- !=0 : Screen is 270° rotated -- 0: Screen is 90° rotated*/ --#define SDL_QT_ROTATION_ENV_NAME "SDL_QT_INVERT_ROTATION" -- -+ !=0 : Screen is 270- rotated -+ 0: Screen is 90- rotated*/ -+#define SDL_QT_ROTATION_ENV_NAME "SDL_QT_ROTATION" -+#define SDL_QT_INVERT_ROTATION_ENV_NAME "SDL_QT_INVERT_ROTATION" -+ - /* Initialization/Query functions */ - static int QT_VideoInit(_THIS, SDL_PixelFormat *vformat); - static SDL_Rect **QT_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags); -@@ -78,6 +147,20 @@ - static int QT_IconifyWindow(_THIS); - static SDL_GrabMode QT_GrabInput(_THIS, SDL_GrabMode mode); - -+ static int console_fd; -+ struct fb_var_screeninfo saved_vinfo; -+ int fb_hwrot; -+ int fb_direct; -+ static int isKHloaded; -+ bool is_VGA_machine; -+ -+#define W100FB_CONFIG 0x57415200 /* WAL\00 */ -+#define W100INIT_ITEM 0 -+#define W100INIT_ALL 1 -+#define W100INIT_ITEM_WITH_VAL 2 -+#define W100FB_CONFIG_EX 0x57415202 /* WAL\02 */ -+ -+ - /* FB driver bootstrap functions */ - - static int QT_Available(void) -@@ -222,13 +305,34 @@ - - int QT_VideoInit(_THIS, SDL_PixelFormat *vformat) - { -- /* Initialize the QPE Application */ -+ const char *SDL_fbdev; -+ struct fb_var_screeninfo vinfo; -+ -+ /* Initialize the QPE Application */ - /* Determine the screen depth */ - vformat->BitsPerPixel = QPixmap::defaultDepth(); - - // For now we hardcode the current depth because anything else - // might as well be emulated by SDL rather than by Qtopia. -- -+ -+ //frame buffer device open. -+ SDL_fbdev = getenv("SDL_FBDEV"); -+ if ( SDL_fbdev == NULL ) { -+ SDL_fbdev = "/dev/fb0"; -+ } -+ console_fd = open(SDL_fbdev, O_RDWR, 0); -+ if ( console_fd < 0 ) { -+ SDL_SetError("Unable to open %s", SDL_fbdev); -+ return(-1); -+ } -+ -+ if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { -+ SDL_SetError("Couldn't get console pixel format"); -+ QT_VideoQuit(_this); -+ return(-1); -+ } -+ saved_vinfo = vinfo; -+ - QSize desktop_size = qApp->desktop()->size(); - QT_AddMode(_this, ((vformat->BitsPerPixel+7)/8)-1, - desktop_size.width(), desktop_size.height()); -@@ -241,7 +345,24 @@ - /* Fill in some window manager capabilities */ - _this->info.wm_available = 0; - -- /* We're done! */ -+#ifdef QTOPIA_LOG -+ st_logfp = fopen("/tmp/sdl-qt-debug", "w"); -+ if (!st_logfp) -+ st_logfp = stderr; -+#endif -+ -+ QT_GrabInput(_this, SDL_GRAB_ON); -+/* -+ { -+ QCopEnvelope e("QPE/KeyHelper", "repeater(int)"); -+ e << 2; -+ } -+*/ -+ isKHloaded=(fopen("/home/zaurus/Settings/keyhelper_SDL.xml","r") != NULL) ? 1 : 0; -+ if (isKHloaded) { -+ system("qcop QPE/KeyHelper \"reload(QString)\" keyhelper_SDL.xml"); //QcopEnvelope can't use. -+ LOG("keyhelper_SDL.xml loaded\n"); -+ } - return(0); - } - -@@ -264,6 +385,7 @@ - - /* Various screen update functions available */ - static void QT_NormalUpdate(_THIS, int numrects, SDL_Rect *rects); -+ static void QT_DirectUpdate(_THIS, int numrects, SDL_Rect *rects); - - - static int QT_SetFullScreen(_THIS, SDL_Surface *screen, int fullscreen) -@@ -276,47 +398,428 @@ - return -1; - } - -+ static machine_t QT_GetMachine(_THIS) -+ { -+ FILE *fp; -+ machine_t machine = MACHINE_SHARP_SL5000D; -+ char buf[1024]; -+ -+ -+ fp = fopen("/proc/cpuinfo", "rb"); -+ if (fp) { -+ if (fread(buf, 1, sizeof(buf), fp) > 0) { -+ LOG("QT_GetMachine: /proc/cpuinfo is %s\n", buf); -+ if (strstr(buf, "SHARP Tosa") != NULL) -+ machine = MACHINE_SHARP_SL6000; -+ else if (strstr(buf, "Collie") != NULL) -+ machine = MACHINE_SHARP_SL5500; -+ else if (strstr(buf, "SHARP Poodle") != NULL) -+ machine = MACHINE_SHARP_SLB500; -+ else if (strstr(buf, "SHARP Corgi") !=NULL) -+ machine = MACHINE_SHARP_SLC700; -+ else if (strstr(buf, "SHARP Shepherd") !=NULL) -+ machine = MACHINE_SHARP_SLC750; -+ else if (strstr(buf, "SHARP Husky") !=NULL) -+ machine = MACHINE_SHARP_SLC760; -+ else if (strstr(buf, "SHARP Boxer") != NULL) -+ machine = MACHINE_SHARP_SLC860; -+ } -+ fclose(fp); -+ } else { -+ LOG("QT_GetMachine: Couldn't read /proc/deviceinfo/product.\n"); -+ LOG(" Now set machine variable to default (SL-5000D)\n"); -+ } -+ -+ LOG(" detected machine is '%s %s'\n", -+ st_machine_spec[machine].manif, st_machine_spec[machine].name); -+ return machine; -+ } -+ -+ static void QT_GetQteServerSpec(_THIS, int *rotation, bool *isQvga) -+ { -+ const char *user; -+ char buf[FILENAME_MAX]; -+ FILE *fp; -+ int rot = 0, is_qvga = 0; -+ -+ user = getenv("USER"); -+ snprintf(buf, sizeof(buf), "/tmp/qtembedded-%s/QtEmbedded-0.spec", -+ user ? user : "root"); -+ LOG("QT_GetRotation: Read spec from '%s'\n", buf); -+ -+ fp = fopen(buf, "rb"); -+ if (fp) { -+ int size; -+ if ((size = fread(buf, 1, sizeof(buf) - 1, fp)) > 0) { -+ buf[size] = '\0'; -+ LOG(" spec is '%s'\n", buf); -+ // get rotation value -+ if (strstr(buf, "Rot")) { -+ rot = atoi(strstr(buf, "Rot") + 3); -+ rot /= 90; -+ if (rot < 0 || rot > 3) { -+ rot = 0; -+ } -+ } else -+ rot = 0; -+ -+ // get qvga mode in SL-C700 -+ if (strstr(buf, "Qvga")) -+ is_qvga = 1; -+ } -+ fclose(fp); -+ } -+ -+ LOG(" Rot=%d, Qvga=%d\n", rot, is_qvga); -+ -+ if (rotation) -+ *rotation = rot; -+ if (isQvga) -+ *isQvga = is_qvga; -+ } -+ - /* FIXME: check return values and cleanup here */ - SDL_Surface *QT_SetVideoMode(_THIS, SDL_Surface *current, - int width, int height, int bpp, Uint32 flags) - { -- - QImage *qimage; -- QSize desktop_size = qApp->desktop()->size(); -+ QSize qteSize = qApp->desktop()->size(); -+ QSize fbSize; -+ QSize userSize; -+ int fb_xres; -+ int fb_yres; -+ struct fb_var_screeninfo vinfo; -+ struct fb_fix_screeninfo finfo; -+ int tmp_ioctl_data; -+ char fb_size_fix = ' '; -+ bool isW100patch_kernel = false; -+ int numFb_Size; -+ -+ int mapped_memlen; -+ int mapped_offset; -+ void *mapped_mem; -+ int fb_offset; -+ -+ -+ machine_t machine = QT_GetMachine(_this); -+ machine_spec_t machineSpec = st_machine_spec[machine]; -+ int qteRotation, userRotation, sdlRotation; -+ int qteKeyRotation, sdlKeyRotation; -+ bool isQteQvga; -+ -+ if (machine == MACHINE_SHARP_SLC700 || -+ machine == MACHINE_SHARP_SLC750 || -+ machine == MACHINE_SHARP_SLC760 || -+ machine == MACHINE_SHARP_SLC860 || // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º -+ machine == MACHINE_SHARP_SL6000 ) { // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º -+ is_VGA_machine = true; -+ }else { -+ is_VGA_machine = false; -+ } -+ -+ // qte ¤Ç¤Î²óž³ÑÅÙ¤ò¼èÆÀ -+ QT_GetQteServerSpec(_this, &qteRotation, &isQteQvga); -+ -+ // SL-C700 ¤Î¥¹¥¿¥¤¥ë -+ bool isInputStyle = false; -+ if (is_VGA_machine) { -+ int status = system("/home/QtPalmtop/bin/chkhinge"); -+ if (WEXITSTATUS(status) != 2) -+ isInputStyle = true; -+ LOG("QT_SetVideoMode: SL-C700 Style is %s\n", -+ isInputStyle ? "Input style" : "View style"); -+ } - - -- current->flags = 0; //SDL_FULLSCREEN; // We always run fullscreen. -+ // specity screen setting -+ if (is_VGA_machine) { -+ -+ // w100 rotation pached kernel check -+ isW100patch_kernel = (fopen("/proc/driver/w100/rotation","r") != NULL) ? true : false; -+ LOG("Your Kernel is %s\n",isW100patch_kernel ? "Special Kernel" : "Normal Kernel"); -+ -+ const char *envFb_Size = getenv("SDL_FB_SIZE"); -+ if (envFb_Size !=NULL) { -+ numFb_Size=sscanf(envFb_Size,"%dx%d%c",&fb_xres,&fb_yres,&fb_size_fix); -+ } else { -+ numFb_Size=0; -+ } - -- if(width <= desktop_size.width() -- && height <= desktop_size.height()) { -- current->w = desktop_size.width(); -- current->h = desktop_size.height(); -- } else if(width <= desktop_size.height() && height <= desktop_size.width()) { -- // Landscape mode -- char * envString = getenv(SDL_QT_ROTATION_ENV_NAME); -- int envValue = envString ? atoi(envString) : 0; -- screenRotation = envValue ? SDL_QT_ROTATION_270 : SDL_QT_ROTATION_90; -- current->h = desktop_size.width(); -- current->w = desktop_size.height(); -+ if (numFb_Size >=2) { -+ -+ // specity screen mode -+ if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { -+ SDL_SetError("Couldn't get console pixel format"); -+ QT_VideoQuit(_this); -+ return(NULL); -+ } -+ -+ vinfo.xres = fb_xres; -+ vinfo.xres_virtual = fb_xres; -+ vinfo.yres = fb_yres; -+ vinfo.yres_virtual = fb_yres; -+ -+ if (fb_size_fix == '@') { -+ width = fb_xres; -+ height = fb_yres; -+ } -+ -+ if ( ioctl(console_fd, FBIOPUT_VSCREENINFO, &vinfo) < 0 ) { -+ SDL_SetError("Couldn't set console screen info"); -+ return(NULL); -+ } -+ -+ -+ if (isW100patch_kernel) { -+ qteSize.setWidth(vinfo.xres); -+ qteSize.setHeight(vinfo.yres); -+ qteRotation=0; -+ }else if(vinfo.xres == 320){ -+ qteSize.setWidth(vinfo.xres); -+ qteSize.setHeight(vinfo.yres); -+ qteRotation=2; -+ }else { -+ qteSize.setWidth(vinfo.yres); -+ qteSize.setHeight(vinfo.xres); -+ qteRotation=3; -+ } -+ -+ if (isW100patch_kernel && (vinfo.xres == 320) && (vinfo.yres == 240)) { -+ tmp_ioctl_data=121; -+ ioctl(console_fd, W100FB_CONFIG_EX, &tmp_ioctl_data); -+ fb_hwrot=1; -+ } -+ -+ LOG("FBVideoMode: %dx%d%c\n", vinfo.xres, vinfo.yres,fb_size_fix ); -+ -+ }else { -+ -+ // auto screen mode -+ if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { -+ SDL_SetError("Couldn't get console pixel format"); -+ QT_VideoQuit(_this); -+ return(NULL); -+ } -+ -+ if (isW100patch_kernel && (isInputStyle == false) && (vinfo.xres == 240) && (vinfo.yres == 320)) { -+ vinfo.xres = 240; -+ vinfo.xres_virtual = 240; -+ vinfo.yres = 320; -+ vinfo.yres_virtual = 320; -+ qteRotation=0; -+ }else if ((width <= 320) && (height <= 240)) { -+ vinfo.xres = 320; -+ vinfo.xres_virtual = 320; -+ vinfo.yres = 240; -+ vinfo.yres_virtual = 240; -+ }else if (isW100patch_kernel && (isInputStyle == true)){ -+ vinfo.xres = 640; -+ vinfo.xres_virtual = 640; -+ vinfo.yres = 480; -+ vinfo.yres_virtual = 480; -+ qteRotation=0; -+ }else { -+ vinfo.xres = 480; -+ vinfo.xres_virtual = 480; -+ vinfo.yres = 640; -+ vinfo.yres_virtual = 640; -+ } -+ -+ if ( ioctl(console_fd, FBIOPUT_VSCREENINFO, &vinfo) < 0 ) { -+ SDL_SetError("Couldn't set console screen info"); -+ return(NULL); -+ } -+ -+ if (isW100patch_kernel) { -+ qteSize.setWidth(vinfo.xres); -+ qteSize.setHeight(vinfo.yres); -+ qteRotation=0; -+ fb_direct=1; -+ }else if(vinfo.xres == 320){ -+ qteSize.setWidth(vinfo.xres); -+ qteSize.setHeight(vinfo.yres); -+ qteRotation=2; -+ }else { -+ qteSize.setWidth(vinfo.yres); -+ qteSize.setHeight(vinfo.xres); -+ qteRotation=3; -+ } -+ -+ if (isW100patch_kernel && (vinfo.xres == 320) && (vinfo.yres == 240)) { -+ tmp_ioctl_data=121; -+ ioctl(console_fd, W100FB_CONFIG_EX, &tmp_ioctl_data); -+ fb_hwrot=1; -+ qteRotation=0; -+ } -+ -+ LOG("FBVideoMode: %dx%d%c\n", vinfo.xres, vinfo.yres,fb_size_fix ); -+ } -+ } -+ -+ // direct paint setting -+ const char *envFb_Direct = getenv("SDL_FB_DIRECT"); -+ if (envFb_Direct !=NULL) -+ fb_direct = envFb_Direct ? atoi(envFb_Direct) : -1; -+ -+ if (fb_direct == 1){ -+ if ( ioctl(console_fd, FBIOGET_FSCREENINFO, &finfo) < 0 ) { -+ SDL_SetError("Couldn't get console hardware info"); -+ QT_VideoQuit(_this); -+ return(NULL); -+ } -+ if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { -+ SDL_SetError("Couldn't get console pixel format"); -+ QT_VideoQuit(_this); -+ return(NULL); -+ } -+ LOG("Direct paint mode\n"); -+ } -+ -+ // hack for SL-5500 -+ if (machine == MACHINE_SHARP_SL5500) -+ qteRotation = 3; -+ -+ // SL-B500 Íѥϥå¯(¤È¤ê¤¢¤¨¤º¡¢¤Í) -+ if (machine == MACHINE_SHARP_SLB500) -+ qteRotation = 3; -+ -+ // À¸¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¤Î¥µ¥¤¥º¤òÆÀ¤ë -+ if (qteRotation & 1) { -+ fbSize.setWidth(qteSize.height()); -+ fbSize.setHeight(qteSize.width()); -+ } else { -+ fbSize = qteSize; -+ } -+ -+ // -+ const char *envRotStr = getenv(SDL_QT_ROTATION_ENV_NAME); -+ userRotation = envRotStr ? atoi(envRotStr) : -1; -+ if ((userRotation >= 0 ? userRotation : qteRotation) & 1) { -+ userSize.setWidth(fbSize.height()); -+ userSize.setHeight(fbSize.width()); -+ } else { -+ userSize = fbSize; -+ } -+ -+ if (width <= userSize.width() && height <= userSize.height()) { -+ // ´Ä¶­ÊÑ¿ô¤Ç²óž³ÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¤½¤ì¤òºÇÍ¥À褹¤ë -+ if (userRotation >= 0) -+ sdlRotation = userRotation; -+ else { -+ // ¤Ç¡¢¤½¤Î»ØÄ̵꤬¤¤¤Î¤Ç¤¢¤ì¤Ð qte ¤Î²óž³ÑÅ٤˹ç¤ï¤»¤ë¤À¤± -+ // ¤Ê¤ó¤À¤±¤É¡¢SL-C700 ¤Ç¤Ï¤Á¤ç¤¤Ê£»¨¡£ -+ if (is_VGA_machine && (fbSize.width() == 320) && (fbSize.height() == 240)) { -+ if (isInputStyle) -+ sdlRotation = 2; -+ else -+ sdlRotation = qteRotation; -+ } else { -+ sdlRotation = qteRotation; -+ } -+ } -+ } else if (width <= fbSize.width() && height <= fbSize.height()) { -+ sdlRotation = 0; -+ if (is_VGA_machine && (fbSize.width() == 320) && (fbSize.height() == 240) && isInputStyle) -+ sdlRotation = 2; -+ } else if (width <= fbSize.height() && height <= fbSize.width()) { -+ sdlRotation = 1; - } else { - SDL_SetError("Unsupported resolution, %dx%d\n", width, height); -+ return NULL; - } -+ -+ if (fb_hwrot == 1) -+ sdlRotation = 0; -+ -+ if (getenv(SDL_QT_INVERT_ROTATION_ENV_NAME) != NULL) { -+ sdlRotation = (sdlRotation + 2) & 3; -+ } -+ -+ LOG("QT_SetVideoMode: argSize=%dx%d\n", width, height); -+ LOG("QT_SetVideoMode: qteSize=%dx%d\n", -+ qteSize.width(), qteSize.height()); -+ LOG("QT_SetVideoMode: fbSize=%dx%d\n", -+ fbSize.width(), fbSize.height()); -+ LOG("QT_SetVideoMode: qteRotation=%d\n", qteRotation); -+ LOG("QT_SetVideoMode: userRotation=%d\n", userRotation); -+ LOG("QT_SetVideoMode: sdlRotation=%d\n", sdlRotation); -+ -+ current->flags = 0;//SDL_FULLSCREEN; // We always run fullscreen. -+ current->w = width; -+ current->h = height; -+ SDL_Win->setScreenRotation(sdlRotation, qteRotation); -+ SDL_Win->setFBSize(fbSize); -+ -+ if (machine == MACHINE_SHARP_SLA300) -+ SDL_Win->setSLA300InputFix(true); -+ -+ // keyboard rotation -+ qteKeyRotation = qteRotation; -+// fprintf(stderr, "%d\n", (machine == MACHINE_SHARP_SLC700)); -+// fprintf(stderr, "%d\n", isQteQvga); -+ if (isQteQvga && is_VGA_machine) -+ qteKeyRotation = 3; -+ else if (machine == MACHINE_SHARP_SLB500) -+ qteKeyRotation = 3; -+ -+ if (isQteQvga && fb_hwrot == 1) -+ qteKeyRotation = 1; -+ -+ sdlKeyRotation = sdlRotation; -+ -+ SDL_Win->setKeyRotation(sdlKeyRotation, qteKeyRotation); -+ -+ LOG("QT_SetVideoMode: qteKeyRotation=%d\n", qteKeyRotation); -+ LOG("QT_SetVideoMode: sdlKeyRotation=%d\n", sdlKeyRotation); -+ - if ( flags & SDL_OPENGL ) { - SDL_SetError("OpenGL not supported"); - return(NULL); -- } -+ } - /* Create the QImage framebuffer */ -- qimage = new QImage(current->w, current->h, bpp); -- if (qimage->isNull()) { -- SDL_SetError("Couldn't create screen bitmap"); -- delete qimage; -- return(NULL); -+ -+ // frame buffer memory mapping -+ if (fb_direct == 1) { -+ current->pitch = finfo.line_length; -+ current->flags = (SDL_FULLSCREEN|SDL_HWSURFACE); -+ mapped_offset = (((long)finfo.smem_start) - -+ (((long)finfo.smem_start)&~(PAGE_SIZE-1))); -+ mapped_memlen = finfo.smem_len+mapped_offset; -+ if(console_fd >0 ) { -+ mapped_mem = mmap(NULL, mapped_memlen,PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); -+ fb_offset=(vinfo.xres-width)+(vinfo.yres-height)*vinfo.xres; -+ current->pixels = (void *)((int )mapped_mem+fb_offset); -+ _this->UpdateRects = QT_DirectUpdate; -+ } else { -+ qimage = new QImage(current->w, current->h, bpp); -+ if (qimage->isNull()) { -+ SDL_SetError("Couldn't create screen bitmap"); -+ delete qimage; -+ return(NULL); -+ } -+ current->pixels = (void *)qimage->bits(); -+ _this->UpdateRects = QT_NormalUpdate; -+ SDL_Win->setImage(qimage); -+// SDL_Win->setFullscreen(true); //comment to non update taskbar -+ } -+ } else { -+ qimage = new QImage(current->w, current->h, bpp); -+ if (qimage->isNull()) { -+ SDL_SetError("Couldn't create screen bitmap"); -+ delete qimage; -+ return(NULL); -+ } -+ current->pitch = qimage->bytesPerLine(); -+ current->pixels = (void *)qimage->bits(); -+ _this->UpdateRects = QT_NormalUpdate; -+ SDL_Win->setImage(qimage); -+// SDL_Win->setFullscreen(true); //comment to non update taskbar -+ - } -- current->pitch = qimage->bytesPerLine(); -- current->pixels = (void *)qimage->bits(); -- SDL_Win->setImage(qimage); -- _this->UpdateRects = QT_NormalUpdate; -- SDL_Win->setFullscreen(true); -+ -+ -+ // fprintf(stderr,"QT_SetVideoMode() qImage:%dx%d %d\n", -+ // qimage->width(), qimage->height(), qimage->bytesPerLine()); - /* We're done */ - return(current); - } -@@ -361,13 +864,19 @@ - { - if(SDL_Win->lockScreen()) { - for(int i=0; irepaintRect(rect); -+ QRect rect(rects[i].x, rects[i].y, -+ rects[i].w, rects[i].h); -+ SDL_Win->repaintRect(rect); - } - SDL_Win->unlockScreen(); - } - } -+ -+ static void QT_DirectUpdate(_THIS, int numrects, SDL_Rect *rects) -+ { -+ -+ } -+ - /* Is the system palette settable? */ - int QT_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors) - { -@@ -383,10 +892,36 @@ - // -- David Hedbor - // delete SDL_Win; - // SDL_Win = 0; -+ -+ if ( console_fd > 0 ) { -+ /* Restore the original video mode and palette */ -+ if (fb_hwrot == 1) { -+ int tmp_ioctl_data=120; -+ ioctl(console_fd, W100FB_CONFIG_EX, &tmp_ioctl_data); -+ } -+ -+ ioctl(console_fd, FBIOPUT_VSCREENINFO, &saved_vinfo); -+ -+ /* We're all done with the framebuffer */ -+ close(console_fd); -+ console_fd = -1; -+ } -+ - _this->screen->pixels = NULL; - QT_GrabInput(_this, SDL_GRAB_OFF); -+/* -+ { -+ QCopEnvelope e("QPE/KeyHelper", "repeater(int)"); -+ e << 1; -+ } -+*/ -+ if (isKHloaded) -+ system("qcop QPE/KeyHelper \"reload()\""); //QcopEnvelope can't use. -+ - } - -+ -+ - static int QT_IconifyWindow(_THIS) { - SDL_Win->hide(); - -Index: SDL-1.2.7/src/video/fbcon/SDL_fbvideo.c -=================================================================== ---- SDL-1.2.7.orig/src/video/fbcon/SDL_fbvideo.c 2005-03-02 22:24:43.458491481 +0100 -+++ SDL-1.2.7/src/video/fbcon/SDL_fbvideo.c 2005-03-02 22:24:46.875008802 +0100 -@@ -51,7 +51,7 @@ - #include "SDL_fbmatrox.h" - #include "SDL_fbriva.h" - -- -+/* #define FBCON_DEBUG 1 */ - #if defined(i386) && defined(FB_TYPE_VGA_PLANES) - #define VGA16_FBCON_SUPPORT - #ifndef FB_AUX_VGA_PLANES_VGA4 -@@ -76,9 +76,11 @@ - { 0, 0, 720, 576 }, /* PAL */ - { 0, 0, 720, 480 }, /* NTSC */ - { 0, 0, 640, 480 }, /* 16 bpp: 0x111, or 273 */ -+ { 0, 0, 480, 640 }, - { 0, 0, 640, 400 }, /* 8 bpp: 0x100, or 256 */ - { 0, 0, 512, 384 }, - { 0, 0, 320, 240 }, -+ { 0, 0, 240, 320 }, - { 0, 0, 320, 200 } - }; - static const struct { -@@ -112,9 +114,11 @@ - */ - { 320, 200, 79440, 16, 16, 20, 4, 48, 1, 0, 2 }, /* 70 Hz */ - { 320, 240, 63492, 16, 16, 16, 4, 48, 2, 0, 2 }, /* 72 Hz */ -+ { 240, 320, 63492, 16, 16, 16, 4, 48, 3, 0, 2 }, /* 72 Hz */ - { 512, 384, 49603, 48, 16, 16, 1, 64, 3, 0, 0 }, /* 78 Hz */ - { 640, 400, 31746, 96, 32, 41, 1, 64, 3, 2, 0 }, /* 85 Hz */ - { 640, 480, 31746, 120, 16, 16, 1, 64, 3, 0, 0 }, /* 75 Hz */ -+ { 480, 640, 31746, 120, 16, 16, 1, 64, 4, 0, 0 }, /* 75 Hz */ - { 768, 576, 26101, 144, 16, 28, 6, 112, 4, 0, 0 }, /* 60 Hz */ - { 800, 600, 20000, 64, 56, 23, 37, 120, 6, 3, 0 }, /* 72 Hz */ - { 960, 720, 17686, 144, 24, 28, 8, 112, 4, 0, 0 }, /* 60 Hz */ -@@ -152,6 +156,10 @@ - struct fb_var_screeninfo *vinfo); - static void FB_RestorePalette(_THIS); - -+static char *console_fd_buf; -+static char *mapped_mem_fb; -+static int rotation_flag; -+ - /* FB driver bootstrap functions */ - - static int FB_Available(void) -@@ -241,18 +249,30 @@ - - mode_okay = 0; - vinfo->bits_per_pixel = (index+1)*8; -- vinfo->xres = *w; -- vinfo->xres_virtual = *w; -- vinfo->yres = *h; -- vinfo->yres_virtual = *h; -+ if ((rotation_flag == 0) || (rotation_flag == 2)) { -+ vinfo->xres = *w; -+ vinfo->xres_virtual = *w; -+ vinfo->yres = *h; -+ vinfo->yres_virtual = *h; -+ } else { -+ vinfo->xres = *h; -+ vinfo->xres_virtual = *h; -+ vinfo->yres = *w; -+ vinfo->yres_virtual = *w; -+ } - vinfo->activate = FB_ACTIVATE_TEST; - if ( ioctl(console_fd, FBIOPUT_VSCREENINFO, vinfo) == 0 ) { - #ifdef FBCON_DEBUG - fprintf(stderr, "Checked mode %dx%d at %d bpp, got mode %dx%d at %d bpp\n", *w, *h, (index+1)*8, vinfo->xres, vinfo->yres, vinfo->bits_per_pixel); - #endif - if ( (((vinfo->bits_per_pixel+7)/8)-1) == index ) { -- *w = vinfo->xres; -- *h = vinfo->yres; -+ if ((rotation_flag == 0) || (rotation_flag == 2)) { -+ *w = vinfo->xres; -+ *h = vinfo->yres; -+ } else { -+ *h = vinfo->xres; -+ *w = vinfo->yres; -+ } - mode_okay = 1; - } - } -@@ -332,6 +352,7 @@ - unsigned int current_w; - unsigned int current_h; - const char *SDL_fbdev; -+ const char *SDL_rot_flag; - - /* Initialize the library */ - SDL_fbdev = getenv("SDL_FBDEV"); -@@ -344,6 +365,14 @@ - return(-1); - } - -+ SDL_rot_flag = getenv("SDL_FBROT"); -+ if ( SDL_rot_flag == NULL ) { -+ rotation_flag = 0; -+ } else { -+ rotation_flag = atoi(SDL_rot_flag); -+ } -+ -+ - #ifndef DISABLE_THREADS - /* Create the hardware surface lock mutex */ - hw_lock = SDL_CreateMutex(); -@@ -407,13 +436,33 @@ - mapped_offset = (((long)finfo.smem_start) - - (((long)finfo.smem_start)&~(PAGE_SIZE-1))); - mapped_memlen = finfo.smem_len+mapped_offset; -- mapped_mem = mmap(NULL, mapped_memlen, -- PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); -- if ( mapped_mem == (char *)-1 ) { -- SDL_SetError("Unable to memory map the video hardware"); -- mapped_mem = NULL; -- FB_VideoQuit(this); -- return(-1); -+ if (rotation_flag == 0) { -+ mapped_mem = mmap(NULL, mapped_memlen, -+ PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); -+ if ( mapped_mem == (char *)-1 ) { -+ SDL_SetError("Unable to memory map the video hardware"); -+ mapped_mem = NULL; -+ FB_VideoQuit(this); -+ return(-1); -+ } -+ } else { -+ -+ console_fd_buf = (char *)malloc(640*480*2); -+ -+ if (console_fd_buf == NULL){ -+ SDL_SetError("Unable to memory for buffer"); -+ return(-1); -+ } -+ -+ mapped_mem_fb = mmap(NULL, mapped_memlen, -+ PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); -+ if ( mapped_mem_fb == (char *)-1 ) { -+ SDL_SetError("Unable to memory map the video hardware"); -+ mapped_mem_fb = NULL; -+ FB_VideoQuit(this); -+ return(-1); -+ } -+ mapped_mem = console_fd_buf; - } - - /* Determine the current screen depth */ -@@ -555,6 +604,7 @@ - - /* Various screen update functions available */ - static void FB_DirectUpdate(_THIS, int numrects, SDL_Rect *rects); -+static void FB_RotationUpdate(_THIS, int numrects, SDL_Rect *rects); - #ifdef VGA16_FBCON_SUPPORT - static void FB_VGA16Update(_THIS, int numrects, SDL_Rect *rects); - #endif -@@ -725,7 +775,7 @@ - Uint32 Bmask; - char *surfaces_mem; - int surfaces_len; -- -+ - /* Set the terminal into graphics mode */ - if ( FB_EnterGraphicsMode(this) < 0 ) { - return(NULL); -@@ -734,6 +784,8 @@ - /* Restore the original palette */ - FB_RestorePalette(this); - -+ flags &= ~SDL_DOUBLEBUF; -+ - /* Set the video mode and get the final screen format */ - if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { - SDL_SetError("Couldn't get console screen info"); -@@ -748,13 +800,24 @@ - vinfo.activate = FB_ACTIVATE_NOW; - vinfo.accel_flags = 0; - vinfo.bits_per_pixel = bpp; -- vinfo.xres = width; -- vinfo.xres_virtual = width; -- vinfo.yres = height; -- if ( flags & SDL_DOUBLEBUF ) { -- vinfo.yres_virtual = height*2; -+ if ((rotation_flag == 0) || (rotation_flag == 2)) { -+ vinfo.xres = width; -+ vinfo.xres_virtual = width; -+ vinfo.yres = height; -+ if ( flags & SDL_DOUBLEBUF ) { -+ vinfo.yres_virtual = height*2; -+ } else { -+ vinfo.yres_virtual = height; -+ } - } else { -- vinfo.yres_virtual = height; -+ vinfo.xres = height; -+ vinfo.xres_virtual = height; -+ vinfo.yres = width; -+ if ( flags & SDL_DOUBLEBUF ) { -+ vinfo.yres_virtual = width*2; -+ } else { -+ vinfo.yres_virtual = width; -+ } - } - vinfo.xoffset = 0; - vinfo.yoffset = 0; -@@ -776,6 +839,15 @@ - return(NULL); - } - } -+ vinfo.xres = width; -+ vinfo.xres_virtual = width; -+ vinfo.yres = height; -+ if ( flags & SDL_DOUBLEBUF ) { -+ vinfo.yres_virtual = height*2; -+ } else { -+ vinfo.yres_virtual = height; -+ } -+ - } else { - int maxheight; - -@@ -821,7 +893,9 @@ - SDL_SetError("Couldn't get console hardware info"); - return(NULL); - } -- -+#ifdef FBCON_DEBUG -+ print_finfo(&finfo); -+#endif - /* Save hardware palette, if needed */ - FB_SavePalette(this, &finfo, &vinfo); - -@@ -829,7 +903,11 @@ - current->flags = (SDL_FULLSCREEN|SDL_HWSURFACE); - current->w = vinfo.xres; - current->h = vinfo.yres; -- current->pitch = finfo.line_length; -+ if ((rotation_flag == 0) || (rotation_flag == 2) ) { -+ current->pitch = finfo.line_length; -+ } else { -+ current->pitch = vinfo.xres*2; -+ } - current->pixels = mapped_mem+mapped_offset; - - /* Set up the information for hardware surfaces */ -@@ -863,7 +941,7 @@ - } - - /* Set the update rectangle function */ -- this->UpdateRects = FB_DirectUpdate; -+ this->UpdateRects = FB_RotationUpdate; - - /* We're done */ - return(current); -@@ -1123,6 +1201,89 @@ - return; - } - -+static void FB_RotationUpdate(_THIS, int numrects, SDL_Rect *rects) -+{ -+ unsigned short *pDst; -+ unsigned short *pSrc; -+ unsigned int width; -+ unsigned int height; -+ unsigned int srcYAdd; -+ unsigned int dstXAdd; -+ unsigned int dstYSub; -+ unsigned int i; -+ unsigned int dstH; -+ unsigned int dstW; -+ -+#ifdef FBCON_DEBUG -+ fprintf(stderr,"rotation_flag = %d \n",rotation_flag); -+#endif -+ switch (rotation_flag) { -+ case 0: -+ break; -+ case 1: -+ memcpy(mapped_mem_fb,mapped_mem,640*480*2); -+ break; -+ case 2: -+ memcpy(mapped_mem_fb,mapped_mem,640*480*2); -+ break; -+ case 3: -+ dstW=cache_vinfo.xres; -+ dstH=cache_vinfo.yres; -+#ifdef FBCON_DEBUG -+ fprintf(stderr,"dstH = %d : dstW = %d : rects->x = %d : rects->y = %d\n",dstH,dstW); -+ fprintf(stderr,"rects->x = %d : rects->y = %d : rects->w = %d : rects->h = %d\n",rects->x,rects->y,rects->w,rects->h); -+#endif -+ while (numrects) { -+ if (rects->w != dstW || rects->h != dstH) { -+ pSrc = mapped_mem + (rects->x + rects->y * dstW)*2; -+ pDst = mapped_mem_fb + (dstH-1+rects->x * dstH - rects->y)*2; -+ -+ width = rects->w; -+ height = rects->h; -+ -+ srcYAdd = dstW - rects->w; -+ dstXAdd = dstH; -+ dstYSub = (dstH * rects->w) + 1; -+ -+ while (height--) { -+ i = width; -+ while (i--) { -+ *pDst = *pSrc ++; -+ pDst += dstXAdd; -+ } -+ pSrc += srcYAdd; -+ pDst -= dstYSub; -+ } -+ -+ } else { -+ pDst=mapped_mem_fb+dstH*2-2; -+ pSrc=mapped_mem; -+ height=dstH; -+ width=dstW; -+ dstXAdd=height; -+ dstYSub=dstW*dstH+1; -+ -+ while (height--) { -+ i = width; -+ while (i--) { -+ *pDst = *pSrc ++; -+ pDst += dstXAdd; -+ } -+ pDst -= dstYSub; -+ } -+ } -+ numrects--; -+ rects++; -+ } -+ break; -+ default: -+ break; -+ } -+ -+ -+ -+} -+ - #ifdef VGA16_FBCON_SUPPORT - /* Code adapted with thanks from the XFree86 VGA16 driver! :) */ - #define writeGr(index, value) \ -Index: SDL-1.2.7/src/video/fbcon/SDL_fbevents.c -=================================================================== ---- SDL-1.2.7.orig/src/video/fbcon/SDL_fbevents.c 2005-03-02 22:24:43.458491481 +0100 -+++ SDL-1.2.7/src/video/fbcon/SDL_fbevents.c 2005-03-02 22:24:46.876008660 +0100 -@@ -60,7 +60,13 @@ - #ifndef GPM_NODE_FIFO - #define GPM_NODE_FIFO "/dev/gpmdata" - #endif -+#define POINTERCAL "/etc/pointercal" - -+static struct SDL_cal { -+ long ok; -+ long a, b, c, d, e, f, s; -+ long rotate; -+} cal = { 0 }; - - /* The translation tables from a console scancode to a SDL keysym */ - #define NUM_VGAKEYMAPS (1<= 0 ) { -+ FILE *pcal; -+ cal.ok = 0; -+ pcal = fopen(POINTERCAL, "r"); -+ if(pcal == NULL){ -+ fprintf(stderr, "Warning: cannot open " POINTERCAL ".\n"); -+ }else{ -+ int n; -+ n = fscanf(pcal, "%d %d %d %d %d %d %d", -+ &cal.a, &cal.b, &cal.c, &cal.d, &cal.e, &cal.f, &cal.s); -+ if(n != 7){ -+ fprintf(stderr, "Warning: " POINTERCAL " is unknown format.\n"); -+ }else{ -+ cal.ok = 1; -+ } -+ fclose(pcal); -+ } -+ if ( sdl_rot_flag == NULL ) { -+ cal.rotate = 0; -+ } else { -+ cal.rotate = atoi(sdl_rot_flag); -+ } -+ mouse_drv = TS_SLC7X0; -+ } -+ } - if ( mouse_fd < 0 ) { - mouse_drv = MOUSE_NONE; - } -+ - return(mouse_fd); - } - -@@ -678,6 +718,10 @@ - packetsize = ELO_PACKET_SIZE; - relative = 0; - break; -+ case TS_SLC7X0: -+ packetsize = 8; -+ relative = 0; -+ break; - case NUM_MOUSE_DRVS: - /* Uh oh.. */ - packetsize = 0; -@@ -810,6 +854,25 @@ - */ - - case MOUSE_ELO: -+ case TS_SLC7X0: -+ /* Get current mouse state */ -+ button = ((mousebuf[i+1] << 8)+mousebuf[i])/500; -+ dx = (mousebuf[i+3] << 8)+mousebuf[i+2]; -+ dy = (mousebuf[i+5] << 8)+mousebuf[i+4]; -+ if(cal.ok){ -+ long X, Y; -+ X = (cal.a * dx + cal.b * dy + cal.c) / cal.s; -+ Y = (cal.d * dx + cal.e * dy + cal.f) / cal.s; -+ dx = X; -+ dy = Y; -+ } -+ if(cal.rotate == 3){ -+ int tmp; -+ tmp=dx; -+ dx = dy; -+ dy = 480-tmp; -+ } -+ break; - case NUM_MOUSE_DRVS: - /* Uh oh.. */ - dx = 0; diff --git a/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch b/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch deleted file mode 100644 index 899e31482c..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/fixlibs.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- SDL-1.2.7/configure.in~fixlibs 2005-10-06 10:27:59.025396872 +0200 -+++ SDL-1.2.7/configure.in 2005-10-06 10:30:16.963087411 +0200 -@@ -1508,8 +1508,8 @@ - AC_MSG_RESULT($video_qtopia) - if test x$video_qtopia = xyes; then - CFLAGS="$CFLAGS -DENABLE_QTOPIA -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -I${QPEDIR}/include -I${QTDIR}/include/ -DNO_DEBUG -fno-rtti -fno-exceptions" -- SDL_LIBS="$SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte" -- SDL_CFLAGS="$SDL_CFLAGS -DQWS" -+ SDL_LIBS="$SDL_LIBS -Wl,-rpath-link -Wl,${QPEDIR}/lib -Wl,-rpath-link -Wl,${QTDIR}/lib" -+ SYSTEM_LIBS="$SYSTEM_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte" - VIDEO_SUBDIRS="$VIDEO_SUBDIRS qtopia" - VIDEO_DRIVERS="$VIDEO_DRIVERS qtopia/libvideo_qtopia.la" - else -@@ -1803,11 +1803,6 @@ - CheckPTHREAD - CheckSIGACTION - CheckAltivec -- # Set up files for the main() stub -- if test "x$video_qtopia" = "xyes"; then -- SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" -- -- fi - # Set up files for the audio library - # We use the OSS and ALSA API's, not the Sun audio API - #if test x$enable_audio = xyes; then diff --git a/packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch b/packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch deleted file mode 100644 index e3738e961e..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/gcc34.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff -ru SDL-1.2.7/src/audio/SDL_mixer_MMX.c SDL-1.2.7.mod/src/audio/SDL_mixer_MMX.c ---- SDL-1.2.7/src/audio/SDL_mixer_MMX.c 2002-11-09 07:13:28.000000000 +0100 -+++ SDL-1.2.7.mod/src/audio/SDL_mixer_MMX.c 2004-04-25 18:15:46.335228624 +0200 -@@ -19,9 +19,9 @@ - " movl %1,%%esi\n" // esi = src - " movl %3,%%eax\n" // eax = volume - --" movl %2,%%ebx\n" // ebx = size -+" movl %2,%%edx\n" // edx = size - --" shrl $4,%%ebx\n" // process 16 bytes per iteration = 8 samples -+" shrl $4,%%edx\n" // process 16 bytes per iteration = 8 samples - - " jz .endS16\n" - -@@ -95,7 +95,7 @@ - - " addl $16,%%edi\n" - --" dec %%ebx\n" -+" dec %%edx\n" - - " jnz .mixloopS16\n" - -@@ -105,7 +105,7 @@ - : - : "m" (dst), "m"(src),"m"(size), - "m"(volume) -- : "eax","ebx", "esi", "edi","memory" -+ : "eax","edx", "esi", "edi","memory" - ); - } - -@@ -123,7 +123,7 @@ - " movl %1,%%esi\n" // esi = src - " movl %3,%%eax\n" // eax = volume - --" movd %%ebx,%%mm0\n" -+" movd %%edx,%%mm0\n" - " movq %%mm0,%%mm1\n" - " psllq $16,%%mm0\n" - " por %%mm1,%%mm0\n" -@@ -132,10 +132,10 @@ - " psllq $16,%%mm0\n" - " por %%mm1,%%mm0\n" - --" movl %2,%%ebx\n" // ebx = size --" shr $3,%%ebx\n" // process 8 bytes per iteration = 8 samples -+" movl %2,%%edx\n" // edx = size -+" shr $3,%%edx\n" // process 8 bytes per iteration = 8 samples - --" cmp $0,%%ebx\n" -+" cmp $0,%%edx\n" - " je .endS8\n" - - ".align 16\n" -@@ -169,7 +169,7 @@ - " movq %%mm3,(%%edi)\n" // store back to ram - " addl $8,%%edi\n" - --" dec %%ebx\n" -+" dec %%edx\n" - - " jnz .mixloopS8\n" - -@@ -178,7 +178,7 @@ - : - : "m" (dst), "m"(src),"m"(size), - "m"(volume) -- : "eax","ebx", "esi", "edi","memory" -+ : "eax","edx", "esi", "edi","memory" - ); - } - #endif -diff -ru SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.7.mod/src/cpuinfo/SDL_cpuinfo.c ---- SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c 2004-02-10 16:31:35.000000000 +0100 -+++ SDL-1.2.7.mod/src/cpuinfo/SDL_cpuinfo.c 2004-04-25 18:15:46.336228472 +0200 -@@ -118,7 +118,7 @@ - " movl %%edi,%%ebx\n" - : "=m" (features) - : -- : "%eax", "%ebx", "%ecx", "%edx", "%edi" -+ : "%eax", "%ecx", "%edx", "%edi" - ); - #elif defined(_MSC_VER) - __asm { -@@ -153,7 +153,7 @@ - " movl %%edi,%%ebx\n" - : "=m" (features) - : -- : "%eax", "%ebx", "%ecx", "%edx", "%edi" -+ : "%eax", "%ecx", "%edx", "%edi" - ); - #elif defined(_MSC_VER) - __asm { -diff -ru SDL-1.2.7/src/video/SDL_yuv_mmx.c SDL-1.2.7.mod/src/video/SDL_yuv_mmx.c ---- SDL-1.2.7/src/video/SDL_yuv_mmx.c 2004-02-18 18:22:04.000000000 +0100 -+++ SDL-1.2.7.mod/src/video/SDL_yuv_mmx.c 2004-04-25 18:15:46.337228320 +0200 -@@ -120,12 +120,12 @@ - "movd (%2), %%mm2\n" // 0 0 0 0 l3 l2 l1 l0 - "punpcklbw %%mm7,%%mm1\n" // 0 v3 0 v2 00 v1 00 v0 - "punpckldq %%mm1,%%mm1\n" // 00 v1 00 v0 00 v1 00 v0 -- "psubw _MMX_0080w,%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 -+ "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 - - // create Cr_g (result in mm0) - "movq %%mm1,%%mm0\n" // r1 r1 r0 r0 r1 r1 r0 r0 -- "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64 -- "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64 -+ "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64 -+ "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64 - "psraw $6, %%mm0\n" // red=red/64 - "psraw $6, %%mm1\n" // red=red/64 - -@@ -134,8 +134,8 @@ - "movq (%2,%4),%%mm3\n" // 0 0 0 0 L3 L2 L1 L0 - "punpckldq %%mm3,%%mm2\n" // L3 L2 L1 L0 l3 l2 l1 l0 - "movq %%mm2,%%mm4\n" // L3 L2 L1 L0 l3 l2 l1 l0 -- "pand _MMX_FF00w,%%mm2\n" // L3 0 L1 0 l3 0 l1 0 -- "pand _MMX_00FFw,%%mm4\n" // 0 L2 0 L0 0 l2 0 l0 -+ "pand %[_MMX_FF00w],%%mm2\n" // L3 0 L1 0 l3 0 l1 0 -+ "pand %[_MMX_00FFw],%%mm4\n" // 0 L2 0 L0 0 l2 0 l0 - "psrlw $8,%%mm2\n" // 0 L3 0 L1 0 l3 0 l1 - - // create R (result in mm6) -@@ -152,11 +152,11 @@ - "movd (%1), %%mm1\n" // 0 0 0 0 u3 u2 u1 u0 - "punpcklbw %%mm7,%%mm1\n" // 0 u3 0 u2 00 u1 00 u0 - "punpckldq %%mm1,%%mm1\n" // 00 u1 00 u0 00 u1 00 u0 -- "psubw _MMX_0080w,%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 -+ "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 - // create Cb_g (result in mm5) - "movq %%mm1,%%mm5\n" // u1 u1 u0 u0 u1 u1 u0 u0 -- "pmullw _MMX_UgrnRGB,%%mm5\n" // blue*-109dec=1.7129*64 -- "pmullw _MMX_UbluRGB,%%mm1\n" // blue*114dec=1.78125*64 -+ "pmullw %[_MMX_UgrnRGB],%%mm5\n" // blue*-109dec=1.7129*64 -+ "pmullw %[_MMX_UbluRGB],%%mm1\n" // blue*114dec=1.78125*64 - "psraw $6, %%mm5\n" // blue=red/64 - "psraw $6, %%mm1\n" // blue=blue/64 - -@@ -238,8 +238,14 @@ - "popl %%ebx\n" - : - : "m" (cr), "r"(cb),"r"(lum), -- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod) -- : "%ebx" -+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod), -+ [_MMX_0080w] "m" (*_MMX_0080w), -+ [_MMX_00FFw] "m" (*_MMX_00FFw), -+ [_MMX_FF00w] "m" (*_MMX_FF00w), -+ [_MMX_VgrnRGB] "m" (*_MMX_VgrnRGB), -+ [_MMX_VredRGB] "m" (*_MMX_VredRGB), -+ [_MMX_UgrnRGB] "m" (*_MMX_UgrnRGB), -+ [_MMX_UbluRGB] "m" (*_MMX_UbluRGB) - ); - } - -@@ -413,8 +419,16 @@ - "popl %%ebx\n" - : - :"m" (cr), "r"(cb),"r"(lum), -- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod) -- : "%ebx" -+ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod), -+ [_MMX_0080w] "m" (*_MMX_0080w), -+ [_MMX_Ugrn565] "m" (*_MMX_Ugrn565), -+ [_MMX_Ublu5x5] "m" (*_MMX_Ublu5x5), -+ [_MMX_00FFw] "m" (*_MMX_00FFw), -+ [_MMX_Vgrn565] "m" (*_MMX_Vgrn565), -+ [_MMX_Vred5x5] "m" (*_MMX_Vred5x5), -+ [_MMX_Ycoeff] "m" (*_MMX_Ycoeff), -+ [_MMX_red565] "m" (*_MMX_red565), -+ [_MMX_grn565] "m" (*_MMX_grn565) - ); - } - diff --git a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch b/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch deleted file mode 100644 index bf57953c08..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/ipaq.patch +++ /dev/null @@ -1,143 +0,0 @@ -Index: SDL-1.2.7/src/video/qtopia/Makefile.am -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2005-05-16 14:21:01.000000000 +0200 -+++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-05-16 14:24:02.000000000 +0200 -@@ -22,4 +22,4 @@ - # overwrite USER variables - CXXLD = $(CC) - CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -- $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@ -+ $(AM_LDFLAGS) $(LDFLAGS) -lopiecore2 -lsupc++ -o $@ -Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.cc -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/SDL_QWin.cc 2005-05-16 14:21:01.000000000 +0200 -+++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-05-16 14:24:02.000000000 +0200 -@@ -29,8 +29,11 @@ - #include "SDL_QWin.h" - #include - #include -+#include - #include - -+using namespace Opie::Core; -+ - extern int fb_hwrot; - extern int fb_direct; - extern bool is_VGA_machine; -@@ -545,18 +548,32 @@ - case Qt::Key_F7: scancode = SDLK_F7; break; - case Qt::Key_F8: scancode = SDLK_F8; break; - case Qt::Key_F9: -- scancode = SDLK_F9; -- mouse_button_mode=1; -+ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { -+ scancode = SDLK_y; } -+ else { -+ scancode = SDLK_F9; -+ mouse_button_mode=1; } - break; - case Qt::Key_F10: -- scancode = SDLK_F10; -- mouse_button_mode=2; -+ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { -+ scancode = SDLK_LALT; } -+ else { -+ scancode = SDLK_F10; -+ mouse_button_mode=2; } - break; - case Qt::Key_F11: scancode = SDLK_F11; break; -- case Qt::Key_F12: scancode = SDLK_F12; break; -+ case Qt::Key_F12: -+ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { -+ scancode = SDLK_RETURN; } -+ else { -+ scancode = SDLK_F12; } -+ break; - case Qt::Key_F13: -- scancode = SDLK_F13; -- mouse_button_mode=3; -+ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { -+ scancode = SDLK_ESCAPE; } -+ else { -+ scancode = SDLK_F13; -+ mouse_button_mode=3; } - break; - case Qt::Key_F14: scancode = SDLK_F14; break; - case Qt::Key_F15: scancode = SDLK_F15; break; -@@ -573,6 +590,9 @@ - scancode = SDLK_RETURN; - break; - -+ // To use record button on ipaq -+ case Qt::Key_F24: scancode = SDLK_LSHIFT; break; -+ - default: - scancode = SDLK_UNKNOWN; - break; -Index: SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/SDL_sysvideo.cc 2005-05-16 14:21:00.000000000 +0200 -+++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-05-16 14:24:02.000000000 +0200 -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -66,6 +67,8 @@ - #include "SDL_syswm_c.h" - #include "SDL_lowvideo.h" - -+using namespace Opie::Core; -+ - //#define QTOPIA_DEBUG - #define QTOPIA_LOG - #define QT_HIDDEN_SIZE 32 /* starting hidden window size */ -@@ -106,6 +109,7 @@ - MACHINE_SHARP_SLC760, - MACHINE_SHARP_SLC860, - MACHINE_SHARP_SL6000, -+ MACHINE_IPAQ, - MACHINE_MAX - } machine_t; - -@@ -119,6 +123,7 @@ - { "Sharp", "SL-C760", 0 }, - { "Sharp", "SL-C860", 0 }, - { "Sharp", "SL-6000", 0 }, -+ { "HP", "HP IPAQ", 0 }, - }; - - /* Name of the environment variable used to invert the screen rotation or not: -@@ -423,6 +428,13 @@ - machine = MACHINE_SHARP_SLC760; - else if (strstr(buf, "SHARP Boxer") != NULL) - machine = MACHINE_SHARP_SLC860; -+ else if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) -+ machine = MACHINE_IPAQ; -+ else -+ { -+ machine = MACHINE_SHARP_SL5000D; -+ LOG("Can't detect machine defaulting to SL5000D"); -+ } - } - fclose(fp); - } else { -@@ -679,6 +691,15 @@ - if (machine == MACHINE_SHARP_SL5500) - qteRotation = 3; - -+ // HP IPaq -+ if ( ODevice::inst( )-> series ( ) == Model_iPAQ ) { -+ qteRotation = 3; -+ } -+ if ( ODevice::inst ( )-> model ( ) == Model_iPAQ_H38xx ) { -+ qteRotation = 1; -+ } -+ -+ - // SL-B500 Íѥϥå¯(¤È¤ê¤¢¤¨¤º¡¢¤Í) - if (machine == MACHINE_SHARP_SLB500) - qteRotation = 3; diff --git a/packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch b/packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch deleted file mode 100644 index 9629583f9b..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch +++ /dev/null @@ -1,408 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: SDL-1.2.7/src/main/Makefile.am -=================================================================== ---- SDL-1.2.7.orig/src/main/Makefile.am 2005-03-02 22:24:52.592201093 +0100 -+++ SDL-1.2.7/src/main/Makefile.am 2005-03-02 22:24:56.658626603 +0100 -@@ -46,3 +46,9 @@ - (cd $(distdir) && rm -f $(BUILT_SOURCES)) - cp -rp $(ARCH_SUBDIRS) $(distdir) - (cd $(distdir) && rm -rf `find . -name CVS`) -+ -+# overwrite USER variables -+CXXLD = $(CC) -+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@ -+ -Index: SDL-1.2.7/src/video/qtopia/Makefile.am -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2005-03-02 22:24:52.592201093 +0100 -+++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-03-02 22:24:56.658626603 +0100 -@@ -17,3 +17,9 @@ - SDL_sysevents.cc \ - SDL_sysevents_c.h \ - SDL_qmain.cc -+ -+ -+# overwrite USER variables -+CXXLD = $(CC) -+CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ -+ $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@ -Index: SDL-1.2.7/acinclude.m4 -=================================================================== ---- SDL-1.2.7.orig/acinclude.m4 2005-03-02 22:24:41.232805923 +0100 -+++ SDL-1.2.7/acinclude.m4 2005-03-02 22:24:56.667625332 +0100 -@@ -1305,11 +1305,11 @@ - case $host_os in - aix3*) - version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ library_names_spec='${libname}${release}${shrext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shrext}$major' - ;; - - aix4* | aix5*) -@@ -1319,7 +1319,7 @@ - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 -- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shrext}$major ${libname}${release}${shrext}$versuffix $libname${shrext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file -@@ -1345,12 +1345,12 @@ - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' -- soname_spec='${libname}${release}${shared_ext}$major' -+ soname_spec='${libname}${release}${shrext}$major' - fi - shlibpath_var=LIBPATH - fi -@@ -1363,7 +1363,7 @@ - ;; - - beos*) -- library_names_spec='${libname}${shared_ext}' -+ library_names_spec='${libname}${shrext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -@@ -1371,8 +1371,8 @@ - bsdi4*) - version_type=linux - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -@@ -1405,14 +1405,14 @@ - case $host_os in - cygwin*) - # Cygwin DLLs use 'cyg' prefix rather than 'lib' -- #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}' -+ #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext}' -+ soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shrext}' - sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" - ;; - mingw*) - # MinGW DLLs use traditional 'lib' prefix -- #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -- soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}' -+ #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext}' -+ soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shrext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH printed by -@@ -1428,13 +1428,13 @@ - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' -- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shrext}' - ;; - esac - ;; - - *) -- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext} $libname.lib' - ;; - esac - dynamic_linker='Win32 ld.exe' -@@ -1450,8 +1450,8 @@ - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. -- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' -- soname_spec='${libname}${release}${major}$shared_ext' -+ library_names_spec='${libname}${release}${versuffix}$shrext ${libname}${release}${major}$shrext ${libname}$shrext' -+ soname_spec='${libname}${release}${major}$shrext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext='$(test .$module = .yes && echo .so || echo .dylib)' -@@ -1466,8 +1466,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname$shrext' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -1480,12 +1480,12 @@ - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext} $libname${shrext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) -- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ library_names_spec='${libname}${release}${shrext}$versuffix $libname${shrext}$versuffix' - need_version=yes - ;; - esac -@@ -1509,8 +1509,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}${major} ${libname}${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - hardcode_into_libs=yes - ;; -@@ -1528,8 +1528,8 @@ - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else -@@ -1543,8 +1543,8 @@ - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; -@@ -1553,8 +1553,8 @@ - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555. -@@ -1573,8 +1573,8 @@ - esac - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shrext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${release}${shrext} $libname${shrext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= -@@ -1608,8 +1608,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no -@@ -1632,12 +1632,12 @@ - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${release}${shrext} ${libname}${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH -@@ -1647,7 +1647,7 @@ - - newsos6) - version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -@@ -1656,8 +1656,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -@@ -1666,7 +1666,7 @@ - version_type=sunos - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -@@ -1687,7 +1687,7 @@ - libname_spec='$name' - shrext=".dll" - need_lib_prefix=no -- library_names_spec='$libname${shared_ext} $libname.a' -+ library_names_spec='$libname${shrext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; -@@ -1696,8 +1696,8 @@ - version_type=osf - need_lib_prefix=no - need_version=no -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shrext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -@@ -1705,8 +1705,8 @@ - - sco3.2v5*) - version_type=osf -- soname_spec='${libname}${release}${shared_ext}$major' -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shrext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -1714,8 +1714,8 @@ - version_type=linux - need_lib_prefix=no - need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes -@@ -1725,7 +1725,7 @@ - - sunos4*) - version_type=sunos -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes -@@ -1737,8 +1737,8 @@ - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) -@@ -1762,16 +1762,16 @@ - sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux -- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -- soname_spec='$libname${shared_ext}.$major' -+ library_names_spec='$libname${shrext}.$versuffix $libname${shrext}.$major $libname${shrext}' -+ soname_spec='$libname${shrext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; - - uts4*) - version_type=linux -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' -+ soname_spec='${libname}${release}${shrext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; - -@@ -3278,8 +3278,8 @@ - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. -@@ -3288,7 +3288,7 @@ - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. -- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shrext 2>&1 | grep "ld"`; rm -f libconftest$shrext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -@@ -3367,7 +3367,7 @@ - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -3427,7 +3427,7 @@ - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. -- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -4376,7 +4376,7 @@ - # Whether we need a single -rpath flag with a separated argument. - hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - --# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -+# Set to yes if using DIR/libNAME${shrext} during linking hardcodes DIR into the - # resulting binary. - hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - diff --git a/packages/libsdl/libsdl-qpe-1.2.7/mouse.patch b/packages/libsdl/libsdl-qpe-1.2.7/mouse.patch deleted file mode 100644 index 99320fad0d..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/mouse.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- ./src/video/qtopia/SDL_QWin.cc.old 2004-05-16 20:28:36.000000000 +0930 -+++ ./src/video/qtopia/SDL_QWin.cc 2004-05-16 20:31:39.000000000 +0930 -@@ -169,7 +169,12 @@ - Qt::ButtonState button = e->button(); - int sdlstate = 0; - if( (button & Qt::LeftButton)) { -- sdlstate |= SDL_BUTTON_LMASK; -+ if (mouse_button_mode == 3) -+ sdlstate |= SDL_BUTTON_RMASK; -+ else if (mouse_button_mode == 2) -+ sdlstate |= SDL_BUTTON_MMASK; -+ else -+ sdlstate |= SDL_BUTTON_LMASK; - } - if( (button & Qt::RightButton)) { - sdlstate |= SDL_BUTTON_RMASK; -@@ -539,20 +544,20 @@ - case Qt::Key_F6: scancode = SDLK_F6; break; - case Qt::Key_F7: scancode = SDLK_F7; break; - case Qt::Key_F8: scancode = SDLK_F8; break; -- case Qt::Key_F9: scancode = SDLK_F9; break; -- case Qt::Key_F10: -- scancode = SDLK_F10; -+ case Qt::Key_F9: -+ scancode = SDLK_F9; - mouse_button_mode=1; - break; -- case Qt::Key_F11: -- scancode = SDLK_F11; -- mouse_button_mode=3; -- break; -- case Qt::Key_F12: -- scancode = SDLK_F12; -+ case Qt::Key_F10: -+ scancode = SDLK_F10; - mouse_button_mode=2; - break; -- case Qt::Key_F13: scancode = SDLK_F13; break; -+ case Qt::Key_F11: scancode = SDLK_F11; break; -+ case Qt::Key_F12: scancode = SDLK_F12; break; -+ case Qt::Key_F13: -+ scancode = SDLK_F13; -+ mouse_button_mode=3; -+ break; - case Qt::Key_F14: scancode = SDLK_F14; break; - case Qt::Key_F15: scancode = SDLK_F15; break; - case Qt::Key_Super_L: scancode = SDLK_LSUPER; break; diff --git a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch b/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch deleted file mode 100644 index 4b39267a8a..0000000000 --- a/packages/libsdl/libsdl-qpe-1.2.7/pygame.patch +++ /dev/null @@ -1,196 +0,0 @@ -Index: SDL-1.2.7/src/main/qtopia/SDL_qtopia_main.cc -=================================================================== ---- SDL-1.2.7.orig/src/main/qtopia/SDL_qtopia_main.cc 2003-12-14 07:25:53.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,47 +0,0 @@ -- --/* Include the SDL main definition header */ --#include "SDL_main.h" --#include --#include --#ifdef main --#undef main --#endif --#ifdef QWS --#include --#include --#include --#include -- --// Workaround for OPIE to remove taskbar icon. Also fixes --// some issues in Qtopia where there are left-over qcop files in /tmp/. --// I'm guessing this will also clean up the taskbar in the Sharp version --// of Qtopia. --static inline void cleanupQCop() { -- QString appname(qApp->argv()[0]); -- int slash = appname.findRev("/"); -- if(slash != -1) { appname = appname.mid(slash+1); } -- QString cmd = QPEApplication::qpeDir() + "bin/qcop QPE/System 'closing(QString)' '"+appname+"'"; -- system(cmd.latin1()); -- cmd = "/tmp/qcop-msg-"+appname; -- unlink(cmd.latin1()); --} -- --static QPEApplication *app; --#endif -- --extern int SDL_main(int argc, char *argv[]); -- --int main(int argc, char *argv[]) --{ --#ifdef QWS -- // This initializes the Qtopia application. It needs to be done here -- // because it parses command line options. -- app = new QPEApplication(argc, argv); -- QWidget dummy; -- app->showMainWidget(&dummy); -- atexit(cleanupQCop); --#endif -- // Exit here because if return is used, the application -- // doesn't seem to quit correctly. -- exit(SDL_main(argc, argv)); --} -Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ SDL-1.2.7/src/video/qtopia/SDL_qmain.cc 2005-09-24 19:55:14.000000000 +0200 -@@ -0,0 +1,99 @@ -+/* Include the SDL main definition header */ -+#include "SDL_main.h" -+#include -+ -+#include -+#include -+#include -+ -+ -+#ifdef QWS -+#include -+#include -+#include -+ -+ -+ -+static QWidget *dummyW = 0; -+static QPEApplication *theApp = 0; -+static char **cmdline= 0; -+static int size = 0; -+ -+static void parse_cmd_line() { -+ /* -+ * find the number -+ */ -+ char buf[1024]; -+ int available = 0; -+ char *string_start = 0; -+ int fd = ::open( "/proc/self/cmdline", O_RDONLY ); -+ if ( fd < 0 ) { -+ qWarning( "Error getting the cmdline, can't be" ); -+ goto error_out; -+ } -+ -+ available = ::read( fd, &buf, sizeof(buf) ); -+ if ( available <= 0 ) -+ goto error_out; -+ -+ /* -+ * find out the number of arguments -+ */ -+ size = 0; -+ for (int i = 0; i < available; ++i ) -+ if ( buf[i] == '\0' ) -+ ++size; -+ -+ /* now create a the cmdline */ -+ cmdline = new char*[size+1]; -+ cmdline[size] = '\0'; // parnoid... -+ -+ string_start = &buf[0]; -+ for ( int i = 0; i < size; ++i ) { -+ /* -+ * find the end of the string -+ */ -+ size_t sz = ::strlen(string_start); -+ cmdline[i] = new char[sz+1]; -+ memcpy( cmdline[i], string_start, sz+1 ); -+ string_start += (sz+1); // +1 for '\0' +1 to set it beyond -+ } -+ -+ ::close(fd); -+ -+ return; -+ -+/* error code */ -+error_out: -+ cmdline = new char*[2]; -+ cmdline[0] = "unknown_app"; -+ cmdline[1] = '\0'; -+ size = 1; -+} -+ -+static void free_cmd_line() { -+ /* -+ * free each string and then free the array -+ */ -+ for ( int i = 0; i < size; ++i ) -+ delete [] cmdline[i]; -+ -+ delete [] cmdline; -+} -+ -+static void __attribute__((constructor)) initialize_qpe_app() { -+ parse_cmd_line(); -+ -+ theApp = new QPEApplication( size, cmdline ); -+ dummyW = new QWidget; -+ theApp->showMainWidget(dummyW); -+} -+ -+static void __attribute__((destructor)) deinitialize_qpe_app() { -+ free_cmd_line(); -+ delete dummyW; -+ delete theApp; -+} -+ -+ -+#endif -Index: SDL-1.2.7/src/main/Makefile.am -=================================================================== ---- SDL-1.2.7.orig/src/main/Makefile.am 2004-02-18 18:22:01.000000000 +0100 -+++ SDL-1.2.7/src/main/Makefile.am 2005-09-24 19:56:40.000000000 +0200 -@@ -21,11 +21,7 @@ - if TARGET_MACOSX - MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h - else --if TARGET_QTOPIA --MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc --else - MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c --endif # !TARGET_QTOPIA - endif # !TARGET_MACOSX - endif # !TARGET_WIN32 - libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS) -Index: SDL-1.2.7/src/video/qtopia/Makefile.am -=================================================================== ---- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2002-05-28 21:24:11.000000000 +0200 -+++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-09-24 19:56:40.000000000 +0200 -@@ -15,4 +15,5 @@ - SDL_syswm.cc \ - SDL_syswm_c.h \ - SDL_sysevents.cc \ -- SDL_sysevents_c.h -+ SDL_sysevents_c.h \ -+ SDL_qmain.cc -Index: SDL-1.2.7/configure.in -=================================================================== ---- SDL-1.2.7.orig/configure.in 2004-02-22 22:31:47.000000000 +0100 -+++ SDL-1.2.7/configure.in 2005-09-24 19:58:30.000000000 +0200 -@@ -1806,7 +1806,7 @@ - # Set up files for the main() stub - if test "x$video_qtopia" = "xyes"; then - SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" -- SDL_LIBS="-lSDLmain $SDL_LIBS" -+ - fi - # Set up files for the audio library - # We use the OSS and ALSA API's, not the Sun audio API diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb deleted file mode 100644 index 60c2a9d385..0000000000 --- a/packages/libsdl/libsdl-qpe_1.2.7.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "Simple DirectMedia Layer - QtE-based Palmtop Environments Edition" -SECTION = "opie/libs" -PRIORITY = "optional" -DEPENDS = "virtual/libqpe1 libopie2" -PROVIDES = "virtual/libsdl" -LICENSE = "LGPL" - -# NOTE: make sure to keep PR in sync with libsdl-x11 -PR = "r9" - -SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ - file://agawa-piro-mickey.patch;patch=1 \ - file://pygame.patch;patch=1 \ - file://gcc34.patch;patch=1 \ - file://mouse.patch;patch=1 \ - file://kill-stdc++.patch;patch=1 \ - file://ipaq.patch;patch=1 \ - file://SDL-Akita.patch;patch=1 \ - file://fixlibs.patch;patch=1" -S = "${WORKDIR}/SDL-${PV}" - -inherit autotools binconfig - -EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ - --enable-file --enable-oss --disable-alsa --disable-esd --disable-arts \ - --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ - --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \ - --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \ - --disable-video-xbios --disable-video-gem --disable-video-dummy \ - --disable-video-opengl --enable-input-events --enable-pthreads \ - --disable-video-picogui --enable-video-qtopia --enable-dlopen" - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*config" - -do_compile_prepend() { - if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ] - then - sed -i s,-lqte,-lqte-mt, src/Makefile - fi -} - -do_stage() { - oe_libinstall -so -C src libSDL ${STAGING_LIBDIR} - rm ${STAGING_LIBDIR}/libSDL.la - ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so - install -m 0655 src/main/libSDLmain.a src/main/.libs/ - oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/SDL - for f in include/*.h - do - install -m 0644 $f ${STAGING_INCDIR}/SDL/ - done - - install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/obsolete/libsdl/.mtn2git_empty b/packages/obsolete/libsdl/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch new file mode 100644 index 0000000000..b47a127398 --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/SDL-Akita.patch @@ -0,0 +1,37 @@ +--- SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc.orig 2005-07-23 14:31:20.060123510 +0200 ++++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-07-23 14:38:49.000000000 +0200 +@@ -109,6 +109,7 @@ + MACHINE_SHARP_SLC760, + MACHINE_SHARP_SLC860, + MACHINE_SHARP_SL6000, ++ MACHINE_SHARP_SLC1000, + MACHINE_IPAQ, + MACHINE_MAX + } machine_t; +@@ -123,6 +124,7 @@ + { "Sharp", "SL-C760", 0 }, + { "Sharp", "SL-C860", 0 }, + { "Sharp", "SL-6000", 0 }, ++ { "Sharp", "SL-C1000", 0 }, + { "HP", "HP IPAQ", 0 }, + }; + +@@ -428,6 +430,8 @@ + machine = MACHINE_SHARP_SLC760; + else if (strstr(buf, "SHARP Boxer") != NULL) + machine = MACHINE_SHARP_SLC860; ++ else if (strstr(buf, "SHARP Akita") != NULL) ++ machine = MACHINE_SHARP_SLC1000; + else if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) + machine = MACHINE_IPAQ; + else +@@ -523,7 +527,8 @@ + machine == MACHINE_SHARP_SLC750 || + machine == MACHINE_SHARP_SLC760 || + machine == MACHINE_SHARP_SLC860 || // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º +- machine == MACHINE_SHARP_SL6000 ) { // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º ++ machine == MACHINE_SHARP_SL6000 || ++ machine == MACHINE_SHARP_SLC1000 ) { // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º + is_VGA_machine = true; + }else { + is_VGA_machine = false; diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4 b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4 new file mode 100644 index 0000000000..ca2df9d5e5 --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/acinclude.m4 @@ -0,0 +1,189 @@ +# Local macros for the SDL configure.in script + +dnl Function to link an architecture specific file +dnl LINK_ARCH_SRC(source_dir, arch, source_file) +AC_DEFUN([COPY_ARCH_SRC], +[ + old="$srcdir/$1/$2/$3" + new="$1/$3" + if test ! -d $1; then + echo "Creating directory $1" + mkdir -p $1 + fi + echo "Copying $old -> $new" + cat >$new <<__EOF__ +/* WARNING: This file was automatically generated! + * Original: $old + */ +__EOF__ + cat >>$new <$old +]) + +# +# --- esd.m4 --- +# +# Configure paths for ESD +# Manish Singh 98-9-30 +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS +dnl +AC_DEFUN([AM_PATH_ESD], +[dnl +dnl Get the cflags and libraries from the esd-config script +dnl +AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)], + esd_prefix="$withval", esd_prefix="") +AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)], + esd_exec_prefix="$withval", esd_exec_prefix="") +AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program], + , enable_esdtest=yes) + + if test x$esd_exec_prefix != x ; then + esd_args="$esd_args --exec-prefix=$esd_exec_prefix" + if test x${ESD_CONFIG+set} != xset ; then + ESD_CONFIG=$esd_exec_prefix/bin/esd-config + fi + fi + if test x$esd_prefix != x ; then + esd_args="$esd_args --prefix=$esd_prefix" + if test x${ESD_CONFIG+set} != xset ; then + ESD_CONFIG=$esd_prefix/bin/esd-config + fi + fi + + AC_PATH_PROG(ESD_CONFIG, esd-config, no) + min_esd_version=ifelse([$1], ,0.2.7,$1) + AC_MSG_CHECKING(for ESD - version >= $min_esd_version) + no_esd="" + if test "$ESD_CONFIG" = "no" ; then + no_esd=yes + else + ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` + ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` + + esd_major_version=`$ESD_CONFIG $esd_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + esd_minor_version=`$ESD_CONFIG $esd_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_esdtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" +dnl +dnl Now check if the installed ESD is sufficiently new. (Also sanity +dnl checks the results of esd-config to some extent +dnl + rm -f conf.esdtest + AC_TRY_RUN([ +#include +#include +#include +#include + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.esdtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_esd_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_esd_version"); + exit(1); + } + + if (($esd_major_version > major) || + (($esd_major_version == major) && ($esd_minor_version > minor)) || + (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); + printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); + printf("*** to point to the correct copy of esd-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_esd" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$ESD_CONFIG" = "no" ; then + echo "*** The esd-config script installed by ESD could not be found" + echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the ESD_CONFIG environment variable to the" + echo "*** full path to esd-config." + else + if test -f conf.esdtest ; then + : + else + echo "*** Could not run ESD test program, checking why..." + CFLAGS="$CFLAGS $ESD_CFLAGS" + LIBS="$LIBS $ESD_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding ESD or finding the wrong" + echo "*** version of ESD. If it is not finding ESD, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means ESD was incorrectly installed" + echo "*** or that you have moved ESD since it was installed. In the latter case, you" + echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + ESD_CFLAGS="" + ESD_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(ESD_CFLAGS) + AC_SUBST(ESD_LIBS) + rm -f conf.esdtest +]) + diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch new file mode 100644 index 0000000000..7f3622ea4c --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/agawa-piro-mickey.patch @@ -0,0 +1,2065 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.cc +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/SDL_QWin.cc 2005-03-02 22:24:43.457491622 +0100 ++++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-03-02 22:24:46.867009932 +0100 +@@ -1,3 +1,4 @@ ++ + /* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2004 Sam Lantinga +@@ -27,15 +28,24 @@ + + #include "SDL_QWin.h" + #include ++#include + #include + ++extern int fb_hwrot; ++extern int fb_direct; ++extern bool is_VGA_machine; ++static int mouse_button_mode=1; ++ + screenRotationT screenRotation = SDL_QT_NO_ROTATION; + + SDL_QWin::SDL_QWin(const QSize& size) + : QWidget(0, "SDL_main"), my_painter(0), my_image(0), + my_inhibit_resize(false), my_mouse_pos(-1,-1), my_flags(0), +- my_has_fullscreen(false), my_locked(0) ++ my_has_fullscreen(false), my_locked(0), ++ rotation_(0), qteRotation_(0), keyRotation_(0), qteKeyRotation_(0), ++ isSLA300InputFix_(0) + { ++ for (int i = 0; i < 5; i++) curAxis_[i] = 0; + setBackgroundMode(NoBackground); + } + +@@ -84,6 +94,7 @@ + } + + void SDL_QWin::setMousePos(const QPoint &pos) { ++#if 0 + if(my_image->width() == height()) { + if (screenRotation == SDL_QT_ROTATION_90) + my_mouse_pos = QPoint(height()-pos.y(), pos.x()); +@@ -92,6 +103,66 @@ + } else { + my_mouse_pos = pos; + } ++#else ++ QPoint realPos; ++ ++ if (is_VGA_machine) { ++ realPos = pos; ++ my_mouse_pos = realPos; ++ }else { ++ switch (qteRotation_) { ++ case 0: ++ realPos = pos; ++ break; ++ case 1: ++ realPos.setX(pos.y()); ++ realPos.setY(fbSize_.height() - 1 - pos.x()); ++ break; ++ case 2: ++ realPos.setX(fbSize_.width() - 1 - pos.x()); ++ realPos.setY(fbSize_.height() - 1 - pos.y()); ++ break; ++ case 3: ++ realPos.setX(fbSize_.width() - 1 - pos.y()); ++ realPos.setY(pos.x()); ++ break; ++ }; ++ ++ // fprintf(stderr, "setMousePos: realPos(%d, %d)\n", realPos.x(), realPos.y()); ++ ++ int borderWidth = (fbSize_.width() - my_image->width()) >> 1; ++ int borderHeight = (fbSize_.height() - my_image->height()) >> 1; ++ if ( rotation_ & 1 ){ ++ borderWidth = (fbSize_.height() - my_image->width()) >> 1; ++ borderHeight = (fbSize_.width() - my_image->height()) >> 1; ++ } ++ realPos.setX(realPos.x() - borderWidth); ++ realPos.setY(realPos.y() - borderHeight); ++ ++ fprintf(stderr, "setMousePos: realPos2(%d, %d)\n", realPos.x(), realPos.y()); ++ ++ switch (rotation_) { ++ case 0: ++ my_mouse_pos = realPos; ++ break; ++ case 1: ++ my_mouse_pos.setX(realPos.y()); ++ my_mouse_pos.setY(my_image->height() - 1 - realPos.x()); ++ break; ++ case 2: ++ my_mouse_pos.setX(my_image->width() - 1 - realPos.x()); ++ my_mouse_pos.setY(my_image->height() - 1 - realPos.y()); ++ break; ++ case 3: ++ my_mouse_pos.setX(realPos.y());//my_image->width() - 1 - realPos.y()); ++ my_mouse_pos.setY(my_image->height() - realPos.x()); ++ break; ++ } ++ } ++ ++// fprintf(stderr, "setMousePos: mymousePos(%d, %d)\n", (short)my_mouse_pos.x(), (short)my_mouse_pos.y()); ++ ++#endif + } + + void SDL_QWin::mouseMoveEvent(QMouseEvent *e) { +@@ -113,269 +184,318 @@ + void SDL_QWin::mousePressEvent(QMouseEvent *e) { + mouseMoveEvent(e); + Qt::ButtonState button = e->button(); +- SDL_PrivateMouseButton(SDL_PRESSED, +- (button & Qt::LeftButton) ? 1 : +- ((button & Qt::RightButton) ? 2 : 3), ++ SDL_PrivateMouseButton(SDL_PRESSED,mouse_button_mode, + my_mouse_pos.x(), my_mouse_pos.y()); + } + + void SDL_QWin::mouseReleaseEvent(QMouseEvent *e) { + setMousePos(e->pos()); + Qt::ButtonState button = e->button(); +- SDL_PrivateMouseButton(SDL_RELEASED, +- (button & Qt::LeftButton) ? 1 : +- ((button & Qt::RightButton) ? 2 : 3), ++ SDL_PrivateMouseButton(SDL_RELEASED,mouse_button_mode, + my_mouse_pos.x(), my_mouse_pos.y()); + my_mouse_pos = QPoint(-1, -1); + } + +-static inline void +-gs_fastRotateBlit_3 ( unsigned short *fb, +- unsigned short *bits, +- const QRect& rect ) ++#ifndef __i386__ ++ ++static void ++blitRotate3(Uint16 *dstBits, const QSize& dstSize, ++ const Uint16 *srcBits, const QSize& srcSize, ++ const QRect& srcBlitRect); ++ ++static void ++blitRotate0(Uint16 *dstBits, const QSize& dstSize, ++ const Uint16 *srcBits, const QSize& srcSize, ++ const QRect& srcBlitRect) + { +- // FIXME: this only works correctly for 240x320 displays +- int startx, starty; +- int width, height; +- +- startx = rect.left() >> 1; +- starty = rect.top() >> 1; +- width = ((rect.right() - rect.left()) >> 1) + 2; +- height = ((rect.bottom() - rect.top()) >> 1) + 2; +- +- if((startx+width) > 120) { +- width = 120 - startx; // avoid horizontal overflow +- } +- if((starty+height) > 160) { +- height = 160 - starty; // avoid vertical overflow +- } +- +- ulong *sp1, *sp2, *dp1, *dp2; +- ulong stop, sbot, dtop, dbot; +- +- sp1 = (ulong*)bits + startx + starty*240; +- sp2 = sp1 + 120; +- dp1 = (ulong *)fb + (159 - starty) + startx*320; +- dp2 = dp1 + 160; +- int rowadd = (-320*width) - 1; +- int rowadd2 = 240 - width; +- // transfer in cells of 2x2 pixels in words +- for (int y=0; y>16) + (stop & 0xffff0000); +- // write to framebuffer +- *dp1 = dtop; +- *dp2 = dbot; +- // update source ptrs +- sp1++; sp2++; +- // update dest ptrs - 2 pix at a time +- dp1 += 320; +- dp2 += 320; +- } +- // adjust src ptrs - skip a row as we work in pairs +- sp1 += rowadd2; +- sp2 += rowadd2; +- // adjust dest ptrs for rotation +- dp1 += rowadd; +- dp2 += rowadd; ++ srcBits += srcBlitRect.left() + srcBlitRect.top() * srcSize.width(); ++ dstBits += ((dstSize.width() - srcSize.width()) >> 1) ++ + (((dstSize.height() - srcSize.height()) >> 1) * dstSize.width()); ++ dstBits += srcBlitRect.left() + srcBlitRect.top() * dstSize.width(); ++ int w = srcBlitRect.width() << 1; ++ int h = srcBlitRect.height(); ++ ++ while (h--) { ++ memcpy(dstBits, srcBits, w); ++ dstBits += dstSize.width(); ++ srcBits += srcSize.width(); + } + } + +-static inline void +-gs_fastRotateBlit_1 ( unsigned short *fb, +- unsigned short *bits, +- const QRect& rect ) { +- // FIXME: this only works correctly for 240x320 displays +- int startx, starty; +- int width, height; +- +- startx = rect.left() >> 1; +- starty = rect.top() >> 1; +- width = ((rect.right() - rect.left()) >> 1) + 2; +- height = ((rect.bottom() - rect.top()) >> 1) + 2; +- +- if((startx+width) > 120) { +- width = 120 - startx; // avoid horizontal overflow +- } +- if((starty+height) > 160) { +- height = 160 - starty; // avoid vertical overflow +- } +- +- ulong *sp1, *sp2, *dp1, *dp2; +- ulong stop, sbot, dtop, dbot; +- fb += 320*239; // Move "fb" to top left corner +- sp1 = (ulong*)bits + startx + starty*240; +- sp2 = sp1 + 120; +- dp1 = (ulong*)fb - startx * 320 - starty; +- dp2 = dp1 - 160; +- int rowadd = (320*width) + 1; +- int rowadd2 = 240 - width; +- // transfer in cells of 2x2 pixels in words +- for (int y=0; y>16) + (sbot & 0xffff0000); +- // write +- *dp1 = dtop; +- *dp2 = dbot; +- // update source ptrs +- sp1++; sp2++; +- // update dest ptrs - 2 pix at a time +- dp1 -= 320; +- dp2 -= 320; +- } +- // adjust src ptrs - skip a row as we work in pairs +- sp1 += rowadd2; +- sp2 += rowadd2; +- // adjust dest ptrs for rotation +- dp1 += rowadd; +- dp2 += rowadd; +- } ++static void ++blitRotate1(Uint16 *dstBits, const QSize& dstSize, ++ const Uint16 *srcBits, const QSize& srcSize, ++ const QRect& srcBlitRect) ++{ ++// fprintf(stdout, "SDL_QT_ROTATION (1) is not implemented.\n"); ++ blitRotate3(dstBits, dstSize, srcBits, srcSize, srcBlitRect); + } + +-// desktop, SL-A300 etc +-bool SDL_QWin::repaintRotation0(const QRect& rect) { +- if(my_image->width() == width()) { +- uchar *fb = (uchar*)my_painter->frameBuffer(); +- uchar *buf = (uchar*)my_image->bits(); +- if(rect == my_image->rect()) { +- memcpy(fb, buf, width()*height()*2); +- } else { +- int h = rect.height(); +- int wd = rect.width()<<1; +- int fblineadd = my_painter->lineStep(); +- int buflineadd = my_image->bytesPerLine(); +- fb += (rect.left()<<1) + rect.top() * my_painter->lineStep(); +- buf += (rect.left()<<1) + rect.top() * my_image->bytesPerLine(); +- while(h--) { +- memcpy(fb, buf, wd); +- fb += fblineadd; +- buf += buflineadd; +- } ++static void ++blitRotate2(Uint16 *dstBits, const QSize& dstSize, ++ const Uint16 *srcBits, const QSize& srcSize, ++ QRect srcBlitRect) ++{ ++// if (srcBlitRect.left() & 1) ++// srcBlitRect.setLeft(srcBlitRect.left() - 1); ++// if (srcBlitRect.right() & 1) ++// srcBlitRect.setRight(srcBlitRect.right() - 1); ++ ++ int dstBorderLeftRight = (dstSize.width() - srcSize.width()) >>1; ++ int dstBorderTopBottom = (dstSize.height() - srcSize.height()) >>1; ++ int dstStartOffsetX = dstSize.width() - dstBorderLeftRight - 2; ++ int dstStartOffsetY = dstSize.height() - dstBorderTopBottom - 1; ++ int left = srcBlitRect.left() & ~(int)1; // to be 32bit aligned ++ srcBits += left + srcBlitRect.top() * srcSize.width(); ++ dstBits += dstStartOffsetY * dstSize.width() + dstStartOffsetX; ++ dstBits -= left; ++ dstBits -= srcBlitRect.top() * dstSize.width(); ++ ++ Uint32 *pSrc = (Uint32 *)srcBits; ++ Uint32 *pDst = (Uint32 *)dstBits; ++ ++ int width = srcBlitRect.width(), width2 = srcBlitRect.width(), w; ++ if ( srcBlitRect.left() & 1 ){ ++ width--; width2++; ++ } ++ if ( (srcBlitRect.left()+srcBlitRect.width()) & 1 ){ ++ width--; width2++; ++ } ++ width >>= 1; ++ int height = srcBlitRect.height(); ++ int srcYAdd = srcSize.width() - width2; ++ int dstYSub = dstSize.width() - width2; ++ ++ while (height--) { ++ w = width; ++ if (srcBlitRect.left() & 1){ ++ *((Uint16 *)pDst) = *(((Uint16 *)pSrc) + 1); ++ pDst--; pSrc++; + } +- } else { +- return false; // FIXME: Landscape ++ while (w--) { ++ *pDst-- = (*pSrc << 16) | (*pSrc >> 16); ++ ++pSrc; ++ } ++ if ((srcBlitRect.left()+srcBlitRect.width()) & 1){ ++ *(((Uint16 *)pDst) + 1) = *((Uint16 *)pSrc); ++ pDst--; pSrc++; ++ } ++ pSrc += srcYAdd; ++ pDst -= dstYSub; + } +-#ifdef __i386__ +- my_painter->fillRect( rect, QBrush( Qt::NoBrush ) ); +-#endif +- return true; + } + +- +-// Sharp Zaurus SL-5500 etc +-bool SDL_QWin::repaintRotation3(const QRect& rect) { +- if(my_image->width() == width()) { +- ushort *fb = (ushort*)my_painter->frameBuffer(); +- ushort *buf = (ushort*)my_image->bits(); +- gs_fastRotateBlit_3(fb, buf, rect); ++#define BLIT_ROTATE_3_MOV32 ++ ++static void ++blitRotate3(Uint16 *dstBits, const QSize& dstSize, ++ const Uint16 *srcBits, const QSize& srcSize, ++ const QRect& srcBlitRect) ++{ ++ if (srcBlitRect.width() != dstSize.height() || ++ srcBlitRect.height() != dstSize.width()) { ++ // partial update ++ const Uint16 *pSrc = srcBits + ++ (srcBlitRect.left() + srcBlitRect.top() * srcSize.width()); ++ ++ int dstBorderLeftRight = (dstSize.width() - srcSize.height()) >>1; ++ int dstBorderTopBottom = (dstSize.height() - srcSize.width()) >>1; ++ int dstStartOffsetX = dstSize.width() - dstBorderLeftRight - 1; ++ int dstStartOffsetY = dstBorderTopBottom; ++ Uint16 *pDst = dstBits + ++ (dstStartOffsetY * dstSize.width() + dstStartOffsetX); ++ pDst += srcBlitRect.left() * dstSize.width(); ++ pDst -= srcBlitRect.top(); ++ ++ int width = srcBlitRect.width(), height = srcBlitRect.height(), w; ++ int srcYAdd = srcSize.width() - srcBlitRect.width(); ++ int dstXAdd = dstSize.width(); ++ int dstYSub = (dstSize.width() * srcBlitRect.width()) + 1; ++ ++#if 0 ++ fprintf(stderr, "---- Blit begin\n"); ++ fprintf(stderr, "srcSize.width: %d srcSize.height:%d\n", ++ srcSize.width(), srcSize.height()); ++ fprintf(stderr, "srcBlitRect.left:%d srcBlitRect.right:%d srcBlitRect.top:%d srcBlitRect.bottom:%d srcBlitRect.width:%d srcBlitRect.height:%d\n", ++ srcBlitRect.left(), srcBlitRect.right(), srcBlitRect.top(), srcBlitRect.bottom(), srcBlitRect.width(), srcBlitRect.height()); ++ ++ fprintf(stderr, "dstSize.width: %d dstSize.height:%d\n", ++ dstSize.width(), dstSize.height()); ++ fprintf(stderr, "dstBorderLeftRight:%d dstBorderTopBottom:%d dstStartOffsetX:%d dstStartOffsetY:%d\n", ++ dstBorderLeftRight, dstBorderTopBottom, dstStartOffsetX, dstStartOffsetY); ++ fprintf(stderr, "srcYAdd:%d dstXAdd:%d dstYSub:%d\n", srcYAdd, dstXAdd, dstYSub); ++#endif ++ ++ while (height--) { ++ w = width; ++ while (w--) { ++ *pDst = *pSrc ++; ++ pDst += dstXAdd; ++ } ++ pSrc += srcYAdd; ++ pDst -= dstYSub; ++ } ++ // fprintf(stderr, "---- Blit end\n"); + } else { +- // landscape mode +- if (screenRotation == SDL_QT_ROTATION_90) { +- uchar *fb = (uchar*)my_painter->frameBuffer(); +- uchar *buf = (uchar*)my_image->bits(); +- if(rect == my_image->rect()) { +- memcpy(fb, buf, width()*height()*2); +- } else { +- int h = rect.height(); +- int wd = rect.width()<<1; +- int fblineadd = my_painter->lineStep(); +- int buflineadd = my_image->bytesPerLine(); +- fb += (rect.left()<<1) + rect.top() * my_painter->lineStep(); +- buf += (rect.left()<<1) + rect.top() * my_image->bytesPerLine(); +- while(h--) { +- memcpy(fb, buf, wd); +- fb += fblineadd; +- buf += buflineadd; +- } ++ // full update ++#if !defined(BLIT_ROTATE_3_MOV32) ++ const Uint16 *src = srcBits; ++ Uint16 *dst = dstBits + (dstSize.width() - 1); ++ int w = srcBlitRect.width(); ++ int h = srcBlitRect.height(); ++ int i, dstSub = dstSize.width() * w + 1; ++ int dstAdd = dstSize.width(); ++ ++ while (h--) { ++ i = w; ++ while (i--) { ++ *dst = *src ++; ++ dst += dstAdd; + } +- } else if (screenRotation == SDL_QT_ROTATION_270) { +- int h = rect.height(); +- int wd = rect.width(); +- int fblineadd = my_painter->lineStep() - (rect.width() << 1); +- int buflineadd = my_image->bytesPerLine() - (rect.width() << 1); +- int w; +- +- uchar *fb = (uchar*)my_painter->frameBuffer(); +- uchar *buf = (uchar*)my_image->bits(); +- +- fb += ((my_painter->width() - (rect.top() + rect.height())) * +- my_painter->lineStep()) + ((my_painter->height() - ((rect.left() + +- rect.width()))) << 1); +- +- buf += my_image->bytesPerLine() * (rect.top() + rect.height()) - +- (((my_image->width() - (rect.left() + rect.width())) << 1) + 2); +- +- while(h--) { +- w = wd; +- while(w--) *((unsigned short*)fb)++ = *((unsigned short*)buf)--; +- fb += fblineadd; +- buf -= buflineadd; ++ dst -= dstSub; ++ } ++#else // BLIT_ROTATE_3_MOV32 ++ Uint32 *src1 = (Uint32 *)(srcBits); ++ Uint32 *src2 = (Uint32 *)(srcBits + srcSize.width()); ++ Uint32 *dst1 = (Uint32 *)(dstBits + (dstSize.width() - 2)); ++ Uint32 *dst2 = (Uint32 *)(dstBits + (dstSize.width() + dstSize.width() - 2)); ++ int w = srcBlitRect.width() >> 3; ++ int h = srcBlitRect.height() >> 1; ++ int i, dstSub = ((dstSize.width() * srcBlitRect.width()) >> 1) + 1; ++ int dstAdd = dstSize.width(); ++ ++ Uint32 a, b; ++ while (h--) { ++ i = w; ++ while (i--) { ++ a = *src1 ++; ++ b = *src2 ++; ++ *dst1 = (a << 16) | (b & 0xFFFF); ++ *dst2 = (a & 0xFFFF0000) | (b >> 16); ++ dst1 += dstAdd; ++ dst2 += dstAdd; ++ ++ a = *src1 ++; ++ b = *src2 ++; ++ *dst1 = (a << 16) | (b & 0xFFFF); ++ *dst2 = (a & 0xFFFF0000) | (b >> 16); ++ dst1 += dstAdd; ++ dst2 += dstAdd; ++ ++ a = *src1 ++; ++ b = *src2 ++; ++ *dst1 = (a << 16) | (b & 0xFFFF); ++ *dst2 = (a & 0xFFFF0000) | (b >> 16); ++ dst1 += dstAdd; ++ dst2 += dstAdd; ++ ++ a = *src1 ++; ++ b = *src2 ++; ++ *dst1 = (a << 16) | (b & 0xFFFF); ++ *dst2 = (a & 0xFFFF0000) | (b >> 16); ++ dst1 += dstAdd; ++ dst2 += dstAdd; + } ++ src1 += srcSize.width() >> 1; ++ src2 += srcSize.width() >> 1; ++ dst1 -= dstSub; ++ dst2 -= dstSub; + } ++#endif // BLIT_ROTATE_3_MOV32 + } +- return true; + } + +-// ipaq 3800... +-bool SDL_QWin::repaintRotation1(const QRect& rect) { +- if(my_image->width() == width()) { +- ushort *fb = (ushort*)my_painter->frameBuffer(); +- ushort *buf = (ushort*)my_image->bits(); +- gs_fastRotateBlit_1(fb, buf, rect); +- } else { +- return false; // FIXME: landscape mode +- } +- return true; +-} ++#endif // __i386__ + + void SDL_QWin::repaintRect(const QRect& rect) { + if(!my_painter || !rect.width() || !rect.height()) { + return; + } +- +- if(QPixmap::defaultDepth() == 16) { +- switch(my_painter->transformOrientation()) { +- case 3: +- if(repaintRotation3(rect)) { return; } ++#ifndef __i386__ ++ if (QPixmap::defaultDepth() == 16 && my_painter->numRects() >= 0) { ++ Uint16 *fb = (Uint16*)my_painter->frameBuffer(); ++ Uint16 *buf = (Uint16*)my_image->bits(); ++ switch (rotation_) { ++ case 0: ++ blitRotate0(fb, fbSize_, ++ buf, QSize(my_image->width(), my_image->height()), ++ rect); + break; + case 1: +- if(repaintRotation1(rect)) { return; } ++ blitRotate1(fb, fbSize_, ++ buf, QSize(my_image->width(), my_image->height()), ++ rect); + break; +- case 0: +- if(repaintRotation0(rect)) { return; } ++ case 2: ++ blitRotate2(fb, fbSize_, ++ buf, QSize(my_image->width(), my_image->height()), ++ rect); ++ break; ++ case 3: ++ blitRotate3(fb, fbSize_, ++ buf, QSize(my_image->width(), my_image->height()), ++ rect); + break; + } +- } +- my_painter->drawImage(rect.topLeft(), *my_image, rect); ++ } else { ++#endif // __i386__ ++ QDirectPainter pp(this); ++ pp.drawImage(rect.topLeft(), *my_image, rect); ++// pp.end(); ++#ifndef __i386__ ++ } ++#endif // __i386__ + } + + // This paints the current buffer to the screen, when desired. + void SDL_QWin::paintEvent(QPaintEvent *ev) { +- if(my_image) { ++ if(my_image && isVisible() && isActiveWindow()) { ++ // TODO: better handling + lockScreen(true); + repaintRect(ev->rect()); + unlockScreen(); + } + } + ++int SDL_QWin::ApplyKeyRotation(int key) ++{ ++ int c; ++ int sdlScancode[] = { SDLK_LEFT, SDLK_DOWN, SDLK_RIGHT, SDLK_UP }; ++ ++ switch (key) { ++ case Qt::Key_Left: ++ c = 0; ++ break; ++ case Qt::Key_Down: ++ c = 1; ++ break; ++ case Qt::Key_Right: ++ c = 2; ++ break; ++ case Qt::Key_Up: ++ c = 3; ++ break; ++ default: ++ return 0; ++ } ++ ++// c = (c + qteKeyRotation_) & 3; ++// return sdlScancode[(c - keyRotation_) & 3]; ++ return sdlScancode[(c + qteKeyRotation_ - keyRotation_) & 3]; ++} ++ + /* Function to translate a keyboard transition and queue the key event + * This should probably be a table although this method isn't exactly + * slow. + */ + void SDL_QWin::QueueKey(QKeyEvent *e, int pressed) +-{ ++{ ++ if (e->isAutoRepeat()) ++ return; ++ + SDL_keysym keysym; + int scancode = e->key(); ++ + /* Set the keysym information */ + if(scancode >= 'A' && scancode <= 'Z') { + // Qt sends uppercase, SDL wants lowercase +@@ -396,26 +516,12 @@ + case Qt::Key_Home: scancode = SDLK_HOME; break; + case Qt::Key_End: scancode = SDLK_END; break; + // We want the control keys to rotate with the screen +- case Qt::Key_Left: +- if (screenRotation == SDL_QT_ROTATION_90) scancode = SDLK_UP; +- else if (screenRotation == SDL_QT_ROTATION_270) scancode = SDLK_DOWN; +- else scancode = SDLK_LEFT; +- break; +- case Qt::Key_Up: +- if (screenRotation == SDL_QT_ROTATION_90) scancode = SDLK_RIGHT; +- else if (screenRotation == SDL_QT_ROTATION_270) scancode = SDLK_LEFT; +- else scancode = SDLK_UP; +- break; +- case Qt::Key_Right: +- if (screenRotation == SDL_QT_ROTATION_90) scancode = SDLK_DOWN; +- else if (screenRotation == SDL_QT_ROTATION_270) scancode = SDLK_UP; +- else scancode = SDLK_RIGHT; +- break; ++ case Qt::Key_Left: ++ case Qt::Key_Up: ++ case Qt::Key_Right: + case Qt::Key_Down: +- if (screenRotation == SDL_QT_ROTATION_90) scancode = SDLK_LEFT; +- else if (screenRotation == SDL_QT_ROTATION_270) scancode = SDLK_RIGHT; +- else scancode = SDLK_DOWN; +- break; ++ scancode = ApplyKeyRotation(scancode); ++ break; + case Qt::Key_Prior: scancode = SDLK_PAGEUP; break; + case Qt::Key_Next: scancode = SDLK_PAGEDOWN; break; + case Qt::Key_Shift: scancode = SDLK_LSHIFT; break; +@@ -434,9 +540,18 @@ + case Qt::Key_F7: scancode = SDLK_F7; break; + case Qt::Key_F8: scancode = SDLK_F8; break; + case Qt::Key_F9: scancode = SDLK_F9; break; +- case Qt::Key_F10: scancode = SDLK_F10; break; +- case Qt::Key_F11: scancode = SDLK_F11; break; +- case Qt::Key_F12: scancode = SDLK_F12; break; ++ case Qt::Key_F10: ++ scancode = SDLK_F10; ++ mouse_button_mode=1; ++ break; ++ case Qt::Key_F11: ++ scancode = SDLK_F11; ++ mouse_button_mode=3; ++ break; ++ case Qt::Key_F12: ++ scancode = SDLK_F12; ++ mouse_button_mode=2; ++ break; + case Qt::Key_F13: scancode = SDLK_F13; break; + case Qt::Key_F14: scancode = SDLK_F14; break; + case Qt::Key_F15: scancode = SDLK_F15; break; +@@ -452,13 +567,14 @@ + // david@hedbor.org + scancode = SDLK_RETURN; + break; ++ + default: + scancode = SDLK_UNKNOWN; + break; + } +- keysym.sym = static_cast(scancode); ++ keysym.sym = static_cast(scancode); + } else { +- keysym.sym = static_cast(scancode); ++ keysym.sym = static_cast(scancode); + } + keysym.scancode = scancode; + keysym.mod = KMOD_NONE; +@@ -478,11 +594,82 @@ + // pressed = 1; + // } + ++ if (isSLA300InputFix_ && ++ (keysym.sym == SDLK_SPACE || (keysym.sym >= 273 && keysym.sym <= 276))) { ++ if (keysym.sym >= 273) curAxis_[keysym.sym-273] = pressed; ++ else curAxis_[4] = pressed; ++ } ++ + /* Queue the key event */ + if ( pressed ) { +- SDL_PrivateKeyboard(SDL_PRESSED, &keysym); ++ /* fprintf(stderr, "press %d\n", keysym.sym); */ ++ SDL_PrivateKeyboard(SDL_PRESSED, &keysym); ++ if (isSLA300InputFix_ && ++ (keysym.sym >= 273 && keysym.sym <= 276)) { ++ if (keysym.sym == SDLK_UP) { ++ if (curAxis_[1]) { ++ keysym.sym = SDLK_DOWN; ++ keysym.scancode = Qt::Key_Down; ++ curAxis_[1] = 0; ++ /* fprintf(stderr, "force release %d\n", keysym.sym); */ ++ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); ++ } ++ } ++ else if (keysym.sym == SDLK_DOWN) { ++ if (curAxis_[0]) { ++ keysym.sym = SDLK_UP; ++ keysym.scancode = Qt::Key_Up; ++ curAxis_[0] = 0; ++ /* fprintf(stderr, "force release %d\n", keysym.sym); */ ++ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); ++ } ++ } ++ else if (keysym.sym == SDLK_RIGHT) { ++ if (curAxis_[3]) { ++ keysym.sym = SDLK_LEFT; ++ keysym.scancode = Qt::Key_Left; ++ curAxis_[3] = 0; ++ /* fprintf(stderr, "force release %d\n", keysym.sym); */ ++ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); ++ } ++ } ++ else if (keysym.sym == SDLK_LEFT) { ++ if (curAxis_[2]) { ++ keysym.sym = SDLK_RIGHT; ++ keysym.scancode = Qt::Key_Right; ++ curAxis_[2] = 0; ++ /* fprintf(stderr, "force release %d\n", keysym.sym); */ ++ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); ++ } ++ } ++ } + } else { +- SDL_PrivateKeyboard(SDL_RELEASED, &keysym); ++ /* fprintf(stderr, "release %d\n", keysym.sym); */ ++ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); ++ ++ if (isSLA300InputFix_ && ++ (keysym.sym == SDLK_SPACE || ++ (keysym.sym >= 273 && keysym.sym <= 276))) { ++ for (int i = 0; i < 4; i++) { ++ if (curAxis_[i]) { ++ int sym = i+273; ++ keysym.sym = static_cast(sym); ++ if (sym == SDLK_UP) keysym.scancode = Qt::Key_Up; ++ else if (sym == SDLK_RIGHT) keysym.scancode = Qt::Key_Right; ++ else if (sym == SDLK_DOWN) keysym.scancode = Qt::Key_Down; ++ else if (sym == SDLK_LEFT) keysym.scancode = Qt::Key_Left; ++ curAxis_[i] = 0; ++ /* fprintf(stderr, "force release %d\n", keysym.sym); */ ++ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); ++ } ++ } ++ if (curAxis_[4]) { ++ keysym.scancode = keysym.sym = SDLK_SPACE; ++ curAxis_[4] = 0; ++ /* fprintf(stderr, "force release %d\n", keysym.sym); */ ++ SDL_PrivateKeyboard(SDL_RELEASED, &keysym); ++ } ++ } + } + } + +@@ -524,7 +711,7 @@ + my_locked--; // decrease lock refcount; + } + if(!my_locked && my_painter) { +- my_painter->end(); ++// my_painter->end(); + delete my_painter; + my_painter = 0; + } +Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.h +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/SDL_QWin.h 2005-03-02 22:24:43.457491622 +0100 ++++ SDL-1.2.7/src/video/qtopia/SDL_QWin.h 2005-03-02 22:24:46.868009791 +0100 +@@ -1,3 +1,4 @@ ++ + /* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2004 Sam Lantinga +@@ -52,6 +53,7 @@ + class SDL_QWin : public QWidget + { + void QueueKey(QKeyEvent *e, int pressed); ++ int ApplyKeyRotation(int key); + public: + SDL_QWin(const QSize& size); + virtual ~SDL_QWin(); +@@ -71,7 +73,7 @@ + y = my_offset.y(); + } + QImage *image(void) { return my_image; } +- ++ + void setWFlags(WFlags flags) { + QWidget::setWFlags(flags); + my_flags = flags; +@@ -83,6 +85,15 @@ + bool lockScreen(bool force=false); + void unlockScreen(); + void repaintRect(const QRect& rect); ++ void setScreenRotation(int sdlr, int qter) { ++ rotation_ = sdlr; qteRotation_ = qter; ++ } ++ void setKeyRotation(int sdlr, int qter) { ++ keyRotation_ = sdlr; qteKeyRotation_ = qter; ++ } ++ void setFBSize(QSize& s) { fbSize_ = s; } ++// void setSLC700InputFix(bool isEnable) { isSLC700InputFix_ = isEnable; } ++ void setSLA300InputFix(bool isEnable) { isSLA300InputFix_ = isEnable; } + protected: + /* Handle resizing of the window */ + virtual void resizeEvent(QResizeEvent *e); +@@ -95,10 +106,8 @@ + void paintEvent(QPaintEvent *ev); + void keyPressEvent(QKeyEvent *e) { QueueKey(e, 1); } + void keyReleaseEvent(QKeyEvent *e) { QueueKey(e, 0); } ++ + private: +- bool repaintRotation0(const QRect& rect); +- bool repaintRotation1(const QRect& rect); +- bool repaintRotation3(const QRect& rect); + void enableFullscreen(); + QDirectPainter *my_painter; + QImage *my_image; +@@ -108,6 +117,12 @@ + WFlags my_flags; + WFlags my_has_fullscreen; + unsigned int my_locked; ++ int rotation_, qteRotation_; ++ int keyRotation_, qteKeyRotation_; ++ QSize fbSize_; ++// bool isSLC700InputFix_; ++ bool isSLA300InputFix_; ++ int curAxis_[5]; // 0: up, 1: down, 2: right, 3: left, 4: center + }; + + #endif /* _SDL_QWin_h */ +Index: SDL-1.2.7/src/video/qtopia/SDL_sysmouse.cc +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/SDL_sysmouse.cc 2005-03-02 22:24:43.457491622 +0100 ++++ SDL-1.2.7/src/video/qtopia/SDL_sysmouse.cc 2005-03-02 22:24:46.868009791 +0100 +@@ -60,6 +60,7 @@ + void QT_WarpWMCursor(_THIS, Uint16 x, Uint16 y) + { + SDL_Win->setMousePos(QPoint(x, y)); ++ SDL_PrivateMouseMotion( 0, 0, x, y ); + } + + }; /* Extern C */ +Index: SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/SDL_sysvideo.cc 2005-03-02 22:24:43.458491481 +0100 ++++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-03-02 22:24:46.873009084 +0100 +@@ -1,3 +1,4 @@ ++ + /* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2004 Sam Lantinga +@@ -29,17 +30,32 @@ + + #include + #include ++#include ++#include ++#include + + #include + #include ++#include ++#include ++#include ++#include ++#include + + #include + #include ++#include ++#include ++#include ++#include ++#include ++#include + + #include "SDL.h" + #include "SDL_timer.h" + + #include "SDL_QWin.h" ++#include "SDL_sysvideo.h" + + extern "C" { + +@@ -51,14 +67,67 @@ + #include "SDL_lowvideo.h" + + //#define QTOPIA_DEBUG ++#define QTOPIA_LOG + #define QT_HIDDEN_SIZE 32 /* starting hidden window size */ + ++#ifdef QTOPIA_LOG ++ static FILE *st_logfp = NULL; ++#endif ++ static inline void LOG(char *fmt, ...) ++ { ++#ifdef QTOPIA_LOG ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vfprintf(st_logfp, fmt, ap); ++ if (st_logfp != stderr) { ++ fflush(st_logfp); ++ vfprintf(stderr, fmt, ap); ++ } ++ va_end(ap); ++#endif ++ } ++ ++ typedef struct machine_spec { ++ const char *manif; ++ const char *name; ++ int qpe_server_rotation; ++ int init_screen_rot; ++ int init_key_rot; ++ } machine_spec_t; ++ ++ typedef enum { ++ MACHINE_SHARP_SL5000D, ++ MACHINE_SHARP_SL5500, ++ MACHINE_SHARP_SLA300, ++ MACHINE_SHARP_SLB500, ++ MACHINE_SHARP_SLC700, ++ MACHINE_SHARP_SLC750, ++ MACHINE_SHARP_SLC760, ++ MACHINE_SHARP_SLC860, ++ MACHINE_SHARP_SL6000, ++ MACHINE_MAX ++ } machine_t; ++ ++ static const machine_spec_t st_machine_spec[] = { ++ { "Sharp", "SL-5000D", 0 }, ++ { "Sharp", "SL-5500", 0 }, ++ { "Sharp", "SL-A300", 0 }, ++ { "Sharp", "SL-B500", 0 }, ++ { "Sharp", "SL-C700", 0 }, ++ { "Sharp", "SL-C750", 0 }, ++ { "Sharp", "SL-C760", 0 }, ++ { "Sharp", "SL-C860", 0 }, ++ { "Sharp", "SL-6000", 0 }, ++ }; ++ + /* Name of the environment variable used to invert the screen rotation or not: + Possible values: +- !=0 : Screen is 270° rotated +- 0: Screen is 90° rotated*/ +-#define SDL_QT_ROTATION_ENV_NAME "SDL_QT_INVERT_ROTATION" +- ++ !=0 : Screen is 270- rotated ++ 0: Screen is 90- rotated*/ ++#define SDL_QT_ROTATION_ENV_NAME "SDL_QT_ROTATION" ++#define SDL_QT_INVERT_ROTATION_ENV_NAME "SDL_QT_INVERT_ROTATION" ++ + /* Initialization/Query functions */ + static int QT_VideoInit(_THIS, SDL_PixelFormat *vformat); + static SDL_Rect **QT_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags); +@@ -78,6 +147,20 @@ + static int QT_IconifyWindow(_THIS); + static SDL_GrabMode QT_GrabInput(_THIS, SDL_GrabMode mode); + ++ static int console_fd; ++ struct fb_var_screeninfo saved_vinfo; ++ int fb_hwrot; ++ int fb_direct; ++ static int isKHloaded; ++ bool is_VGA_machine; ++ ++#define W100FB_CONFIG 0x57415200 /* WAL\00 */ ++#define W100INIT_ITEM 0 ++#define W100INIT_ALL 1 ++#define W100INIT_ITEM_WITH_VAL 2 ++#define W100FB_CONFIG_EX 0x57415202 /* WAL\02 */ ++ ++ + /* FB driver bootstrap functions */ + + static int QT_Available(void) +@@ -222,13 +305,34 @@ + + int QT_VideoInit(_THIS, SDL_PixelFormat *vformat) + { +- /* Initialize the QPE Application */ ++ const char *SDL_fbdev; ++ struct fb_var_screeninfo vinfo; ++ ++ /* Initialize the QPE Application */ + /* Determine the screen depth */ + vformat->BitsPerPixel = QPixmap::defaultDepth(); + + // For now we hardcode the current depth because anything else + // might as well be emulated by SDL rather than by Qtopia. +- ++ ++ //frame buffer device open. ++ SDL_fbdev = getenv("SDL_FBDEV"); ++ if ( SDL_fbdev == NULL ) { ++ SDL_fbdev = "/dev/fb0"; ++ } ++ console_fd = open(SDL_fbdev, O_RDWR, 0); ++ if ( console_fd < 0 ) { ++ SDL_SetError("Unable to open %s", SDL_fbdev); ++ return(-1); ++ } ++ ++ if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { ++ SDL_SetError("Couldn't get console pixel format"); ++ QT_VideoQuit(_this); ++ return(-1); ++ } ++ saved_vinfo = vinfo; ++ + QSize desktop_size = qApp->desktop()->size(); + QT_AddMode(_this, ((vformat->BitsPerPixel+7)/8)-1, + desktop_size.width(), desktop_size.height()); +@@ -241,7 +345,24 @@ + /* Fill in some window manager capabilities */ + _this->info.wm_available = 0; + +- /* We're done! */ ++#ifdef QTOPIA_LOG ++ st_logfp = fopen("/tmp/sdl-qt-debug", "w"); ++ if (!st_logfp) ++ st_logfp = stderr; ++#endif ++ ++ QT_GrabInput(_this, SDL_GRAB_ON); ++/* ++ { ++ QCopEnvelope e("QPE/KeyHelper", "repeater(int)"); ++ e << 2; ++ } ++*/ ++ isKHloaded=(fopen("/home/zaurus/Settings/keyhelper_SDL.xml","r") != NULL) ? 1 : 0; ++ if (isKHloaded) { ++ system("qcop QPE/KeyHelper \"reload(QString)\" keyhelper_SDL.xml"); //QcopEnvelope can't use. ++ LOG("keyhelper_SDL.xml loaded\n"); ++ } + return(0); + } + +@@ -264,6 +385,7 @@ + + /* Various screen update functions available */ + static void QT_NormalUpdate(_THIS, int numrects, SDL_Rect *rects); ++ static void QT_DirectUpdate(_THIS, int numrects, SDL_Rect *rects); + + + static int QT_SetFullScreen(_THIS, SDL_Surface *screen, int fullscreen) +@@ -276,47 +398,428 @@ + return -1; + } + ++ static machine_t QT_GetMachine(_THIS) ++ { ++ FILE *fp; ++ machine_t machine = MACHINE_SHARP_SL5000D; ++ char buf[1024]; ++ ++ ++ fp = fopen("/proc/cpuinfo", "rb"); ++ if (fp) { ++ if (fread(buf, 1, sizeof(buf), fp) > 0) { ++ LOG("QT_GetMachine: /proc/cpuinfo is %s\n", buf); ++ if (strstr(buf, "SHARP Tosa") != NULL) ++ machine = MACHINE_SHARP_SL6000; ++ else if (strstr(buf, "Collie") != NULL) ++ machine = MACHINE_SHARP_SL5500; ++ else if (strstr(buf, "SHARP Poodle") != NULL) ++ machine = MACHINE_SHARP_SLB500; ++ else if (strstr(buf, "SHARP Corgi") !=NULL) ++ machine = MACHINE_SHARP_SLC700; ++ else if (strstr(buf, "SHARP Shepherd") !=NULL) ++ machine = MACHINE_SHARP_SLC750; ++ else if (strstr(buf, "SHARP Husky") !=NULL) ++ machine = MACHINE_SHARP_SLC760; ++ else if (strstr(buf, "SHARP Boxer") != NULL) ++ machine = MACHINE_SHARP_SLC860; ++ } ++ fclose(fp); ++ } else { ++ LOG("QT_GetMachine: Couldn't read /proc/deviceinfo/product.\n"); ++ LOG(" Now set machine variable to default (SL-5000D)\n"); ++ } ++ ++ LOG(" detected machine is '%s %s'\n", ++ st_machine_spec[machine].manif, st_machine_spec[machine].name); ++ return machine; ++ } ++ ++ static void QT_GetQteServerSpec(_THIS, int *rotation, bool *isQvga) ++ { ++ const char *user; ++ char buf[FILENAME_MAX]; ++ FILE *fp; ++ int rot = 0, is_qvga = 0; ++ ++ user = getenv("USER"); ++ snprintf(buf, sizeof(buf), "/tmp/qtembedded-%s/QtEmbedded-0.spec", ++ user ? user : "root"); ++ LOG("QT_GetRotation: Read spec from '%s'\n", buf); ++ ++ fp = fopen(buf, "rb"); ++ if (fp) { ++ int size; ++ if ((size = fread(buf, 1, sizeof(buf) - 1, fp)) > 0) { ++ buf[size] = '\0'; ++ LOG(" spec is '%s'\n", buf); ++ // get rotation value ++ if (strstr(buf, "Rot")) { ++ rot = atoi(strstr(buf, "Rot") + 3); ++ rot /= 90; ++ if (rot < 0 || rot > 3) { ++ rot = 0; ++ } ++ } else ++ rot = 0; ++ ++ // get qvga mode in SL-C700 ++ if (strstr(buf, "Qvga")) ++ is_qvga = 1; ++ } ++ fclose(fp); ++ } ++ ++ LOG(" Rot=%d, Qvga=%d\n", rot, is_qvga); ++ ++ if (rotation) ++ *rotation = rot; ++ if (isQvga) ++ *isQvga = is_qvga; ++ } ++ + /* FIXME: check return values and cleanup here */ + SDL_Surface *QT_SetVideoMode(_THIS, SDL_Surface *current, + int width, int height, int bpp, Uint32 flags) + { +- + QImage *qimage; +- QSize desktop_size = qApp->desktop()->size(); ++ QSize qteSize = qApp->desktop()->size(); ++ QSize fbSize; ++ QSize userSize; ++ int fb_xres; ++ int fb_yres; ++ struct fb_var_screeninfo vinfo; ++ struct fb_fix_screeninfo finfo; ++ int tmp_ioctl_data; ++ char fb_size_fix = ' '; ++ bool isW100patch_kernel = false; ++ int numFb_Size; ++ ++ int mapped_memlen; ++ int mapped_offset; ++ void *mapped_mem; ++ int fb_offset; ++ ++ ++ machine_t machine = QT_GetMachine(_this); ++ machine_spec_t machineSpec = st_machine_spec[machine]; ++ int qteRotation, userRotation, sdlRotation; ++ int qteKeyRotation, sdlKeyRotation; ++ bool isQteQvga; ++ ++ if (machine == MACHINE_SHARP_SLC700 || ++ machine == MACHINE_SHARP_SLC750 || ++ machine == MACHINE_SHARP_SLC760 || ++ machine == MACHINE_SHARP_SLC860 || // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º ++ machine == MACHINE_SHARP_SL6000 ) { // ¾Ü¤·¤¤¤³¤È¤ï¤«¤é¤ó¤±¤É¤È¤ê¤¢¤¨¤º ++ is_VGA_machine = true; ++ }else { ++ is_VGA_machine = false; ++ } ++ ++ // qte ¤Ç¤Î²óž³ÑÅÙ¤ò¼èÆÀ ++ QT_GetQteServerSpec(_this, &qteRotation, &isQteQvga); ++ ++ // SL-C700 ¤Î¥¹¥¿¥¤¥ë ++ bool isInputStyle = false; ++ if (is_VGA_machine) { ++ int status = system("/home/QtPalmtop/bin/chkhinge"); ++ if (WEXITSTATUS(status) != 2) ++ isInputStyle = true; ++ LOG("QT_SetVideoMode: SL-C700 Style is %s\n", ++ isInputStyle ? "Input style" : "View style"); ++ } + + +- current->flags = 0; //SDL_FULLSCREEN; // We always run fullscreen. ++ // specity screen setting ++ if (is_VGA_machine) { ++ ++ // w100 rotation pached kernel check ++ isW100patch_kernel = (fopen("/proc/driver/w100/rotation","r") != NULL) ? true : false; ++ LOG("Your Kernel is %s\n",isW100patch_kernel ? "Special Kernel" : "Normal Kernel"); ++ ++ const char *envFb_Size = getenv("SDL_FB_SIZE"); ++ if (envFb_Size !=NULL) { ++ numFb_Size=sscanf(envFb_Size,"%dx%d%c",&fb_xres,&fb_yres,&fb_size_fix); ++ } else { ++ numFb_Size=0; ++ } + +- if(width <= desktop_size.width() +- && height <= desktop_size.height()) { +- current->w = desktop_size.width(); +- current->h = desktop_size.height(); +- } else if(width <= desktop_size.height() && height <= desktop_size.width()) { +- // Landscape mode +- char * envString = getenv(SDL_QT_ROTATION_ENV_NAME); +- int envValue = envString ? atoi(envString) : 0; +- screenRotation = envValue ? SDL_QT_ROTATION_270 : SDL_QT_ROTATION_90; +- current->h = desktop_size.width(); +- current->w = desktop_size.height(); ++ if (numFb_Size >=2) { ++ ++ // specity screen mode ++ if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { ++ SDL_SetError("Couldn't get console pixel format"); ++ QT_VideoQuit(_this); ++ return(NULL); ++ } ++ ++ vinfo.xres = fb_xres; ++ vinfo.xres_virtual = fb_xres; ++ vinfo.yres = fb_yres; ++ vinfo.yres_virtual = fb_yres; ++ ++ if (fb_size_fix == '@') { ++ width = fb_xres; ++ height = fb_yres; ++ } ++ ++ if ( ioctl(console_fd, FBIOPUT_VSCREENINFO, &vinfo) < 0 ) { ++ SDL_SetError("Couldn't set console screen info"); ++ return(NULL); ++ } ++ ++ ++ if (isW100patch_kernel) { ++ qteSize.setWidth(vinfo.xres); ++ qteSize.setHeight(vinfo.yres); ++ qteRotation=0; ++ }else if(vinfo.xres == 320){ ++ qteSize.setWidth(vinfo.xres); ++ qteSize.setHeight(vinfo.yres); ++ qteRotation=2; ++ }else { ++ qteSize.setWidth(vinfo.yres); ++ qteSize.setHeight(vinfo.xres); ++ qteRotation=3; ++ } ++ ++ if (isW100patch_kernel && (vinfo.xres == 320) && (vinfo.yres == 240)) { ++ tmp_ioctl_data=121; ++ ioctl(console_fd, W100FB_CONFIG_EX, &tmp_ioctl_data); ++ fb_hwrot=1; ++ } ++ ++ LOG("FBVideoMode: %dx%d%c\n", vinfo.xres, vinfo.yres,fb_size_fix ); ++ ++ }else { ++ ++ // auto screen mode ++ if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { ++ SDL_SetError("Couldn't get console pixel format"); ++ QT_VideoQuit(_this); ++ return(NULL); ++ } ++ ++ if (isW100patch_kernel && (isInputStyle == false) && (vinfo.xres == 240) && (vinfo.yres == 320)) { ++ vinfo.xres = 240; ++ vinfo.xres_virtual = 240; ++ vinfo.yres = 320; ++ vinfo.yres_virtual = 320; ++ qteRotation=0; ++ }else if ((width <= 320) && (height <= 240)) { ++ vinfo.xres = 320; ++ vinfo.xres_virtual = 320; ++ vinfo.yres = 240; ++ vinfo.yres_virtual = 240; ++ }else if (isW100patch_kernel && (isInputStyle == true)){ ++ vinfo.xres = 640; ++ vinfo.xres_virtual = 640; ++ vinfo.yres = 480; ++ vinfo.yres_virtual = 480; ++ qteRotation=0; ++ }else { ++ vinfo.xres = 480; ++ vinfo.xres_virtual = 480; ++ vinfo.yres = 640; ++ vinfo.yres_virtual = 640; ++ } ++ ++ if ( ioctl(console_fd, FBIOPUT_VSCREENINFO, &vinfo) < 0 ) { ++ SDL_SetError("Couldn't set console screen info"); ++ return(NULL); ++ } ++ ++ if (isW100patch_kernel) { ++ qteSize.setWidth(vinfo.xres); ++ qteSize.setHeight(vinfo.yres); ++ qteRotation=0; ++ fb_direct=1; ++ }else if(vinfo.xres == 320){ ++ qteSize.setWidth(vinfo.xres); ++ qteSize.setHeight(vinfo.yres); ++ qteRotation=2; ++ }else { ++ qteSize.setWidth(vinfo.yres); ++ qteSize.setHeight(vinfo.xres); ++ qteRotation=3; ++ } ++ ++ if (isW100patch_kernel && (vinfo.xres == 320) && (vinfo.yres == 240)) { ++ tmp_ioctl_data=121; ++ ioctl(console_fd, W100FB_CONFIG_EX, &tmp_ioctl_data); ++ fb_hwrot=1; ++ qteRotation=0; ++ } ++ ++ LOG("FBVideoMode: %dx%d%c\n", vinfo.xres, vinfo.yres,fb_size_fix ); ++ } ++ } ++ ++ // direct paint setting ++ const char *envFb_Direct = getenv("SDL_FB_DIRECT"); ++ if (envFb_Direct !=NULL) ++ fb_direct = envFb_Direct ? atoi(envFb_Direct) : -1; ++ ++ if (fb_direct == 1){ ++ if ( ioctl(console_fd, FBIOGET_FSCREENINFO, &finfo) < 0 ) { ++ SDL_SetError("Couldn't get console hardware info"); ++ QT_VideoQuit(_this); ++ return(NULL); ++ } ++ if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { ++ SDL_SetError("Couldn't get console pixel format"); ++ QT_VideoQuit(_this); ++ return(NULL); ++ } ++ LOG("Direct paint mode\n"); ++ } ++ ++ // hack for SL-5500 ++ if (machine == MACHINE_SHARP_SL5500) ++ qteRotation = 3; ++ ++ // SL-B500 Íѥϥå¯(¤È¤ê¤¢¤¨¤º¡¢¤Í) ++ if (machine == MACHINE_SHARP_SLB500) ++ qteRotation = 3; ++ ++ // À¸¥Õ¥ì¡¼¥à¥Ð¥Ã¥Õ¥¡¤Î¥µ¥¤¥º¤òÆÀ¤ë ++ if (qteRotation & 1) { ++ fbSize.setWidth(qteSize.height()); ++ fbSize.setHeight(qteSize.width()); ++ } else { ++ fbSize = qteSize; ++ } ++ ++ // ++ const char *envRotStr = getenv(SDL_QT_ROTATION_ENV_NAME); ++ userRotation = envRotStr ? atoi(envRotStr) : -1; ++ if ((userRotation >= 0 ? userRotation : qteRotation) & 1) { ++ userSize.setWidth(fbSize.height()); ++ userSize.setHeight(fbSize.width()); ++ } else { ++ userSize = fbSize; ++ } ++ ++ if (width <= userSize.width() && height <= userSize.height()) { ++ // ´Ä¶­ÊÑ¿ô¤Ç²óž³ÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¤½¤ì¤òºÇÍ¥À褹¤ë ++ if (userRotation >= 0) ++ sdlRotation = userRotation; ++ else { ++ // ¤Ç¡¢¤½¤Î»ØÄ̵꤬¤¤¤Î¤Ç¤¢¤ì¤Ð qte ¤Î²óž³ÑÅ٤˹ç¤ï¤»¤ë¤À¤± ++ // ¤Ê¤ó¤À¤±¤É¡¢SL-C700 ¤Ç¤Ï¤Á¤ç¤¤Ê£»¨¡£ ++ if (is_VGA_machine && (fbSize.width() == 320) && (fbSize.height() == 240)) { ++ if (isInputStyle) ++ sdlRotation = 2; ++ else ++ sdlRotation = qteRotation; ++ } else { ++ sdlRotation = qteRotation; ++ } ++ } ++ } else if (width <= fbSize.width() && height <= fbSize.height()) { ++ sdlRotation = 0; ++ if (is_VGA_machine && (fbSize.width() == 320) && (fbSize.height() == 240) && isInputStyle) ++ sdlRotation = 2; ++ } else if (width <= fbSize.height() && height <= fbSize.width()) { ++ sdlRotation = 1; + } else { + SDL_SetError("Unsupported resolution, %dx%d\n", width, height); ++ return NULL; + } ++ ++ if (fb_hwrot == 1) ++ sdlRotation = 0; ++ ++ if (getenv(SDL_QT_INVERT_ROTATION_ENV_NAME) != NULL) { ++ sdlRotation = (sdlRotation + 2) & 3; ++ } ++ ++ LOG("QT_SetVideoMode: argSize=%dx%d\n", width, height); ++ LOG("QT_SetVideoMode: qteSize=%dx%d\n", ++ qteSize.width(), qteSize.height()); ++ LOG("QT_SetVideoMode: fbSize=%dx%d\n", ++ fbSize.width(), fbSize.height()); ++ LOG("QT_SetVideoMode: qteRotation=%d\n", qteRotation); ++ LOG("QT_SetVideoMode: userRotation=%d\n", userRotation); ++ LOG("QT_SetVideoMode: sdlRotation=%d\n", sdlRotation); ++ ++ current->flags = 0;//SDL_FULLSCREEN; // We always run fullscreen. ++ current->w = width; ++ current->h = height; ++ SDL_Win->setScreenRotation(sdlRotation, qteRotation); ++ SDL_Win->setFBSize(fbSize); ++ ++ if (machine == MACHINE_SHARP_SLA300) ++ SDL_Win->setSLA300InputFix(true); ++ ++ // keyboard rotation ++ qteKeyRotation = qteRotation; ++// fprintf(stderr, "%d\n", (machine == MACHINE_SHARP_SLC700)); ++// fprintf(stderr, "%d\n", isQteQvga); ++ if (isQteQvga && is_VGA_machine) ++ qteKeyRotation = 3; ++ else if (machine == MACHINE_SHARP_SLB500) ++ qteKeyRotation = 3; ++ ++ if (isQteQvga && fb_hwrot == 1) ++ qteKeyRotation = 1; ++ ++ sdlKeyRotation = sdlRotation; ++ ++ SDL_Win->setKeyRotation(sdlKeyRotation, qteKeyRotation); ++ ++ LOG("QT_SetVideoMode: qteKeyRotation=%d\n", qteKeyRotation); ++ LOG("QT_SetVideoMode: sdlKeyRotation=%d\n", sdlKeyRotation); ++ + if ( flags & SDL_OPENGL ) { + SDL_SetError("OpenGL not supported"); + return(NULL); +- } ++ } + /* Create the QImage framebuffer */ +- qimage = new QImage(current->w, current->h, bpp); +- if (qimage->isNull()) { +- SDL_SetError("Couldn't create screen bitmap"); +- delete qimage; +- return(NULL); ++ ++ // frame buffer memory mapping ++ if (fb_direct == 1) { ++ current->pitch = finfo.line_length; ++ current->flags = (SDL_FULLSCREEN|SDL_HWSURFACE); ++ mapped_offset = (((long)finfo.smem_start) - ++ (((long)finfo.smem_start)&~(PAGE_SIZE-1))); ++ mapped_memlen = finfo.smem_len+mapped_offset; ++ if(console_fd >0 ) { ++ mapped_mem = mmap(NULL, mapped_memlen,PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); ++ fb_offset=(vinfo.xres-width)+(vinfo.yres-height)*vinfo.xres; ++ current->pixels = (void *)((int )mapped_mem+fb_offset); ++ _this->UpdateRects = QT_DirectUpdate; ++ } else { ++ qimage = new QImage(current->w, current->h, bpp); ++ if (qimage->isNull()) { ++ SDL_SetError("Couldn't create screen bitmap"); ++ delete qimage; ++ return(NULL); ++ } ++ current->pixels = (void *)qimage->bits(); ++ _this->UpdateRects = QT_NormalUpdate; ++ SDL_Win->setImage(qimage); ++// SDL_Win->setFullscreen(true); //comment to non update taskbar ++ } ++ } else { ++ qimage = new QImage(current->w, current->h, bpp); ++ if (qimage->isNull()) { ++ SDL_SetError("Couldn't create screen bitmap"); ++ delete qimage; ++ return(NULL); ++ } ++ current->pitch = qimage->bytesPerLine(); ++ current->pixels = (void *)qimage->bits(); ++ _this->UpdateRects = QT_NormalUpdate; ++ SDL_Win->setImage(qimage); ++// SDL_Win->setFullscreen(true); //comment to non update taskbar ++ + } +- current->pitch = qimage->bytesPerLine(); +- current->pixels = (void *)qimage->bits(); +- SDL_Win->setImage(qimage); +- _this->UpdateRects = QT_NormalUpdate; +- SDL_Win->setFullscreen(true); ++ ++ ++ // fprintf(stderr,"QT_SetVideoMode() qImage:%dx%d %d\n", ++ // qimage->width(), qimage->height(), qimage->bytesPerLine()); + /* We're done */ + return(current); + } +@@ -361,13 +864,19 @@ + { + if(SDL_Win->lockScreen()) { + for(int i=0; irepaintRect(rect); ++ QRect rect(rects[i].x, rects[i].y, ++ rects[i].w, rects[i].h); ++ SDL_Win->repaintRect(rect); + } + SDL_Win->unlockScreen(); + } + } ++ ++ static void QT_DirectUpdate(_THIS, int numrects, SDL_Rect *rects) ++ { ++ ++ } ++ + /* Is the system palette settable? */ + int QT_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors) + { +@@ -383,10 +892,36 @@ + // -- David Hedbor + // delete SDL_Win; + // SDL_Win = 0; ++ ++ if ( console_fd > 0 ) { ++ /* Restore the original video mode and palette */ ++ if (fb_hwrot == 1) { ++ int tmp_ioctl_data=120; ++ ioctl(console_fd, W100FB_CONFIG_EX, &tmp_ioctl_data); ++ } ++ ++ ioctl(console_fd, FBIOPUT_VSCREENINFO, &saved_vinfo); ++ ++ /* We're all done with the framebuffer */ ++ close(console_fd); ++ console_fd = -1; ++ } ++ + _this->screen->pixels = NULL; + QT_GrabInput(_this, SDL_GRAB_OFF); ++/* ++ { ++ QCopEnvelope e("QPE/KeyHelper", "repeater(int)"); ++ e << 1; ++ } ++*/ ++ if (isKHloaded) ++ system("qcop QPE/KeyHelper \"reload()\""); //QcopEnvelope can't use. ++ + } + ++ ++ + static int QT_IconifyWindow(_THIS) { + SDL_Win->hide(); + +Index: SDL-1.2.7/src/video/fbcon/SDL_fbvideo.c +=================================================================== +--- SDL-1.2.7.orig/src/video/fbcon/SDL_fbvideo.c 2005-03-02 22:24:43.458491481 +0100 ++++ SDL-1.2.7/src/video/fbcon/SDL_fbvideo.c 2005-03-02 22:24:46.875008802 +0100 +@@ -51,7 +51,7 @@ + #include "SDL_fbmatrox.h" + #include "SDL_fbriva.h" + +- ++/* #define FBCON_DEBUG 1 */ + #if defined(i386) && defined(FB_TYPE_VGA_PLANES) + #define VGA16_FBCON_SUPPORT + #ifndef FB_AUX_VGA_PLANES_VGA4 +@@ -76,9 +76,11 @@ + { 0, 0, 720, 576 }, /* PAL */ + { 0, 0, 720, 480 }, /* NTSC */ + { 0, 0, 640, 480 }, /* 16 bpp: 0x111, or 273 */ ++ { 0, 0, 480, 640 }, + { 0, 0, 640, 400 }, /* 8 bpp: 0x100, or 256 */ + { 0, 0, 512, 384 }, + { 0, 0, 320, 240 }, ++ { 0, 0, 240, 320 }, + { 0, 0, 320, 200 } + }; + static const struct { +@@ -112,9 +114,11 @@ + */ + { 320, 200, 79440, 16, 16, 20, 4, 48, 1, 0, 2 }, /* 70 Hz */ + { 320, 240, 63492, 16, 16, 16, 4, 48, 2, 0, 2 }, /* 72 Hz */ ++ { 240, 320, 63492, 16, 16, 16, 4, 48, 3, 0, 2 }, /* 72 Hz */ + { 512, 384, 49603, 48, 16, 16, 1, 64, 3, 0, 0 }, /* 78 Hz */ + { 640, 400, 31746, 96, 32, 41, 1, 64, 3, 2, 0 }, /* 85 Hz */ + { 640, 480, 31746, 120, 16, 16, 1, 64, 3, 0, 0 }, /* 75 Hz */ ++ { 480, 640, 31746, 120, 16, 16, 1, 64, 4, 0, 0 }, /* 75 Hz */ + { 768, 576, 26101, 144, 16, 28, 6, 112, 4, 0, 0 }, /* 60 Hz */ + { 800, 600, 20000, 64, 56, 23, 37, 120, 6, 3, 0 }, /* 72 Hz */ + { 960, 720, 17686, 144, 24, 28, 8, 112, 4, 0, 0 }, /* 60 Hz */ +@@ -152,6 +156,10 @@ + struct fb_var_screeninfo *vinfo); + static void FB_RestorePalette(_THIS); + ++static char *console_fd_buf; ++static char *mapped_mem_fb; ++static int rotation_flag; ++ + /* FB driver bootstrap functions */ + + static int FB_Available(void) +@@ -241,18 +249,30 @@ + + mode_okay = 0; + vinfo->bits_per_pixel = (index+1)*8; +- vinfo->xres = *w; +- vinfo->xres_virtual = *w; +- vinfo->yres = *h; +- vinfo->yres_virtual = *h; ++ if ((rotation_flag == 0) || (rotation_flag == 2)) { ++ vinfo->xres = *w; ++ vinfo->xres_virtual = *w; ++ vinfo->yres = *h; ++ vinfo->yres_virtual = *h; ++ } else { ++ vinfo->xres = *h; ++ vinfo->xres_virtual = *h; ++ vinfo->yres = *w; ++ vinfo->yres_virtual = *w; ++ } + vinfo->activate = FB_ACTIVATE_TEST; + if ( ioctl(console_fd, FBIOPUT_VSCREENINFO, vinfo) == 0 ) { + #ifdef FBCON_DEBUG + fprintf(stderr, "Checked mode %dx%d at %d bpp, got mode %dx%d at %d bpp\n", *w, *h, (index+1)*8, vinfo->xres, vinfo->yres, vinfo->bits_per_pixel); + #endif + if ( (((vinfo->bits_per_pixel+7)/8)-1) == index ) { +- *w = vinfo->xres; +- *h = vinfo->yres; ++ if ((rotation_flag == 0) || (rotation_flag == 2)) { ++ *w = vinfo->xres; ++ *h = vinfo->yres; ++ } else { ++ *h = vinfo->xres; ++ *w = vinfo->yres; ++ } + mode_okay = 1; + } + } +@@ -332,6 +352,7 @@ + unsigned int current_w; + unsigned int current_h; + const char *SDL_fbdev; ++ const char *SDL_rot_flag; + + /* Initialize the library */ + SDL_fbdev = getenv("SDL_FBDEV"); +@@ -344,6 +365,14 @@ + return(-1); + } + ++ SDL_rot_flag = getenv("SDL_FBROT"); ++ if ( SDL_rot_flag == NULL ) { ++ rotation_flag = 0; ++ } else { ++ rotation_flag = atoi(SDL_rot_flag); ++ } ++ ++ + #ifndef DISABLE_THREADS + /* Create the hardware surface lock mutex */ + hw_lock = SDL_CreateMutex(); +@@ -407,13 +436,33 @@ + mapped_offset = (((long)finfo.smem_start) - + (((long)finfo.smem_start)&~(PAGE_SIZE-1))); + mapped_memlen = finfo.smem_len+mapped_offset; +- mapped_mem = mmap(NULL, mapped_memlen, +- PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); +- if ( mapped_mem == (char *)-1 ) { +- SDL_SetError("Unable to memory map the video hardware"); +- mapped_mem = NULL; +- FB_VideoQuit(this); +- return(-1); ++ if (rotation_flag == 0) { ++ mapped_mem = mmap(NULL, mapped_memlen, ++ PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); ++ if ( mapped_mem == (char *)-1 ) { ++ SDL_SetError("Unable to memory map the video hardware"); ++ mapped_mem = NULL; ++ FB_VideoQuit(this); ++ return(-1); ++ } ++ } else { ++ ++ console_fd_buf = (char *)malloc(640*480*2); ++ ++ if (console_fd_buf == NULL){ ++ SDL_SetError("Unable to memory for buffer"); ++ return(-1); ++ } ++ ++ mapped_mem_fb = mmap(NULL, mapped_memlen, ++ PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0); ++ if ( mapped_mem_fb == (char *)-1 ) { ++ SDL_SetError("Unable to memory map the video hardware"); ++ mapped_mem_fb = NULL; ++ FB_VideoQuit(this); ++ return(-1); ++ } ++ mapped_mem = console_fd_buf; + } + + /* Determine the current screen depth */ +@@ -555,6 +604,7 @@ + + /* Various screen update functions available */ + static void FB_DirectUpdate(_THIS, int numrects, SDL_Rect *rects); ++static void FB_RotationUpdate(_THIS, int numrects, SDL_Rect *rects); + #ifdef VGA16_FBCON_SUPPORT + static void FB_VGA16Update(_THIS, int numrects, SDL_Rect *rects); + #endif +@@ -725,7 +775,7 @@ + Uint32 Bmask; + char *surfaces_mem; + int surfaces_len; +- ++ + /* Set the terminal into graphics mode */ + if ( FB_EnterGraphicsMode(this) < 0 ) { + return(NULL); +@@ -734,6 +784,8 @@ + /* Restore the original palette */ + FB_RestorePalette(this); + ++ flags &= ~SDL_DOUBLEBUF; ++ + /* Set the video mode and get the final screen format */ + if ( ioctl(console_fd, FBIOGET_VSCREENINFO, &vinfo) < 0 ) { + SDL_SetError("Couldn't get console screen info"); +@@ -748,13 +800,24 @@ + vinfo.activate = FB_ACTIVATE_NOW; + vinfo.accel_flags = 0; + vinfo.bits_per_pixel = bpp; +- vinfo.xres = width; +- vinfo.xres_virtual = width; +- vinfo.yres = height; +- if ( flags & SDL_DOUBLEBUF ) { +- vinfo.yres_virtual = height*2; ++ if ((rotation_flag == 0) || (rotation_flag == 2)) { ++ vinfo.xres = width; ++ vinfo.xres_virtual = width; ++ vinfo.yres = height; ++ if ( flags & SDL_DOUBLEBUF ) { ++ vinfo.yres_virtual = height*2; ++ } else { ++ vinfo.yres_virtual = height; ++ } + } else { +- vinfo.yres_virtual = height; ++ vinfo.xres = height; ++ vinfo.xres_virtual = height; ++ vinfo.yres = width; ++ if ( flags & SDL_DOUBLEBUF ) { ++ vinfo.yres_virtual = width*2; ++ } else { ++ vinfo.yres_virtual = width; ++ } + } + vinfo.xoffset = 0; + vinfo.yoffset = 0; +@@ -776,6 +839,15 @@ + return(NULL); + } + } ++ vinfo.xres = width; ++ vinfo.xres_virtual = width; ++ vinfo.yres = height; ++ if ( flags & SDL_DOUBLEBUF ) { ++ vinfo.yres_virtual = height*2; ++ } else { ++ vinfo.yres_virtual = height; ++ } ++ + } else { + int maxheight; + +@@ -821,7 +893,9 @@ + SDL_SetError("Couldn't get console hardware info"); + return(NULL); + } +- ++#ifdef FBCON_DEBUG ++ print_finfo(&finfo); ++#endif + /* Save hardware palette, if needed */ + FB_SavePalette(this, &finfo, &vinfo); + +@@ -829,7 +903,11 @@ + current->flags = (SDL_FULLSCREEN|SDL_HWSURFACE); + current->w = vinfo.xres; + current->h = vinfo.yres; +- current->pitch = finfo.line_length; ++ if ((rotation_flag == 0) || (rotation_flag == 2) ) { ++ current->pitch = finfo.line_length; ++ } else { ++ current->pitch = vinfo.xres*2; ++ } + current->pixels = mapped_mem+mapped_offset; + + /* Set up the information for hardware surfaces */ +@@ -863,7 +941,7 @@ + } + + /* Set the update rectangle function */ +- this->UpdateRects = FB_DirectUpdate; ++ this->UpdateRects = FB_RotationUpdate; + + /* We're done */ + return(current); +@@ -1123,6 +1201,89 @@ + return; + } + ++static void FB_RotationUpdate(_THIS, int numrects, SDL_Rect *rects) ++{ ++ unsigned short *pDst; ++ unsigned short *pSrc; ++ unsigned int width; ++ unsigned int height; ++ unsigned int srcYAdd; ++ unsigned int dstXAdd; ++ unsigned int dstYSub; ++ unsigned int i; ++ unsigned int dstH; ++ unsigned int dstW; ++ ++#ifdef FBCON_DEBUG ++ fprintf(stderr,"rotation_flag = %d \n",rotation_flag); ++#endif ++ switch (rotation_flag) { ++ case 0: ++ break; ++ case 1: ++ memcpy(mapped_mem_fb,mapped_mem,640*480*2); ++ break; ++ case 2: ++ memcpy(mapped_mem_fb,mapped_mem,640*480*2); ++ break; ++ case 3: ++ dstW=cache_vinfo.xres; ++ dstH=cache_vinfo.yres; ++#ifdef FBCON_DEBUG ++ fprintf(stderr,"dstH = %d : dstW = %d : rects->x = %d : rects->y = %d\n",dstH,dstW); ++ fprintf(stderr,"rects->x = %d : rects->y = %d : rects->w = %d : rects->h = %d\n",rects->x,rects->y,rects->w,rects->h); ++#endif ++ while (numrects) { ++ if (rects->w != dstW || rects->h != dstH) { ++ pSrc = mapped_mem + (rects->x + rects->y * dstW)*2; ++ pDst = mapped_mem_fb + (dstH-1+rects->x * dstH - rects->y)*2; ++ ++ width = rects->w; ++ height = rects->h; ++ ++ srcYAdd = dstW - rects->w; ++ dstXAdd = dstH; ++ dstYSub = (dstH * rects->w) + 1; ++ ++ while (height--) { ++ i = width; ++ while (i--) { ++ *pDst = *pSrc ++; ++ pDst += dstXAdd; ++ } ++ pSrc += srcYAdd; ++ pDst -= dstYSub; ++ } ++ ++ } else { ++ pDst=mapped_mem_fb+dstH*2-2; ++ pSrc=mapped_mem; ++ height=dstH; ++ width=dstW; ++ dstXAdd=height; ++ dstYSub=dstW*dstH+1; ++ ++ while (height--) { ++ i = width; ++ while (i--) { ++ *pDst = *pSrc ++; ++ pDst += dstXAdd; ++ } ++ pDst -= dstYSub; ++ } ++ } ++ numrects--; ++ rects++; ++ } ++ break; ++ default: ++ break; ++ } ++ ++ ++ ++} ++ + #ifdef VGA16_FBCON_SUPPORT + /* Code adapted with thanks from the XFree86 VGA16 driver! :) */ + #define writeGr(index, value) \ +Index: SDL-1.2.7/src/video/fbcon/SDL_fbevents.c +=================================================================== +--- SDL-1.2.7.orig/src/video/fbcon/SDL_fbevents.c 2005-03-02 22:24:43.458491481 +0100 ++++ SDL-1.2.7/src/video/fbcon/SDL_fbevents.c 2005-03-02 22:24:46.876008660 +0100 +@@ -60,7 +60,13 @@ + #ifndef GPM_NODE_FIFO + #define GPM_NODE_FIFO "/dev/gpmdata" + #endif ++#define POINTERCAL "/etc/pointercal" + ++static struct SDL_cal { ++ long ok; ++ long a, b, c, d, e, f, s; ++ long rotate; ++} cal = { 0 }; + + /* The translation tables from a console scancode to a SDL keysym */ + #define NUM_VGAKEYMAPS (1<= 0 ) { ++ FILE *pcal; ++ cal.ok = 0; ++ pcal = fopen(POINTERCAL, "r"); ++ if(pcal == NULL){ ++ fprintf(stderr, "Warning: cannot open " POINTERCAL ".\n"); ++ }else{ ++ int n; ++ n = fscanf(pcal, "%d %d %d %d %d %d %d", ++ &cal.a, &cal.b, &cal.c, &cal.d, &cal.e, &cal.f, &cal.s); ++ if(n != 7){ ++ fprintf(stderr, "Warning: " POINTERCAL " is unknown format.\n"); ++ }else{ ++ cal.ok = 1; ++ } ++ fclose(pcal); ++ } ++ if ( sdl_rot_flag == NULL ) { ++ cal.rotate = 0; ++ } else { ++ cal.rotate = atoi(sdl_rot_flag); ++ } ++ mouse_drv = TS_SLC7X0; ++ } ++ } + if ( mouse_fd < 0 ) { + mouse_drv = MOUSE_NONE; + } ++ + return(mouse_fd); + } + +@@ -678,6 +718,10 @@ + packetsize = ELO_PACKET_SIZE; + relative = 0; + break; ++ case TS_SLC7X0: ++ packetsize = 8; ++ relative = 0; ++ break; + case NUM_MOUSE_DRVS: + /* Uh oh.. */ + packetsize = 0; +@@ -810,6 +854,25 @@ + */ + + case MOUSE_ELO: ++ case TS_SLC7X0: ++ /* Get current mouse state */ ++ button = ((mousebuf[i+1] << 8)+mousebuf[i])/500; ++ dx = (mousebuf[i+3] << 8)+mousebuf[i+2]; ++ dy = (mousebuf[i+5] << 8)+mousebuf[i+4]; ++ if(cal.ok){ ++ long X, Y; ++ X = (cal.a * dx + cal.b * dy + cal.c) / cal.s; ++ Y = (cal.d * dx + cal.e * dy + cal.f) / cal.s; ++ dx = X; ++ dy = Y; ++ } ++ if(cal.rotate == 3){ ++ int tmp; ++ tmp=dx; ++ dx = dy; ++ dy = 480-tmp; ++ } ++ break; + case NUM_MOUSE_DRVS: + /* Uh oh.. */ + dx = 0; diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch new file mode 100644 index 0000000000..899e31482c --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/fixlibs.patch @@ -0,0 +1,25 @@ +--- SDL-1.2.7/configure.in~fixlibs 2005-10-06 10:27:59.025396872 +0200 ++++ SDL-1.2.7/configure.in 2005-10-06 10:30:16.963087411 +0200 +@@ -1508,8 +1508,8 @@ + AC_MSG_RESULT($video_qtopia) + if test x$video_qtopia = xyes; then + CFLAGS="$CFLAGS -DENABLE_QTOPIA -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -I${QPEDIR}/include -I${QTDIR}/include/ -DNO_DEBUG -fno-rtti -fno-exceptions" +- SDL_LIBS="$SDL_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte" +- SDL_CFLAGS="$SDL_CFLAGS -DQWS" ++ SDL_LIBS="$SDL_LIBS -Wl,-rpath-link -Wl,${QPEDIR}/lib -Wl,-rpath-link -Wl,${QTDIR}/lib" ++ SYSTEM_LIBS="$SYSTEM_LIBS -L${QPEDIR}/lib -L${QTDIR}/lib/ -lqpe -lqte" + VIDEO_SUBDIRS="$VIDEO_SUBDIRS qtopia" + VIDEO_DRIVERS="$VIDEO_DRIVERS qtopia/libvideo_qtopia.la" + else +@@ -1803,11 +1803,6 @@ + CheckPTHREAD + CheckSIGACTION + CheckAltivec +- # Set up files for the main() stub +- if test "x$video_qtopia" = "xyes"; then +- SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" +- +- fi + # Set up files for the audio library + # We use the OSS and ALSA API's, not the Sun audio API + #if test x$enable_audio = xyes; then diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch new file mode 100644 index 0000000000..e3738e961e --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/gcc34.patch @@ -0,0 +1,176 @@ +diff -ru SDL-1.2.7/src/audio/SDL_mixer_MMX.c SDL-1.2.7.mod/src/audio/SDL_mixer_MMX.c +--- SDL-1.2.7/src/audio/SDL_mixer_MMX.c 2002-11-09 07:13:28.000000000 +0100 ++++ SDL-1.2.7.mod/src/audio/SDL_mixer_MMX.c 2004-04-25 18:15:46.335228624 +0200 +@@ -19,9 +19,9 @@ + " movl %1,%%esi\n" // esi = src + " movl %3,%%eax\n" // eax = volume + +-" movl %2,%%ebx\n" // ebx = size ++" movl %2,%%edx\n" // edx = size + +-" shrl $4,%%ebx\n" // process 16 bytes per iteration = 8 samples ++" shrl $4,%%edx\n" // process 16 bytes per iteration = 8 samples + + " jz .endS16\n" + +@@ -95,7 +95,7 @@ + + " addl $16,%%edi\n" + +-" dec %%ebx\n" ++" dec %%edx\n" + + " jnz .mixloopS16\n" + +@@ -105,7 +105,7 @@ + : + : "m" (dst), "m"(src),"m"(size), + "m"(volume) +- : "eax","ebx", "esi", "edi","memory" ++ : "eax","edx", "esi", "edi","memory" + ); + } + +@@ -123,7 +123,7 @@ + " movl %1,%%esi\n" // esi = src + " movl %3,%%eax\n" // eax = volume + +-" movd %%ebx,%%mm0\n" ++" movd %%edx,%%mm0\n" + " movq %%mm0,%%mm1\n" + " psllq $16,%%mm0\n" + " por %%mm1,%%mm0\n" +@@ -132,10 +132,10 @@ + " psllq $16,%%mm0\n" + " por %%mm1,%%mm0\n" + +-" movl %2,%%ebx\n" // ebx = size +-" shr $3,%%ebx\n" // process 8 bytes per iteration = 8 samples ++" movl %2,%%edx\n" // edx = size ++" shr $3,%%edx\n" // process 8 bytes per iteration = 8 samples + +-" cmp $0,%%ebx\n" ++" cmp $0,%%edx\n" + " je .endS8\n" + + ".align 16\n" +@@ -169,7 +169,7 @@ + " movq %%mm3,(%%edi)\n" // store back to ram + " addl $8,%%edi\n" + +-" dec %%ebx\n" ++" dec %%edx\n" + + " jnz .mixloopS8\n" + +@@ -178,7 +178,7 @@ + : + : "m" (dst), "m"(src),"m"(size), + "m"(volume) +- : "eax","ebx", "esi", "edi","memory" ++ : "eax","edx", "esi", "edi","memory" + ); + } + #endif +diff -ru SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c SDL-1.2.7.mod/src/cpuinfo/SDL_cpuinfo.c +--- SDL-1.2.7/src/cpuinfo/SDL_cpuinfo.c 2004-02-10 16:31:35.000000000 +0100 ++++ SDL-1.2.7.mod/src/cpuinfo/SDL_cpuinfo.c 2004-04-25 18:15:46.336228472 +0200 +@@ -118,7 +118,7 @@ + " movl %%edi,%%ebx\n" + : "=m" (features) + : +- : "%eax", "%ebx", "%ecx", "%edx", "%edi" ++ : "%eax", "%ecx", "%edx", "%edi" + ); + #elif defined(_MSC_VER) + __asm { +@@ -153,7 +153,7 @@ + " movl %%edi,%%ebx\n" + : "=m" (features) + : +- : "%eax", "%ebx", "%ecx", "%edx", "%edi" ++ : "%eax", "%ecx", "%edx", "%edi" + ); + #elif defined(_MSC_VER) + __asm { +diff -ru SDL-1.2.7/src/video/SDL_yuv_mmx.c SDL-1.2.7.mod/src/video/SDL_yuv_mmx.c +--- SDL-1.2.7/src/video/SDL_yuv_mmx.c 2004-02-18 18:22:04.000000000 +0100 ++++ SDL-1.2.7.mod/src/video/SDL_yuv_mmx.c 2004-04-25 18:15:46.337228320 +0200 +@@ -120,12 +120,12 @@ + "movd (%2), %%mm2\n" // 0 0 0 0 l3 l2 l1 l0 + "punpcklbw %%mm7,%%mm1\n" // 0 v3 0 v2 00 v1 00 v0 + "punpckldq %%mm1,%%mm1\n" // 00 v1 00 v0 00 v1 00 v0 +- "psubw _MMX_0080w,%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 ++ "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 + + // create Cr_g (result in mm0) + "movq %%mm1,%%mm0\n" // r1 r1 r0 r0 r1 r1 r0 r0 +- "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64 +- "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64 ++ "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64 ++ "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64 + "psraw $6, %%mm0\n" // red=red/64 + "psraw $6, %%mm1\n" // red=red/64 + +@@ -134,8 +134,8 @@ + "movq (%2,%4),%%mm3\n" // 0 0 0 0 L3 L2 L1 L0 + "punpckldq %%mm3,%%mm2\n" // L3 L2 L1 L0 l3 l2 l1 l0 + "movq %%mm2,%%mm4\n" // L3 L2 L1 L0 l3 l2 l1 l0 +- "pand _MMX_FF00w,%%mm2\n" // L3 0 L1 0 l3 0 l1 0 +- "pand _MMX_00FFw,%%mm4\n" // 0 L2 0 L0 0 l2 0 l0 ++ "pand %[_MMX_FF00w],%%mm2\n" // L3 0 L1 0 l3 0 l1 0 ++ "pand %[_MMX_00FFw],%%mm4\n" // 0 L2 0 L0 0 l2 0 l0 + "psrlw $8,%%mm2\n" // 0 L3 0 L1 0 l3 0 l1 + + // create R (result in mm6) +@@ -152,11 +152,11 @@ + "movd (%1), %%mm1\n" // 0 0 0 0 u3 u2 u1 u0 + "punpcklbw %%mm7,%%mm1\n" // 0 u3 0 u2 00 u1 00 u0 + "punpckldq %%mm1,%%mm1\n" // 00 u1 00 u0 00 u1 00 u0 +- "psubw _MMX_0080w,%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 ++ "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 + // create Cb_g (result in mm5) + "movq %%mm1,%%mm5\n" // u1 u1 u0 u0 u1 u1 u0 u0 +- "pmullw _MMX_UgrnRGB,%%mm5\n" // blue*-109dec=1.7129*64 +- "pmullw _MMX_UbluRGB,%%mm1\n" // blue*114dec=1.78125*64 ++ "pmullw %[_MMX_UgrnRGB],%%mm5\n" // blue*-109dec=1.7129*64 ++ "pmullw %[_MMX_UbluRGB],%%mm1\n" // blue*114dec=1.78125*64 + "psraw $6, %%mm5\n" // blue=red/64 + "psraw $6, %%mm1\n" // blue=blue/64 + +@@ -238,8 +238,14 @@ + "popl %%ebx\n" + : + : "m" (cr), "r"(cb),"r"(lum), +- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod) +- : "%ebx" ++ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod), ++ [_MMX_0080w] "m" (*_MMX_0080w), ++ [_MMX_00FFw] "m" (*_MMX_00FFw), ++ [_MMX_FF00w] "m" (*_MMX_FF00w), ++ [_MMX_VgrnRGB] "m" (*_MMX_VgrnRGB), ++ [_MMX_VredRGB] "m" (*_MMX_VredRGB), ++ [_MMX_UgrnRGB] "m" (*_MMX_UgrnRGB), ++ [_MMX_UbluRGB] "m" (*_MMX_UbluRGB) + ); + } + +@@ -413,8 +419,16 @@ + "popl %%ebx\n" + : + :"m" (cr), "r"(cb),"r"(lum), +- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod) +- : "%ebx" ++ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod), ++ [_MMX_0080w] "m" (*_MMX_0080w), ++ [_MMX_Ugrn565] "m" (*_MMX_Ugrn565), ++ [_MMX_Ublu5x5] "m" (*_MMX_Ublu5x5), ++ [_MMX_00FFw] "m" (*_MMX_00FFw), ++ [_MMX_Vgrn565] "m" (*_MMX_Vgrn565), ++ [_MMX_Vred5x5] "m" (*_MMX_Vred5x5), ++ [_MMX_Ycoeff] "m" (*_MMX_Ycoeff), ++ [_MMX_red565] "m" (*_MMX_red565), ++ [_MMX_grn565] "m" (*_MMX_grn565) + ); + } + diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch new file mode 100644 index 0000000000..bf57953c08 --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/ipaq.patch @@ -0,0 +1,143 @@ +Index: SDL-1.2.7/src/video/qtopia/Makefile.am +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2005-05-16 14:21:01.000000000 +0200 ++++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-05-16 14:24:02.000000000 +0200 +@@ -22,4 +22,4 @@ + # overwrite USER variables + CXXLD = $(CC) + CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@ ++ $(AM_LDFLAGS) $(LDFLAGS) -lopiecore2 -lsupc++ -o $@ +Index: SDL-1.2.7/src/video/qtopia/SDL_QWin.cc +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/SDL_QWin.cc 2005-05-16 14:21:01.000000000 +0200 ++++ SDL-1.2.7/src/video/qtopia/SDL_QWin.cc 2005-05-16 14:24:02.000000000 +0200 +@@ -29,8 +29,11 @@ + #include "SDL_QWin.h" + #include + #include ++#include + #include + ++using namespace Opie::Core; ++ + extern int fb_hwrot; + extern int fb_direct; + extern bool is_VGA_machine; +@@ -545,18 +548,32 @@ + case Qt::Key_F7: scancode = SDLK_F7; break; + case Qt::Key_F8: scancode = SDLK_F8; break; + case Qt::Key_F9: +- scancode = SDLK_F9; +- mouse_button_mode=1; ++ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { ++ scancode = SDLK_y; } ++ else { ++ scancode = SDLK_F9; ++ mouse_button_mode=1; } + break; + case Qt::Key_F10: +- scancode = SDLK_F10; +- mouse_button_mode=2; ++ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { ++ scancode = SDLK_LALT; } ++ else { ++ scancode = SDLK_F10; ++ mouse_button_mode=2; } + break; + case Qt::Key_F11: scancode = SDLK_F11; break; +- case Qt::Key_F12: scancode = SDLK_F12; break; ++ case Qt::Key_F12: ++ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { ++ scancode = SDLK_RETURN; } ++ else { ++ scancode = SDLK_F12; } ++ break; + case Qt::Key_F13: +- scancode = SDLK_F13; +- mouse_button_mode=3; ++ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { ++ scancode = SDLK_ESCAPE; } ++ else { ++ scancode = SDLK_F13; ++ mouse_button_mode=3; } + break; + case Qt::Key_F14: scancode = SDLK_F14; break; + case Qt::Key_F15: scancode = SDLK_F15; break; +@@ -573,6 +590,9 @@ + scancode = SDLK_RETURN; + break; + ++ // To use record button on ipaq ++ case Qt::Key_F24: scancode = SDLK_LSHIFT; break; ++ + default: + scancode = SDLK_UNKNOWN; + break; +Index: SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/SDL_sysvideo.cc 2005-05-16 14:21:00.000000000 +0200 ++++ SDL-1.2.7/src/video/qtopia/SDL_sysvideo.cc 2005-05-16 14:24:02.000000000 +0200 +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -66,6 +67,8 @@ + #include "SDL_syswm_c.h" + #include "SDL_lowvideo.h" + ++using namespace Opie::Core; ++ + //#define QTOPIA_DEBUG + #define QTOPIA_LOG + #define QT_HIDDEN_SIZE 32 /* starting hidden window size */ +@@ -106,6 +109,7 @@ + MACHINE_SHARP_SLC760, + MACHINE_SHARP_SLC860, + MACHINE_SHARP_SL6000, ++ MACHINE_IPAQ, + MACHINE_MAX + } machine_t; + +@@ -119,6 +123,7 @@ + { "Sharp", "SL-C760", 0 }, + { "Sharp", "SL-C860", 0 }, + { "Sharp", "SL-6000", 0 }, ++ { "HP", "HP IPAQ", 0 }, + }; + + /* Name of the environment variable used to invert the screen rotation or not: +@@ -423,6 +428,13 @@ + machine = MACHINE_SHARP_SLC760; + else if (strstr(buf, "SHARP Boxer") != NULL) + machine = MACHINE_SHARP_SLC860; ++ else if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) ++ machine = MACHINE_IPAQ; ++ else ++ { ++ machine = MACHINE_SHARP_SL5000D; ++ LOG("Can't detect machine defaulting to SL5000D"); ++ } + } + fclose(fp); + } else { +@@ -679,6 +691,15 @@ + if (machine == MACHINE_SHARP_SL5500) + qteRotation = 3; + ++ // HP IPaq ++ if ( ODevice::inst( )-> series ( ) == Model_iPAQ ) { ++ qteRotation = 3; ++ } ++ if ( ODevice::inst ( )-> model ( ) == Model_iPAQ_H38xx ) { ++ qteRotation = 1; ++ } ++ ++ + // SL-B500 Íѥϥå¯(¤È¤ê¤¢¤¨¤º¡¢¤Í) + if (machine == MACHINE_SHARP_SLB500) + qteRotation = 3; diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch new file mode 100644 index 0000000000..9629583f9b --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/kill-stdc++.patch @@ -0,0 +1,408 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: SDL-1.2.7/src/main/Makefile.am +=================================================================== +--- SDL-1.2.7.orig/src/main/Makefile.am 2005-03-02 22:24:52.592201093 +0100 ++++ SDL-1.2.7/src/main/Makefile.am 2005-03-02 22:24:56.658626603 +0100 +@@ -46,3 +46,9 @@ + (cd $(distdir) && rm -f $(BUILT_SOURCES)) + cp -rp $(ARCH_SUBDIRS) $(distdir) + (cd $(distdir) && rm -rf `find . -name CVS`) ++ ++# overwrite USER variables ++CXXLD = $(CC) ++CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@ ++ +Index: SDL-1.2.7/src/video/qtopia/Makefile.am +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2005-03-02 22:24:52.592201093 +0100 ++++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-03-02 22:24:56.658626603 +0100 +@@ -17,3 +17,9 @@ + SDL_sysevents.cc \ + SDL_sysevents_c.h \ + SDL_qmain.cc ++ ++ ++# overwrite USER variables ++CXXLD = $(CC) ++CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ++ $(AM_LDFLAGS) $(LDFLAGS) -lsupc++ -o $@ +Index: SDL-1.2.7/acinclude.m4 +=================================================================== +--- SDL-1.2.7.orig/acinclude.m4 2005-03-02 22:24:41.232805923 +0100 ++++ SDL-1.2.7/acinclude.m4 2005-03-02 22:24:56.667625332 +0100 +@@ -1305,11 +1305,11 @@ + case $host_os in + aix3*) + version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ library_names_spec='${libname}${release}${shrext}$versuffix $libname.a' + shlibpath_var=LIBPATH + + # AIX 3 has no versioning support, so we append a major version to the name. +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='${libname}${release}${shrext}$major' + ;; + + aix4* | aix5*) +@@ -1319,7 +1319,7 @@ + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 +- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shrext}$major ${libname}${release}${shrext}$versuffix $libname${shrext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file +@@ -1345,12 +1345,12 @@ + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' + else + # We preserve .a as extension for shared libraries through AIX4.2 + # and later when we are not doing run time linking. + library_names_spec='${libname}${release}.a $libname.a' +- soname_spec='${libname}${release}${shared_ext}$major' ++ soname_spec='${libname}${release}${shrext}$major' + fi + shlibpath_var=LIBPATH + fi +@@ -1363,7 +1363,7 @@ + ;; + + beos*) +- library_names_spec='${libname}${shared_ext}' ++ library_names_spec='${libname}${shrext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; +@@ -1371,8 +1371,8 @@ + bsdi4*) + version_type=linux + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" +@@ -1405,14 +1405,14 @@ + case $host_os in + cygwin*) + # Cygwin DLLs use 'cyg' prefix rather than 'lib' +- #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}' ++ #soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shrext}' + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" + ;; + mingw*) + # MinGW DLLs use traditional 'lib' prefix +- #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' +- soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shared_ext}' ++ #soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext}' ++ soname_spec='`echo ${libname} | sed -e 's/^lib//'`${shrext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then + # It is most probably a Windows format PATH printed by +@@ -1428,13 +1428,13 @@ + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' +- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shrext}' + ;; + esac + ;; + + *) +- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shrext} $libname.lib' + ;; + esac + dynamic_linker='Win32 ld.exe' +@@ -1450,8 +1450,8 @@ + # FIXME: Relying on posixy $() will cause problems for + # cross-compilation, but unfortunately the echo tests do not + # yet detect zsh echo's removal of \ escapes. +- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext' +- soname_spec='${libname}${release}${major}$shared_ext' ++ library_names_spec='${libname}${release}${versuffix}$shrext ${libname}${release}${major}$shrext ${libname}$shrext' ++ soname_spec='${libname}${release}${major}$shrext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext='$(test .$module = .yes && echo .so || echo .dylib)' +@@ -1466,8 +1466,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname$shrext' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -1480,12 +1480,12 @@ + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext} $libname${shrext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) +- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shrext}$versuffix $libname${shrext}$versuffix' + need_version=yes + ;; + esac +@@ -1509,8 +1509,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}${major} ${libname}${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + hardcode_into_libs=yes + ;; +@@ -1528,8 +1528,8 @@ + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else +@@ -1543,8 +1543,8 @@ + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + ;; +@@ -1553,8 +1553,8 @@ + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555. +@@ -1573,8 +1573,8 @@ + esac + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shrext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${release}${shrext} $libname${shrext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= +@@ -1608,8 +1608,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no +@@ -1632,12 +1632,12 @@ + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major ${libname}${release}${shrext} ${libname}${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH +@@ -1647,7 +1647,7 @@ + + newsos6) + version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; +@@ -1656,8 +1656,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; +@@ -1666,7 +1666,7 @@ + version_type=sunos + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +@@ -1687,7 +1687,7 @@ + libname_spec='$name' + shrext=".dll" + need_lib_prefix=no +- library_names_spec='$libname${shared_ext} $libname.a' ++ library_names_spec='$libname${shrext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; +@@ -1696,8 +1696,8 @@ + version_type=osf + need_lib_prefix=no + need_version=no +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shrext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" +@@ -1705,8 +1705,8 @@ + + sco3.2v5*) + version_type=osf +- soname_spec='${libname}${release}${shared_ext}$major' +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shrext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -1714,8 +1714,8 @@ + version_type=linux + need_lib_prefix=no + need_version=no +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes +@@ -1725,7 +1725,7 @@ + + sunos4*) + version_type=sunos +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${shrext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes +@@ -1737,8 +1737,8 @@ + + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) +@@ -1762,16 +1762,16 @@ + sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux +- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' +- soname_spec='$libname${shared_ext}.$major' ++ library_names_spec='$libname${shrext}.$versuffix $libname${shrext}.$major $libname${shrext}' ++ soname_spec='$libname${shrext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; + + uts4*) + version_type=linux +- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' +- soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shrext}$versuffix ${libname}${release}${shrext}$major $libname${shrext}' ++ soname_spec='${libname}${release}${shrext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; + +@@ -3278,8 +3278,8 @@ + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +@@ -3288,7 +3288,7 @@ + # explicitly linking system object files so we need to strip them + # from the output so that they don't get included in the library + # dependencies. +- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shrext 2>&1 | grep "ld"`; rm -f libconftest$shrext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +@@ -3367,7 +3367,7 @@ + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3427,7 +3427,7 @@ + # KCC will only create a shared library if the output file + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shrext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -4376,7 +4376,7 @@ + # Whether we need a single -rpath flag with a separated argument. + hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) + +-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the ++# Set to yes if using DIR/libNAME${shrext} during linking hardcodes DIR into the + # resulting binary. + hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) + diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch new file mode 100644 index 0000000000..99320fad0d --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/mouse.patch @@ -0,0 +1,47 @@ +--- ./src/video/qtopia/SDL_QWin.cc.old 2004-05-16 20:28:36.000000000 +0930 ++++ ./src/video/qtopia/SDL_QWin.cc 2004-05-16 20:31:39.000000000 +0930 +@@ -169,7 +169,12 @@ + Qt::ButtonState button = e->button(); + int sdlstate = 0; + if( (button & Qt::LeftButton)) { +- sdlstate |= SDL_BUTTON_LMASK; ++ if (mouse_button_mode == 3) ++ sdlstate |= SDL_BUTTON_RMASK; ++ else if (mouse_button_mode == 2) ++ sdlstate |= SDL_BUTTON_MMASK; ++ else ++ sdlstate |= SDL_BUTTON_LMASK; + } + if( (button & Qt::RightButton)) { + sdlstate |= SDL_BUTTON_RMASK; +@@ -539,20 +544,20 @@ + case Qt::Key_F6: scancode = SDLK_F6; break; + case Qt::Key_F7: scancode = SDLK_F7; break; + case Qt::Key_F8: scancode = SDLK_F8; break; +- case Qt::Key_F9: scancode = SDLK_F9; break; +- case Qt::Key_F10: +- scancode = SDLK_F10; ++ case Qt::Key_F9: ++ scancode = SDLK_F9; + mouse_button_mode=1; + break; +- case Qt::Key_F11: +- scancode = SDLK_F11; +- mouse_button_mode=3; +- break; +- case Qt::Key_F12: +- scancode = SDLK_F12; ++ case Qt::Key_F10: ++ scancode = SDLK_F10; + mouse_button_mode=2; + break; +- case Qt::Key_F13: scancode = SDLK_F13; break; ++ case Qt::Key_F11: scancode = SDLK_F11; break; ++ case Qt::Key_F12: scancode = SDLK_F12; break; ++ case Qt::Key_F13: ++ scancode = SDLK_F13; ++ mouse_button_mode=3; ++ break; + case Qt::Key_F14: scancode = SDLK_F14; break; + case Qt::Key_F15: scancode = SDLK_F15; break; + case Qt::Key_Super_L: scancode = SDLK_LSUPER; break; diff --git a/packages/obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch new file mode 100644 index 0000000000..4b39267a8a --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe-1.2.7/pygame.patch @@ -0,0 +1,196 @@ +Index: SDL-1.2.7/src/main/qtopia/SDL_qtopia_main.cc +=================================================================== +--- SDL-1.2.7.orig/src/main/qtopia/SDL_qtopia_main.cc 2003-12-14 07:25:53.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,47 +0,0 @@ +- +-/* Include the SDL main definition header */ +-#include "SDL_main.h" +-#include +-#include +-#ifdef main +-#undef main +-#endif +-#ifdef QWS +-#include +-#include +-#include +-#include +- +-// Workaround for OPIE to remove taskbar icon. Also fixes +-// some issues in Qtopia where there are left-over qcop files in /tmp/. +-// I'm guessing this will also clean up the taskbar in the Sharp version +-// of Qtopia. +-static inline void cleanupQCop() { +- QString appname(qApp->argv()[0]); +- int slash = appname.findRev("/"); +- if(slash != -1) { appname = appname.mid(slash+1); } +- QString cmd = QPEApplication::qpeDir() + "bin/qcop QPE/System 'closing(QString)' '"+appname+"'"; +- system(cmd.latin1()); +- cmd = "/tmp/qcop-msg-"+appname; +- unlink(cmd.latin1()); +-} +- +-static QPEApplication *app; +-#endif +- +-extern int SDL_main(int argc, char *argv[]); +- +-int main(int argc, char *argv[]) +-{ +-#ifdef QWS +- // This initializes the Qtopia application. It needs to be done here +- // because it parses command line options. +- app = new QPEApplication(argc, argv); +- QWidget dummy; +- app->showMainWidget(&dummy); +- atexit(cleanupQCop); +-#endif +- // Exit here because if return is used, the application +- // doesn't seem to quit correctly. +- exit(SDL_main(argc, argv)); +-} +Index: SDL-1.2.7/src/video/qtopia/SDL_qmain.cc +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ SDL-1.2.7/src/video/qtopia/SDL_qmain.cc 2005-09-24 19:55:14.000000000 +0200 +@@ -0,0 +1,99 @@ ++/* Include the SDL main definition header */ ++#include "SDL_main.h" ++#include ++ ++#include ++#include ++#include ++ ++ ++#ifdef QWS ++#include ++#include ++#include ++ ++ ++ ++static QWidget *dummyW = 0; ++static QPEApplication *theApp = 0; ++static char **cmdline= 0; ++static int size = 0; ++ ++static void parse_cmd_line() { ++ /* ++ * find the number ++ */ ++ char buf[1024]; ++ int available = 0; ++ char *string_start = 0; ++ int fd = ::open( "/proc/self/cmdline", O_RDONLY ); ++ if ( fd < 0 ) { ++ qWarning( "Error getting the cmdline, can't be" ); ++ goto error_out; ++ } ++ ++ available = ::read( fd, &buf, sizeof(buf) ); ++ if ( available <= 0 ) ++ goto error_out; ++ ++ /* ++ * find out the number of arguments ++ */ ++ size = 0; ++ for (int i = 0; i < available; ++i ) ++ if ( buf[i] == '\0' ) ++ ++size; ++ ++ /* now create a the cmdline */ ++ cmdline = new char*[size+1]; ++ cmdline[size] = '\0'; // parnoid... ++ ++ string_start = &buf[0]; ++ for ( int i = 0; i < size; ++i ) { ++ /* ++ * find the end of the string ++ */ ++ size_t sz = ::strlen(string_start); ++ cmdline[i] = new char[sz+1]; ++ memcpy( cmdline[i], string_start, sz+1 ); ++ string_start += (sz+1); // +1 for '\0' +1 to set it beyond ++ } ++ ++ ::close(fd); ++ ++ return; ++ ++/* error code */ ++error_out: ++ cmdline = new char*[2]; ++ cmdline[0] = "unknown_app"; ++ cmdline[1] = '\0'; ++ size = 1; ++} ++ ++static void free_cmd_line() { ++ /* ++ * free each string and then free the array ++ */ ++ for ( int i = 0; i < size; ++i ) ++ delete [] cmdline[i]; ++ ++ delete [] cmdline; ++} ++ ++static void __attribute__((constructor)) initialize_qpe_app() { ++ parse_cmd_line(); ++ ++ theApp = new QPEApplication( size, cmdline ); ++ dummyW = new QWidget; ++ theApp->showMainWidget(dummyW); ++} ++ ++static void __attribute__((destructor)) deinitialize_qpe_app() { ++ free_cmd_line(); ++ delete dummyW; ++ delete theApp; ++} ++ ++ ++#endif +Index: SDL-1.2.7/src/main/Makefile.am +=================================================================== +--- SDL-1.2.7.orig/src/main/Makefile.am 2004-02-18 18:22:01.000000000 +0100 ++++ SDL-1.2.7/src/main/Makefile.am 2005-09-24 19:56:40.000000000 +0200 +@@ -21,11 +21,7 @@ + if TARGET_MACOSX + MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h + else +-if TARGET_QTOPIA +-MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc +-else + MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c +-endif # !TARGET_QTOPIA + endif # !TARGET_MACOSX + endif # !TARGET_WIN32 + libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS) +Index: SDL-1.2.7/src/video/qtopia/Makefile.am +=================================================================== +--- SDL-1.2.7.orig/src/video/qtopia/Makefile.am 2002-05-28 21:24:11.000000000 +0200 ++++ SDL-1.2.7/src/video/qtopia/Makefile.am 2005-09-24 19:56:40.000000000 +0200 +@@ -15,4 +15,5 @@ + SDL_syswm.cc \ + SDL_syswm_c.h \ + SDL_sysevents.cc \ +- SDL_sysevents_c.h ++ SDL_sysevents_c.h \ ++ SDL_qmain.cc +Index: SDL-1.2.7/configure.in +=================================================================== +--- SDL-1.2.7.orig/configure.in 2004-02-22 22:31:47.000000000 +0100 ++++ SDL-1.2.7/configure.in 2005-09-24 19:58:30.000000000 +0200 +@@ -1806,7 +1806,7 @@ + # Set up files for the main() stub + if test "x$video_qtopia" = "xyes"; then + SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" +- SDL_LIBS="-lSDLmain $SDL_LIBS" ++ + fi + # Set up files for the audio library + # We use the OSS and ALSA API's, not the Sun audio API diff --git a/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb new file mode 100644 index 0000000000..60c2a9d385 --- /dev/null +++ b/packages/obsolete/libsdl/libsdl-qpe_1.2.7.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "Simple DirectMedia Layer - QtE-based Palmtop Environments Edition" +SECTION = "opie/libs" +PRIORITY = "optional" +DEPENDS = "virtual/libqpe1 libopie2" +PROVIDES = "virtual/libsdl" +LICENSE = "LGPL" + +# NOTE: make sure to keep PR in sync with libsdl-x11 +PR = "r9" + +SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ + file://agawa-piro-mickey.patch;patch=1 \ + file://pygame.patch;patch=1 \ + file://gcc34.patch;patch=1 \ + file://mouse.patch;patch=1 \ + file://kill-stdc++.patch;patch=1 \ + file://ipaq.patch;patch=1 \ + file://SDL-Akita.patch;patch=1 \ + file://fixlibs.patch;patch=1" +S = "${WORKDIR}/SDL-${PV}" + +inherit autotools binconfig + +EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ + --enable-file --enable-oss --disable-alsa --disable-esd --disable-arts \ + --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ + --disable-mintaudio --disable-nasm --disable-video-x11 --disable-video-dga \ + --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \ + --disable-video-xbios --disable-video-gem --disable-video-dummy \ + --disable-video-opengl --enable-input-events --enable-pthreads \ + --disable-video-picogui --enable-video-qtopia --enable-dlopen" + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*config" + +do_compile_prepend() { + if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ] + then + sed -i s,-lqte,-lqte-mt, src/Makefile + fi +} + +do_stage() { + oe_libinstall -so -C src libSDL ${STAGING_LIBDIR} + rm ${STAGING_LIBDIR}/libSDL.la + ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so + install -m 0655 src/main/libSDLmain.a src/main/.libs/ + oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/SDL + for f in include/*.h + do + install -m 0644 $f ${STAGING_INCDIR}/SDL/ + done + + install -m 0644 *.m4 ${STAGING_DATADIR}/aclocal/ +} -- cgit v1.2.3 From 6510c755565cf44a68179f64a6487b9824ee8315 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 14 Jan 2007 20:01:48 +0000 Subject: qte 2.3.10: Finish converting kernel-keymap.patch to -p1 format. --- packages/qte/qte-common_2.3.10.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'packages') diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 29b94db2b1..ce9969f3a3 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -54,19 +54,19 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m # add device specific patches here # SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " -SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-corgi.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;pnum=0 file://kernel-keymap-corgi.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_poodle = "file://kernel-keymap.patch;patch=1;pnum=0 " -SRC_URI_append_a780 = "file://kernel-keymap.patch;patch=1;pnum=0 " -SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1;pnum=0 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1;pnum=0 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_jornada6xx = "file://kernel-keymap.patch;patch=1;pnum=0 " -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_poodle = "file://kernel-keymap.patch;patch=1 " +SRC_URI_append_a780 = "file://kernel-keymap.patch;patch=1 " +SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1 " +SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_jornada6xx = "file://kernel-keymap.patch;patch=1 " +SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ file://mnci.patch;patch=1 \ file://mnci-touchscreen.patch;patch=1 \ -- cgit v1.2.3 From d347205f624d85d551a80daae8a0bbbb2e751d29 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Sun, 14 Jan 2007 20:31:40 +0000 Subject: libdaemon: Add missing header file daemon.h to package. --- packages/libdaemon/libdaemon_0.10.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libdaemon/libdaemon_0.10.bb b/packages/libdaemon/libdaemon_0.10.bb index a166414e61..ba7140ffdb 100644 --- a/packages/libdaemon/libdaemon_0.10.bb +++ b/packages/libdaemon/libdaemon_0.10.bb @@ -3,6 +3,7 @@ SECTION = "libs" AUTHOR = "Lennart Poettering " HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/" LICENSE = "LGPL" +PR = "r1" SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz" @@ -13,7 +14,7 @@ EXTRA_OECONF = "--disable-lynx --disable-doxygen" do_stage () { oe_libinstall -a -so -C libdaemon libdaemon ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/libdaemon - for i in dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do + for i in daemon.h dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do install -m 0644 ${S}/libdaemon/$i ${STAGING_INCDIR}/libdaemon/ done } -- cgit v1.2.3 From 5a24b133566e60f9302b952226a6a5cfa60eb093 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Sun, 14 Jan 2007 20:35:15 +0000 Subject: libg15: Add library staging. --- packages/libg15/libg15_1.2.1.bb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/libg15/libg15_1.2.1.bb b/packages/libg15/libg15_1.2.1.bb index 520c9441b8..746e5f2e98 100644 --- a/packages/libg15/libg15_1.2.1.bb +++ b/packages/libg15/libg15_1.2.1.bb @@ -1,12 +1,19 @@ DESCRIPTION = "This is a library to handle the LCD and extra keys on the Logitech G15 Gaming Keyboard." HOMEPAGE = "http://g15tools.sourceforge.net" LICENSE = "GPLv2" -SECTION = "console/utils" +SECTION = "libs" PRIORITY = "optional" DEPENDS = "libusb" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/g15tools/libg15-${PV}.tar.bz2" inherit autotools +do_stage () { + oe_libinstall -a -so libg15 ${STAGING_LIBDIR} + for i in libg15.h; do + install -m 0644 ${S}/$i ${STAGING_INCDIR}/ + done +} + -- cgit v1.2.3 From 934186241e31b00c8e7d7bcc1bb00203037dfe8a Mon Sep 17 00:00:00 2001 From: ccsmart Date: Sun, 14 Jan 2007 20:36:14 +0000 Subject: g15daemon: Added new package. --- packages/g15daemon/.mtn2git_empty | 0 packages/g15daemon/g15daemon_1.2.6a.bb | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 packages/g15daemon/.mtn2git_empty create mode 100644 packages/g15daemon/g15daemon_1.2.6a.bb (limited to 'packages') diff --git a/packages/g15daemon/.mtn2git_empty b/packages/g15daemon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/g15daemon/g15daemon_1.2.6a.bb b/packages/g15daemon/g15daemon_1.2.6a.bb new file mode 100644 index 0000000000..872d61d848 --- /dev/null +++ b/packages/g15daemon/g15daemon_1.2.6a.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "G15daemon takes control of the G15 keyboard, \ +allowing the use of all keys through the linux kernel uinput \ +device driver. It also controls the use of the keyboard's \ +LCD display, allows multiple, simultaneous client applications \ +to connect, and gives the user the ability to switch between \ +client apps at the press of a button." +HOMEPAGE = "http://g15tools.sourceforge.net" +LICENSE = "GPLv2" +SECTION = "console/utils" +PRIORITY = "optional" +DEPENDS = "libdaemon libg15" +RDEPENDS = "libg15" + +SRC_URI = "${SOURCEFORGE_MIRROR}/g15daemon/g15daemon-${PV}.tar.bz2" + +inherit autotools + +EXTRA_OECONF = "--disable-build-docs" + -- cgit v1.2.3 From 426035340eaa5cb6b8c893785c7706bcffe5a581 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sun, 14 Jan 2007 23:03:02 +0000 Subject: linux-efika: Enable CIFS in defconfig. --- packages/linux/linux-efika/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/linux/linux-efika/defconfig b/packages/linux/linux-efika/defconfig index 05a06b6c5e..b8a39ffa05 100644 --- a/packages/linux/linux-efika/defconfig +++ b/packages/linux/linux-efika/defconfig @@ -1827,7 +1827,7 @@ CONFIG_RPCSEC_GSS_SPKM3=m CONFIG_SMB_FS=m CONFIG_SMB_NLS_DEFAULT=y CONFIG_SMB_NLS_REMOTE="iso8859-1" -# CONFIG_CIFS is not set +CONFIG_CIFS=m # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -- cgit v1.2.3 From 0b7c9fa2763c447ce89b09efc55c2c4226ff114c Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sun, 14 Jan 2007 23:13:21 +0000 Subject: linux-efika: Sound driver altered to keep hands of register bits it shouldn't touch. --- ...d-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt | 834 +++++++++++++++++++++ packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb | 5 +- 2 files changed, 837 insertions(+), 2 deletions(-) create mode 100644 packages/linux/linux-efika/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt (limited to 'packages') diff --git a/packages/linux/linux-efika/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt b/packages/linux/linux-efika/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt new file mode 100644 index 0000000000..a352f0e2f5 --- /dev/null +++ b/packages/linux/linux-efika/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt @@ -0,0 +1,834 @@ +I cleaned up the setting of the port_config register on the MPC5200B. +This driver now touches only the two relevant bits without overriding +the others. + +Signed-off-by: Leon Woestenberg + +From 144658ad3d23bb426e29562235e40f0f9797a9c7 Mon Sep 17 00:00:00 2001 +From: Sylvain Munaut +Date: Mon, 18 Dec 2006 22:51:38 +0100 +Subject: [PATCH] sound: Add support for the MPC52xx PSC AC97 Link + +Messy driver, to be cleaned ... a lot ... + +Signed-off-by: Sylvain Munaut +--- + include/asm-ppc/mpc52xx_psc.h | 10 - + sound/ppc/Kconfig | 16 + + sound/ppc/Makefile | 3 + sound/ppc/mpc52xx_ac97.c | 738 +++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 765 insertions(+), 2 deletions(-) + +Index: linux-2.6.19-rc6_efika/include/asm-ppc/mpc52xx_psc.h +=================================================================== +--- linux-2.6.19-rc6_efika.orig/include/asm-ppc/mpc52xx_psc.h 2007-01-14 19:45:07.000000000 +0100 ++++ linux-2.6.19-rc6_efika/include/asm-ppc/mpc52xx_psc.h 2007-01-14 19:45:07.000000000 +0100 +@@ -28,6 +28,10 @@ + #define MPC52xx_PSC_MAXNUM 6 + + /* Programmable Serial Controller (PSC) status register bits */ ++#define MPC52xx_PSC_SR_UNEX_RX 0x0001 ++#define MPC52xx_PSC_SR_DATA_VAL 0x0002 ++#define MPC52xx_PSC_SR_DATA_OVR 0x0004 ++#define MPC52xx_PSC_SR_CMDSEND 0x0008 + #define MPC52xx_PSC_SR_CDE 0x0080 + #define MPC52xx_PSC_SR_RXRDY 0x0100 + #define MPC52xx_PSC_SR_RXFULL 0x0200 +@@ -132,8 +136,10 @@ + u8 reserved5[3]; + u8 ctlr; /* PSC + 0x1c */ + u8 reserved6[3]; +- u16 ccr; /* PSC + 0x20 */ +- u8 reserved7[14]; ++ u32 ccr; /* PSC + 0x20 */ ++ u32 ac97_slots; /* PSC + 0x24 */ ++ u32 ac97_cmd; /* PSC + 0x28 */ ++ u32 ac97_data; /* PSC + 0x2c */ + u8 ivr; /* PSC + 0x30 */ + u8 reserved8[3]; + u8 ip; /* PSC + 0x34 */ +Index: linux-2.6.19-rc6_efika/sound/ppc/Kconfig +=================================================================== +--- linux-2.6.19-rc6_efika.orig/sound/ppc/Kconfig 2007-01-14 19:45:07.000000000 +0100 ++++ linux-2.6.19-rc6_efika/sound/ppc/Kconfig 2007-01-14 19:45:07.000000000 +0100 +@@ -33,3 +33,19 @@ + option. + + endmenu ++ ++ ++# ALSA ppc drivers ++ ++menu "ALSA PPC devices" ++ depends on SND!=n && PPC ++ ++config SND_PPC_MPC52xx_AC97 ++ tristate "Freescale MPC52xx AC97 interface support" ++ depends on SND && PPC_MPC52xx ++ select SND_AC97_CODEC ++ help ++ Say Y or M if you want to support any AC97 codec attached to ++ the Freescqle MPC52xx AC97 interface. ++ ++endmenu +Index: linux-2.6.19-rc6_efika/sound/ppc/Makefile +=================================================================== +--- linux-2.6.19-rc6_efika.orig/sound/ppc/Makefile 2007-01-14 19:45:07.000000000 +0100 ++++ linux-2.6.19-rc6_efika/sound/ppc/Makefile 2007-01-14 19:45:07.000000000 +0100 +@@ -4,6 +4,9 @@ + # + + snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o ++snd-mpc52xx-ac97-objs := mpc52xx_ac97.o + + # Toplevel Module Dependency + obj-$(CONFIG_SND_POWERMAC) += snd-powermac.o ++ ++obj-$(CONFIG_SND_PPC_MPC52xx_AC97) += snd-mpc52xx-ac97.o +Index: linux-2.6.19-rc6_efika/sound/ppc/mpc52xx_ac97.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.19-rc6_efika/sound/ppc/mpc52xx_ac97.c 2007-01-14 22:45:55.000000000 +0100 +@@ -0,0 +1,742 @@ ++/* ++ * Driver for the PSC of the Freescale MPC52xx configured as AC97 interface ++ * ++ * ++ * Copyright (C) 2006 Sylvain Munaut ++ * ++ * This file is licensed under the terms of the GNU General Public License ++ * version 2. This program is licensed "as is" without any warranty of any ++ * kind, whether express or implied. ++ */ ++ ++#define DEBUG ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++ ++#define DRV_NAME "mpc52xx-psc-ac97" ++ ++ ++/* ======================================================================== */ ++/* Structs / Defines */ ++/* ======================================================================== */ ++ ++/* Private structure */ ++struct mpc52xx_ac97_priv { ++ struct device *dev; ++ resource_size_t mem_start; ++ resource_size_t mem_len; ++ int irq; ++ struct mpc52xx_psc __iomem *psc; ++ struct snd_card *card; ++ struct snd_pcm *pcm; ++ struct snd_ac97 *ac97; ++ ++ struct snd_pcm_substream *substream_playback; ++ unsigned int buf_pos; ++}; ++ ++/* Register bit definition (AC97 mode specific) */ ++#define PSC_AC97_SLOT_BIT(n) (1<<(12-n)) ++#define PSC_AC97_SLOTS_XMIT_SHIFT 16 ++#define PSC_AC97_SLOTS_RECV_SHIFT 0 ++ ++ ++ ++/* ======================================================================== */ ++/* ISR routine */ ++/* ======================================================================== */ ++ ++static irqreturn_t ++mpc52xx_ac97_irq(int irq, void *dev_id) ++{ ++ struct mpc52xx_ac97_priv *priv = dev_id; ++ ++ static int icnt = 0; ++ #if 0 ++ { ++ unsigned int val; ++// val = in_be32(&priv->psc->ac97_data); ++ printk(KERN_INFO "mpc52xx_ac97_irq fired (isr=%04x, status=%04x) %08x\n", in_be16(&priv->psc->mpc52xx_psc_imr), in_be16(&priv->psc->mpc52xx_psc_status), val); ++ out_8(&priv->psc->command,MPC52xx_PSC_RST_ERR_STAT); ++ } ++ #endif ++ ++ /* Anti Crash during dev ;) */ ++ #if 0 ++ if ((icnt++) > 50000) ++ out_be16(&priv->psc->mpc52xx_psc_imr, 0); ++ #endif ++ ++ /* Copy 64 data into the buffer */ ++ if (in_be16(&priv->psc->mpc52xx_psc_imr) & 0x0100) { ++ if (priv->substream_playback) { ++ struct snd_pcm_runtime *rt; ++ ++ rt = priv->substream_playback->runtime; ++ ++ if (snd_pcm_playback_hw_avail(rt) < bytes_to_frames(rt,128)) { ++ int i; ++ /* Push silence */ ++ for (i=0; i<64; i++) ++ out_be32(&priv->psc->mpc52xx_psc_buffer_32, 0x00000800); ++ printk(KERN_DEBUG "pushed silence ...\n"); ++ } else { ++ int i; ++ unsigned short *data; ++ ++ data = (unsigned short *) ++ (&rt->dma_area[frames_to_bytes(rt, priv->buf_pos)]); ++ ++ for (i=0; i<64; i++) ++ out_be32(&priv->psc->mpc52xx_psc_buffer_32, ++ (((unsigned int)data[i]) << 16) | 0x00000000); ++ /* Setting the sof bit looks useless */ ++ ++ priv->buf_pos += bytes_to_frames(rt,128);; ++ if (priv->buf_pos >= rt->buffer_size) ++ priv->buf_pos = 0; ++ ++ snd_pcm_period_elapsed(priv->substream_playback); ++ } ++ } else { ++ out_be16(&priv->psc->mpc52xx_psc_imr, 0); ++ printk(KERN_DEBUG "Interrupt with no stream ...\n"); ++ } ++ } else { ++ printk(KERN_ERR "Spurious int\n"); ++ } ++ ++ return IRQ_HANDLED; ++} ++ ++ ++/* ======================================================================== */ ++/* PCM interface */ ++/* ======================================================================== */ ++ ++/* HW desc */ ++ ++static struct snd_pcm_hardware mpc52xx_ac97_hw = { ++ .info = SNDRV_PCM_INFO_INTERLEAVED | ++ SNDRV_PCM_INFO_MMAP | ++ SNDRV_PCM_INFO_MMAP_VALID, ++ .formats = SNDRV_PCM_FMTBIT_S16_BE, ++ .rates = SNDRV_PCM_RATE_8000_48000, ++ .rate_min = 8000, ++ .rate_max = 48000, ++ .channels_min = 1, ++ .channels_max = 2, /* Support for more ? */ ++ .buffer_bytes_max = 128*1024, ++ .period_bytes_min = 128, /* 32, */ ++ .period_bytes_max = 128, /* 16*1024, */ ++ .periods_min = 8, ++ .periods_max = 256, ++ .fifo_size = 512, ++}; ++ ++ ++/* Playback */ ++ ++static int ++mpc52xx_ac97_playback_open(struct snd_pcm_substream *substream) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ ++ dev_dbg(priv->dev, "mpc52xx_ac97_playback_open(%p)\n", substream); ++ ++ substream->runtime->hw = mpc52xx_ac97_hw; ++ ++ priv->substream_playback = substream; ++ priv->buf_pos = 0; /* FIXME Do that where ? */ ++ ++ return 0; /* FIXME */ ++} ++ ++static int ++mpc52xx_ac97_playback_close(struct snd_pcm_substream *substream) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ dev_dbg(priv->dev, "mpc52xx_ac97_playback_close(%p)\n", substream); ++ priv->substream_playback = NULL; ++ return 0; /* FIXME */ ++} ++ ++static int ++mpc52xx_ac97_playback_prepare(struct snd_pcm_substream *substream) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ ++ dev_dbg(priv->dev, "mpc52xx_ac97_playback_prepare(%p)\n", substream); ++ ++ /* FIXME, need a spinlock to protect access */ ++ if (substream->runtime->channels == 1) ++ out_be32(&priv->psc->ac97_slots, 0x01000000); ++ else ++ out_be32(&priv->psc->ac97_slots, 0x03000000); ++ ++ snd_ac97_set_rate(priv->ac97, AC97_PCM_FRONT_DAC_RATE, substream->runtime->rate); ++ ++ return 0; /* FIXME */ ++} ++ ++ ++/* Capture */ ++ ++static int ++mpc52xx_ac97_capture_open(struct snd_pcm_substream *substream) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ return 0; /* FIXME */ ++} ++ ++static int ++mpc52xx_ac97_capture_close(struct snd_pcm_substream *substream) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ return 0; /* FIXME */ ++} ++ ++static int ++mpc52xx_ac97_capture_prepare(struct snd_pcm_substream *substream) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ return 0; /* FIXME */ ++} ++ ++ ++/* Common */ ++ ++static int ++mpc52xx_ac97_hw_params(struct snd_pcm_substream *substream, ++ struct snd_pcm_hw_params *params) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ int rv; ++ ++ dev_dbg(priv->dev, "mpc52xx_ac97_hw_params(%p)\n", substream); ++ ++ rv = snd_pcm_lib_malloc_pages(substream, ++ params_buffer_bytes(params)); ++ if (rv < 0) { ++ printk(KERN_ERR "hw params failes\n"); /* FIXME */ ++ return rv; ++ } ++ ++ printk(KERN_DEBUG "%d %d %d\n", params_buffer_bytes(params), params_period_bytes(params), params_periods(params)); ++ ++ ++ return 0; ++} ++ ++static int ++mpc52xx_ac97_hw_free(struct snd_pcm_substream *substream) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ ++ dev_dbg(priv->dev, "mpc52xx_ac97_hw_free(%p)\n", substream); ++ ++ return snd_pcm_lib_free_pages(substream); ++} ++ ++static int ++mpc52xx_ac97_trigger(struct snd_pcm_substream *substream, int cmd) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ int rv = 0; ++ ++ dev_dbg(priv->dev, "mpc52xx_ac97_trigger(%p,%d)\n", substream, cmd); ++ ++ switch (cmd) { ++ case SNDRV_PCM_TRIGGER_START: ++ /* Enable TX interrupt */ ++ out_be16(&priv->psc->mpc52xx_psc_imr, 0x0100); // 0x0100 ++ ++ break; ++ ++ case SNDRV_PCM_TRIGGER_STOP: ++ /* Disable TX interrupt */ ++ out_be16(&priv->psc->mpc52xx_psc_imr, 0x0000); ++ ++ break; ++ ++ default: ++ rv = -EINVAL; ++ } ++ ++ /* FIXME */ ++ return rv; ++} ++ ++static snd_pcm_uframes_t ++mpc52xx_ac97_pointer(struct snd_pcm_substream *substream) ++{ ++ struct mpc52xx_ac97_priv *priv = substream->pcm->private_data; ++ ++// dev_dbg(priv->dev, "mpc52xx_ac97_pointer(%p)\n", substream); ++ ++ if (substream->runtime->channels == 1) ++ return priv->buf_pos; /* FIXME */ ++ else ++ return priv->buf_pos >> 1; /* FIXME */ ++} ++ ++ ++/* Ops */ ++ ++static struct snd_pcm_ops mpc52xx_ac97_playback_ops = { ++ .open = mpc52xx_ac97_playback_open, ++ .close = mpc52xx_ac97_playback_close, ++ .ioctl = snd_pcm_lib_ioctl, ++ .hw_params = mpc52xx_ac97_hw_params, ++ .hw_free = mpc52xx_ac97_hw_free, ++ .prepare = mpc52xx_ac97_playback_prepare, ++ .trigger = mpc52xx_ac97_trigger, ++ .pointer = mpc52xx_ac97_pointer, ++}; ++ ++static struct snd_pcm_ops mpc52xx_ac97_capture_ops = { ++ .open = mpc52xx_ac97_capture_open, ++ .close = mpc52xx_ac97_capture_close, ++ .ioctl = snd_pcm_lib_ioctl, ++ .hw_params = mpc52xx_ac97_hw_params, ++ .hw_free = mpc52xx_ac97_hw_free, ++ .prepare = mpc52xx_ac97_capture_prepare, ++ .trigger = mpc52xx_ac97_trigger, ++ .pointer = mpc52xx_ac97_pointer, ++}; ++ ++ ++/* ======================================================================== */ ++/* AC97 Bus interface */ ++/* ======================================================================== */ ++ ++static unsigned short ++mpc52xx_ac97_bus_read(struct snd_ac97 *ac97, unsigned short reg) ++{ ++ struct mpc52xx_ac97_priv *priv = ac97->private_data; ++ int timeout; ++ unsigned int val; ++ ++ dev_dbg(priv->dev, "ac97 read: reg %04x\n", reg); ++ ++ /* Wait for it to be ready */ ++ timeout = 1000; ++ while ((--timeout) && (in_be16(&priv->psc->mpc52xx_psc_status) & ++ MPC52xx_PSC_SR_CMDSEND) ) ++ udelay(10); ++ ++ if (!timeout) { ++ printk(KERN_ERR DRV_NAME ": timeout on ac97 bus (rdy)\n"); ++ return 0xffff; ++ } ++ ++ /* Do the read */ ++ out_be32(&priv->psc->ac97_cmd, (1<<31) | ((reg & 0x7f) << 24)); ++ ++ /* Wait for the answer */ ++ timeout = 1000; ++ while ((--timeout) && !(in_be16(&priv->psc->mpc52xx_psc_status) & ++ MPC52xx_PSC_SR_DATA_VAL) ) ++ udelay(10); ++ ++ if (!timeout) { ++ printk(KERN_ERR DRV_NAME ": timeout on ac97 read (val)\n"); ++ return 0xffff; ++ } ++ ++ /* Get the data */ ++ val = in_be32(&priv->psc->ac97_data); ++ if ( ((val>>24) & 0x7f) != reg ) { ++ printk(KERN_ERR DRV_NAME ": reg echo error on ac97 read\n"); ++ return 0xffff; ++ } ++ val = (val >> 8) & 0xffff; ++ ++ dev_dbg(priv->dev, "ac97 read ok: reg %04x val %04x\n", ++ reg, val); ++ ++ return (unsigned short) val; ++} ++ ++static void ++mpc52xx_ac97_bus_write(struct snd_ac97 *ac97, ++ unsigned short reg, unsigned short val) ++{ ++ struct mpc52xx_ac97_priv *priv = ac97->private_data; ++ int timeout; ++ ++ dev_dbg(priv->dev, "ac97 write: reg %04x val %04x\n", ++ reg, val); ++ ++ /* Wait for it to be ready */ ++ timeout = 1000; ++ while ((--timeout) && (in_be16(&priv->psc->mpc52xx_psc_status) & ++ MPC52xx_PSC_SR_CMDSEND) ) ++ udelay(10); ++ ++ if (!timeout) { ++ printk(KERN_ERR DRV_NAME ": timeout on ac97 write\n"); ++ return; ++ } ++ ++ /* Write data */ ++ out_be32(&priv->psc->ac97_cmd, ((reg & 0x7f) << 24) | (val << 8)); ++} ++ ++static void ++mpc52xx_ac97_bus_reset(struct snd_ac97 *ac97) ++{ ++ struct mpc52xx_ac97_priv *priv = ac97->private_data; ++ ++ dev_dbg(priv->dev, "ac97 codec reset\n"); ++ ++ /* Do a cold reset */ ++ out_8(&priv->psc->op1, 0x03); ++ udelay(10); ++ out_8(&priv->psc->op0, 0x02); ++ udelay(50); ++ ++ /* PSC recover from cold reset (cfr user manual, not sure if useful) */ ++ out_be32(&priv->psc->sicr, in_be32(&priv->psc->sicr)); ++} ++ ++ ++static struct snd_ac97_bus_ops mpc52xx_ac97_bus_ops = { ++ .read = mpc52xx_ac97_bus_read, ++ .write = mpc52xx_ac97_bus_write, ++ .reset = mpc52xx_ac97_bus_reset, ++}; ++ ++ ++/* ======================================================================== */ ++/* Sound driver setup */ ++/* ======================================================================== */ ++ ++static int ++mpc52xx_ac97_setup_pcm(struct mpc52xx_ac97_priv *priv) ++{ ++ int rv; ++ ++ rv = snd_pcm_new(priv->card, DRV_NAME "-pcm", 0, 1, 1, &priv->pcm); ++ if (rv) { ++ printk(KERN_ERR DRV_NAME ": snd_pcm_new failed\n"); ++ return rv; ++ } ++ ++ rv = snd_pcm_lib_preallocate_pages_for_all(priv->pcm, ++ SNDRV_DMA_TYPE_CONTINUOUS, snd_dma_continuous_data(GFP_KERNEL), ++ 128*1024, 128*1024); ++ if (rv) { ++ printk(KERN_ERR DRV_NAME ++ ": snd_pcm_lib_preallocate_pages_for_all failed\n"); ++ return rv; ++ } ++ ++ snd_pcm_set_ops(priv->pcm, SNDRV_PCM_STREAM_PLAYBACK, ++ &mpc52xx_ac97_playback_ops); ++ snd_pcm_set_ops(priv->pcm, SNDRV_PCM_STREAM_CAPTURE, ++ &mpc52xx_ac97_capture_ops); ++ ++ priv->pcm->private_data = priv; ++ priv->pcm->info_flags = 0; ++ ++ strcpy(priv->pcm->name, "Freescale MPC52xx PSC-AC97 PCM"); ++ ++ return 0; ++} ++ ++static int ++mpc52xx_ac97_setup_mixer(struct mpc52xx_ac97_priv *priv) ++{ ++ struct snd_ac97_bus *ac97_bus; ++ struct snd_ac97_template ac97_template; ++ int rv; ++ ++ rv = snd_ac97_bus(priv->card, 0, &mpc52xx_ac97_bus_ops, NULL, &ac97_bus); ++ if (rv) { ++ printk(KERN_ERR DRV_NAME ": snd_ac97_bus failed\n"); ++ return rv; ++ } ++ ++ memset(&ac97_template, 0, sizeof(struct snd_ac97_template)); ++ ac97_template.private_data = priv; ++ ++ rv = snd_ac97_mixer(ac97_bus, &ac97_template, &priv->ac97); ++ if (rv) { ++ printk(KERN_ERR DRV_NAME ": snd_ac97_mixer failed\n"); ++ return rv; ++ } ++ ++ return 0; ++} ++ ++ ++static int ++mpc52xx_ac97_hwinit(struct mpc52xx_ac97_priv *priv) ++{ ++ /* Reset everything first by safety */ ++ out_8(&priv->psc->command,MPC52xx_PSC_RST_RX); ++ out_8(&priv->psc->command,MPC52xx_PSC_RST_TX); ++ out_8(&priv->psc->command,MPC52xx_PSC_RST_ERR_STAT); ++ ++ /* Do a cold reset of codec */ ++ out_8(&priv->psc->op1, 0x03); ++ udelay(10); ++ out_8(&priv->psc->op0, 0x02); ++ udelay(50); ++ ++ /* Configure AC97 enhanced mode */ ++ out_be32(&priv->psc->sicr, 0x03010000); ++ ++ /* No slots active */ ++ out_be32(&priv->psc->ac97_slots, 0x00000000); ++ ++ /* No IRQ */ ++ out_be16(&priv->psc->mpc52xx_psc_imr, 0x0000); ++ ++ /* FIFO levels */ ++ out_8(&priv->psc->rfcntl, 0x07); ++ out_8(&priv->psc->tfcntl, 0x07); ++ out_be16(&priv->psc->rfalarm, 0x80); ++ out_be16(&priv->psc->tfalarm, 0x80); ++ ++ /* Go */ ++ out_8(&priv->psc->command,MPC52xx_PSC_TX_ENABLE); ++ out_8(&priv->psc->command,MPC52xx_PSC_RX_ENABLE); ++ ++ return 0; ++} ++ ++static int ++mpc52xx_ac97_hwshutdown(struct mpc52xx_ac97_priv *priv) ++{ ++ /* No IRQ */ ++ out_be16(&priv->psc->mpc52xx_psc_imr, 0x0000); ++ ++ /* Disable TB & RX */ ++ out_8(&priv->psc->command,MPC52xx_PSC_RST_RX); ++ out_8(&priv->psc->command,MPC52xx_PSC_RST_TX); ++ ++ /* FIXME : Reset or put codec in low power ? */ ++ ++ return 0; ++} ++ ++ ++/* ======================================================================== */ ++/* OF Platform Driver */ ++/* ======================================================================== */ ++ ++static int __devinit ++mpc52xx_ac97_probe(struct of_device *op, const struct of_device_id *match) ++{ ++ struct device_node *dn = op->node; ++ struct mpc52xx_ac97_priv *priv; ++ struct snd_card *card; ++ struct resource res; ++ int rv; ++ ++ dev_dbg(&op->dev, "probing MPC52xx PSC AC97 driver\n"); ++ ++ /* Get card structure */ ++ rv = -ENOMEM; ++ card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, ++ THIS_MODULE, sizeof(struct mpc52xx_ac97_priv)); ++ if (!card) ++ goto err_early; ++ ++ priv = card->private_data; ++ ++ /* Init our private structure */ ++ priv->card = card; ++ priv->dev = &op->dev; ++ ++ /* Get resources (mem,irq,...) */ ++ rv = of_address_to_resource(dn, 0, &res); ++ if (rv) ++ goto err_early; ++ ++ priv->mem_start = res.start; ++ priv->mem_len = res.end - res.start + 1; ++ ++ if (!request_mem_region(priv->mem_start, priv->mem_len, DRV_NAME)) { ++ printk(KERN_ERR DRV_NAME ": request_mem_region failed\n"); ++ rv = -EBUSY; ++ goto err_early; ++ } ++ ++ priv->psc = ioremap(priv->mem_start, priv->mem_len); ++ if (!priv->psc) { ++ printk(KERN_ERR DRV_NAME ": ioremap failed\n"); ++ rv = -ENOMEM; ++ goto err_iomap; ++ } ++ ++ priv->irq = irq_of_parse_and_map(dn, 0); ++ if (priv->irq == NO_IRQ) { ++ printk(KERN_ERR DRV_NAME ": irq_of_parse_and_map failed\n"); ++ rv = -EBUSY; ++ goto err_irqmap; ++ } ++ ++ /* Low level HW Init */ ++ mpc52xx_ac97_hwinit(priv); ++ ++ /* Request IRQ now that we're 'stable' */ ++ rv = request_irq(priv->irq, mpc52xx_ac97_irq, 0, DRV_NAME, priv); ++ if (rv < 0) { ++ printk(KERN_ERR DRV_NAME ": request_irq failed\n"); ++ goto err_irqreq; ++ } ++ ++ /* Prepare sound stuff */ ++ rv = mpc52xx_ac97_setup_mixer(priv); ++ if (rv) ++ goto err_late; ++ ++ rv = mpc52xx_ac97_setup_pcm(priv); ++ if (rv) ++ goto err_late; ++ ++ /* Finally register the card */ ++ snprintf(card->shortname, sizeof(card->shortname), DRV_NAME); ++ snprintf(card->longname, sizeof(card->longname), ++ "Freescale MPC52xx PSC-AC97 (%s)", card->mixername); ++ ++ rv = snd_card_register(card); ++ if (rv) { ++ printk(KERN_ERR DRV_NAME ": snd_card_register failed\n"); ++ goto err_late; ++ } ++ ++ dev_set_drvdata(&op->dev, priv); ++ ++ return 0; ++ ++err_late: ++ free_irq(priv->irq, priv); ++err_irqreq: ++ mpc52xx_ac97_hwshutdown(priv); ++ irq_dispose_mapping(priv->irq); ++err_irqmap: ++ iounmap(priv->psc); ++err_iomap: ++ release_mem_region(priv->mem_start, priv->mem_len); ++err_early: ++ if (card) ++ snd_card_free(card); ++ return rv; ++} ++ ++static int ++mpc52xx_ac97_remove(struct of_device *op) ++{ ++ struct mpc52xx_ac97_priv *priv; ++ ++ dev_dbg(&op->dev, "removing MPC52xx PSC AC97 driver\n"); ++ ++ priv = dev_get_drvdata(&op->dev); ++ if (priv) { ++ /* Sound subsys shutdown */ ++ snd_card_free(priv->card); ++ ++ /* Low level HW shutdown */ ++ mpc52xx_ac97_hwshutdown(priv); ++ ++ /* Release resources */ ++ iounmap(priv->psc); ++ free_irq(priv->irq, priv); ++ irq_dispose_mapping(priv->irq); ++ release_mem_region(priv->mem_start, priv->mem_len); ++ } ++ ++ dev_set_drvdata(&op->dev, NULL); ++ ++ return 0; ++} ++ ++ ++static struct of_device_id mpc52xx_ac97_of_match[] = { ++ { ++/* .type = "ac97", FIXME Efika ... */ ++ .compatible = "mpc5200b-psc-ac97", /* B only for now */ ++ }, ++}; ++/* Prevent autoload during developpment phase ... */ ++/* MODULE_DEVICE_TABLE(of, mpc52xx_ac97_of_match); */ ++ ++ ++static struct of_platform_driver mpc52xx_ac97_of_driver = { ++ .owner = THIS_MODULE, ++ .name = DRV_NAME, ++ .match_table = mpc52xx_ac97_of_match, ++ .probe = mpc52xx_ac97_probe, ++ .remove = mpc52xx_ac97_remove, ++ .driver = { ++ .name = DRV_NAME, ++ }, ++}; ++ ++ ++/* ======================================================================== */ ++/* Module */ ++/* ======================================================================== */ ++ ++static int __init ++mpc52xx_ac97_init(void) ++{ ++ int rv; ++ ++ /* Set port_config bits[25:26] to 01, keep the others as-is. This ++ sets PSC2 to AC97 mode. */ ++ { ++ void *mbar; ++ u32 port_config; ++ mbar = ioremap(0xf0000000, 0x100000); ++ port_config = in_be32(mbar + 0xb00); ++ printk(KERN_INFO "port_config was: %08x\n", port_config); ++ port_config &= ~0x00000060; ++ port_config |= 0x00000020; ++ out_be32(mbar + 0xb00, port_config); ++ printk(KERN_INFO "port_config now: %08x\n", port_config); ++ iounmap(mbar); ++ } ++ ++ printk(KERN_INFO "Sound: MPC52xx PSC AC97 driver\n"); ++ ++ rv = of_register_platform_driver(&mpc52xx_ac97_of_driver); ++ if (rv) { ++ printk(KERN_ERR DRV_NAME ": " ++ "of_register_platform_driver failed (%i)\n", rv); ++ return rv; ++ } ++ ++ return 0; ++} ++ ++static void __exit ++mpc52xx_ac97_exit(void) ++{ ++ of_unregister_platform_driver(&mpc52xx_ac97_of_driver); ++} ++ ++module_init(mpc52xx_ac97_init); ++module_exit(mpc52xx_ac97_exit); ++ ++MODULE_AUTHOR("Sylvain Munaut "); ++MODULE_DESCRIPTION(DRV_NAME ": Freescale MPC52xx PSC AC97 driver"); ++MODULE_LICENSE("GPL"); ++ diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb index 679bd667d5..fec05ad168 100644 --- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb +++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb @@ -1,15 +1,16 @@ DESCRIPTION = "Linux Kernel for the EFIKA dev platform" SECTION = "kernel" LICENSE = "GPL" -PR = "r1" +PR = "r2" COMPATIBLE_MACHINE = "efika" SRC_URI = "http://www.efika.de/download/linux-2.6.19-rc6_efika.tgz \ - http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \ + file://0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \ http://www.246tnt.com/files/0001-powerpc-Add-device-tree-fixup-for-the-EFIKA.txt;patch=1 \ file://defconfig \ " +# http://www.246tnt.com/files/0001-sound-Add-support-for-the-MPC52xx-PSC-AC97-Link.txt;patch=1 \ # http://lkml.org/lkml/2006/11/29/335;patch=1 \ S = "${WORKDIR}/linux-2.6.19-rc6_efika" -- cgit v1.2.3 From 8df84b1a2c7d93b25322584146586fbf2ac90163 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Jan 2007 00:31:30 +0000 Subject: wv: add 1.2.0, from Poky, ran through oe-stylize.py --- packages/wv/.mtn2git_empty | 0 packages/wv/wv_1.2.0.bb | 12 ++++++++++++ 2 files changed, 12 insertions(+) create mode 100644 packages/wv/.mtn2git_empty create mode 100644 packages/wv/wv_1.2.0.bb (limited to 'packages') diff --git a/packages/wv/.mtn2git_empty b/packages/wv/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wv/wv_1.2.0.bb b/packages/wv/wv_1.2.0.bb new file mode 100644 index 0000000000..10c3264766 --- /dev/null +++ b/packages/wv/wv_1.2.0.bb @@ -0,0 +1,12 @@ +LICENSE = "GPLv2" + +SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/wvware/wv-${PV}.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + -- cgit v1.2.3 From 18b31b669a67fd9dbfdf043d21817ce42831ee16 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 15 Jan 2007 03:37:55 +0000 Subject: libopie2: Enable SQL PIM backend. * Let users store their data reliably. XML backend is still used by default, user must activate SQLite in config files (see OPIE wiki). * Regarding concerns due to which is wasn't enabled before: "too large for 16MB flash devices" - such devices welcome to disable-override it; "no sync" - apparently, no sync with SQLite backend active, but XML is till by default. * SQLite backend and opie-pimconvert tested to work OK on hx4700 (on small dataset though, more tetsing pending). Suprising;y, I had rather weird issues with sqlite3 on qemuarm. --- packages/libopie/libopie2.inc | 8 ++++++-- packages/libopie/libopie2_1.2.2.bb | 2 +- packages/libopie/libopie2_cvs.bb | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 17ac4e2605..1e0d4f1b9a 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -19,8 +19,12 @@ EXTRA_QMAKEVARS_POST += 'DEFINES+=OPIE_NEW_MALLOC \ DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \ LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"' -#NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images -EXTRA_QMAKEVARS_PRE += 'ENABLE_SQL_PIM_BACKEND=n' +ENABLE_SQL_PIM_BACKEND = "y" +# NOTE: Machines with too little amount of flash may want to disable SQL backend support +# (known not to fit in 16MB). Also, XML backend is still used by default, as SQL doesn't +# support sync yet. +#ENABLE_SQL_PIM_BACKEND_smallmachine = "n" +EXTRA_QMAKEVARS_PRE += 'ENABLE_SQL_PIM_BACKEND=${ENABLE_SQL_PIM_BACKEND}' MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez" LIBS = "core2 db2 mm2 net2 pim2 security2 ui2 bluez2" diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb index 8fcc2fba0a..1bef43c329 100644 --- a/packages/libopie/libopie2_1.2.2.bb +++ b/packages/libopie/libopie2_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index d8385ceea6..1635a5b1a3 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "1.2.2+cvs${SRCDATE}" -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 2cd333daa8322617cc933113902bba032f352275 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Jan 2007 12:24:49 +0000 Subject: abiword-2.5.inc: add include file for abiword 2.5 series, based on the one present in Poky. * abiword 2.5.0 is missing the perl cdump and doesn't compile, so that's why the actual recipe is missing --- packages/abiword/abiword-2.5.inc | 62 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 packages/abiword/abiword-2.5.inc (limited to 'packages') diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc new file mode 100644 index 0000000000..cd95777227 --- /dev/null +++ b/packages/abiword/abiword-2.5.inc @@ -0,0 +1,62 @@ +DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" +SECTION = "gnome/office" +HOMEPAGE = "http://www.abiword.org"" +LICENSE = "GPLv2" + +DEPENDS = "perl-native wv libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng libxml2" +RDEPENDS = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \ + glibc-gconv-iso8859-15 glibc-gconv-iso8859-1" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz" + +#want 2.x from 2.x.y for the installation directory +SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" + +FILES_${PN} += " \ + ${datadir}/icons/* \ + ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/glade \ + ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/scripts \ + ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en \ + ${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile-en_GB \ +# ${datadir}/AbiSuite-${SHRT_VER}/templates/A4.awt \ +# ${datadir}/AbiSuite-${SHRT_VER}/templates/US-Letter.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/normal.awt-en_GB \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Employee-Directory.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Business-Report.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Fax-Coversheet.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Resume.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Two-Columns.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Memo.awt \ + ${datadir}/AbiSuite-${SHRT_VER}/templates/Press-Release.awt " + +inherit autotools pkgconfig + +PARALLEL_MAKE = "" + +EXTRA_OECONF = " --disable-pspell \ + --enable-enchant \ + --with-sys-wv" + +# AbiWord configure.ac does not play nicely with autoreconf +# so use the autogen.sh script that comes with AbiWord +# +do_configure() { + cd ${S} + export NOCONFIGURE="no"; ./autogen.sh + oe_runconf +} + + +do_install_append() { + install -d ${D}${datadir}/pixmaps/ + mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ +} + +PACKAGES += " abiword-clipart abiword-icons abiword-strings abiword-systemprofiles abiword-templates " + +FILES_abiword-clipart += "${datadir}/AbiSuite-${SHRT_VER}/clipart" +FILES_abiword-icons += "${datadir}/AbiSuite-${SHRT_VER}/icons" +FILES_abiword-strings += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/strings" +FILES_abiword-systemprofiles += "${datadir}/AbiSuite-${SHRT_VER}/AbiWord/system.profile*" +FILES_abiword-templates += "${datadir}/AbiSuite-${SHRT_VER}/templates" -- cgit v1.2.3 From c95d5e23ce088516b69c98aa9cc13fdd65d8aefc Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 12:58:54 +0000 Subject: bluez: update libs and utils to 3.8, hcidump to 1.33 --- packages/bluez/bluez-hcidump_1.25.bb | 15 ---------- packages/bluez/bluez-hcidump_1.33.bb | 13 +++++++++ packages/bluez/bluez-libs_3.1.bb | 22 --------------- packages/bluez/bluez-libs_3.8.bb | 22 +++++++++++++++ packages/bluez/bluez-utils_3.1.bb | 52 ----------------------------------- packages/bluez/bluez-utils_3.8.bb | 53 ++++++++++++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 89 deletions(-) delete mode 100644 packages/bluez/bluez-hcidump_1.25.bb create mode 100644 packages/bluez/bluez-hcidump_1.33.bb delete mode 100644 packages/bluez/bluez-libs_3.1.bb create mode 100644 packages/bluez/bluez-libs_3.8.bb delete mode 100644 packages/bluez/bluez-utils_3.1.bb create mode 100644 packages/bluez/bluez-utils_3.8.bb (limited to 'packages') diff --git a/packages/bluez/bluez-hcidump_1.25.bb b/packages/bluez/bluez-hcidump_1.25.bb deleted file mode 100644 index 0cbc0fd6ec..0000000000 --- a/packages/bluez/bluez-hcidump_1.25.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools - - diff --git a/packages/bluez/bluez-hcidump_1.33.bb b/packages/bluez/bluez-hcidump_1.33.bb new file mode 100644 index 0000000000..877c8db33c --- /dev/null +++ b/packages/bluez/bluez-hcidump_1.33.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" +S = "${WORKDIR}/bluez-hcidump-${PV}" + +EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" + +inherit autotools diff --git a/packages/bluez/bluez-libs_3.1.bb b/packages/bluez/bluez-libs_3.1.bb deleted file mode 100644 index d740bd80a9..0000000000 --- a/packages/bluez/bluez-libs_3.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.bluez.org" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools pkgconfig - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez/bluez-libs_3.8.bb b/packages/bluez/bluez-libs_3.8.bb new file mode 100644 index 0000000000..d740bd80a9 --- /dev/null +++ b/packages/bluez/bluez-libs_3.8.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" + +inherit autotools pkgconfig + +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" + +do_stage() { + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/bluetooth/ + for f in ${HEADERS} + do + install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f + done +} diff --git a/packages/bluez/bluez-utils_3.1.bb b/packages/bluez/bluez-utils_3.1.bb deleted file mode 100644 index 40aabaab50..0000000000 --- a/packages/bluez/bluez-utils_3.1.bb +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus" -RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" -RCONFLICTS = "bluez-utils-dbus bluez-utils-nodbus" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - file://02dtl1_cs.sh \ - file://hciattach-ti-bts.patch;patch=1" - -# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' until further notice... -SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" - -S = "${WORKDIR}/bluez-utils-${PV}" - -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "bluetooth" -INITSCRIPT_PARAMS = "defaults 23 19" - -do_install_append() { - install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ - mv ${D}${sbindir}/* ${D}${base_sbindir}/ - mv ${D}${bindir}/* ${D}${base_bindir}/ - rmdir ${D}${bindir} ${D}${sbindir} - chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig - install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ - install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ -} - -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth" - -PACKAGES =+ "${PN}-ciptool" -FILES_${PN}-ciptool = "/bin/ciptool" -RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" -RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" diff --git a/packages/bluez/bluez-utils_3.8.bb b/packages/bluez/bluez-utils_3.8.bb new file mode 100644 index 0000000000..d549d12d30 --- /dev/null +++ b/packages/bluez/bluez-utils_3.8.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." +SECTION = "console" +PRIORITY = "optional" +DEPENDS = "bluez-libs-${PV} dbus" +PROVIDES = "bluez-utils-dbus" +RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" +RREPLACES = "bluez-utils-dbus" +RCONFLICTS_${PN} = "bluez-utils-nodbus" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + file://02dtl1_cs.sh \ + file://hciattach-ti-bts.patch;patch=1" + +# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol +# Let's default to that instead of 'any' until further notice... +SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" + +S = "${WORKDIR}/bluez-utils-${PV}" + +EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" +# --enable-obex enable OBEX support +# --enable-alsa enable ALSA support +# --enable-cups install CUPS backend support +# --enable-bccmd install BCCMD interface utility +# --enable-avctrl install Audio/Video control utility +# --enable-hid2hci install HID mode switching utility +# --enable-dfutool install DFU firmware upgrade utility + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bluetooth" +INITSCRIPT_PARAMS = "defaults 23 19" + +do_install_append() { + install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ + mv ${D}${sbindir}/* ${D}${base_sbindir}/ + mv ${D}${bindir}/* ${D}${base_bindir}/ + rmdir ${D}${bindir} ${D}${sbindir} + chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig + install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ + install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ +} + +CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ + ${sysconfdir}/default/bluetooth" + +PACKAGES =+ "${PN}-ciptool" +FILES_${PN}-ciptool = "/bin/ciptool" +RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" +RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" -- cgit v1.2.3 From 8e87aa5a55e8f6c1b8f43b98a01efdd9bea5523f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Jan 2007 13:11:37 +0000 Subject: abiword: add 2.5.0 so abi-master Xora can play with it --- packages/abiword/abiword_2.5.0.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/abiword/abiword_2.5.0.bb (limited to 'packages') diff --git a/packages/abiword/abiword_2.5.0.bb b/packages/abiword/abiword_2.5.0.bb new file mode 100644 index 0000000000..32b703c9ae --- /dev/null +++ b/packages/abiword/abiword_2.5.0.bb @@ -0,0 +1,8 @@ +require abiword-2.5.inc + +DEFAULT_PREFERENCE = "-1" + +PR = "r0" + +RCONFLICTS = "abiword-embedded" + -- cgit v1.2.3 From 14bf4d2ccae8bce7f73e77a3a1e05de280fd6ed0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 13:34:14 +0000 Subject: avahi: update to 0.6.16 and remove old versions --- packages/avahi/avahi_0.6.10.bb | 3 --- packages/avahi/avahi_0.6.11.bb | 3 --- packages/avahi/avahi_0.6.12.bb | 7 ------- packages/avahi/avahi_0.6.13.bb | 7 ------- packages/avahi/avahi_0.6.14.bb | 8 -------- packages/avahi/avahi_0.6.16.bb | 8 ++++++++ packages/avahi/avahi_0.6.5.bb | 1 - packages/avahi/avahi_0.6.8.bb | 1 - 8 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 packages/avahi/avahi_0.6.10.bb delete mode 100644 packages/avahi/avahi_0.6.11.bb delete mode 100644 packages/avahi/avahi_0.6.12.bb delete mode 100644 packages/avahi/avahi_0.6.13.bb delete mode 100644 packages/avahi/avahi_0.6.14.bb create mode 100644 packages/avahi/avahi_0.6.16.bb delete mode 100644 packages/avahi/avahi_0.6.5.bb delete mode 100644 packages/avahi/avahi_0.6.8.bb (limited to 'packages') diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb deleted file mode 100644 index 27dcdcffcb..0000000000 --- a/packages/avahi/avahi_0.6.10.bb +++ /dev/null @@ -1,3 +0,0 @@ -require avahi.inc - -PR = "r1" diff --git a/packages/avahi/avahi_0.6.11.bb b/packages/avahi/avahi_0.6.11.bb deleted file mode 100644 index 27dcdcffcb..0000000000 --- a/packages/avahi/avahi_0.6.11.bb +++ /dev/null @@ -1,3 +0,0 @@ -require avahi.inc - -PR = "r1" diff --git a/packages/avahi/avahi_0.6.12.bb b/packages/avahi/avahi_0.6.12.bb deleted file mode 100644 index aad7d2661c..0000000000 --- a/packages/avahi/avahi_0.6.12.bb +++ /dev/null @@ -1,7 +0,0 @@ -require avahi.inc - -PR = "r2" - -do_stage() { - autotools_stage_all -} diff --git a/packages/avahi/avahi_0.6.13.bb b/packages/avahi/avahi_0.6.13.bb deleted file mode 100644 index 076dc0d148..0000000000 --- a/packages/avahi/avahi_0.6.13.bb +++ /dev/null @@ -1,7 +0,0 @@ -require avahi.inc - -PR = "r1" - -do_stage() { - autotools_stage_all -} diff --git a/packages/avahi/avahi_0.6.14.bb b/packages/avahi/avahi_0.6.14.bb deleted file mode 100644 index e42f4bbc13..0000000000 --- a/packages/avahi/avahi_0.6.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require avahi.inc - -FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ - ${sysconfdir}/avahi/avahi-autoipd.action" - -do_stage() { - autotools_stage_all -} diff --git a/packages/avahi/avahi_0.6.16.bb b/packages/avahi/avahi_0.6.16.bb new file mode 100644 index 0000000000..e42f4bbc13 --- /dev/null +++ b/packages/avahi/avahi_0.6.16.bb @@ -0,0 +1,8 @@ +require avahi.inc + +FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \ + ${sysconfdir}/avahi/avahi-autoipd.action" + +do_stage() { + autotools_stage_all +} diff --git a/packages/avahi/avahi_0.6.5.bb b/packages/avahi/avahi_0.6.5.bb deleted file mode 100644 index 9189734dfa..0000000000 --- a/packages/avahi/avahi_0.6.5.bb +++ /dev/null @@ -1 +0,0 @@ -require avahi.inc diff --git a/packages/avahi/avahi_0.6.8.bb b/packages/avahi/avahi_0.6.8.bb deleted file mode 100644 index 9189734dfa..0000000000 --- a/packages/avahi/avahi_0.6.8.bb +++ /dev/null @@ -1 +0,0 @@ -require avahi.inc -- cgit v1.2.3 From c5d9be54bc0be29cd6197be90a8bf2666a3031d2 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 13:34:50 +0000 Subject: libnss-mdns: update to 0.9, bugfix release --- packages/libnss-mdns/libnss-mdns_0.8.bb | 33 --------------------------------- packages/libnss-mdns/libnss-mdns_0.9.bb | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 packages/libnss-mdns/libnss-mdns_0.8.bb create mode 100644 packages/libnss-mdns/libnss-mdns_0.9.bb (limited to 'packages') diff --git a/packages/libnss-mdns/libnss-mdns_0.8.bb b/packages/libnss-mdns/libnss-mdns_0.8.bb deleted file mode 100644 index a4a9cd00d1..0000000000 --- a/packages/libnss-mdns/libnss-mdns_0.8.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "NSS module for Multicast DNS name resolution" -HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" -LICENSE = "GPL" -SECTION = "libs" -PRIORITY = "optional" - -RRECOMMENDS_${PN} = "zeroconf" -PR = "r1" - -EXTRA_OECONF = "--libdir=/lib" -S = "${WORKDIR}/nss-mdns-${PV}" - -SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" - -inherit autotools - -pkg_postinst () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { - cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf - mv /tmp/nsswitch.conf /etc/nsswitch.conf - } -} - -pkg_prerm () { - cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { - cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf - mv /tmp/nsswitch.conf /etc/nsswitch.conf - } -} diff --git a/packages/libnss-mdns/libnss-mdns_0.9.bb b/packages/libnss-mdns/libnss-mdns_0.9.bb new file mode 100644 index 0000000000..171ff5113b --- /dev/null +++ b/packages/libnss-mdns/libnss-mdns_0.9.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "NSS module for Multicast DNS name resolution" +HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" + +RRECOMMENDS_${PN} = "zeroconf" +PR = "r0" + +EXTRA_OECONF = "--libdir=/lib" +S = "${WORKDIR}/nss-mdns-${PV}" + +SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" + +inherit autotools + +pkg_postinst () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} + +pkg_prerm () { + cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} -- cgit v1.2.3 From eb3ad275253b32d30962c312757cf290ea47218c Mon Sep 17 00:00:00 2001 From: Dirk Opfer Date: Mon, 15 Jan 2007 13:43:54 +0000 Subject: wlan-ng: add version 0.2.7 --- .../wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty | 0 .../wlan-ng-modules-0.2.7/only-the-modules.patch | 26 ++++++++ packages/wlan-ng/wlan-ng-modules_0.2.7.bb | 6 ++ .../wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty | 0 packages/wlan-ng/wlan-ng-utils-0.2.7/config.in | 21 +++++++ .../wlan-ng-utils-0.2.7/only-the-utils.patch | 26 ++++++++ packages/wlan-ng/wlan-ng-utils_0.2.7.bb | 69 ++++++++++++++++++++++ 7 files changed, 148 insertions(+) create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch create mode 100644 packages/wlan-ng/wlan-ng-modules_0.2.7.bb create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.7/config.in create mode 100644 packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch create mode 100644 packages/wlan-ng/wlan-ng-utils_0.2.7.bb (limited to 'packages') diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty b/packages/wlan-ng/wlan-ng-modules-0.2.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch b/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch new file mode 100644 index 0000000000..abb3b137da --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.7/only-the-modules.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-23 12:50:56.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:52:45.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared p80211 prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-23 12:50:55.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:52:09.000000000 +0200 +@@ -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_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb new file mode 100644 index 0000000000..169b72dd0b --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb @@ -0,0 +1,6 @@ +require wlan-ng-modules.inc + +SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2" + +S = "${WORKDIR}/linux-wlan-ng-${PV}" + diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty b/packages/wlan-ng/wlan-ng-utils-0.2.7/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in b/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in new file mode 100644 index 0000000000..be01488a92 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.7/config.in @@ -0,0 +1,21 @@ +WLAN_VERSION=0 +WLAN_PATCHLEVEL=2 +WLAN_SUBLEVEL=3 +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-utils-0.2.7/only-the-utils.patch b/packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch new file mode 100644 index 0000000000..af1f442a4c --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils-0.2.7/only-the-utils.patch @@ -0,0 +1,26 @@ +Index: trunk/src/Makefile +=================================================================== +--- trunk.orig/src/Makefile 2006-08-21 16:24:58.000000000 +0200 ++++ trunk/src/Makefile 2006-08-23 12:49:08.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../config.mk + +-DIRS=mkmeta shared wlanctl nwepgen wlancfg p80211 prism2 ++DIRS=mkmeta shared wlanctl nwepgen wlancfg prism2 + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` +Index: trunk/src/prism2/Makefile +=================================================================== +--- trunk.orig/src/prism2/Makefile 2006-08-21 16:24:57.000000000 +0200 ++++ trunk/src/prism2/Makefile 2006-08-23 12:48:32.000000000 +0200 +@@ -44,7 +44,7 @@ + + -include ../../config.mk + +-DIRS=driver ridlist download ++DIRS=ridlist download + + ifneq ($(wildcard *.addon),) + DIRS+=`cat *.addon` diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb new file mode 100644 index 0000000000..929f67fe16 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "linux-wlan-ng userland utilities" +HOMEPAGE = "http://www.linux-wlan.org" +SECTION = "kernel/userland" +DEPENDS = "virtual/kernel" +LICENSE = "GPL" + +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://hostldflags.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}/man1 + install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ +} + +FILES_${PN} = "/etc /sbin" -- cgit v1.2.3 From 77c460e2fa2b9755ae35f80299791ff28d71b6d4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 14:26:45 +0000 Subject: portmap: fix occurence of http://${DEBIAN_MIRROR} - these variables include the protocol --- packages/portmap/portmap.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc index e7e7673001..bb9d2b6652 100644 --- a/packages/portmap/portmap.inc +++ b/packages/portmap/portmap.inc @@ -3,7 +3,7 @@ SECTION = "console/network" LICENSE = "GPL" SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ - http://${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ + ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ file://no-libwrap.patch;patch=1;pnum=0 \ file://portmap.init \ file://make.patch;patch=1" -- cgit v1.2.3 From e68c4472cce34d6ebf1a48c07212a471e3c24bf0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 14:27:18 +0000 Subject: libnotify: update to 0.4.3 --- packages/libnotify/libnotify_0.3.2.bb | 13 ------------- packages/libnotify/libnotify_0.4.3.bb | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 packages/libnotify/libnotify_0.3.2.bb create mode 100644 packages/libnotify/libnotify_0.4.3.bb (limited to 'packages') diff --git a/packages/libnotify/libnotify_0.3.2.bb b/packages/libnotify/libnotify_0.3.2.bb deleted file mode 100644 index f3f3aff334..0000000000 --- a/packages/libnotify/libnotify_0.3.2.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "sends desktop notifications to a notification daemon" -HOMEPAGE = "http://www.galago-project.org/" -LICENSE = "LGPL" -DEPENDS = "dbus gtk+" -PR = "r0" - -SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/libnotify/libnotify_0.4.3.bb b/packages/libnotify/libnotify_0.4.3.bb new file mode 100644 index 0000000000..f3f3aff334 --- /dev/null +++ b/packages/libnotify/libnotify_0.4.3.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "sends desktop notifications to a notification daemon" +HOMEPAGE = "http://www.galago-project.org/" +LICENSE = "LGPL" +DEPENDS = "dbus gtk+" +PR = "r0" + +SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From c23afbe7c1cc18b96616cd2c2e83353d340a77cf Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 14:36:29 +0000 Subject: libsexy: unify recipes, add 0.1.10, drop 0.1.[45] --- packages/libsexy/libsexy.inc | 16 ++++++++++++++++ packages/libsexy/libsexy_0.1.10.bb | 2 ++ packages/libsexy/libsexy_0.1.4.bb | 16 ---------------- packages/libsexy/libsexy_0.1.5.bb | 16 ---------------- packages/libsexy/libsexy_0.1.6.bb | 16 +--------------- packages/libsexy/libsexy_0.1.8.bb | 17 +---------------- 6 files changed, 20 insertions(+), 63 deletions(-) create mode 100644 packages/libsexy/libsexy.inc create mode 100644 packages/libsexy/libsexy_0.1.10.bb delete mode 100644 packages/libsexy/libsexy_0.1.4.bb delete mode 100644 packages/libsexy/libsexy_0.1.5.bb (limited to 'packages') diff --git a/packages/libsexy/libsexy.inc b/packages/libsexy/libsexy.inc new file mode 100644 index 0000000000..522b7e0d63 --- /dev/null +++ b/packages/libsexy/libsexy.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" +HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" +AUTHOR = "Christian Hammond " +SECTION = "x11/libs" + +DEPENDS = "gtk+ enchant libxml2" + +SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { +autotools_stage_all +} + + diff --git a/packages/libsexy/libsexy_0.1.10.bb b/packages/libsexy/libsexy_0.1.10.bb new file mode 100644 index 0000000000..042ea757e9 --- /dev/null +++ b/packages/libsexy/libsexy_0.1.10.bb @@ -0,0 +1,2 @@ +require libsexy.inc +PR = "r0" diff --git a/packages/libsexy/libsexy_0.1.4.bb b/packages/libsexy/libsexy_0.1.4.bb deleted file mode 100644 index b3e7e7ad7d..0000000000 --- a/packages/libsexy/libsexy_0.1.4.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond " -PR = "r1" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} - - diff --git a/packages/libsexy/libsexy_0.1.5.bb b/packages/libsexy/libsexy_0.1.5.bb deleted file mode 100644 index 964c381c7d..0000000000 --- a/packages/libsexy/libsexy_0.1.5.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond " -PR = "r0" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} - - diff --git a/packages/libsexy/libsexy_0.1.6.bb b/packages/libsexy/libsexy_0.1.6.bb index 964c381c7d..042ea757e9 100644 --- a/packages/libsexy/libsexy_0.1.6.bb +++ b/packages/libsexy/libsexy_0.1.6.bb @@ -1,16 +1,2 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond " +require libsexy.inc PR = "r0" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://osiris.chipx86.com/projects/libsexy/releases/${P}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} - - diff --git a/packages/libsexy/libsexy_0.1.8.bb b/packages/libsexy/libsexy_0.1.8.bb index 1de4a9175a..91784ffb49 100644 --- a/packages/libsexy/libsexy_0.1.8.bb +++ b/packages/libsexy/libsexy_0.1.8.bb @@ -1,17 +1,2 @@ -DESCRIPTION = "Libsexy is a collection of GTK+ widgets that extend the functionality of such standard widgets as GtkEntry and GtkLabel" -HOMEPAGE = "http://wiki.chipx86.com/wiki/Libsexy" -AUTHOR = "Christian Hammond " -SECTION = "x11/libs" +require libsexy.inc PR = "r1" - -DEPENDS = "gtk+ enchant libxml2" - -SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { -autotools_stage_all -} - - -- cgit v1.2.3 From 13efca366dab9df6dead91a1273270ec2cbd068a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 15 Jan 2007 15:12:56 +0000 Subject: abiword_2.5.0.bb : finish the .bb --- packages/abiword/abiword_2.5.0.bb | 6 ++++++ packages/abiword/files/cdump.pl | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100755 packages/abiword/files/cdump.pl (limited to 'packages') diff --git a/packages/abiword/abiword_2.5.0.bb b/packages/abiword/abiword_2.5.0.bb index 32b703c9ae..82d4e0e944 100644 --- a/packages/abiword/abiword_2.5.0.bb +++ b/packages/abiword/abiword_2.5.0.bb @@ -2,7 +2,13 @@ require abiword-2.5.inc DEFAULT_PREFERENCE = "-1" +SRC_URI += " file://cdump.pl " + PR = "r0" RCONFLICTS = "abiword-embedded" +do_compile_prepend () { + cp ${WORKDIR}/cdump.pl ${S}/src/tools/cdump/xp/ +} + diff --git a/packages/abiword/files/cdump.pl b/packages/abiword/files/cdump.pl new file mode 100755 index 0000000000..76f9c8841b --- /dev/null +++ b/packages/abiword/files/cdump.pl @@ -0,0 +1,32 @@ +#!/usr/bin/perl + +# This script replace the cdump tool we used to build the ap_wp_Splash.cpp +# Because the cdump tool has to be run as a part of building the AW package, +# it breaks cross-compilation. A perl script seemed like a generic solution + + +if ($#ARGV != 1 ) +{ + print "Usage: $0 datafile arrayname $#ARGV $ARGV[0] $ARGV[1]\n"; + exit(-1); +} + +open FROM, "<$ARGV[0]" or die "Could not open file $ARGV[0]"; +binmode FROM; + +print "unsigned char $ARGV[1] [] = {\n"; + +while ($len = read(FROM, $buf, 16)) +{ + foreach(split(//,$buf)) + { + printf("0x%02x,", ord($_)); + } + + print "\n"; +} + + +printf "};\nunsigned long $ARGV[1]_sizeof = sizeof($ARGV[1]);\n"; + +close FROM; \ No newline at end of file -- cgit v1.2.3 From ced19f9eb4ea93154a74e2abb0e051c9a6490cd9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 15:18:05 +0000 Subject: notification-daemon: add 0.3.6, drop 0.3.4 --- packages/notification-daemon/notification-daemon_0.3.4.bb | 15 --------------- packages/notification-daemon/notification-daemon_0.3.6.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 packages/notification-daemon/notification-daemon_0.3.4.bb create mode 100644 packages/notification-daemon/notification-daemon_0.3.6.bb (limited to 'packages') diff --git a/packages/notification-daemon/notification-daemon_0.3.4.bb b/packages/notification-daemon/notification-daemon_0.3.4.bb deleted file mode 100644 index 8acabfae73..0000000000 --- a/packages/notification-daemon/notification-daemon_0.3.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them" -HOMEPAGE = "http://www.galago-project.org/" -LICENSE = "GPL" -DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck" - -PACKAGES = "${PN}" -FILES_${PN} = "${libexecdir}/notification-daemon \ - ${datadir}/dbus-1/services/notification-daemon.service \ - ${libdir}/notification-daemon-1.0/engines/libstandard.so \ - ${sysconfdir}/gconf/schemas/notification-daemon.schemas" - -SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz" -EXTRA_OECONF = "--disable-binreloc" - -inherit autotools pkgconfig diff --git a/packages/notification-daemon/notification-daemon_0.3.6.bb b/packages/notification-daemon/notification-daemon_0.3.6.bb new file mode 100644 index 0000000000..8acabfae73 --- /dev/null +++ b/packages/notification-daemon/notification-daemon_0.3.6.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them" +HOMEPAGE = "http://www.galago-project.org/" +LICENSE = "GPL" +DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck" + +PACKAGES = "${PN}" +FILES_${PN} = "${libexecdir}/notification-daemon \ + ${datadir}/dbus-1/services/notification-daemon.service \ + ${libdir}/notification-daemon-1.0/engines/libstandard.so \ + ${sysconfdir}/gconf/schemas/notification-daemon.schemas" + +SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz" +EXTRA_OECONF = "--disable-binreloc" + +inherit autotools pkgconfig -- cgit v1.2.3 From dddb2e26017c226a72ca58339c86b5ee1a475b90 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 15 Jan 2007 15:43:24 +0000 Subject: notification-daemon: add obligatory --prefix parameter to dbus-binding-tool - fixes compilation against dbus-glib >= 0.72 --- packages/notification-daemon/files/.mtn2git_empty | 0 .../notification-daemon/files/dbus-glib-tool-prefix.patch | 13 +++++++++++++ packages/notification-daemon/notification-daemon_0.3.6.bb | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 packages/notification-daemon/files/.mtn2git_empty create mode 100644 packages/notification-daemon/files/dbus-glib-tool-prefix.patch (limited to 'packages') diff --git a/packages/notification-daemon/files/.mtn2git_empty b/packages/notification-daemon/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/notification-daemon/files/dbus-glib-tool-prefix.patch b/packages/notification-daemon/files/dbus-glib-tool-prefix.patch new file mode 100644 index 0000000000..bfe06f7737 --- /dev/null +++ b/packages/notification-daemon/files/dbus-glib-tool-prefix.patch @@ -0,0 +1,13 @@ +Index: notification-daemon-0.3.6/src/Makefile.am +=================================================================== +--- notification-daemon-0.3.6.orig/src/Makefile.am 2007-01-15 16:25:37.000000000 +0100 ++++ notification-daemon-0.3.6/src/Makefile.am 2007-01-15 16:26:01.000000000 +0100 +@@ -13,7 +13,7 @@ + BUILT_SOURCES = notificationdaemon-dbus-glue.h + + notificationdaemon-dbus-glue.h: notificationdaemon.xml +- dbus-binding-tool --mode=glib-server \ ++ dbus-binding-tool --mode=glib-server --prefix= \ + $(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h + + INCLUDES = \ diff --git a/packages/notification-daemon/notification-daemon_0.3.6.bb b/packages/notification-daemon/notification-daemon_0.3.6.bb index 8acabfae73..1fdf6f2762 100644 --- a/packages/notification-daemon/notification-daemon_0.3.6.bb +++ b/packages/notification-daemon/notification-daemon_0.3.6.bb @@ -9,7 +9,8 @@ FILES_${PN} = "${libexecdir}/notification-daemon \ ${libdir}/notification-daemon-1.0/engines/libstandard.so \ ${sysconfdir}/gconf/schemas/notification-daemon.schemas" -SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz" +SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \ + file://dbus-glib-tool-prefix.patch;patch=1" EXTRA_OECONF = "--disable-binreloc" inherit autotools pkgconfig -- cgit v1.2.3 From 6eafd8a3f7ce813e5c2e33a606d2b2754d6aacb1 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 15 Jan 2007 16:32:04 +0000 Subject: neon: fix SRC_URI to make older versions fetchable again --- packages/neon/neon_0.25.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/neon/neon_0.25.5.bb b/packages/neon/neon_0.25.5.bb index d73081e249..eec428136d 100644 --- a/packages/neon/neon_0.25.5.bb +++ b/packages/neon/neon_0.25.5.bb @@ -6,7 +6,7 @@ DEPENDS = "zlib libxml2 expat time" PR = "r1" -SRC_URI = "http://be.lunar-linux.org/lunar/cache/neon-${PV}.tar.gz" +SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz" inherit autotools binconfig lib_package -- cgit v1.2.3 From f00b2ecc4057866b860837d4ff8f4e76f3b9e15e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Jan 2007 16:46:31 +0000 Subject: asterisk: Upstream upgrade to 1.2.14 --- packages/asterisk/asterisk-1.2.14/.mtn2git_empty | 0 packages/asterisk/asterisk-1.2.14/asterisk.patch | 221 +++++++++++++++++++++ .../asterisk-1.2.14/uclibc-compat-getloadavg.patch | 13 ++ packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch | 18 ++ packages/asterisk/asterisk_1.2.14.bb | 38 ++++ 5 files changed, 290 insertions(+) create mode 100644 packages/asterisk/asterisk-1.2.14/.mtn2git_empty create mode 100644 packages/asterisk/asterisk-1.2.14/asterisk.patch create mode 100644 packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch create mode 100644 packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch create mode 100644 packages/asterisk/asterisk_1.2.14.bb (limited to 'packages') diff --git a/packages/asterisk/asterisk-1.2.14/.mtn2git_empty b/packages/asterisk/asterisk-1.2.14/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/asterisk/asterisk-1.2.14/asterisk.patch b/packages/asterisk/asterisk-1.2.14/asterisk.patch new file mode 100644 index 0000000000..006b8e9291 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.14/asterisk.patch @@ -0,0 +1,221 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- asterisk-1.2.9.1/./Makefile~asterisk ++++ asterisk-1.2.9.1/./Makefile +@@ -331,7 +331,7 @@ + ASTCFLAGS+= $(TRACE_FRAMES) + ASTCFLAGS+= $(MALLOC_DEBUG) + ASTCFLAGS+= $(BUSYDETECT) +-ASTCFLAGS+= $(OPTIONS) ++#ASTCFLAGS+= $(OPTIONS) + ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) + ASTCFLAGS+= -fomit-frame-pointer + endif +@@ -347,12 +347,12 @@ + netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \ + cryptostub.o + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),) + OBJS+= poll.o + ASTCFLAGS+=-DPOLLCOMPAT + endif + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),) + OBJS+= dlfcn.o + ASTCFLAGS+=-DDLFCNCOMPAT + endif +@@ -397,7 +397,7 @@ + endif + + ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) +- CFLAGS+=$(ASTCFLAGS) ++override CFLAGS+=$(ASTCFLAGS) + endif + + # This is used when generating the doxygen documentation +@@ -519,7 +519,7 @@ + fi + rm -f include/asterisk/build.h.tmp + $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c +- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) ++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS) + + muted: muted.o + $(CC) $(AUDIO_LIBS) -o muted muted.o +--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk ++++ asterisk-1.2.9.1/codecs/gsm/Makefile +@@ -51,7 +51,7 @@ + ifneq (${PROC},ppc) + ifneq (${PROC},ppc64) + ifneq (${PROC},s390) +-OPTIMIZE+=-march=$(PROC) ++#OPTIMIZE+=-march=$(PROC) + endif + endif + endif +@@ -243,7 +243,7 @@ + ifneq (${PROC},arm) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) +-GSM_SOURCES+= $(SRC)/k6opt.s ++#GSM_SOURCES+= $(SRC)/k6opt.s + endif + endif + endif +@@ -309,7 +309,7 @@ + ifneq ($(shell uname -m), armv4l) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) +-GSM_OBJECTS+= $(SRC)/k6opt.o ++#GSM_OBJECTS+= $(SRC)/k6opt.o + endif + endif + endif +--- asterisk-1.2.9.1/res/Makefile~asterisk ++++ asterisk-1.2.9.1/res/Makefile +@@ -89,7 +89,7 @@ + fi + + res_crypto.so: res_crypto.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS) ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS) + + clean: + rm -f *.so *.o .depend +--- asterisk-1.2.9.1/channels/Makefile~asterisk ++++ asterisk-1.2.9.1/channels/Makefile +@@ -73,7 +73,7 @@ + SOLINK+=-lrt + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),) + CHANNEL_LIBS+=chan_phone.so + endif + +@@ -88,16 +88,16 @@ + + CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),) + CHANNEL_LIBS+=chan_alsa.so + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),) + CFLAGS+=-DZAPATA_PRI + ZAPPRI=-lpri + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),) + CFLAGS+=-DZAPATA_R2 + ZAPR2=-lmfcr2 + endif +@@ -110,7 +110,7 @@ + endif + + ifndef WITHOUT_ZAPTEL +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),) + ifeq (${OSARCH},NetBSD) + SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib + endif +@@ -122,7 +122,7 @@ + endif + endif # WITHOUT_ZAPTEL + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),) + CHANNEL_LIBS+=chan_vpb.so + CFLAGS+=-DLINUX + endif +@@ -137,7 +137,7 @@ + + ZAPDIR=/usr/lib + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),) + CHANNEL_LIBS+=chan_nbs.so + endif + +@@ -158,7 +158,7 @@ + rm -f busy.h ringtone.h gentone gentone-ulaw + + %.so : %.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS} + + ifneq ($(wildcard .depend),) + include .depend +@@ -215,7 +215,7 @@ + chan_alsa.o: $(ALSA_SRC) + + chan_alsa.so: chan_alsa.o +- $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl ++ $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS) + + chan_nbs.so: chan_nbs.o + $(CC) $(SOLINK) -o $@ $< -lnbs +--- asterisk-1.2.9.1/pbx/Makefile~asterisk ++++ asterisk-1.2.9.1/pbx/Makefile +@@ -59,7 +59,7 @@ + $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS) + + pbx_dundi.so: dundi-parser.o pbx_dundi.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS) + + %.moc : %.h + $(MOC) $< -o $@ +--- asterisk-1.2.9.1/formats/Makefile~asterisk ++++ asterisk-1.2.9.1/formats/Makefile +@@ -25,7 +25,7 @@ + # + # OGG/Vorbis format + # +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),) + FORMAT_LIBS+=format_ogg_vorbis.so + endif + +@@ -57,7 +57,7 @@ + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm + + format_ogg_vorbis.so : format_ogg_vorbis.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS) + + install: all + for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done +--- asterisk-1.2.9.1/utils/Makefile~asterisk ++++ asterisk-1.2.9.1/utils/Makefile +@@ -22,11 +22,11 @@ + + TARGET=stereorize streamplayer + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),) + TARGET+=smsq + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),) + TARGET+=astman + endif + +@@ -64,7 +64,7 @@ + $(CC) $(CFLAGS) -o $@ $^ + + smsq: smsq.o +- $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt ++ $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(LDFLAGS) + + streamplayer: streamplayer.o + $(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o ${SOLLIBS} diff --git a/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch new file mode 100644 index 0000000000..a909513b1c --- /dev/null +++ b/packages/asterisk/asterisk-1.2.14/uclibc-compat-getloadavg.patch @@ -0,0 +1,13 @@ +diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h +--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100 ++++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100 +@@ -75,7 +75,9 @@ + #define HAVE_STRTOQ + + #ifdef _BSD_SOURCE ++#ifndef __UCLIBC__ + #define HAVE_GETLOADAVG ++#endif /* __UCLIBC__ */ + #endif + + #ifdef __linux__ diff --git a/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch b/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch new file mode 100644 index 0000000000..23657bcc76 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.14/uclibc-dsn.patch @@ -0,0 +1,18 @@ +diff -ruN asterisk-1.0.7-old/dns.c asterisk-1.0.7-new/dns.c +--- asterisk-1.0.7-old/dns.c 2004-06-22 22:11:15.000000000 +0200 ++++ asterisk-1.0.7-new/dns.c 2005-03-19 17:38:06.000000000 +0100 +@@ -153,7 +153,13 @@ + + #if defined(res_ninit) + #define HAS_RES_NINIT +-#else ++#endif ++ ++#ifdef __UCLIBC__ ++#undef HAS_RES_NINIT ++#endif ++ ++#ifndef HAS_RES_NINIT + AST_MUTEX_DEFINE_STATIC(res_lock); + #if 0 + #warning "Warning, res_ninit is missing... Could have reentrancy issues" diff --git a/packages/asterisk/asterisk_1.2.14.bb b/packages/asterisk/asterisk_1.2.14.bb new file mode 100644 index 0000000000..42a3214f0a --- /dev/null +++ b/packages/asterisk/asterisk_1.2.14.bb @@ -0,0 +1,38 @@ +DESCRIPTION="The Asterisk open source software PBX" +HOMEPAGE="www.asterisk.org" +LICENSE="GPL" +DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" +PR = "r1" + +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://uclibc-compat-getloadavg.patch;patch=1 \ + file://uclibc-dsn.patch;patch=1 \ + file://asterisk.patch;patch=1" + + +export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}" +export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}" +export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" + +export CROSS_ARCH="Linux" +export CROSS_PROC="arm" +export SUB_PROC="xscale" + +export MAKECMDGOALS="dont-optimize" + +# We will probably have to edit the CFLAG in the Makefile + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +do_stage () { + install -d ${STAGING_INCDIR}/asterisk + install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/ +} + + -- cgit v1.2.3 From 547d37e3dc0dd43dc86d45ab2490dc622b0c386d Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Jan 2007 16:53:35 +0000 Subject: busybox: Upstream upgrade to 1.3.1, DEFAULT_PREFERENCE=-1 --- packages/busybox/busybox-1.3.1/.mtn2git_empty | 0 .../busybox/busybox-1.3.1/add-getkey-applet.patch | 167 ++++++ .../busybox/busybox-1.3.1/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/angstrom/defconfig | 647 +++++++++++++++++++++ packages/busybox/busybox-1.3.1/below.patch | 46 ++ packages/busybox/busybox-1.3.1/busybox-mdev.sh | 69 +++ packages/busybox/busybox-1.3.1/defconfig | 647 +++++++++++++++++++++ packages/busybox/busybox-1.3.1/dhcp-hostname.patch | 30 + packages/busybox/busybox-1.3.1/dhcpretrytime.patch | 85 +++ packages/busybox/busybox-1.3.1/fbset.patch | 24 + packages/busybox/busybox-1.3.1/hdparm_M.patch | 47 ++ .../busybox-1.3.1/ifupdown-spurious-environ.patch | 12 + .../busybox-1.3.1/iproute-flush-cache.patch | 23 + packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/mnci/defconfig | 643 ++++++++++++++++++++ .../busybox/busybox-1.3.1/mount-all-type.patch | 84 +++ .../busybox/busybox-1.3.1/nylon/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/nylon/defconfig | 568 ++++++++++++++++++ .../busybox/busybox-1.3.1/openmn/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/readlink.patch | 85 +++ packages/busybox/busybox-1.3.1/rmmod.patch | 40 ++ .../busybox/busybox-1.3.1/slugos/.mtn2git_empty | 0 packages/busybox/busybox-1.3.1/slugos/defconfig | 610 +++++++++++++++++++ .../busybox/busybox-1.3.1/slugos/udhcpscript.patch | 133 +++++ .../busybox/busybox-1.3.1/sparc/.mtn2git_empty | 0 .../busybox-1.3.1/udhcppidfile-breakage.patch | 57 ++ packages/busybox/busybox-1.3.1/udhcppidfile.patch | 274 +++++++++ packages/busybox/busybox-1.3.1/udhcpscript.patch | 17 + .../busybox/busybox-1.3.1/wget-long-options.patch | 20 + .../busybox/busybox-1.3.1/wrt54/.mtn2git_empty | 0 .../busybox/busybox-1.3.1/xargs-double-size.patch | 13 + packages/busybox/busybox_1.3.1.bb | 100 ++++ 32 files changed, 4441 insertions(+) create mode 100644 packages/busybox/busybox-1.3.1/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/add-getkey-applet.patch create mode 100644 packages/busybox/busybox-1.3.1/angstrom/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/angstrom/defconfig create mode 100644 packages/busybox/busybox-1.3.1/below.patch create mode 100755 packages/busybox/busybox-1.3.1/busybox-mdev.sh create mode 100644 packages/busybox/busybox-1.3.1/defconfig create mode 100644 packages/busybox/busybox-1.3.1/dhcp-hostname.patch create mode 100644 packages/busybox/busybox-1.3.1/dhcpretrytime.patch create mode 100644 packages/busybox/busybox-1.3.1/fbset.patch create mode 100644 packages/busybox/busybox-1.3.1/hdparm_M.patch create mode 100644 packages/busybox/busybox-1.3.1/ifupdown-spurious-environ.patch create mode 100644 packages/busybox/busybox-1.3.1/iproute-flush-cache.patch create mode 100644 packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/mnci/defconfig create mode 100644 packages/busybox/busybox-1.3.1/mount-all-type.patch create mode 100644 packages/busybox/busybox-1.3.1/nylon/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/nylon/defconfig create mode 100644 packages/busybox/busybox-1.3.1/openmn/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/readlink.patch create mode 100644 packages/busybox/busybox-1.3.1/rmmod.patch create mode 100644 packages/busybox/busybox-1.3.1/slugos/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/slugos/defconfig create mode 100644 packages/busybox/busybox-1.3.1/slugos/udhcpscript.patch create mode 100644 packages/busybox/busybox-1.3.1/sparc/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/udhcppidfile-breakage.patch create mode 100644 packages/busybox/busybox-1.3.1/udhcppidfile.patch create mode 100644 packages/busybox/busybox-1.3.1/udhcpscript.patch create mode 100644 packages/busybox/busybox-1.3.1/wget-long-options.patch create mode 100644 packages/busybox/busybox-1.3.1/wrt54/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.3.1/xargs-double-size.patch create mode 100644 packages/busybox/busybox_1.3.1.bb (limited to 'packages') diff --git a/packages/busybox/busybox-1.3.1/.mtn2git_empty b/packages/busybox/busybox-1.3.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/add-getkey-applet.patch b/packages/busybox/busybox-1.3.1/add-getkey-applet.patch new file mode 100644 index 0000000000..a75cf823c7 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/add-getkey-applet.patch @@ -0,0 +1,167 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: busybox-1.1.0/console-tools/getkey.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ busybox-1.1.0/console-tools/getkey.c 2006-03-14 17:17:28.000000000 +0100 +@@ -0,0 +1,94 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * getkey.c - Michael 'Mickey' Lauer ++ * ++ * Version 0.1 ++ * ++ * A simple keygrapper. Displays a configurable message and waits a dedicated number ++ * of seconds for a keypress. Sets the exit code accordingly (SUCCESS on keypress). ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "busybox.h" ++ ++extern int getkey_main(int argc, char **argv) ++{ ++ int status = EXIT_FAILURE; ++ ++ if ( argc < 2 ) ++ { ++ bb_show_usage(); ++ } ++ ++ /* ++ * If no terminal is attached it is quite useless ++ * to treat it like one. ++ */ ++ if( !isatty(STDIN_FILENO) ) ++ { ++ goto error_hard; ++ } ++ ++ //bb_printf( "DEBUG: time = '%s'\n", argv[1] ); ++ //bb_printf( "DEBUG: mesg = '%s'\n", argv[2] ); ++ ++ struct termios orig; ++ struct termios attr; ++ ++ if ( tcgetattr(STDIN_FILENO, &orig) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ attr = orig; ++ attr.c_cc[VMIN] = 0; ++ attr.c_cc[VTIME] = 0; ++ attr.c_iflag |= INLCR; ++ attr.c_oflag |= OPOST|ONLCR; ++ attr.c_cflag &= ~PARENB; ++ attr.c_lflag &= ~(ICANON/*|ECHO*/); ++ if ( tcsetattr(STDIN_FILENO,TCSANOW,&attr) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ fd_set rfds; ++ struct timeval tv; ++ int retval; ++ ++ FD_ZERO(&rfds); ++ FD_SET(0, &rfds); ++ ++ tv.tv_sec = atoi( argv[1] ); ++ tv.tv_usec = 0; ++ ++ if ( argc == 3 ) ++ { ++ bb_printf( argv[2], tv.tv_sec ); ++ bb_printf( "\n" ); ++ fflush(stdout); ++ } ++ retval = select(1, &rfds, NULL, NULL, &tv); ++ if (retval > 0) ++ { ++ status = EXIT_SUCCESS; ++ } ++ ++ if (tcsetattr(STDIN_FILENO,TCSANOW,&orig) == -1 ) ++ { ++ goto error_hard; ++ } ++ ++ return status; ++ ++error_hard : ++ return EXIT_FAILURE; ++}; ++ +Index: busybox-1.1.0/console-tools/Makefile.in +=================================================================== +--- busybox-1.1.0.orig/console-tools/Makefile.in 2006-01-11 06:43:57.000000000 +0100 ++++ busybox-1.1.0/console-tools/Makefile.in 2006-03-14 17:18:18.000000000 +0100 +@@ -21,6 +21,7 @@ + CONSOLETOOLS_DIR-$(CONFIG_OPENVT) += openvt.o + CONSOLETOOLS_DIR-$(CONFIG_RESET) += reset.o + CONSOLETOOLS_DIR-$(CONFIG_SETKEYCODES) += setkeycodes.o ++CONSOLETOOLS_DIR-$(CONFIG_GETKEY) += getkey.o + + libraries-y+=$(CONSOLETOOLS_DIR)$(CONSOLETOOLS_AR) + +Index: busybox-1.1.0/console-tools/Config.in +=================================================================== +--- busybox-1.1.0.orig/console-tools/Config.in 2006-01-11 06:43:57.000000000 +0100 ++++ busybox-1.1.0/console-tools/Config.in 2006-03-14 17:17:28.000000000 +0100 +@@ -31,6 +31,14 @@ + This program dumps the kernel's keyboard translation table to + stdout, in binary format. You can then use loadkmap to load it. + ++config CONFIG_GETKEY ++ bool "getkey" ++ default n ++ help ++ This program displays a configurable message and waits ++ a dedicated number of seconds for a keypress. It sets ++ the exit code accordingly, i.e. SUCCESS if there was a keypress. ++ + config CONFIG_LOADFONT + bool "loadfont" + default n +Index: busybox-1.1.0/include/applets.h +=================================================================== +--- busybox-1.1.0.orig/include/applets.h 2006-01-11 06:44:14.000000000 +0100 ++++ busybox-1.1.0/include/applets.h 2006-03-14 17:17:28.000000000 +0100 +@@ -261,6 +261,9 @@ + #ifdef CONFIG_FUSER + APPLET(fuser, fuser_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) + #endif ++#ifdef CONFIG_GETKEY ++ APPLET(getkey, getkey_main, _BB_DIR_SBIN, _BB_SUID_NEVER) ++#endif + #ifdef CONFIG_GETOPT + APPLET(getopt, getopt_main, _BB_DIR_BIN, _BB_SUID_NEVER) + #endif +Index: busybox-1.1.0/include/usage.h +=================================================================== +--- busybox-1.1.0.orig/include/usage.h 2006-01-11 06:44:14.000000000 +0100 ++++ busybox-1.1.0/include/usage.h 2006-03-14 17:19:11.000000000 +0100 +@@ -841,6 +841,13 @@ + "\t-p, --password Password to be used\n" \ + "\t-P, --port Port number to be used" + ++#define getkey_trivial_usage \ ++ "time [message]" ++#define getkey_full_usage \ ++ "Display a message and wait for a keypress." ++#define getkey_example_usage \ ++ "$ getkey 5 'Press a key within %d seconds to interrupt autoboot.'" ++ + #define fuser_trivial_usage \ + "[options] file OR port/proto" + #define fuser_full_usage \ diff --git a/packages/busybox/busybox-1.3.1/angstrom/.mtn2git_empty b/packages/busybox/busybox-1.3.1/angstrom/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/angstrom/defconfig b/packages/busybox/busybox-1.3.1/angstrom/defconfig new file mode 100644 index 0000000000..7308eead76 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/angstrom/defconfig @@ -0,0 +1,647 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_CMP is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +CONFIG_APP_UDHCPD=y +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=63 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/packages/busybox/busybox-1.3.1/below.patch b/packages/busybox/busybox-1.3.1/below.patch new file mode 100644 index 0000000000..95e8376e46 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/below.patch @@ -0,0 +1,46 @@ +Index: busybox-1.1.0/modutils/modprobe.c +=================================================================== +--- busybox-1.1.0.orig/modutils/modprobe.c 2006-01-11 06:43:56.000000000 +0100 ++++ busybox-1.1.0/modutils/modprobe.c 2006-03-14 16:36:54.000000000 +0100 +@@ -509,6 +509,41 @@ + } + } + } ++ else if ((strncmp (buffer, "below", 5) == 0) && isspace (buffer[5])) { ++ char *mod, *deps; ++ if (parse_tag_value (buffer + 6, &mod, &deps)) { ++ struct dep_t *dt; ++ ++ for (dt = first; dt; dt = dt->m_next) { ++ if (strcmp (dt->m_name, mod) == 0) ++ break; ++ } ++ if (dt) { ++ char *pp; ++ char *name; ++ ++ pp = name = deps; ++ ++ for (;;) { ++ while (*pp != 0 && !isspace (*pp)) ++ pp++; ++ if (isspace (*pp)) ++ *(pp++) = 0; ++ ++ dt->m_depcnt++; ++ dt->m_deparr = (char **) xrealloc (dt->m_deparr, ++ sizeof (char *) * dt->m_depcnt); ++ dt->m_deparr[dt->m_depcnt - 1] = bb_xstrdup (name); ++ ++ while (isspace (*pp)) ++ pp++; ++ name = pp; ++ if (*pp == 0) ++ break; ++ } ++ } ++ } ++ } + } + } + close ( fd ); diff --git a/packages/busybox/busybox-1.3.1/busybox-mdev.sh b/packages/busybox/busybox-1.3.1/busybox-mdev.sh new file mode 100755 index 0000000000..9744322fa9 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/busybox-mdev.sh @@ -0,0 +1,69 @@ +#!/bin/sh +MDEV=/sbin/mdev +DESC="Busybox mdev setup" + +# Complain if thing's aren't right +if [ ! -e /proc/filesystems ]; then + echo "mdev requires a mounted procfs, not started." + exit 1 +fi + +if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then + echo "mdev requires tmpfs support, not started." + exit 1 +fi + +if [ ! -d /sys/class/ ]; then + echo "mdev requires a mounted sysfs, not started." + exit 1 +fi + +if [ ! -e /proc/sys/kernel/hotplug ]; then + echo "mdev requires hotplug support, not started." + exit 1 +fi + +# We need to unmount /dev/pts/ and remount it later over the tmpfs +if mountpoint -q /dev/pts/; then + umount -l /dev/pts/ +fi + +if mountpoint -q /dev/shm/; then + umount -l /dev/shm/ +fi + +# Create tmpfs for /dev +echo "Creating tmpfs at /dev" +mount -t tmpfs tmpfs /dev -o size=800k + +# Register mdev as hotplug event helper +echo "$MDEV" > /proc/sys/kernel/hotplug + +# Populate /dev from /sys info +echo "Populating /dev using mdev" +$MDEV -s + +# Touch .udev to inform scripts that /dev needs no further setup +touch /dev/.udev + +# Mount devpts +TTYGRP=5 +TTYMODE=620 +mkdir -m 755 -p /dev/pts +if [ ! -e /dev/ptmx ]; then + mknod -m 666 /dev/ptmx c 5 2 +fi +mount -t devpts devpts /dev/pts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE + +# Make shm directory +mkdir -m 755 -p /dev/shm + +# Make extraneous links +ln -sf /proc/self/fd /dev/fd +ln -sf /proc/self/fd/0 /dev/stdin +ln -sf /proc/self/fd/1 /dev/stdout +ln -sf /proc/self/fd/2 /dev/stderr +ln -sf /proc/kcore /dev/core +ln -sf /proc/asound/oss/sndstat /dev/sndstat + +exit 0 diff --git a/packages/busybox/busybox-1.3.1/defconfig b/packages/busybox/busybox-1.3.1/defconfig new file mode 100644 index 0000000000..7308eead76 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/defconfig @@ -0,0 +1,647 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_CMP is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +CONFIG_APP_UDHCPD=y +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=63 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/packages/busybox/busybox-1.3.1/dhcp-hostname.patch b/packages/busybox/busybox-1.3.1/dhcp-hostname.patch new file mode 100644 index 0000000000..e0adea662e --- /dev/null +++ b/packages/busybox/busybox-1.3.1/dhcp-hostname.patch @@ -0,0 +1,30 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- busybox-1.01/networking/udhcp/dhcpc.c~dhcp-hostname ++++ busybox-1.01/networking/udhcp/dhcpc.c +@@ -193,6 +193,7 @@ + int max_fd; + int sig; + int no_clientid = 0; ++ char hostbuf[256]; /* SUSv2: hostnames are <= 255 bytes */ + + static const struct option arg_options[] = { + {"clientid", required_argument, 0, 'c'}, +@@ -211,6 +212,14 @@ + {0, 0, 0, 0} + }; + ++ if (gethostname (hostbuf, sizeof (hostbuf)) == 0) { ++ len = strlen (hostbuf); ++ client_config.hostname = xmalloc (len + 2); ++ client_config.hostname[OPT_CODE] = DHCP_HOST_NAME; ++ client_config.hostname[OPT_LEN] = len; ++ strncpy(client_config.hostname + 2, hostbuf, len); ++ } ++ + /* get options */ + while (1) { + int option_index = 0; diff --git a/packages/busybox/busybox-1.3.1/dhcpretrytime.patch b/packages/busybox/busybox-1.3.1/dhcpretrytime.patch new file mode 100644 index 0000000000..893e346acf --- /dev/null +++ b/packages/busybox/busybox-1.3.1/dhcpretrytime.patch @@ -0,0 +1,85 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: busybox-1.1.0/networking/udhcp/dhcpc.c +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/dhcpc.c 2006-03-14 17:19:31.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/dhcpc.c 2006-03-14 17:20:45.000000000 +0100 +@@ -48,6 +48,7 @@ + static unsigned long requested_ip; /* = 0 */ + static unsigned long server_addr; + static unsigned long timeout; ++static unsigned long retrytime = 60; + static int packet_num; /* = 0 */ + static int fd = -1; + +@@ -95,6 +96,7 @@ + " -r, --request=IP IP address to request (default: none)\n" + " -s, --script=file Run file at dhcp events (default:\n" + " " DEFAULT_SCRIPT ")\n" ++" -t, --retrytime time to retry DHCP request (default 60s)\n") + " -v, --version Display version\n" + ); + exit(0); +@@ -214,6 +216,7 @@ + {"quit", no_argument, 0, 'q'}, + {"request", required_argument, 0, 'r'}, + {"script", required_argument, 0, 's'}, ++ {"retrytime", required_argument, 0, 't'}, + {"version", no_argument, 0, 'v'}, + {0, 0, 0, 0} + }; +@@ -229,7 +232,7 @@ + /* get options */ + while (1) { + int option_index = 0; +- c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:v", arg_options, &option_index); ++ c = getopt_long(argc, argv, "c:CV:fbH:h:F:i:np:qr:s:t:v", arg_options, &option_index); + if (c == -1) break; + + switch (c) { +@@ -305,6 +308,9 @@ + case 's': + client_config.script = optarg; + break; ++ case 't': ++ retrytime = atol(optarg); ++ break; + case 'v': + printf("udhcpcd, version %s\n\n", VERSION); + return 0; +@@ -394,7 +400,7 @@ + } + /* wait to try again */ + packet_num = 0; +- timeout = now + 60; ++ timeout = now + retrytime; + } + break; + case RENEW_REQUESTED: +Index: busybox-1.1.0/networking/ifupdown.c +=================================================================== +--- busybox-1.1.0.orig/networking/ifupdown.c 2006-01-11 06:43:51.000000000 +0100 ++++ busybox-1.1.0/networking/ifupdown.c 2006-03-14 17:19:41.000000000 +0100 +@@ -506,7 +506,7 @@ + static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) + { + if (execable("/sbin/udhcpc")) { +- return( execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i " ++ return( execute("udhcpc -b -p /var/run/udhcpc.%iface%.pid -i " + "%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)); + } else if (execable("/sbin/pump")) { + return( execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)); +@@ -526,8 +526,8 @@ + /* SIGUSR2 forces udhcpc to release the current lease and go inactive, + * and SIGTERM causes udhcpc to exit. Signals are queued and processed + * sequentially so we don't need to sleep */ +- result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); +- result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); ++ result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec); ++ result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec); + } else if (execable("/sbin/pump")) { + result = execute("pump -i %iface% -k", ifd, exec); + } else if (execable("/sbin/dhclient")) { diff --git a/packages/busybox/busybox-1.3.1/fbset.patch b/packages/busybox/busybox-1.3.1/fbset.patch new file mode 100644 index 0000000000..d0609ce6f7 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/fbset.patch @@ -0,0 +1,24 @@ +--- busybox/util-linux/fbset.c~ 2004-07-03 16:24:23.000000000 +0100 ++++ busybox/util-linux/fbset.c 2004-12-30 20:09:26.000000000 +0000 +@@ -337,7 +337,7 @@ + { + struct fb_var_screeninfo var, varset; + int fh, i; +- char *fbdev = DEFAULTFBDEV; ++ char *fbdev = NULL; + char *modefile = DEFAULTFBMODE; + char *thisarg, *mode = NULL; + +@@ -404,7 +404,12 @@ + } + } + ++ if (fbdev == NULL) ++ fbdev = DEFAULTFBDEV; + if ((fh = open(fbdev, O_RDONLY)) < 0) ++#ifdef CONFIG_FEATURE_DEVFS ++ if ((fh = open("/dev/fb0", O_RDONLY)) < 0) ++#endif + bb_perror_msg_and_die("fbset(open)"); + if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) + bb_perror_msg_and_die("fbset(ioctl)"); diff --git a/packages/busybox/busybox-1.3.1/hdparm_M.patch b/packages/busybox/busybox-1.3.1/hdparm_M.patch new file mode 100644 index 0000000000..9adcd36f92 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/hdparm_M.patch @@ -0,0 +1,47 @@ +Index: busybox-1.1.0/miscutils/hdparm.c +=================================================================== +--- busybox-1.1.0.orig/miscutils/hdparm.c 2006-01-11 06:44:13.000000000 +0100 ++++ busybox-1.1.0/miscutils/hdparm.c 2006-03-14 17:22:22.000000000 +0100 +@@ -1255,6 +1255,7 @@ + static unsigned long set_sleepnow, get_sleepnow; + static unsigned long get_powermode; + static unsigned long set_apmmode, get_apmmode, apmmode; ++static unsigned long set_acoustic = 0, get_acoustic = 0, acoustic = 0; + #endif + #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY + static int get_IDentity; +@@ -2124,6 +2125,20 @@ + } + bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD"); + } ++ if (set_acoustic) ++ { ++ no_scsi(); ++ acoustic=check_if_min_and_set_val(acoustic,0); ++ acoustic=check_if_maj_and_set_val(acoustic,254); ++ if_printf(get_acoustic," setting AAM level to 0x%02lX (%ld)\n", acoustic, acoustic); ++ bb_ioctl(fd, HDIO_SET_ACOUSTIC, (int*)acoustic,"HDIO_SET_ACOUSTIC"); ++ } ++ if (get_acoustic) ++ { ++ no_scsi(); ++ bb_ioctl(fd, HDIO_GET_ACOUSTIC, (unsigned long*)&parm,"HDIO_GET_ACOUSTIC"); ++ printf(" acoustic = %2ld (128=quiet ... 254=fast)\n", parm); ++ } + if (set_wcache) + { + #ifdef DO_FLUSHCACHE +@@ -2832,6 +2847,13 @@ + p = *argv++, --argc; + p=GET_NUMBER(p,&set_readahead,&Xreadahead); + break; ++ case 'M': ++ get_acoustic = noisy; ++ noisy = 1; ++ if (!*p && argc && isalnum(**argv)) ++ p = *argv++, --argc; ++ p=GET_NUMBER(p,&set_acoustic,&acoustic); ++ break; + case 'B': + get_apmmode = noisy; + noisy = 1; diff --git a/packages/busybox/busybox-1.3.1/ifupdown-spurious-environ.patch b/packages/busybox/busybox-1.3.1/ifupdown-spurious-environ.patch new file mode 100644 index 0000000000..8753315f2c --- /dev/null +++ b/packages/busybox/busybox-1.3.1/ifupdown-spurious-environ.patch @@ -0,0 +1,12 @@ +--- busybox-1.00/networking/ifupdown.c.old 2005-06-11 19:51:59.000000000 +0100 ++++ busybox-1.00/networking/ifupdown.c 2005-06-11 19:52:19.000000000 +0100 +@@ -148,6 +148,9 @@ + struct mapping_defn_t *mappings; + }; + ++/* XXX */ ++#define environ local_environ ++ + static char no_act = 0; + static char verbose = 0; + static char **environ = NULL; diff --git a/packages/busybox/busybox-1.3.1/iproute-flush-cache.patch b/packages/busybox/busybox-1.3.1/iproute-flush-cache.patch new file mode 100644 index 0000000000..f8becc3390 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/iproute-flush-cache.patch @@ -0,0 +1,23 @@ +Index: networking/libiproute/iproute.c +=================================================================== +RCS file: /var/cvs/busybox/networking/libiproute/iproute.c,v +retrieving revision 1.14 +diff -u -r1.14 iproute.c +--- networking/libiproute/iproute.c 11 Aug 2004 08:10:58 -0000 1.14 ++++ networking/libiproute/iproute.c 30 Nov 2004 20:43:44 -0000 +@@ -537,6 +537,15 @@ + } else if (matches(*argv, "match") == 0) { + NEXT_ARG(); + get_prefix(&filter.mdst, *argv, do_ipv6); ++ } else if (matches(*argv, "table") == 0) { ++ NEXT_ARG(); ++ if (matches(*argv, "cache") == 0) { ++ filter.tb = -1; ++ } else if (matches(*argv, "main") != 0) { ++ invarg("invalid \"table\"", *argv); ++ } ++ } else if (matches(*argv, "cache") == 0) { ++ filter.tb = -1; + } else { + if (matches(*argv, "exact") == 0) { + NEXT_ARG(); diff --git a/packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty b/packages/busybox/busybox-1.3.1/mnci/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/mnci/defconfig b/packages/busybox/busybox-1.3.1/mnci/defconfig new file mode 100644 index 0000000000..6a04803f18 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/mnci/defconfig @@ -0,0 +1,643 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +# CONFIG_SHOW_USAGE is not set +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +# CONFIG_LFS is not set +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-linux-" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +CONFIG_CMP=y +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_BINARY is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +# CONFIG_LOGNAME is not set +CONFIG_LS=y +# CONFIG_FEATURE_LS_FILETYPES is not set +# CONFIG_FEATURE_LS_FOLLOWLINKS is not set +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +# CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +# CONFIG_FEATURE_FANCY_TAIL is not set +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +# CONFIG_WATCH is not set +CONFIG_WC=y +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +# CONFIG_PATCH is not set +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +CONFIG_FEATURE_SHADOWPASSWDS=y +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +CONFIG_ADDGROUP=y +CONFIG_DELGROUP=y +CONFIG_ADDUSER=y +CONFIG_DELUSER=y +CONFIG_GETTY=y +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set +CONFIG_LOGIN=y +# CONFIG_FEATURE_SECURETTY is not set +CONFIG_PASSWD=y +CONFIG_SU=y +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# FDISK_SUPPORT_LARGE_DISKS is not set +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +CONFIG_GETOPT=y +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +CONFIG_IPCS=y +# CONFIG_LOSETUP is not set +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_PIVOT_ROOT=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +CONFIG_ADJTIMEX=y +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +CONFIG_FEATURE_DEVFS=y +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +CONFIG_ARPING=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING6 is not set +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +# CONFIG_TFTP is not set +# CONFIG_FEATURE_TFTP_GET is not set +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +# CONFIG_APP_UDHCPD is not set +CONFIG_APP_UDHCPC=y +# CONFIG_APP_DUMPLEASES is not set +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set +# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_ZCIP=y + +# +# Process Utilities +# +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_PIDOF is not set +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +# CONFIG_UPTIME is not set + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=15 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/packages/busybox/busybox-1.3.1/mount-all-type.patch b/packages/busybox/busybox-1.3.1/mount-all-type.patch new file mode 100644 index 0000000000..476094a804 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/mount-all-type.patch @@ -0,0 +1,84 @@ +--- busybox-1.00/.pc/mount-all-type.patch/util-linux/mount.c 2004-08-02 17:14:02.000000000 -0700 ++++ busybox-1.00/util-linux/mount.c 2005-05-13 00:17:19.054232796 -0700 +@@ -364,6 +364,56 @@ + exit(EXIT_SUCCESS); + } + ++/* Does this file system type, from /etc/fstab, match the given ++ * -t option value? ++ */ ++static int match_fs(const char *option, const char *type) ++{ ++ const int len = strlen(type); ++ const int no = option[0] == 'n' && option[1] == 'o'; ++ const char *optp = option; ++ ++ if (len > 0) do { ++ const char *match = strstr(optp, type); ++ ++ if (match == NULL) { ++ /* No match, but if the option string starts 'no' no match ++ * means yes. ++ */ ++ return no; ++ } ++ ++ /* Match, may be partial, check for end-of-type in option string. */ ++ if (match[len] == 0 || match[len] == ',') { ++ /* Ok, check for type or notype. */ ++ if (match == option) { ++ /* Exact match at start (can't be 'no') */ ++ return 1; ++ } ++ if (match > option+1) { ++ if (match[-1] == ',') { ++ /* Exact match in middle, might be 'no' */ ++ return !no; ++ } ++ if (match == option+2 && no) { ++ /* Exact match to 'notype' at start. */ ++ return 0; ++ } ++ if (match > option+2 && match[-3] == ',' && ++ match[-2] == 'n' && match[-1] == 'o') { ++ return 0; ++ } ++ } ++ } ++ ++ /* Look for another match. */ ++ optp = match+1; ++ } while (1); ++ ++ /* zero length type in fstab (impossible?), don't match it. */ ++ return 0; ++} ++ + extern int mount_main(int argc, char **argv) + { + struct stat statbuf; +@@ -371,6 +421,7 @@ + char *extra_opts; + int flags = 0; + char *filesystemType = "auto"; ++ char *filesystemOption = 0; + int got_filesystemType = 0; + char *device = xmalloc(PATH_MAX); + char *directory = xmalloc(PATH_MAX); +@@ -393,6 +444,7 @@ + break; + case 't': + filesystemType = optarg; ++ filesystemOption = optarg; + got_filesystemType = 1; + break; + case 'w': +@@ -460,6 +512,8 @@ + + strcpy(device, m->mnt_fsname); + strcpy(directory, m->mnt_dir); ++ if (all && filesystemOption != 0 && !match_fs(filesystemOption, m->mnt_type)) ++ continue; + filesystemType = bb_xstrdup(m->mnt_type); + singlemount: + extra_opts = string_flags; diff --git a/packages/busybox/busybox-1.3.1/nylon/.mtn2git_empty b/packages/busybox/busybox-1.3.1/nylon/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/nylon/defconfig b/packages/busybox/busybox-1.3.1/nylon/defconfig new file mode 100644 index 0000000000..67c5408ada --- /dev/null +++ b/packages/busybox/busybox-1.3.1/nylon/defconfig @@ -0,0 +1,568 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# General Configuration +# +# CONFIG_NITPICK is not set +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_FEATURE_DEVFS=y +# CONFIG_EJECT is not set +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_LFS is not set +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" +# CONFIG_BUILD_AT_ONCE is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Archival Utilities +# +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_BUNZIP2=y +CONFIG_CPIO=y +CONFIG_DPKG=y +CONFIG_DPKG_DEB=y +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +# CONFIG_FEATURE_TAR_BZIP2 is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +CONFIG_FEATURE_TAR_COMPRESS=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_UNCOMPRESS=y +# CONFIG_UNLZMA is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Common options for dpkg and dpkg_deb +# +CONFIG_FEATURE_DEB_TAR_GZ=y +CONFIG_FEATURE_DEB_TAR_BZ2=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAL=y +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_BINARY is not set +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_COMM is not set +# CONFIG_CKSUM is not set +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_CMP=y +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y + +# +# date (forced enabled for use with watch) +# +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +CONFIG_DF=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_INSTALL=y +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_STAT=y +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +# CONFIG_TEST is not set +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +CONFIG_UUDECODE=y +CONFIG_UUENCODE=y +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls and more +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +CONFIG_DUMPKMAP=y +CONFIG_GETKEY=y +# CONFIG_LOADFONT is not set +CONFIG_LOADKMAP=y +# CONFIG_OPENVT is not set +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=n + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +CONFIG_PIPE_PROGRESS=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +# CONFIG_VI is not set +#CONFIG_FEATURE_VI_COLON=y +#CONFIG_FEATURE_VI_YANKMARK=y +#CONFIG_FEATURE_VI_SEARCH=y +#CONFIG_FEATURE_VI_USE_SIGNALS=y +#CONFIG_FEATURE_VI_DOT_CMD=y +#CONFIG_FEATURE_VI_READONLY=y +#CONFIG_FEATURE_VI_SETOPTS=y +#CONFIG_FEATURE_VI_SET=y +#CONFIG_FEATURE_VI_WIN_RESIZE=y +#CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set +# CONFIG_REBOOT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_U_W_TMP=y +# CONFIG_LOGIN is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_E2FSCK is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set +# CONFIG_MKE2FS is not set +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +CONFIG_CROND=y +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_CRONTAB=y +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +CONFIG_WATCHDOG=y + +# +# Linux Module Utilities +# +# CONFIG_INSMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_MODPROBE is not set +# CONFIG_RMMOD is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_ARPING=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_WITHOUT_INETD=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +CONFIG_INETD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y +CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +CONFIG_NAMEIF=y +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_ZCIP=y + +# +# udhcp Server/Client +# +CONFIG_APP_UDHCPD=y +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set + +# +# Process Utilities +# +CONFIG_FREE=y +# CONFIG_FUSER is not set +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +# CONFIG_FEATURE_PS_WIDE is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +FEATURE_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y +CONFIG_SYSCTL=y + +# +# Another Bourne-like Shell +# +# CONFIG_FEATURE_SH_IS_ASH is not set +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +CONFIG_FEATURE_SH_IS_NONE=y +# CONFIG_ASH is not set +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +# CONFIG_HWCLOCK is not set +# CONFIG_IPCRM is not set +CONFIG_IPCS=y +CONFIG_LOSETUP=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +# CONFIG_MORE is not set +CONFIG_PIVOT_ROOT=y +CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +# CONFIG_SWITCH_ROOT is not set +CONFIG_MOUNT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_MOUNT_FORCE=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +CONFIG_DEBUG_YANK_SUSv2=y diff --git a/packages/busybox/busybox-1.3.1/openmn/.mtn2git_empty b/packages/busybox/busybox-1.3.1/openmn/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/readlink.patch b/packages/busybox/busybox-1.3.1/readlink.patch new file mode 100644 index 0000000000..0c5431085a --- /dev/null +++ b/packages/busybox/busybox-1.3.1/readlink.patch @@ -0,0 +1,85 @@ +diff -p -u -r1.7 Config.in +--- busybox-1.00/debianutils/Config.in 15 Mar 2004 08:28:24 -0000 1.7 ++++ busybox-1.00-patched/debianutils/Config.in 16 Nov 2004 11:46:41 -0000 +@@ -24,6 +24,13 @@ config CONFIG_READLINK + This program reads a symbolic link and returns the name + of the file it points to + ++config CONFIG_FEATURE_READLINK_FOLLOW ++ bool " Enable canonicalization by following all symlinks (-f)" ++ default n ++ depends on CONFIG_READLINK ++ help ++ Enable the readlink option (-f). ++ + config CONFIG_RUN_PARTS + bool "run-parts" + default n +diff -p -u -r1.2 readlink.c +--- busybox-1.00/debianutils/readlink.c 19 Mar 2003 09:11:41 -0000 1.2 ++++ busybox-1.00-patched/debianutils/readlink.c 16 Nov 2004 11:46:41 -0000 +@@ -23,18 +23,38 @@ + #include + #include + #include ++#include + #include "busybox.h" + ++#ifdef CONFIG_FEATURE_READLINK_FOLLOW ++# define READLINK_FOLLOW "f" ++# define READLINK_FLAG_f (1 << 0) ++#else ++# define READLINK_FOLLOW "" ++#endif ++ ++static const char readlink_options[] = READLINK_FOLLOW; ++ + int readlink_main(int argc, char **argv) + { + char *buf = NULL; ++ unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options); ++#ifdef CONFIG_FEATURE_READLINK_FOLLOW ++ RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX); ++#endif + + /* no options, no getopt */ + +- if (argc != 2) ++ if (optind + 1 != argc) + bb_show_usage(); + +- buf = xreadlink(argv[1]); ++#ifdef CONFIG_FEATURE_READLINK_FOLLOW ++ if (opt & READLINK_FLAG_f) { ++ buf = realpath(argv[optind], resolved_path); ++ } else ++#endif ++ buf = xreadlink(argv[optind]); ++ + if (!buf) + return EXIT_FAILURE; + puts(buf); +diff -p -u -r1.222 usage.h +--- busybox-1.00/include/usage.h 14 Sep 2004 16:23:56 -0000 1.222 ++++ busybox-1.00-patched/include/usage.h 16 Nov 2004 11:46:42 -0000 +@@ -1985,10 +1985,18 @@ + "\t-s\tSet the system date and time (default).\n" \ + "\t-p\tPrint the date and time." + ++#ifdef CONFIG_FEATURE_READLINK_FOLLOW ++#define USAGE_READLINK_FOLLOW(a) a ++#else ++#define USAGE_READLINK_FOLLOW(a) ++#endif ++ + #define readlink_trivial_usage \ +- "" ++ USAGE_READLINK_FOLLOW("[-f] ") "FILE" + #define readlink_full_usage \ +- "Displays the value of a symbolic link." ++ "Displays the value of a symbolic link." \ ++ USAGE_READLINK_FOLLOW("\n\nOptions:\n" \ ++ "\t-f\tcanonicalize by following all symlinks") + + #define realpath_trivial_usage \ + "pathname ..." diff --git a/packages/busybox/busybox-1.3.1/rmmod.patch b/packages/busybox/busybox-1.3.1/rmmod.patch new file mode 100644 index 0000000000..20770e0dc4 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/rmmod.patch @@ -0,0 +1,40 @@ +Index: busybox-1.1.0/modutils/rmmod.c +=================================================================== +--- busybox-1.1.0.orig/modutils/rmmod.c 2006-01-11 06:43:56.000000000 +0100 ++++ busybox-1.1.0/modutils/rmmod.c 2006-03-14 16:42:14.000000000 +0100 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include "busybox.h" + + #ifdef CONFIG_FEATURE_2_6_MODULES +@@ -64,6 +65,16 @@ + but must get */ + size_t bufsize = sizeof(bb_common_bufsiz1); + #endif ++#ifdef CONFIG_FEATURE_2_6_MODULES ++ int k_version = 0; ++ struct utsname myuname; ++ ++ if (uname(&myuname) == 0) { ++ if (myuname.release[0] == '2') { ++ k_version = myuname.release[2] - '0'; ++ } ++ } ++#endif + + /* Parse command line. */ + n = bb_getopt_ulflags(argc, argv, "wfa"); +@@ -109,6 +120,10 @@ + afterslash++; + module_name = alloca(strlen(afterslash) + 1); + filename2modname(module_name, afterslash); ++ if (k_version != 4) ++ filename2modname(module_name, afterslash); ++ else ++ strcpy(module_name, afterslash); + #else + #define module_name argv[n] + #endif diff --git a/packages/busybox/busybox-1.3.1/slugos/.mtn2git_empty b/packages/busybox/busybox-1.3.1/slugos/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/slugos/defconfig b/packages/busybox/busybox-1.3.1/slugos/defconfig new file mode 100644 index 0000000000..c35b4f7f70 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/slugos/defconfig @@ -0,0 +1,610 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +# CONFIG_FEATURE_COMPRESS_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SUID=y +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" +CONFIG_BUILD_AT_ONCE=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_NO_DEBUG_LIB is not set +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_DEBUG_YANK_SUSv2=y + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_MD5_SIZE_VS_SPEED=2 + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +# CONFIG_CPIO is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_CMP is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WATCH=y +CONFIG_WC=y +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +CONFIG_CLEAR=y +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set +CONFIG_RESET=y +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_RUN_PARTS=y +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +CONFIG_FEATURE_VI_DOT_CMD=y +CONFIG_FEATURE_VI_READONLY=y +CONFIG_FEATURE_VI_SETOPTS=y +CONFIG_FEATURE_VI_SET=y +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y + +# +# Finding Utilities +# +# CONFIG_FIND is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +# CONFIG_XARGS is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +CONFIG_FEATURE_UTMP=y +# CONFIG_FEATURE_WTMP is not set +# CONFIG_LOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_E2FSCK=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set +CONFIG_MKE2FS=y +# CONFIG_TUNE2FS is not set +# CONFIG_E2LABEL is not set +# CONFIG_FINDFS is not set + +# +# Linux Module Utilities +# +# CONFIG_INSMOD is not set +# CONFIG_RMMOD is not set +# CONFIG_LSMOD is not set +# CONFIG_MODPROBE is not set + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +# CONFIG_FBSET is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +CONFIG_FEATURE_OSF_LABEL=y +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +# CONFIG_LOSETUP is not set +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +# CONFIG_MOUNT is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_SWITCH_ROOT is not set +# CONFIG_UMOUNT is not set +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +CONFIG_TIME=y +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +# CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_IPX is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +# CONFIG_IP is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +CONFIG_NC=y +# CONFIG_NC_GAPING_SECURITY_HOLE is not set +CONFIG_NETSTAT=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING6=y +CONFIG_ROUTE=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_INETD is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set + +# +# udhcp Server/Client +# +# CONFIG_APP_UDHCPD is not set +CONFIG_APP_UDHCPC=y +CONFIG_APP_DUMPLEASES=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_IP6_LITERAL=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_UPTIME=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +CONFIG_FEATURE_COMMAND_EDITING=y +# CONFIG_FEATURE_COMMAND_EDITING_VI is not set +CONFIG_FEATURE_COMMAND_HISTORY=63 +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_SH_FANCY_PROMPT=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y diff --git a/packages/busybox/busybox-1.3.1/slugos/udhcpscript.patch b/packages/busybox/busybox-1.3.1/slugos/udhcpscript.patch new file mode 100644 index 0000000000..dec6c18994 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/slugos/udhcpscript.patch @@ -0,0 +1,133 @@ +--- busybox-1.00/.pc/udhcpscript.patch/examples/udhcp/simple.script 2004-10-13 00:18:05.000000000 -0700 ++++ busybox-1.00/examples/udhcp/simple.script 2005-06-05 15:08:28.432605118 -0700 +@@ -1,40 +1,101 @@ + #!/bin/sh ++# openslug UDHCP client script ++# this must set the HW address (MAC) on the interface ++# ++. /etc/default/functions + +-# udhcpc script edited by Tim Riker + +-[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 ++echodns(){ ++ local dns ++ if test $# -gt 0 ++ then ++ for dns in "$@" ++ do ++ echo "nameserver $dns" ++ done ++ fi ++} ++ ++# Output the correct contents for resolv.conf ++mkresolv() { ++ test -n "$domain" && echo "search $domain" ++ echodns $dns ++} ++ ++# checksum of a file (or stdin if -) ++md5strm() { ++ md5sum $1 2>/dev/null | sed -n 's/^\([0-9A-Za-z]*\).*$/\1/p' ++} ++ ++bind() { ++ local B N metric i olddomain ++ B= ++ test -n "$broadcast" && B="broadcast $broadcast" ++ N= ++ test -n "$subnet" && N="netmask $subnet" ++ ifconfig "$interface" "$ip" $B $N up ++ ++ # If given router information delete the old information and ++ # enter new stuff, routers get metrics incremented by 1 ++ # between each (this is somewhat arbitrary) ++ if test -n "$router" ++ then ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ++ do ++ : ++ done + +-RESOLV_CONF="/etc/resolv.conf" +-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" +-[ -n "$subnet" ] && NETMASK="netmask $subnet" ++ metric=0 ++ for i in $router ++ do ++ route add default gw "$i" dev "$interface" metric $((metric++)) ++ done ++ fi ++ ++ olddomain= ++ test -r /etc/defaultdomain && olddomain="$(cat /etc/defaultdomain)" ++ if test -n "$domain" -a "$domain" != "$olddomain" ++ then ++ echo "$domain" >/etc/defaultdomain ++ # and update the kernel view too ++ echo "$domain" >/proc/sys/kernel/domainname ++ fi ++ ++ # Update /etc/resolv.conf to reflect domain and dns information, ++ # this always clears resolv.conf if none is given ++ md5old="$(md5strm /etc/resolv.conf)" ++ md5new="$(mkresolv | md5strm -)" ++ test "$md5old" != "$md5new" && mkresolv >/etc/resolv.conf ++} + + case "$1" in +- deconfig) +- /sbin/ifconfig $interface 0.0.0.0 +- ;; +- +- renew|bound) +- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK +- +- if [ -n "$router" ] ; then +- echo "deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do +- : +- done +- +- metric=0 +- for i in $router ; do +- route add default gw $i dev $interface metric $((metric++)) +- done ++deconfig) ++ # Bring the interface up (without inet at this point) ++ ifconfig "$interface" 0.0.0.0;; ++ ++renew|bound) ++ bind;; ++ ++leasefail) ++ # Pull the values from the config data if (only only if) this ++ # is the config interface ++ if test "$interface" = "$(config iface)" ++ then ++ ip="$(config ip)" ++ if test -n "$ip" ++ then ++ router="$(config gateway)" ++ subnet="$(config netmask)" ++ broadcast="$(config broadcast)" ++ domain="$(config domain)" ++ dns="$(config dns)" ++ ++ bind + fi ++ fi;; + +- echo -n > $RESOLV_CONF +- [ -n "$domain" ] && echo search $domain >> $RESOLV_CONF +- for i in $dns ; do +- echo adding dns $i +- echo nameserver $i >> $RESOLV_CONF +- done +- ;; ++*) echo "udhcpc: $*: unknown command" >&2 ++ exit 1;; + esac + + exit 0 diff --git a/packages/busybox/busybox-1.3.1/sparc/.mtn2git_empty b/packages/busybox/busybox-1.3.1/sparc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/udhcppidfile-breakage.patch b/packages/busybox/busybox-1.3.1/udhcppidfile-breakage.patch new file mode 100644 index 0000000000..031274908b --- /dev/null +++ b/packages/busybox/busybox-1.3.1/udhcppidfile-breakage.patch @@ -0,0 +1,57 @@ +--- busybox-1.00/networking/udhcp/common.c~udhcppidfile2 ++++ busybox-1.00/networking/udhcp/common.c +@@ -74,7 +74,7 @@ + + if (pid > 0) { + /* parent */ +- if (pidfile_reassign(pidfile, pid) < 0) { ++ if (pidfile != NULL && pidfile_reassign(pidfile, pid) < 0) { + (void)kill(pid, SIGKILL); + exit(1); + } else +@@ -119,7 +119,7 @@ + sanitize_fds(); + + /* do some other misc startup stuff while we are here to save bytes */ +- if (pidfile_acquire(pidfile) < 0) ++ if (pidfile != NULL && pidfile_acquire(pidfile) < 0) + exit(1); + + /* equivelent of doing a fflush after every \n */ +@@ -166,7 +166,7 @@ + sanitize_fds(); + + /* do some other misc startup stuff while we are here to save bytes */ +- if (pidfile_acquire(pidfile) < 0) ++ if (pidfile != NULL && pidfile_acquire(pidfile) < 0) + exit(1); + + /* equivelent of doing a fflush after every \n */ +--- busybox-1.00/networking/udhcp/pidfile.c~udhcppidfile2 ++++ busybox-1.00/networking/udhcp/pidfile.c +@@ -141,7 +141,11 @@ + int pidfile_acquire(const char *pidfile) + { + int fd, result; +- if (!pidfile) return (-1); ++ ++ if (pidfile == NULL) { ++ LOG(LOG_ERR, "pidfile_acquire: filename is NULL\n"); ++ return (-1); ++ } + + if ((fd = pidfile_open(pidfile)) < 0) + return (-1); +@@ -170,7 +174,11 @@ + int pidfile_reassign(const char *pidfile, int pid) + { + int fd, result; +- if (!pidfile) return (-1); ++ ++ if (pidfile == NULL) { ++ LOG(LOG_ERR, "pidfile_reassign: filename is NULL\n"); ++ return (-1); ++ } + + if ((fd = pidfile_open(pidfile)) < 0) + return (-1); diff --git a/packages/busybox/busybox-1.3.1/udhcppidfile.patch b/packages/busybox/busybox-1.3.1/udhcppidfile.patch new file mode 100644 index 0000000000..b4b86b8775 --- /dev/null +++ b/packages/busybox/busybox-1.3.1/udhcppidfile.patch @@ -0,0 +1,274 @@ +Index: busybox-1.1.0/networking/udhcp/pidfile.h +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/pidfile.h 2006-01-11 06:43:50.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/pidfile.h 2006-03-14 17:15:45.000000000 +0100 +@@ -21,5 +21,5 @@ + + + int pidfile_acquire(const char *pidfile); +-void pidfile_write_release(int pid_fd); ++int pidfile_reassign(const char *pidfile, int newpid); + +Index: busybox-1.1.0/networking/udhcp/pidfile.c +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/pidfile.c 2006-01-11 06:43:50.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/pidfile.c 2006-03-14 17:15:45.000000000 +0100 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include "pidfile.h" + #include "common.h" +@@ -37,39 +38,146 @@ + } + + +-int pidfile_acquire(const char *pidfile) ++static int pidfile_open(const char *pidfile) + { +- int pid_fd; +- if (!pidfile) return -1; ++ int fd; + +- pid_fd = open(pidfile, O_CREAT | O_WRONLY, 0644); +- if (pid_fd < 0) { +- LOG(LOG_ERR, "Unable to open pidfile %s: %m\n", pidfile); +- } else { +- lockf(pid_fd, F_LOCK, 0); +- if (!saved_pidfile) +- atexit(pidfile_delete); +- saved_pidfile = (char *) pidfile; ++ if ((fd = open(pidfile, O_CREAT | O_RDWR, 0644)) < 0) { ++ LOG(LOG_ERR, "pidfile_open: open %s failed: %m\n", pidfile); ++ return (-1); ++ } ++ ++ /* NOTE: lockf is not inherited by child after fork */ ++ if (lockf(fd, F_LOCK, 0) < 0) { ++ LOG(LOG_ERR, "pidfile_open: lock %s failed: %m\n", pidfile); ++ close(fd); ++ return (-1); ++ } ++ ++ return (fd); ++} ++ ++ ++static int pidfile_check(int fd, const char *pidfile) ++{ ++ int len, pid; ++ char buf[20]; ++ ++ if (lseek(fd, 0L, SEEK_SET) < 0) { ++ LOG(LOG_ERR, "pidfile_check: lseek %s failed: %m\n", pidfile); ++ return (-1); ++ } ++ ++ if ((len = read(fd, buf, sizeof buf - 1)) < 0) { ++ LOG(LOG_ERR, "pidfile_check: read %s failed: %m\n", pidfile); ++ return (-1); ++ } ++ ++ if (len == 0) ++ return (0); ++ ++ buf[len] = '\0'; ++ ++ if ((pid = atoi(buf)) <= 1) { ++ LOG(LOG_WARNING, ++ "pidfile_check: ignoring bogus pid (%s) in %s\n", ++ buf, pidfile); ++ return (0); ++ } ++ ++ if (kill((pid_t)pid, 0) == 0) { ++ LOG(LOG_ERR, "pidfile_check: process %d exists (%s)\n", ++ pid, pidfile); ++ return (-1); ++ } ++ ++ if (errno != ESRCH) { ++ LOG(LOG_ERR, "pidfile_check: kill %d failed (%s): %m\n", ++ pid, pidfile); ++ return (-1); ++ } ++ ++ return (0); ++} ++ ++ ++static int pidfile_store(int fd, const char *pidfile, int pid) ++{ ++ int len; ++ char buf[20]; ++ ++ if (lseek(fd, 0L, SEEK_SET) < 0) { ++ LOG(LOG_ERR, "pidfile_store: lseek %s failed: %m\n", pidfile); ++ return (-1); ++ } ++ ++ len = snprintf(buf, sizeof buf - 1, "%d\n", pid); ++ buf[len] = '\0'; ++ ++ if (write(fd, buf, len) < 0) { ++ LOG(LOG_ERR, "pidfile_store: write %s failed: %m\n", ++ pidfile); ++ return (-1); ++ } ++ ++ if (ftruncate(fd, len) < 0) { ++ LOG(LOG_ERR, "pidfile_store: ftruncate %d failed (%s): %m\n", ++ len, pidfile); ++ return (-1); + } + +- return pid_fd; ++ return (0); + } + + +-void pidfile_write_release(int pid_fd) ++static void pidfile_close(int fd) + { +- FILE *out; ++ (void)lseek(fd, 0L, SEEK_SET); ++ (void)lockf(fd, F_ULOCK, 0); ++ (void)close(fd); ++} + +- if (pid_fd < 0) return; + +- if ((out = fdopen(pid_fd, "w")) != NULL) { +- fprintf(out, "%d\n", getpid()); +- fclose(out); ++int pidfile_acquire(const char *pidfile) ++{ ++ int fd, result; ++ if (!pidfile) return (-1); ++ ++ if ((fd = pidfile_open(pidfile)) < 0) ++ return (-1); ++ ++ if ((result = pidfile_check(fd, pidfile)) == 0) ++ result = pidfile_store(fd, pidfile, getpid()); ++ ++ pidfile_close(fd); ++ ++ if (result == 0) { ++ saved_pidfile = (char *) pidfile; ++ atexit(pidfile_delete); + } +- lockf(pid_fd, F_UNLCK, 0); +- close(pid_fd); ++ ++ return (result); + } + + ++/* ++ * reassign the pid in a pidfile - used just after a fork so a parent ++ * can store the pid of its child into the file without any window ++ * where the pid in the file is a dead process (which might let another ++ * instance of the program start). Note the parent must use _exit() to ++ * avoid triggering the unlink scheduled above in pidfile_acquire() ++ */ ++int pidfile_reassign(const char *pidfile, int pid) ++{ ++ int fd, result; ++ if (!pidfile) return (-1); ++ ++ if ((fd = pidfile_open(pidfile)) < 0) ++ return (-1); + ++ result = pidfile_store(fd, pidfile, pid); + ++ pidfile_close(fd); ++ ++ return (result); ++} +Index: busybox-1.1.0/networking/udhcp/common.c +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/common.c 2006-01-11 06:43:50.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/common.c 2006-03-14 17:15:45.000000000 +0100 +@@ -64,16 +64,34 @@ + #ifdef __uClinux__ + LOG(LOG_ERR, "Cannot background in uclinux (yet)"); + #else /* __uClinux__ */ +- int pid_fd; ++ int pid, fd; + +- /* hold lock during fork. */ +- pid_fd = pidfile_acquire(pidfile); +- if (daemon(0, 0) == -1) { ++ /* NOTE: lockf is not inherited by the child after fork */ ++ if ((pid = fork()) < 0) { + perror("fork"); + exit(1); + } ++ ++ if (pid > 0) { ++ /* parent */ ++ if (pidfile_reassign(pidfile, pid) < 0) { ++ (void)kill(pid, SIGKILL); ++ exit(1); ++ } else ++ _exit(0); ++ } ++ ++ /* child */ ++ (void)chdir("/"); ++ if ((fd = open("/dev/null", O_RDWR)) >= 0) { ++ (void)dup2(fd, 0); ++ (void)dup2(fd, 1); ++ (void)dup2(fd, 2); ++ (void)close(fd); ++ } ++ (void)setsid(); ++ + daemonized++; +- pidfile_write_release(pid_fd); + #endif /* __uClinux__ */ + } + +@@ -97,14 +115,12 @@ + + void start_log_and_pid(const char *client_server, const char *pidfile) + { +- int pid_fd; +- + /* Make sure our syslog fd isn't overwritten */ + sanitize_fds(); + + /* do some other misc startup stuff while we are here to save bytes */ +- pid_fd = pidfile_acquire(pidfile); +- pidfile_write_release(pid_fd); ++ if (pidfile_acquire(pidfile) < 0) ++ exit(1); + + /* equivelent of doing a fflush after every \n */ + setlinebuf(stdout); +@@ -150,8 +166,8 @@ + sanitize_fds(); + + /* do some other misc startup stuff while we are here to save bytes */ +- pid_fd = pidfile_acquire(pidfile); +- pidfile_write_release(pid_fd); ++ if (pidfile_acquire(pidfile) < 0) ++ exit(1); + + /* equivelent of doing a fflush after every \n */ + setlinebuf(stdout); +Index: busybox-1.1.0/networking/udhcp/script.c +=================================================================== +--- busybox-1.1.0.orig/networking/udhcp/script.c 2006-01-11 06:43:50.000000000 +0100 ++++ busybox-1.1.0/networking/udhcp/script.c 2006-03-14 17:15:45.000000000 +0100 +@@ -229,6 +229,6 @@ + execle(client_config.script, client_config.script, + name, NULL, envp); + LOG(LOG_ERR, "script %s failed: %m", client_config.script); +- exit(1); ++ _exit(1); + } + } diff --git a/packages/busybox/busybox-1.3.1/udhcpscript.patch b/packages/busybox/busybox-1.3.1/udhcpscript.patch new file mode 100644 index 0000000000..fc21d440cd --- /dev/null +++ b/packages/busybox/busybox-1.3.1/udhcpscript.patch @@ -0,0 +1,17 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- busybox-1.00-rc3/examples/udhcp/simple.script~udhcpscript ++++ busybox-1.00-rc3/examples/udhcp/simple.script +@@ -17,8 +17,7 @@ + /sbin/ifconfig $interface $ip $BROADCAST $NETMASK + + if [ -n "$router" ] ; then +- echo "deleting routers" +- while route del default gw 0.0.0.0 dev $interface ; do ++ while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do + : + done + diff --git a/packages/busybox/busybox-1.3.1/wget-long-options.patch b/packages/busybox/busybox-1.3.1/wget-long-options.patch new file mode 100644 index 0000000000..3c5920a3cb --- /dev/null +++ b/packages/busybox/busybox-1.3.1/wget-long-options.patch @@ -0,0 +1,20 @@ +--- busybox-1.2.1.orig/networking/wget.c ++++ busybox-1.2.1/networking/wget.c +@@ -136,7 +136,7 @@ + #define WGET_OPT_PREFIX 32 + #define WGET_OPT_PROXY 64 + +-#if ENABLE_WGET_LONG_OPTIONS ++#if CONFIG_FEATURE_WGET_LONG_OPTIONS + static const struct option wget_long_options[] = { + { "continue", 0, NULL, 'c' }, + { "quiet", 0, NULL, 'q' }, +@@ -180,7 +180,7 @@ + * Crack command line. + */ + bb_opt_complementally = "-1:\203::"; +-#if ENABLE_WGET_LONG_OPTIONS ++#if CONFIG_FEATURE_WGET_LONG_OPTIONS + bb_applet_long_options = wget_long_options; + #endif + opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:", diff --git a/packages/busybox/busybox-1.3.1/wrt54/.mtn2git_empty b/packages/busybox/busybox-1.3.1/wrt54/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.3.1/xargs-double-size.patch b/packages/busybox/busybox-1.3.1/xargs-double-size.patch new file mode 100644 index 0000000000..df64554ffc --- /dev/null +++ b/packages/busybox/busybox-1.3.1/xargs-double-size.patch @@ -0,0 +1,13 @@ +--- busybox-1.2.1/findutils/xargs.c.org 2006-09-19 18:18:17.084592997 +0200 ++++ busybox-1.2.1/findutils/xargs.c 2006-09-19 18:18:09.820275793 +0200 +@@ -466,8 +466,8 @@ + have it at 1 meg). Things will work fine with a large ARG_MAX but it + will probably hurt the system more than it needs to; an array of this + size is allocated. */ +- if (orig_arg_max > 20 * 1024) +- orig_arg_max = 20 * 1024; ++ if (orig_arg_max > 40 * 1024) ++ orig_arg_max = 40 * 1024; + n_max_chars = orig_arg_max; + } + max_chars = xmalloc(n_max_chars); diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb new file mode 100644 index 0000000000..59aa5f07fc --- /dev/null +++ b/packages/busybox/busybox_1.3.1.bb @@ -0,0 +1,100 @@ +require busybox.inc + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "file://wget-long-options.patch;patch=1 \ + file://defconfig" + +do_configure () { + install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe + + echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" > ${S}/.config + echo "USING_CROSS_COMPILER=y" >> ${S}/.config + + sed -e '/CROSS_COMPILER_PREFIX/d' \ + -e '/USING_CROSS_COMPILER/d' \ + '${S}/.config.oe' >>'${S}/.config' + cml1_do_configure +} + +do_install () { + install -d ${D}${sysconfdir}/init.d + oe_runmake "PREFIX=${D}" install + cp -pPR ${S}/_install/* ${D}/ + + # Move everything to /busybox (not supposed to end up in any package) + install -d ${D}/busybox + ls ${D} -R + + cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/ + # Move the busybox binary back to /bin + install -d ${D}${base_bindir} + mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/ + # Move back the sh symlink + test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/ + + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/ + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/ + if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then + # Move crond back to /usr/sbin/crond + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then + # Move httpd back to /usr/sbin/httpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ + install -d ${D}/srv/www + fi + if grep "CONFIG_APP_UDHCPD=y" ${WORKDIR}/defconfig; then + # Move udhcpd back to /usr/sbin/udhcpd + install -d ${D}${sbindir} + mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/ + + install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then + # Move hwclock back to /sbin/hwclock + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/ + + install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ + fi + if grep "CONFIG_APP_UDHCPC=y" ${WORKDIR}/defconfig; then + # Move dhcpc back to /usr/sbin/udhcpc + install -d ${D}${base_sbindir} + mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/ + + install -d ${D}${sysconfdir}/udhcpc.d + install -d ${D}${datadir}/udhcpc + install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default + install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script + fi + + install -m 0644 ${S}/busybox.links ${D}${sysconfdir} +} + +pkg_prerm_${PN} () { + # This is so you can make busybox commit suicide - removing busybox with no other packages + # providing its files, this will make update-alternatives work, but the update-rc.d part + # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh + tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` + ln -s /bin/busybox $tmpdir/[ + ln -s /bin/busybox $tmpdir/test + ln -s /bin/busybox $tmpdir/head + ln -s /bin/busybox $tmpdir/sh + ln -s /bin/busybox $tmpdir/basename + ln -s /bin/busybox $tmpdir/echo + ln -s /bin/busybox $tmpdir/mv + ln -s /bin/busybox $tmpdir/ln + ln -s /bin/busybox $tmpdir/dirname + ln -s /bin/busybox $tmpdir/rm + ln -s /bin/busybox $tmpdir/sed + ln -s /bin/busybox $tmpdir/sort + export PATH=$PATH:$tmpdir + while read link; do case "$link" in /*/*/*) to="../../bin/busybox";; /bin/*) to="busybox";; /*/*) to="../bin/busybox";; esac; bn=`basename $link`; sh /usr/bin/update-alternatives --remove $bn $to; done Date: Mon, 15 Jan 2007 18:09:18 +0000 Subject: musicpd/mpc: Fix cross compile badness; missing --with-iconv-*. --- packages/musicpd/mpc_0.11.2.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb index 256a2e5ea2..8806653357 100644 --- a/packages/musicpd/mpc_0.11.2.bb +++ b/packages/musicpd/mpc_0.11.2.bb @@ -2,8 +2,10 @@ DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/mpc.shtml" LICENSE = "GPLv2" SECTION = "console/multimedia" -PR = "r0" +PR = "r1" SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" +EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \ + --with-iconv-includes=${STAGING_INCDIR}" inherit autotools -- cgit v1.2.3 From 96de0b5c509c932a70592542bb3e256f16737c9d Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Mon, 15 Jan 2007 18:16:11 +0000 Subject: musicpd/mpc: Added 0.12.0. --- packages/musicpd/mpc_0.12.0.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/musicpd/mpc_0.12.0.bb (limited to 'packages') diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.0.bb new file mode 100644 index 0000000000..1ab29c0d57 --- /dev/null +++ b/packages/musicpd/mpc_0.12.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" +HOMEPAGE = "http://www.musicpd.org/mpc.shtml" +LICENSE = "GPLv2" +SECTION = "console/multimedia" +PR = "r0" + +SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" +EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \ + --with-iconv-includes=${STAGING_INCDIR}" + +inherit autotools -- cgit v1.2.3 From 389c8d10471156957f80965943072ec225011c28 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 15 Jan 2007 20:06:19 +0000 Subject: lsof: make it configure --- packages/lsof/lsof_4.77.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/lsof/lsof_4.77.bb b/packages/lsof/lsof_4.77.bb index ef82b6179f..054875b861 100644 --- a/packages/lsof/lsof_4.77.bb +++ b/packages/lsof/lsof_4.77.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ Its name stands for LiSt Open Files, and it does just that." SECTION = "devel" LICENSE = "BSD" +PR = "r1" SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2" LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" @@ -20,7 +21,7 @@ LSOF_OS_linux-uclibc = "linux" LSOF_OS_linux-gnueabi = "linux" do_configure () { - ./Configure ${LSOF_OS} + yes | ./Configure ${LSOF_OS} } export I = "${STAGING_INCDIR}" -- cgit v1.2.3 From 4566a87bd955d4cabf5d0363d075ed35f959258a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Jan 2007 20:56:11 +0000 Subject: busybox: Remove superflous patch --- .../busybox/busybox-1.3.1/wget-long-options.patch | 20 -------------------- packages/busybox/busybox_1.3.1.bb | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 packages/busybox/busybox-1.3.1/wget-long-options.patch (limited to 'packages') diff --git a/packages/busybox/busybox-1.3.1/wget-long-options.patch b/packages/busybox/busybox-1.3.1/wget-long-options.patch deleted file mode 100644 index 3c5920a3cb..0000000000 --- a/packages/busybox/busybox-1.3.1/wget-long-options.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- busybox-1.2.1.orig/networking/wget.c -+++ busybox-1.2.1/networking/wget.c -@@ -136,7 +136,7 @@ - #define WGET_OPT_PREFIX 32 - #define WGET_OPT_PROXY 64 - --#if ENABLE_WGET_LONG_OPTIONS -+#if CONFIG_FEATURE_WGET_LONG_OPTIONS - static const struct option wget_long_options[] = { - { "continue", 0, NULL, 'c' }, - { "quiet", 0, NULL, 'q' }, -@@ -180,7 +180,7 @@ - * Crack command line. - */ - bb_opt_complementally = "-1:\203::"; --#if ENABLE_WGET_LONG_OPTIONS -+#if CONFIG_FEATURE_WGET_LONG_OPTIONS - bb_applet_long_options = wget_long_options; - #endif - opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:", diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index 59aa5f07fc..b04cd86677 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,9 +1,9 @@ require busybox.inc DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_slugos = "1" -SRC_URI = "file://wget-long-options.patch;patch=1 \ - file://defconfig" +SRC_URI = "file://defconfig" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe -- cgit v1.2.3 From 1e9c114c2b92ab211acf5b3a85dd2abdf2fd6215 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 16 Jan 2007 01:57:56 +0000 Subject: fftw_3.1.2.bb : Add fftw support to openembedded. --- packages/fftw/.mtn2git_empty | 0 packages/fftw/fftw_3.1.2.bb | 17 +++++++++++++++++ packages/usrp/usrp_0.12.bb | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 packages/fftw/.mtn2git_empty create mode 100644 packages/fftw/fftw_3.1.2.bb (limited to 'packages') diff --git a/packages/fftw/.mtn2git_empty b/packages/fftw/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fftw/fftw_3.1.2.bb b/packages/fftw/fftw_3.1.2.bb new file mode 100644 index 0000000000..6cb2accca0 --- /dev/null +++ b/packages/fftw/fftw_3.1.2.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "FFTW" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "" +PR = "r0" + +SRC_URI = "http://www.fftw.org/fftw-3.1.2.tar.gz" + +inherit autotools + +EXTRA_OECONF = "--enable-single --enable-shared --disable-fortran" + +do_stage () { + autotools_stage_all +} + diff --git a/packages/usrp/usrp_0.12.bb b/packages/usrp/usrp_0.12.bb index ade37baf60..398299e4bb 100644 --- a/packages/usrp/usrp_0.12.bb +++ b/packages/usrp/usrp_0.12.bb @@ -7,7 +7,7 @@ RDEPENDS = "python-core" PR = "r0" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \ - file://usb11.patch;patch=1 \ +# file://usb11.patch;patch=1 \ file://fix_compile_h.patch;patch=1;pnum=3 \ file://install_test.patch;patch=1" -- cgit v1.2.3 From f4f31d5f2005ac563f82ef5509fe686f8146f778 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Jan 2007 10:38:19 +0000 Subject: jpeg: add RPROVIDES to fix dependency errors caused by earlier (ab)use of debian.bbclass --- packages/jpeg/jpeg_6b.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb index d725284694..8573789230 100644 --- a/packages/jpeg/jpeg_6b.bb +++ b/packages/jpeg/jpeg_6b.bb @@ -4,8 +4,10 @@ SECTION = "libs" PRIORITY = "required" DEPENDS = "libtool-cross" +RPROVIDES_${PN} = "jpeg" -PR = "r5" + +PR = "r6" SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ file://debian.patch;patch=1 \ -- cgit v1.2.3 From 0e17043b9f0c264dc77531c3c635c4e2e3d6a819 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Jan 2007 11:01:05 +0000 Subject: libgnomeui: update to 2.16.1 --- packages/gnome/libgnomeui_2.16.0.bb | 22 ---------------------- packages/gnome/libgnomeui_2.16.1.bb | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 packages/gnome/libgnomeui_2.16.0.bb create mode 100644 packages/gnome/libgnomeui_2.16.1.bb (limited to 'packages') diff --git a/packages/gnome/libgnomeui_2.16.0.bb b/packages/gnome/libgnomeui_2.16.0.bb deleted file mode 100644 index 8f3e0a725c..0000000000 --- a/packages/gnome/libgnomeui_2.16.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -LICENSE = "GPL" -SECTION = "x11/gnome/libs" -PR = "r0" -DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" -DESCRIPTION = "GNOME User Interface Library" - -FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ - ${libdir}/libglade/*/lib*.so" - -inherit gnome - -SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1" - -EXTRA_OECONF = "--disable-gtk-doc" - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h -} - -do_stage() { -autotools_stage_all -} diff --git a/packages/gnome/libgnomeui_2.16.1.bb b/packages/gnome/libgnomeui_2.16.1.bb new file mode 100644 index 0000000000..8f3e0a725c --- /dev/null +++ b/packages/gnome/libgnomeui_2.16.1.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r0" +DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" +DESCRIPTION = "GNOME User Interface Library" + +FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ + ${libdir}/libglade/*/lib*.so" + +inherit gnome + +SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h +} + +do_stage() { +autotools_stage_all +} -- cgit v1.2.3 From 341ae849fcb55286af75764c6e43131558343360 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 16 Jan 2007 13:03:38 +0000 Subject: cppunit_1.10.2.bb : Add hack to build c++ on EFIKA/powerpc. --- packages/cppunit/cppunit_1.10.2.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/cppunit/cppunit_1.10.2.bb b/packages/cppunit/cppunit_1.10.2.bb index def3c9d1f3..9949f020e2 100644 --- a/packages/cppunit/cppunit_1.10.2.bb +++ b/packages/cppunit/cppunit_1.10.2.bb @@ -11,6 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/cppunit/cppunit-${PV}.tar.gz" inherit autotools +CXXFLAGS_powerpc += "-lstdc++" + do_stage () { autotools_stage_includes cd ./src/cppunit/.libs/ -- cgit v1.2.3 From 19d846302f34ae82d5345e714d2bc70a02e216a9 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 16 Jan 2007 13:08:57 +0000 Subject: disapproval of revision '1b4f1b0c118eeaad3bf775fe1f5c2080e0e260c6' Committed usrp hack by mistake, back out and recommit. --- packages/fftw/.mtn2git_empty | 0 packages/fftw/fftw_3.1.2.bb | 17 ----------------- packages/usrp/usrp_0.12.bb | 2 +- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 packages/fftw/.mtn2git_empty delete mode 100644 packages/fftw/fftw_3.1.2.bb (limited to 'packages') diff --git a/packages/fftw/.mtn2git_empty b/packages/fftw/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/fftw/fftw_3.1.2.bb b/packages/fftw/fftw_3.1.2.bb deleted file mode 100644 index 6cb2accca0..0000000000 --- a/packages/fftw/fftw_3.1.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "FFTW" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "" -PR = "r0" - -SRC_URI = "http://www.fftw.org/fftw-3.1.2.tar.gz" - -inherit autotools - -EXTRA_OECONF = "--enable-single --enable-shared --disable-fortran" - -do_stage () { - autotools_stage_all -} - diff --git a/packages/usrp/usrp_0.12.bb b/packages/usrp/usrp_0.12.bb index 398299e4bb..ade37baf60 100644 --- a/packages/usrp/usrp_0.12.bb +++ b/packages/usrp/usrp_0.12.bb @@ -7,7 +7,7 @@ RDEPENDS = "python-core" PR = "r0" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/usrp-${PV}.tar.gz \ -# file://usb11.patch;patch=1 \ + file://usb11.patch;patch=1 \ file://fix_compile_h.patch;patch=1;pnum=3 \ file://install_test.patch;patch=1" -- cgit v1.2.3 From 8a7feea5aedb5de0c8309ec19879bdea46f2b54a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Jan 2007 13:14:34 +0000 Subject: eds-dbus: add patch to work with a recent dbus-bindings-tool --- packages/eds/eds-dbus/fix-bindig-tool.patch | 22 ++++++++++++++++++++++ packages/eds/eds-dbus_svn.bb | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 packages/eds/eds-dbus/fix-bindig-tool.patch (limited to 'packages') diff --git a/packages/eds/eds-dbus/fix-bindig-tool.patch b/packages/eds/eds-dbus/fix-bindig-tool.patch new file mode 100644 index 0000000000..704df84f69 --- /dev/null +++ b/packages/eds/eds-dbus/fix-bindig-tool.patch @@ -0,0 +1,22 @@ +--- /tmp/Makefile.am 2007-01-16 13:56:57.000000000 +0100 ++++ trunk/calendar/libecal-dbus/Makefile.am 2007-01-16 13:57:40.045251000 +0100 +@@ -64,7 +64,7 @@ + dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ + + %-bindings.h: ../libedata-cal-dbus/%.xml +- dbus-binding-tool --mode=glib-client --output=$@ $^ ++ dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^ + + BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED) + CLEANFILES = $(BUILT_SOURCES) +--- /tmp/Makefile.am 2007-01-16 14:05:49.000000000 +0100 ++++ trunk/calendar/libedata-cal-dbus/Makefile.am 2007-01-16 14:06:15.865251000 +0100 +@@ -90,7 +90,7 @@ + dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ + + %-bindings.h: %.xml +- dbus-binding-tool --mode=glib-client --output=$@ $^ ++ dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^ + + + DBUS_BINDINGS = e-data-cal-factory-bindings.h e-data-cal-bindings.h e-data-cal-view-bindings.h diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index 3cffebc37e..6edd97229e 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -11,7 +11,9 @@ SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://no_libedataserverui-20060126.patch;patch=1;maxdate=20061214 \ file://no_libedataserverui.patch;patch=1;mindate=20061215 \ file://disable_orbit.patch;patch=1;maxdate=20061214 \ + file://fix-bindig-tool.patch;patch=1 \ file://iconv-detect.h" + S = "${WORKDIR}/trunk" inherit autotools pkgconfig -- cgit v1.2.3 From 06d175cce8b1c8ee20ff554a08dba48de8d418e1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Jan 2007 13:24:50 +0000 Subject: dates: add 0.2 --- packages/dates/dates_0.2.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 packages/dates/dates_0.2.bb (limited to 'packages') diff --git a/packages/dates/dates_0.2.bb b/packages/dates/dates_0.2.bb new file mode 100755 index 0000000000..0870313df1 --- /dev/null +++ b/packages/dates/dates_0.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Dates is a calendar application." +SECTION = "x11" +LICENSE = "LGPL" + +DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" + +SRC_URI = "http://projects.o-hand.com/sources/dates/${P}.tar.gz" + +inherit autotools pkgconfig gtk-icon-cache + +FILES_${PN} += "${datadir}/pixmaps/dates.png" + -- cgit v1.2.3 From 4129e2905ec2a33ee48b881cfce4a5a56709fc34 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 16 Jan 2007 13:26:11 +0000 Subject: fftw_3.1.2.bb : Add bb file for fftw (Fastest FFT in the West) --- packages/fftw/.mtn2git_empty | 0 packages/fftw/fftw_3.1.2.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/fftw/.mtn2git_empty create mode 100644 packages/fftw/fftw_3.1.2.bb (limited to 'packages') diff --git a/packages/fftw/.mtn2git_empty b/packages/fftw/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/fftw/fftw_3.1.2.bb b/packages/fftw/fftw_3.1.2.bb new file mode 100644 index 0000000000..e9074d2613 --- /dev/null +++ b/packages/fftw/fftw_3.1.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "FFTW" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz" + +EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared" + +inherit autotools + +do_stage () { + autotools_stage_all +} + -- cgit v1.2.3 From 9474950666617c5a8332cc9b1914360b949779ea Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 16 Jan 2007 13:32:32 +0000 Subject: eds-dbus: add maxdate for the bindings patch --- packages/eds/eds-dbus_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index 6edd97229e..79af6ae10d 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -11,7 +11,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ file://no_libedataserverui-20060126.patch;patch=1;maxdate=20061214 \ file://no_libedataserverui.patch;patch=1;mindate=20061215 \ file://disable_orbit.patch;patch=1;maxdate=20061214 \ - file://fix-bindig-tool.patch;patch=1 \ + file://fix-bindig-tool.patch;patch=1;maxdate=20061223 \ file://iconv-detect.h" S = "${WORKDIR}/trunk" -- cgit v1.2.3 From d5e5a592f1643820e29a35d0eee631d39d86c74a Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Tue, 16 Jan 2007 13:59:56 +0000 Subject: fftw_3.1.2.bb : Install pkgconfig files properly. --- packages/fftw/fftw_3.1.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/fftw/fftw_3.1.2.bb b/packages/fftw/fftw_3.1.2.bb index e9074d2613..e6bc885b77 100644 --- a/packages/fftw/fftw_3.1.2.bb +++ b/packages/fftw/fftw_3.1.2.bb @@ -8,7 +8,7 @@ SRC_URI = "http://www.fftw.org/fftw-${PV}.tar.gz" EXTRA_OECONF = "--disable-fortran --enable-single --enable-shared" -inherit autotools +inherit autotools pkgconfig do_stage () { autotools_stage_all -- cgit v1.2.3