diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2005-09-04 23:18:07 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-04 23:18:07 +0000 |
commit | 544ca4ea5f2fab1a656c3c11dd8656955774fc08 (patch) | |
tree | 8b3cfe3018377f1eaefb423ffff1ff1ad50d6bb7 | |
parent | 3310a8c8bee7cb0a4cfe174a6fb32080cceb1acd (diff) | |
parent | 462f13c149cd4ebd6e7d9d68b7bf1458226c833e (diff) |
merge of 325eef6ef0e12e5a9195df6e68307e029355d4bb
and 62da1bc1858038e3bf6cd02fbd3e864b46a8d189
70 files changed, 1217 insertions, 172 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 7f076a6c84..17755e35e9 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -11,8 +11,7 @@ ${PKGDIR}/packages/bash/*.bb \ ${PKGDIR}/packages/bind/*.bb \ ${PKGDIR}/packages/binutils/*.bb \ ${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/bluez-libs/*.bb \ -${PKGDIR}/packages/bluez-utils/*.bb \ +${PKGDIR}/packages/bluez/*.bb \ ${PKGDIR}/packages/boost/*.bb \ ${PKGDIR}/packages/bridge-utils/*.bb \ ${PKGDIR}/packages/busybox/*.bb \ @@ -79,6 +78,7 @@ ${PKGDIR}/packages/libdvb/*.bb \ ${PKGDIR}/packages/libexif/*.bb \ ${PKGDIR}/packages/libgphoto2/*.bb \ ${PKGDIR}/packages/libgsm/*.bb \ +${PKGDIR}/packages/libiconv/*.bb \ ${PKGDIR}/packages/libid3tag/*.bb \ ${PKGDIR}/packages/liblockfile/*.bb \ ${PKGDIR}/packages/libmad/*.bb \ diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 6e6a07aa58..5919f351fb 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -39,7 +39,7 @@ PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_xhost ?= "0.0cvs20040413" PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" PREFERRED_VERSION_gpe-login ?= "0.82" -PREFERRED_VERSION_gpe-session-scripts ?= "0.65" +PREFERRED_VERSION_gpe-session-scripts ?= "0.66" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-todo ?= "0.54" PREFERRED_VERSION_gpe-calendar ?= "0.65" @@ -86,4 +86,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" +PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1" +PREFERRED_VERSION_poppler ?= "0.3.3" +PREFERRED_VERSION_evince ?= "0.3.2" PREFERRED_VERSION_gpe_mini_browser ?= "0.15" diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index 5ecc44fb03..a45c396c8b 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -10,8 +10,7 @@ ${PKGDIR}/packages/bash/*.bb \ ${PKGDIR}/packages/bind/*.bb \ ${PKGDIR}/packages/binutils/*.bb \ ${PKGDIR}/packages/bison/*.bb \ -${PKGDIR}/packages/bluez-libs/*.bb \ -${PKGDIR}/packages/bluez-utils/*.bb \ +${PKGDIR}/packages/bluez/*.bb \ ${PKGDIR}/packages/boost/*.bb \ ${PKGDIR}/packages/bridge-utils/*.bb \ ${PKGDIR}/packages/busybox/*.bb \ @@ -102,7 +101,6 @@ ${PKGDIR}/packages/ncftp/*.bb \ ${PKGDIR}/packages/ncurses/*.bb \ ${PKGDIR}/packages/netbase/*.bb \ ${PKGDIR}/packages/netpbm/*.bb \ -${PKGDIR}/packages/nslu2-binary-only/*.bb \ ${PKGDIR}/packages/ntp/*.bb \ ${PKGDIR}/packages/obexftp/*.bb \ ${PKGDIR}/packages/openldap/*.bb \ @@ -136,7 +134,6 @@ ${PKGDIR}/packages/samba/*.bb \ ${PKGDIR}/packages/sane-backends/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ -${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ @@ -148,7 +145,6 @@ ${PKGDIR}/packages/timezones/*.bb \ ${PKGDIR}/packages/tinylogin/*.bb \ ${PKGDIR}/packages/uclibc/*.bb \ ${PKGDIR}/packages/unionfs/*.bb \ -${PKGDIR}/packages/unzip/*.bb \ ${PKGDIR}/packages/update-modules/*.bb \ ${PKGDIR}/packages/update-rc.d/*.bb \ ${PKGDIR}/packages/util-linux/*.bb \ diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index be2e54e917..9239e676c7 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -132,4 +132,6 @@ PREFERRED_VERSION_openslug-kernel ?= "2.6.12.2" PREFERRED_VERSION_ixp4xx-csr ?= "1.4" PREFERRED_VERSION_ixp425-eth ?= "1.1" +PREFERRED_VERSION_samba ?= "3.0.14a" + PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r29" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 9e1b677ecf..0565b897b7 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -9,12 +9,14 @@ PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" PREFERRED_VERSION_orinoco-modules = "0.15rc1" BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev modutils-collateral module-init-tools" +BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" -BOOTSTRAP_EXTRA_RDEPENDS_append = " udev modutils-collateral module-init-tools" +BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" -PXA270_MODULES = "g_ether pxa27x_udc" +PXA270_MODULES = "g_ether g_file_storage g_serial pxa27x_udc \ + snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \ + nls_cp437 nls_utf8" SERIAL_CONSOLE = "115200 ttyS0" @@ -29,5 +31,21 @@ GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince" include conf/machine/tune-xscale.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" -HX4700_MODULES = "asic3_base asic3_mmc hx4700_bt hx4700_core hx4700_leds hx4700_navpt hx4700_pcmcia \ - hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700" +HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ + hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power" + +module_autoload_hx4700_power = "hx4700_power" +module_autoload_pcmcia = "pcmcia" +module_autoload_hx4700_pcmcia = "hx4700_pcmcia" +module_autoload_asic3_mmc = "asic3_mmc" +module_autoload_mmc_block = "mmc_block" +module_autoload_hx4700_ts = "hx4700_ts" +module_autoload_hx4700_navpt = "hx4700_navpt" +module_autoload_hx4700_bt = "hx4700_bt" +module_autoload_snd-pxa-i2sound-hx4700 = "snd-pxa-i2sound-hx4700" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-pcm-oss = "snd-mixer-oss" +module_autoload_pxa27x_udc = "pxa27x_udc" + +#FIXME: this should be controlled by a userspace utility later. +module_autoload_g_ether = "g_ether" diff --git a/files/device_table-openslug.txt b/files/device_table-openslug.txt index b3ee0cb4dc..6cfc5fc5e0 100644 --- a/files/device_table-openslug.txt +++ b/files/device_table-openslug.txt @@ -27,7 +27,7 @@ /dev/rbuttons c 660 0 0 60 0 - - - /dev/rtc c 644 0 0 10 135 - - - /dev/sda b 664 0 0 8 0 - - - -/dev/sda b 664 0 0 8 1 1 1 5 +/dev/sda b 664 0 0 8 1 1 1 10 /dev/sdb b 664 0 0 8 16 - - - /dev/sdb b 664 0 0 8 17 1 1 5 /dev/sdc b 664 0 0 8 32 - - - diff --git a/packages/avahi/avahi_0.2.bb b/packages/avahi/avahi_0.2.bb index 00c4dbd599..8added4ed2 100644 --- a/packages/avahi/avahi_0.2.bb +++ b/packages/avahi/avahi_0.2.bb @@ -5,11 +5,10 @@ DEPENDS = "expat libdaemon dbus-0.34" RRECOMMENDS = "libnss-mdns" SECTION = "net" PRIORITY = "optional" +PR = "r1" SRC_URI = "http://www.freedesktop.org/~lennart/avahi-${PV}.tar.gz" -# file://no-strict-ansi.patch;patch=1" - PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" @@ -35,10 +34,12 @@ inherit update-rc.d INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" +INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" +INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" pkg_postinst_avahi-daemon () { - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon avahi + grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi -g Avahi } pkg_postrm_avahi-daemon () { diff --git a/packages/e17/entrance/Xinit.d/.mtn2git_empty b/packages/bogofilter/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/e17/entrance/Xinit.d/.mtn2git_empty +++ b/packages/bogofilter/.mtn2git_empty diff --git a/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty b/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty diff --git a/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch b/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch new file mode 100644 index 0000000000..310eaaa16d --- /dev/null +++ b/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch @@ -0,0 +1,34 @@ +--- bogofilter-0.96.0/configure.ac.orig 2005-09-04 20:42:35.000000000 +0200 ++++ bogofilter-0.96.0/configure.ac 2005-09-04 20:45:12.000000000 +0200 +@@ -460,6 +460,7 @@ + dnl check if run-time link works + saveLIBS="$LIBS" + LIBS="$LIBS $LIBDB" ++ if test x$cross_compiling = xNO ; then + AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) + AC_RUN_IFELSE( + AC_LANG_PROGRAM([[ +@@ -500,6 +501,7 @@ + [AC_MSG_RESULT(no) + AC_MSG_ERROR(db.h header file and db library version do not match.)],) + AC_MSG_RESULT(yes) ++ fi + AC_CHECK_DECLS(db_create,, + AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file. + Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory. +@@ -509,6 +511,7 @@ + #endif + #include <db.h>]] + ) ++ if test x$cross_compiling = xNO ; then + AC_MSG_CHECKING(if Berkeley DB supports shared environments) + if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then + AC_RUN_IFELSE( +@@ -548,6 +551,7 @@ + else + AC_MSG_RESULT(skipped) + fi ++ fi + + AC_DEFINE(ENABLE_DB_DATASTORE,1, [Enable Berkeley DB datastore]) + LIBS="$saveLIBS" diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb new file mode 100644 index 0000000000..e552f1b8bd --- /dev/null +++ b/packages/bogofilter/bogofilter_0.96.0.bb @@ -0,0 +1,17 @@ +SECTION = "console/network" +DEPENDS = "db3" +DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) \ +by a statistical analysis of the message's header and content (body). \ +The program is able to learn from the user's classifications and corrections." +LICENSE = "GPL" +PR = "r1" +PRIORITY = "optional" + +SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \ + file://${FILESDIR}/configure.ac.patch;patch=1 \ + " + +inherit autotools + +EXTRA_OECONF = "--with-libdb-prefix=${libdir}" + diff --git a/packages/dbh/dbh_1.0-18.bb b/packages/dbh/dbh_1.0-18.bb index 65ea98ca75..a84bd95dd4 100644 --- a/packages/dbh/dbh_1.0-18.bb +++ b/packages/dbh/dbh_1.0-18.bb @@ -1,15 +1,13 @@ -SECTION = "devel" -# cramfs-native OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see packages/COPYING) +DESCRIPTION ="Disk based hashes is a method to create multidimensional binary trees on disk." +HOMEPAGE = "http://dbh.sourceforge.net" +LICENSE = "GPL" +SECTION = "libs" +SRC_URI = "${SOURCEFORGE_MIRROR}/dbh/dbh_${PV}.tar.bz2 \ + file://${FILESDIR}/configure.patch;patch=1" -DESCRIPTION="Disk based hashes is a method to create multidimensional binary trees on disk." -HOMEPAGE="http://dbh.sourceforge.net" -LICENSE="QPL" -SRC_URI="${SOURCEFORGE_MIRROR}/dbh/${PN}_${PV}.tar.bz2 \ - file://${FILESDIR}/configure.patch;patch=1" - -S="${WORKDIR}/${PN}_${PV}" +S="${WORKDIR}/dbh_${PV}" inherit autotools pkgconfig @@ -18,6 +16,5 @@ do_stage() { install -m 644 src/dbh_functions.h ${STAGING_INCDIR} install -m 644 src/dbh.h ${STAGING_INCDIR} - oe_soinstall src/.libs/libdbh-1.0.so.1.0.0 ${STAGING_LIBDIR} - ln -s ${STAGING_LIBDIR}/libdbh-1.0.so.1.0.0 ${STAGING_LIBDIR}/libdbh.so + oe_libinstall -C src/.libs libdbh-1.0 ${STAGING_LIBDIR} } diff --git a/packages/dbus/dbus-0.34/.mtn2git_empty b/packages/dbus/dbus-0.34/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dbus/dbus-0.34/.mtn2git_empty diff --git a/packages/dbus/dbus-0.34/dbus-1.init b/packages/dbus/dbus-0.34/dbus-1.init new file mode 100644 index 0000000000..60440b7223 --- /dev/null +++ b/packages/dbus/dbus-0.34/dbus-1.init @@ -0,0 +1,86 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters <walters@debian.org> + +set -e + +DAEMON=/usr/bin/dbus-daemon +NAME=dbus-1 +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus-1 ]; then + . /etc/default/dbus-1 +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + restart|force-reload) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/e17/entrance/Xinit.d/99entrance b/packages/e17/entrance/Xinit.d/99entrance deleted file mode 100644 index 297cc909fe..0000000000 --- a/packages/e17/entrance/Xinit.d/99entrance +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -entrance - diff --git a/packages/e17/entrance/set-display-env.patch b/packages/e17/entrance/set-display-env.patch new file mode 100644 index 0000000000..37bfc1c2c8 --- /dev/null +++ b/packages/e17/entrance/set-display-env.patch @@ -0,0 +1,11 @@ +diff -Nur entrance~/src/daemon/spawner.c entrance/src/daemon/spawner.c +--- entrance~/src/daemon/spawner.c 2005-09-02 14:00:29.000000000 -0700 ++++ entrance/src/daemon/spawner.c 2005-09-02 15:53:31.000000000 -0700 +@@ -199,6 +199,7 @@ + free(d->client.homedir); + d->client.homedir = NULL; + ++ setenv("DISPLAY", d->name, 1); + snprintf(entrance_cmd, PATH_MAX, "%s -d %s", ENTRANCE, d->name); + if (d->config) + snprintf(entrance_cmd, PATH_MAX, "%s -d %s -c \"%s\" -z %d", diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index 8a7a08b881..1c27111f49 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -3,11 +3,11 @@ SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch detect-stylus xserver-common" -RDEPENDS += "bash keylaunch detect-stylus x11-common glibc-gconv-iso8859-1" +RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" CVSDATE = "${PV}" -PR = "r6" +PR = "r9" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ file://Xserver.patch;patch=1 \ @@ -15,7 +15,7 @@ SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/ file://allow-missing-xsession.patch;patch=1 \ file://run-Xinit.patch;patch=1 \ file://use-bash.patch;patch=1 \ - file://Xinit.d \ + file://set-display-env.patch;patch=1 \ file://Sessions" S = "${WORKDIR}/entrance" @@ -31,11 +31,8 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ FILES += "${datadir}" do_install_append() { - install -d ${D}/etc/X11/Xinit.d install -d ${D}/etc/X11/Xsession.d install -d ${D}/etc/X11/Sessions - install -m 755 ${WORKDIR}/Xinit.d/* ${D}/etc/X11/Xinit.d install -m 755 ${WORKDIR}/Sessions/* ${D}/etc/X11/Sessions - } diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index cd42cc93f2..e851cd0c70 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -1,4 +1,5 @@ PR = "r0" +PV = "2.0+cvs-${CVSDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb index beaef3c80c..5e98e9e0d6 100644 --- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb +++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb @@ -6,7 +6,7 @@ RPROVIDES = "gnome-vfs" inherit gnome pkgconfig -DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba" +DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14" RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info" diff --git a/packages/gpe-dm/gpe-dm_0.47.bb b/packages/gpe-dm/gpe-dm_0.47.bb index bc290ebf89..2432c2ad0d 100644 --- a/packages/gpe-dm/gpe-dm_0.47.bb +++ b/packages/gpe-dm/gpe-dm_0.47.bb @@ -5,9 +5,9 @@ DESCRIPTION = "GPE Desktop Manager" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -DEPENDS = "glib-2.0 x11-common" -RDEPENDS_${PN} += "x11-common" -PR = "r5" +DEPENDS = "glib-2.0 xserver-common" +RDEPENDS_${PN} += "xserver-common" +PR = "r6" INITSCRIPT_NAME = "gpe-dm" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb index a54039d09b..986810e8ba 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r16" +PR = "r17" inherit gpe @@ -7,9 +7,9 @@ DESCRIPTION = "GPE session startup scripts" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common" +RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common" # more rdepends: keylaunch ipaq-sleep apmd blueprobe -DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo x11-common" +DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings \ diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb index cf62a9a2d0..9364dcab2e 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -PR = "r0" +PR = "r1" inherit gpe @@ -7,9 +7,9 @@ DESCRIPTION = "GPE session startup scripts" SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common" +RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common" # more rdepends: keylaunch ipaq-sleep apmd blueprobe -DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo x11-common" +DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" SRC_URI += "file://matchbox-session \ file://disable-composite.xsettings \ diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb new file mode 100644 index 0000000000..d7a3054149 --- /dev/null +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.66.bb @@ -0,0 +1,30 @@ +LICENSE = "GPL" +PR = "r0" + +inherit gpe + +DESCRIPTION = "GPE session startup scripts" +SECTION = "gpe" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell <pb@handhelds.org>" +RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common" +# more rdepends: keylaunch ipaq-sleep apmd blueprobe +DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common" + +SRC_URI += "file://matchbox-session \ + file://disable-composite.xsettings" + +do_install_append() { + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then + echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar + fi + install -d ${D}${sysconfdir}/matchbox + install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session + + install -d ${D}${sysconfdir}/gpe/xsettings-default.d + install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite +} + +# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/icecast/icecast_2.2.0.bb b/packages/icecast/icecast_2.2.0.bb index f184ad78c1..2dba8044f9 100644 --- a/packages/icecast/icecast_2.2.0.bb +++ b/packages/icecast/icecast_2.2.0.bb @@ -1,9 +1,8 @@ -DEPENDS = "libxslt" -PR = "r1" +PR = "r2" MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" LICENCE = "GPL-2" -DEPENDS = "libvorbis libogg" +DEPENDS = "libvorbis libogg libxslt" SRC_URI = "http://downloads.us.xiph.org/releases/icecast/${PN}-${PV}.tar.gz" diff --git a/packages/ipkg/ipkg_0.99.153.bb b/packages/ipkg/ipkg_0.99.153.bb index f629b85f00..67a8859fe0 100644 --- a/packages/ipkg/ipkg_0.99.153.bb +++ b/packages/ipkg/ipkg_0.99.153.bb @@ -1,3 +1,3 @@ -DEFAULT_PREFERENCE=-1 +DEFAULT_PREFERENCE = "-1" include ipkg.inc diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig index dbfeab2a62..f90fb80edf 100644 --- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig +++ b/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12-hh1 -# Wed Jul 13 18:54:32 2005 +# Linux kernel version: 2.6.12-hh2 +# Mon Aug 15 19:13:48 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -102,6 +102,7 @@ CONFIG_PXA27x=y CONFIG_PXA_KEYS=y # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set +# CONFIG_MACH_A716 is not set # CONFIG_ARCH_H1900 is not set # CONFIG_ARCH_H2200 is not set # CONFIG_ARCH_H3900 is not set @@ -124,6 +125,9 @@ CONFIG_HX4700_LEDS=m # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_PXA_SHARPSL is not set +# CONFIG_SA1100_H3100 is not set +# CONFIG_SA1100_H3600 is not set +# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader @@ -149,12 +153,7 @@ CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y # -# Bus support -# -CONFIG_ISA_DMA_API=y - -# -# Compaq/iPAQ Options +# Compaq/iPAQ Platforms # CONFIG_PXA_IPAQ=y @@ -162,11 +161,24 @@ 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 +# +CONFIG_ISA_DMA_API=y + +# # PCCARD (PCMCIA/CardBus) support # CONFIG_PCCARD=m @@ -335,10 +347,8 @@ CONFIG_MTD_IPAQ=y CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y +# CONFIG_BLK_DEV_RAM is not set CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=12288 -CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CDROM_PKTCDVD is not set @@ -367,7 +377,6 @@ 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_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set # @@ -690,7 +699,6 @@ CONFIG_NET_RADIO=y # # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set -# CONFIG_PCMCIA_ACX100 is not set CONFIG_NET_WIRELESS=y # CONFIG_HOSTAP is not set @@ -737,7 +745,6 @@ CONFIG_INPUT=y # Userland interfaces # # CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set CONFIG_INPUT_EVDEV=m @@ -1040,6 +1047,8 @@ CONFIG_SND_GENERIC_PM=y # # ALSA ARM devices # +# CONFIG_SND_A716 is not set +# CONFIG_SND_H1910 is not set # CONFIG_SND_H2200 is not set CONFIG_SND_HX4700=m # CONFIG_SND_PXA2XX_UDA1380 is not set @@ -1091,9 +1100,9 @@ CONFIG_USB_PXA27X=m 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_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_G_CHAR is not set # @@ -1122,7 +1131,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y # CONFIG_EXT2_FS_SECURITY is not set # CONFIG_EXT3_FS is not set # CONFIG_JBD is not set -CONFIG_FS_MBCACHE=y +CONFIG_FS_MBCACHE=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set CONFIG_FS_POSIX_ACL=y @@ -1233,7 +1242,7 @@ CONFIG_MSDOS_PARTITION=y # Native Language Support # CONFIG_NLS=m -CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=m # CONFIG_NLS_CODEPAGE_737 is not set # CONFIG_NLS_CODEPAGE_775 is not set diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb index 78dd3a8330..319324dac8 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb @@ -3,6 +3,8 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices." MAINTAINER = "Phil Blundell <pb@handhelds.org>" LICENSE = "GPL" PR = "r0" +DEFAULT_PREFERENCE="-1" + KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh b/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh index ea883e815c..d17c805ffc 100755 --- a/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh +++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks-0.3-1/xrandr-panelapp.sh @@ -6,3 +6,4 @@ xmodmap /etc/X11/xmodmap-portrait else xrandr -o left xmodmap /etc/X11/xmodmap-left +fi diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb index c4632536eb..e7c1b4e648 100644 --- a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb +++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb @@ -5,7 +5,7 @@ SRC_URI = "file://xrandr-panelapp.sh \ file://xrandr.png" SECTION = "x11/wm" PRIORITY = "optional" -PR = "r3" +PR = "r4" LICENSE = "MIT" do_install() { diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 8bb2f048cf..70b6b09e47 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -45,6 +45,7 @@ OPENSLUG_PACKAGES = "\ grep \ gtk-doc \ gzip \ + icecast \ ifupdown \ iperf \ ipkg-utils \ diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb index 733063a1fc..44eb82cf58 100644 --- a/packages/meta/ucslugc-packages.bb +++ b/packages/meta/ucslugc-packages.bb @@ -44,6 +44,7 @@ UCSLUGC_PACKAGES = "\ gcc \ gdb \ gdbm \ + glib-2.0 \ gnu-config \ gphoto2 \ grep \ @@ -122,7 +123,6 @@ UCSLUGC_PACKAGES = "\ # These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc. # KEEP IN ALPHABETICAL ORDER UCSLUGC_BROKEN_PACKAGES = "\ - glib-2.0 \ iperf \ man man-pages \ php \ diff --git a/packages/musicpd/mpd/.mtn2git_empty b/packages/musicpd/mpd/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/musicpd/mpd/.mtn2git_empty diff --git a/packages/musicpd/mpd/save-volume-state.patch b/packages/musicpd/mpd/save-volume-state.patch new file mode 100644 index 0000000000..3e9be0eafb --- /dev/null +++ b/packages/musicpd/mpd/save-volume-state.patch @@ -0,0 +1,31 @@ +diff -Nur mpd-0.11.5~/src/playlist.c mpd-0.11.5/src/playlist.c +--- mpd-0.11.5~/src/playlist.c 2005-08-31 17:11:14.000000000 -0700 ++++ mpd-0.11.5/src/playlist.c 2005-08-31 17:14:36.000000000 -0700 +@@ -49,6 +49,7 @@ + #define PLAYLIST_STATE_FILE_CURRENT "current: " + #define PLAYLIST_STATE_FILE_TIME "time: " + #define PLAYLIST_STATE_FILE_CROSSFADE "crossfade: " ++#define PLAYLIST_STATE_FILE_VOLUME "volume: " + #define PLAYLIST_STATE_FILE_PLAYLIST_BEGIN "playlist_begin" + #define PLAYLIST_STATE_FILE_PLAYLIST_END "playlist_end" + +@@ -275,6 +276,8 @@ + myfprintf(fp,"%s\n",PLAYLIST_STATE_FILE_STATE_STOP); + break; + } ++ myfprintf(fp,"%s%i\n",PLAYLIST_STATE_FILE_VOLUME, ++ getVolumeLevel()); + myfprintf(fp,"%s%i\n",PLAYLIST_STATE_FILE_RANDOM, + playlist.random); + myfprintf(fp,"%s%i\n",PLAYLIST_STATE_FILE_REPEAT, +@@ -403,6 +406,10 @@ + current = atoi(&(buffer + [strlen(PLAYLIST_STATE_FILE_CURRENT)])); + } ++ else if(strncmp(buffer,PLAYLIST_STATE_FILE_VOLUME, ++ strlen(PLAYLIST_STATE_FILE_VOLUME)) == 0) { ++ changeVolumeLevel(1, atoi(&(buffer[strlen(PLAYLIST_STATE_FILE_VOLUME)])), 0); ++ } + else if(strncmp(buffer, + PLAYLIST_STATE_FILE_PLAYLIST_BEGIN, + strlen(PLAYLIST_STATE_FILE_PLAYLIST_BEGIN) diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb index 395d69e79e..a4ef4e9289 100644 --- a/packages/musicpd/mpd_0.11.5.bb +++ b/packages/musicpd/mpd_0.11.5.bb @@ -3,10 +3,11 @@ HOMEPAGE = "http://www.musicpd.org" LICENSE = "GPLv2" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SECTION = "console/multimedia" -DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" -PR = "r2" +DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile virtual/libiconv" +PR = "r5" -SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \ + file://save-volume-state.patch;patch=1" inherit autotools diff --git a/packages/nonworking/ocamlc/ocamlc-native_3.06.bb b/packages/nonworking/ocamlc/ocamlc-native_3.06.bb index 9bd0ce5394..37805aad06 100644 --- a/packages/nonworking/ocamlc/ocamlc-native_3.06.bb +++ b/packages/nonworking/ocamlc/ocamlc-native_3.06.bb @@ -1,9 +1,8 @@ -DESCRIPTION=Objective Caml Compiler -SECTION=base -PRIORITY=optional -LICENSE=QPL +DESCRIPTION = "Objective Caml Compiler" +SECTION = "devel" +LICENSE = "QPL" -SRC_URI = http://caml.inria.fr/distrib/ocaml-3.06/ocaml-3.06.tar.gz -S = ${WORKDIR}/ocaml-${PV} +SRC_URI = "http://caml.inria.fr/distrib/ocaml-${PV}/ocaml-${PV}.tar.gz" +S = "${WORKDIR}/ocaml-${PV}" inherit autotools native diff --git a/packages/poppler/poppler_0.4.2.bb b/packages/poppler/poppler_0.4.2.bb new file mode 100644 index 0000000000..6e03cf9355 --- /dev/null +++ b/packages/poppler/poppler_0.4.2.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base." +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +LICENSE = "GPL" + +DEPENDS = "jpeg gtk+ cairo" + +SRC_URI="http://poppler.freedesktop.org/${PN}-${PV}.tar.gz" + +EXTRA_OECONF = "--disable-gtk-test --disable-poppler-qt" +inherit pkgconfig autotools + + +do_stage() { + autotools_stage_includes + install -d ${STAGING_LIBDIR} + install -m 755 poppler/.libs/libpoppler.so.0.0.0 ${STAGING_LIBDIR}/libpoppler.so + install -m 755 glib/.libs/libpoppler-glib.so.0.0.0 ${STAGING_LIBDIR}/libpoppler-glib.so + +} + + diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb index d5b500a7ac..eab9c4890c 100644 --- a/packages/qmake/qmake-native_1.07a.bb +++ b/packages/qmake/qmake-native_1.07a.bb @@ -3,8 +3,8 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" SECTION = "devel" -LICENSE = "GPL|QPL" -PR = "r1" +LICENSE = "GPL QPL" +PR = "r2" QTEVER = "qt-embedded-free-3.3.4" diff --git a/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty b/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt/qt-x11-free-4.0.1/.mtn2git_empty diff --git a/packages/qt/qt-x11-free-4.0.1/cross-compile.patch b/packages/qt/qt-x11-free-4.0.1/cross-compile.patch new file mode 100644 index 0000000000..39d095d7a0 --- /dev/null +++ b/packages/qt/qt-x11-free-4.0.1/cross-compile.patch @@ -0,0 +1,128 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.0.1/configure~cross-compile ++++ qt-x11-opensource-src-4.0.1/configure +@@ -477,7 +477,7 @@ + UNKNOWN_ARG=yes + fi + ;; +- -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey) ++ -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL=$1 +@@ -768,6 +768,9 @@ + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -1649,100 +1652,7 @@ + echo "Determining system architecture... ($UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE)" + fi + +-if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then +- case "$CFG_EMBEDDED" in +- x86) +- ARCH=i386 +- ;; +- ipaq|sharp) +- ARCH=arm +- ;; +- *) +- ARCH="$CFG_EMBEDDED" +- ;; +- esac +-else +- case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in +- IRIX*:*:*) +- ARCH=`uname -p` +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " SGI ($ARCH)" +- fi +- ;; +- SunOS:5*:sun4*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Sun SPARC (sparc)" +- fi +- ARCH=sparc +- ;; +- Darwin:*:Power?Macintosh) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- Darwin:*:x86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Apple Intel (x86)" +- fi +- ARCH=i386 +- ;; +- AIX:*:00????????00) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit IBM PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- HP-UX:*:9000*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " HP PA-RISC (parisc)" +- fi +- ARCH=parisc +- ;; +- *:*:i?86) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit Intel 80x86 (i386)" +- fi +- ARCH=i386 +- ;; +- *:*:x86_64) +- if [ "$PLATFORM" = "linux-g++-32" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32 bit on 64-bit AMD 80x86 (i386)" +- fi +- ARCH=i386 +- else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 64-bit AMD 80x86 (x86_64)" +- fi +- ARCH=x86_64 +- fi +- ;; +- *:*:ppc) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " 32-bit PowerPC (powerpc)" +- fi +- ARCH=powerpc +- ;; +- *:*:*) +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " Trying '$UNAME_MACHINE'..." +- fi +- ARCH="$UNAME_MACHINE" +- ;; +- esac +-fi +- +-if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is supported" +- fi +-else +- if [ "$OPT_VERBOSE" = "yes" ]; then +- echo " '$ARCH' is unsupported, using 'generic'" +- fi +- ARCH=generic +-fi ++ARCH="$CROSSARCH" + + if [ "$OPT_VERBOSE" = "yes" ]; then + echo "System architecture: '$ARCH'" diff --git a/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch b/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch new file mode 100644 index 0000000000..bc30cab216 --- /dev/null +++ b/packages/qt/qt-x11-free-4.0.1/fix-resinit-declaration.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp~fix-resinit-declaration ++++ qt-x11-opensource-src-4.0.1/src/qt3support/network/q3dns.cpp +@@ -30,7 +30,7 @@ + # include <netinet/in.h> + # include <arpa/nameser.h> + # include <resolv.h> +-extern "C" int res_init(); ++extern "C" int res_init() throw (); + #endif + + // POSIX Large File Support redefines open -> open64 diff --git a/packages/qt/qt-x11-free-4.0.1/no-tools.patch b/packages/qt/qt-x11-free-4.0.1/no-tools.patch new file mode 100644 index 0000000000..75a146a838 --- /dev/null +++ b/packages/qt/qt-x11-free-4.0.1/no-tools.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qt-x11-opensource-src-4.0.1/src/src.pro~no-tools ++++ qt-x11-opensource-src-4.0.1/src/src.pro +@@ -3,7 +3,7 @@ + + # this order is important + win32:SUBDIRS += winmain +-SUBDIRS += tools/moc tools/rcc tools/uic corelib xml gui sql network ++SUBDIRS += corelib xml gui sql network + !embedded:contains(QT_CONFIG, opengl): SUBDIRS += opengl + contains(QT_CONFIG, qt3support): SUBDIRS += qt3support + !cross_compile { diff --git a/packages/qt/qt-x11-free_3.3.3.bb b/packages/qt/qt-x11-free_3.3.3.bb index 1aaef72d1c..e56e0aec31 100644 --- a/packages/qt/qt-x11-free_3.3.3.bb +++ b/packages/qt/qt-x11-free_3.3.3.bb @@ -1,10 +1,11 @@ DESCRIPTION = "Qt/X11 Version ${PV}" -SECTION = "libs" +SECTION = "x11/libs" PRIORITY = "optional" LICENSE = "GPL QPL" +HOMEPAGE = "http://www.trolltech.com" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql" -PR = "r8" +PR = "r9" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \ file://configure.patch;patch=1 \ diff --git a/packages/qt/qt-x11-free_4.0.0-b1.bb b/packages/qt/qt-x11-free_4.0.0-b1.bb deleted file mode 100644 index 4b9deaaf6a..0000000000 --- a/packages/qt/qt-x11-free_4.0.0-b1.bb +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "Qt/X11 Version ${PV}" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -DEPENDS = "uicmoc4-native qmake-native-1.08a freetype x11 xft xext libxrender libxrandr libxcursor mysql" -PR = "r0" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-${PV}.tar.gz" -S = "${WORKDIR}/qt-x11-opensource-${PV}" - -# Not the prime time of Qt4 yet -# TODO: make it not look in /usr and /usr/include for its tests! -DEFAULT_PREFERENCE = "-1" -BROKEN = "1" - -PACKAGES += "qt-x11-plugins" -FILES_qt-x11-plugins = "${prefix}/plugins" - -inherit qmake-base qt4x11 - -export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt4" -ARCH_i686 = "x86" -EXTRA_OEMAKE = "-e" - -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-nis -no-cups -plugin-sql-mysql -verbose -stl" - -do_configure() { - echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri - unset QMAKESPEC - echo yes | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql -} - -do_compile() { - unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS LINK - install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc - install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc - install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic - - oe_runmake -} - -do_stage() { - install -d ${STAGING_QT_DIR}/lib - oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib - install -d ${STAGING_QT_DIR}/include/private - for f in include/*.h - do - install -m 0644 $f ${STAGING_QT_DIR}/include/ - done - for f in include/private/*.h - do - install -m 0644 $f ${STAGING_QT_DIR}/include/private - done -} - -do_install() { - install -d ${D}${libdir}/ - oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/ - oe_runmake -C plugins/src INSTALL_ROOT="${D}" \ - QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \ - QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e" \ - install -} diff --git a/packages/qt/qt-x11-free_4.0.1.bb b/packages/qt/qt-x11-free_4.0.1.bb new file mode 100644 index 0000000000..301d58a54b --- /dev/null +++ b/packages/qt/qt-x11-free_4.0.1.bb @@ -0,0 +1,116 @@ +DESCRIPTION = "Qt/X11 Version ${PV}" +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +DEPENDS = "uicmoc4-native freetype jpeg x11 xft xext libxrender libxrandr libxcursor mysql" +# FIXME: Make it use 'our' qmake +# DEPENDS += "qmake-native-2.00a" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://fix-resinit-declaration.patch;patch=1 \ + file://no-tools.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +# Not the prime time of Qt4 yet ... +# TODO: make it not look in /usr and /usr/include for its tests! +DEFAULT_PREFERENCE = "-1" +BROKEN = "1" + +PARALLEL_MAKE = "" + +inherit qmake-base qt4x11 pkgconfig + +export QTDIR = "${S}" +STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" +export ARCH = "${TARGET_ARCH}" +export ARCH_i686 = "x86" +EXTRA_OEMAKE = "-e" + +QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \ + -no-tablet -no-xkb -no-nis -no-cups -no-opengl -plugin-sql-mysql -verbose -stl" + +# EXTRA_ENV = 'QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \ + +EXTRA_ENV = 'QMAKE="${S}/bin/qmake -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e"' + +do_configure() { + echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri + echo "DEFINES += QT_NO_XIM" >>src/qbase.pri + unset QMAKESPEC + echo yes | ./configure -prefix ${prefix} -crossarch ${ARCH} ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql +} + +# FIXME: Might want to compile the cross tools for the -dev packages as well... + +do_compile() { + unset CFLAGS CXXFLAGS + install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic + + oe_runmake ${EXTRA_ENV} +} + +PARTS = "3Support Core Designer DesignerComponents Gui Network Sql Xml" + +do_stage() { + install -d ${STAGING_QT_DIR} + for part in ${PARTS} + do + oe_libinstall -so -C lib libQt$part ${STAGING_QT_DIR} + done + oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} + cp -a include/* ${STAGING_INCDIR}/ +} + +do_install() { + install -d ${D}${libdir} + install -d ${D}${bindir} + for part in ${PARTS} + do + oe_libinstall -so -C lib libQt$part ${D}${libdir} + done + oe_libinstall -a -C lib libQtAssistantClient ${STAGING_QT_DIR} + cp -a include/* ${D}${incdir} + cp -a plugins ${D}${libdir} + cp -a bin/* ${D}${bindir} + + install -d ${D}${bindir}/qt4-examples + for binary in `find examples -perm 0755 -type f` + do + install -m 0755 $binary ${D}${bindir}/qt4-examples/ + done +} + +PACKAGES =+ "libqtcore4 libqtxml4 libqtgui4 libqtnetwork4 libqtsql4 libqtdesigner4 libqtdesignercomponents4 \ + qt4-assistant qt4-designer qt4-examples qt4-linguist \ + qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers" + +FILES_libqtcore4 = "${libdir}/libQtCore.so*" +FILES_libqtgui4 = "${libdir}/libQtGui.so*" +FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so*" +FILES_libqtxml4 = "${libdir}/libQtXml.so*" +FILES_libqtsql4 = "${libdir}/libQtSql.so*" +FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so*" +FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so*" + +FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" +FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" +FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" +FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" +FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" + +FILES_qt4-assistant = "${bindir}/*assistant*" +FILES_qt4-designer = "${bindir}/*designer*" +FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" + +FILES_qt4-examples = "${bindir}/qt4-examples/*" diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb index d9138a002e..7eceaef3e2 100644 --- a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb +++ b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb @@ -1,7 +1,7 @@ -SECTION = "opie/base" DESCRIPTION= "Tools to update the Qt fontdir" MAINTAINER = "M&N Solutions <info@mn-solutions.de>" -LICENSE = "GPL/QPL" +SECTION = "opie/base" +LICENSE = "GPL QPL" PACKAGE_ARCH = "all" PR = "r3" @@ -10,6 +10,7 @@ SRC_URI += "file://update-qtfontdir" S = "${WORKDIR}/qt-embedded-free-${PV}" do_compile() { + : } do_install() { diff --git a/packages/qte/qte-2.3.10/improve-calibration-r0.patch b/packages/qte/qte-2.3.10/improve-calibration-r0.patch new file mode 100644 index 0000000000..6052510b94 --- /dev/null +++ b/packages/qte/qte-2.3.10/improve-calibration-r0.patch @@ -0,0 +1,159 @@ +Index: qt-2.3.10/src/kernel/qwsmouse_qws.cpp +=================================================================== +--- qt-2.3.10.orig/src/kernel/qwsmouse_qws.cpp 2005-08-31 13:44:12.000000000 +0000 ++++ qt-2.3.10/src/kernel/qwsmouse_qws.cpp 2005-09-01 19:38:27.000000000 +0000 +@@ -14,10 +14,6 @@ + ** Foundation and appearing in the file LICENSE.GPL included in the + ** packaging of this file. + ** +-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition +-** licenses for Qt/Embedded may use this file in accordance with the +-** Qt Embedded Commercial License Agreement provided with the Software. +-** + ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + ** +@@ -30,6 +26,12 @@ + ** + **********************************************************************/ + ++/* ++ * The 5 point algorithim in QTSLibHandlerPrivate::calibrate() is ++ * GPL only code and Copyright (C) 2001 Russel King. ++ * ++ * Taken from ts_calibrate.c from tslib ++ */ + #include "qwindowsystem_qws.h" + #include "qsocketnotifier.h" + #include "qwsevent_qws.h" +@@ -1813,6 +1815,7 @@ + + void QTSLibHandlerPrivate::calibrate( QWSPointerCalibrationData * cd) + { ++#ifdef ORIG_CALIBRATE + QPoint dev_tl = cd->devPoints[ QWSPointerCalibrationData::TopLeft ]; + QPoint dev_br = cd->devPoints[ QWSPointerCalibrationData::BottomRight ]; + QPoint screen_tl = cd->screenPoints[ QWSPointerCalibrationData::TopLeft ]; +@@ -1843,6 +1846,122 @@ + { + qDebug( "Could not save calibration: %s", calFile.latin1() ); + } ++ ++#else ++ int j; ++ float n, x, y, x2, y2, xy, z, zx, zy; ++ float det, cal_a, cal_b, cal_c, cal_d, cal_e, cal_f, cal_i; ++ float scaling = 65536.0; ++ int cal_x[5], cal_xfb[5], cal_y[5], cal_yfb[5], cal_o[7]; ++ ++ cal_x[0]=cd->devPoints[ QWSPointerCalibrationData::TopLeft ].x(); ++ cal_y[0]=cd->devPoints[ QWSPointerCalibrationData::TopLeft ].y(); ++ cal_x[1]=cd->devPoints[ QWSPointerCalibrationData::TopRight ].x(); ++ cal_y[1]=cd->devPoints[ QWSPointerCalibrationData::TopRight ].y(); ++ cal_x[2]=cd->devPoints[ QWSPointerCalibrationData::BottomLeft ].x(); ++ cal_y[2]=cd->devPoints[ QWSPointerCalibrationData::BottomLeft ].y(); ++ cal_x[3]=cd->devPoints[ QWSPointerCalibrationData::BottomRight ].x(); ++ cal_y[3]=cd->devPoints[ QWSPointerCalibrationData::BottomRight ].y(); ++ cal_x[4]=cd->devPoints[ QWSPointerCalibrationData::Center ].x(); ++ cal_y[4]=cd->devPoints[ QWSPointerCalibrationData::Center ].y(); ++ ++ cal_xfb[0]=cd->screenPoints[ QWSPointerCalibrationData::TopLeft ].x(); ++ cal_yfb[0]=cd->screenPoints[ QWSPointerCalibrationData::TopLeft ].y(); ++ cal_xfb[1]=cd->screenPoints[ QWSPointerCalibrationData::TopRight ].x(); ++ cal_yfb[1]=cd->screenPoints[ QWSPointerCalibrationData::TopRight ].y(); ++ cal_xfb[2]=cd->screenPoints[ QWSPointerCalibrationData::BottomLeft ].x(); ++ cal_yfb[2]=cd->screenPoints[ QWSPointerCalibrationData::BottomLeft ].y(); ++ cal_xfb[3]=cd->screenPoints[ QWSPointerCalibrationData::BottomRight ].x(); ++ cal_yfb[3]=cd->screenPoints[ QWSPointerCalibrationData::BottomRight ].y(); ++ cal_xfb[4]=cd->screenPoints[ QWSPointerCalibrationData::Center ].x(); ++ cal_yfb[4]=cd->screenPoints[ QWSPointerCalibrationData::Center ].y(); ++ ++ //qDebug("Top left : X = %4d Y = %4d", cal_x[0], cal_y[0]); ++ //qDebug("Top right: X = %4d Y = %4d", cal_x[1], cal_y[1]); ++ //qDebug("Bot left : X = %4d Y = %4d", cal_x[2], cal_y[2]); ++ //qDebug("Bot right: X = %4d Y = %4d", cal_x[3], cal_y[3]); ++ //qDebug("Middle: X = %4d Y = %4d", cal_x[4], cal_y[4]); ++ ++ // Get sums for matrix ++ n = x = y = x2 = y2 = xy = 0; ++ for(j=0;j<5;j++) { ++ n += 1.0; ++ x += (float)cal_x[j]; ++ y += (float)cal_y[j]; ++ x2 += (float)(cal_x[j]*cal_x[j]); ++ y2 += (float)(cal_y[j]*cal_y[j]); ++ xy += (float)(cal_x[j]*cal_y[j]); ++ } ++ ++ // Get determinant of matrix -- check if determinant is too small ++ det = n*(x2*y2 - xy*xy) + x*(xy*y - x*y2) + y*(x*xy - y*x2); ++ if(det < 0.1 && det > -0.1) { ++ qDebug("determinant is too small -- %f",det); ++ return;// false; ++ } ++ ++ // Get elements of inverse matrix ++ cal_a = (x2*y2 - xy*xy)/det; ++ cal_b = (xy*y - x*y2)/det; ++ cal_c = (x*xy - y*x2)/det; ++ cal_e = (n*y2 - y*y)/det; ++ cal_f = (x*y - n*xy)/det; ++ cal_i = (n*x2 - x*x)/det; ++ ++ // Get sums for x calibration ++ z = zx = zy = 0; ++ for(j=0;j<5;j++) { ++ z += (float)cal_xfb[j]; ++ zx += (float)(cal_xfb[j]*cal_x[j]); ++ zy += (float)(cal_xfb[j]*cal_y[j]); ++ } ++ ++ // Now multiply out to get the calibration for framebuffer x coord ++ cal_o[0] = (int)((cal_a*z + cal_b*zx + cal_c*zy)*(scaling)); ++ cal_o[1] = (int)((cal_b*z + cal_e*zx + cal_f*zy)*(scaling)); ++ cal_o[2] = (int)((cal_c*z + cal_f*zx + cal_i*zy)*(scaling)); ++ ++ qDebug("%f %f %f",(cal_a*z + cal_b*zx + cal_c*zy), (cal_b*z + cal_e*zx + cal_f*zy), (cal_c*z + cal_f*zx + cal_i*zy)); ++ ++ // Get sums for y calibration ++ z = zx = zy = 0; ++ for (j=0;j<5;j++) { ++ z += (float)cal_yfb[j]; ++ zx += (float)(cal_yfb[j]*cal_x[j]); ++ zy += (float)(cal_yfb[j]*cal_y[j]); ++ } ++ ++ // Now multiply out to get the calibration for framebuffer y coord ++ cal_o[3] = (int)((cal_a*z + cal_b*zx + cal_c*zy)*(scaling)); ++ cal_o[4] = (int)((cal_b*z + cal_e*zx + cal_f*zy)*(scaling)); ++ cal_o[5] = (int)((cal_c*z + cal_f*zx + cal_i*zy)*(scaling)); ++ ++ qDebug("%f %f %f",(cal_a*z + cal_b*zx + cal_c*zy), (cal_b*z + cal_e*zx + cal_f*zy), (cal_c*z + cal_f*zx + cal_i*zy)); ++ ++ ++ // If we got here, we're OK, so assign scaling to a[6] and return ++ cal_o[6] = (int) scaling; ++ ++ qDebug("Calibration constants: %d %d %d %d %d %d %d", ++ cal_o[0], cal_o[1], cal_o[2], ++ cal_o[3], cal_o[4], cal_o[5], ++ cal_o[6]); ++ ++ QString calFile = "/etc/pointercal"; ++#ifndef QT_NO_TEXTSTREAM ++ QFile file( calFile ); ++ if ( file.open( IO_WriteOnly ) ) { ++ QTextStream t( &file ); ++ t << cal_o[1] << " " << cal_o[2] << " " << cal_o[0] << " "; ++ t << cal_o[4] << " " << cal_o[5] << " " << cal_o[3] << " " << cal_o[6]; ++ file.flush(); closeTs(); ++ openTs(); ++ } else ++#endif ++ { ++ qDebug( "Could not save calibration: %s", calFile.latin1() ); ++ } ++#endif + } + + void QTSLibHandlerPrivate::readMouseData() diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb index fb40262eb9..ee7ac50898 100644 --- a/packages/qte/qte_2.3.10.bb +++ b/packages/qte/qte_2.3.10.bb @@ -2,12 +2,12 @@ DESCRIPTION = "Qt/Embedded Version ${PV}" SECTION = "libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -LICENSE = "GPL QPL" +LICENSE = "GPL" DEPENDS = "zlib libpng jpeg tslib uicmoc-native" DEPENDS_mnci = "zlib libpng jpeg uicmoc-native" DEPENDS_append_c7x0 = " sharp-aticore-oss" PROVIDES = "virtual/qte virtual/libqte2" -PR = "r25" +PR = "r26" SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;md5=1f7ad30113afc500cab7f5b2f4dec0d7 \ file://qpe.patch;patch=1 \ @@ -29,10 +29,11 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://fix-linuxfb-setmode.patch;patch=1 \ file://fix-linuxfb-offscreenoverflow.patch;patch=1 \ file://fix-qscreen-sync.patch;patch=1 \ - file://sharp_char.h \ + file://improve-calibration-r0.patch;patch=1 \ file://key.patch;patch=1 \ - file://switches.h \ - file://bidimetrics.patch;patch=5 " + file://bidimetrics.patch;patch=5 \ + file://sharp_char.h \ + file://switches.h" SRC_URI_append_simpad = "file://devfs.patch;patch=1 " SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ diff --git a/packages/samba/samba_3.0.20.bb b/packages/samba/samba_3.0.20.bb new file mode 100644 index 0000000000..aea0b4867a --- /dev/null +++ b/packages/samba/samba_3.0.20.bb @@ -0,0 +1,53 @@ +PR = "r1" + +SRC_URI = "http://us2.samba.org/samba/ftp/stable/samba-${PV}.tar.gz \ + file://configure.patch;patch=1 \ + file://cifs.patch;patch=1 \ + file://config-lfs.patch;patch=1 \ + file://init \ + file://quota.patch;patch=1;pnum=0 \ + " +S := ${WORKDIR}/${P}/source + +include samba.inc +inherit update-rc.d + +INITSCRIPT_NAME = "samba" +# No dependencies, goes in at level 20 (NOTE: take care with the +# level, later levels put the shutdown later too - see the links +# in rc6.d, the shutdown must precede network shutdown). +INITSCRIPT_PARAMS = "defaults" +CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf" + +# The file system settings --foodir=dirfoo and overridden unconditionally +# in the samba config by --with-foodir=dirfoo - even if the --with is not +# specified! Fix that here. Set the privatedir to /etc/samba/private. +EXTRA_OECONF += "\ + --with-configdir=${sysconfdir}/samba \ + --with-privatedir=${sysconfdir}/samba/private \ + --with-lockdir=${localstatedir}/lock \ + --with-piddir=${localstatedir}/run \ + --with-logfilebase=${localstatedir}/log \ + --with-libdir=${libdir} \ + --with-mandir=${mandir} \ + --with-swatdir=${datadir}/swat \ + " + +do_install_append() { + install -d "${D}${localstatedir}/log" + rm -f ${D}/sbin/mount.smbfs + rmdir ${D}/sbin + ln -sf smbmount ${D}${bindir}/mount.smbfs + install -d "${D}${sysconfdir}/init.d" + install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba + install -d "${D}${sysconfdir}/samba" + install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf +} + +PACKAGES =+ "swat" + +FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg" +FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat" +# +# bug fix for samba.inc: +FILES_cifs-doc = "${mandir}/man8/mount.cifs.8" diff --git a/packages/slutils/slutils-0.1.0/slfb/.mtn2git_empty b/packages/slutils/slutils-0.1.0/slfb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/slutils/slutils-0.1.0/slfb/.mtn2git_empty diff --git a/packages/slutils/slutils-0.1.0/slfb/slfb.c b/packages/slutils/slutils-0.1.0/slfb/slfb.c new file mode 100644 index 0000000000..9cb72d12d2 --- /dev/null +++ b/packages/slutils/slutils-0.1.0/slfb/slfb.c @@ -0,0 +1,34 @@ +#include <stdio.h> +#include <fcntl.h> +#include <stdlib.h> +#include <sys/ioctl.h> + +int main(int argc, char ** argv) { + int fd = open("/dev/fb0", O_WRONLY|O_NONBLOCK ); + int on; + int res = 0; + + if (argc != 2) { + printf("You must specify on or off\n"); + return 0; + } + + on = !strncmp(argv[1], "on", (strlen(argv[1]) > 1 ? 2 : 1)); + + printf((on ? "on\n" : "off\n")); + + if ( fd ) + { + int ioctlnum = 0x4611; + int vesaMode = on ? 0 : 3; + res = ioctl ( fd, ioctlnum, vesaMode ); + printf("%i\n", res); + close ( fd ); + } + else + { + printf("failed\n"); + } + return res; +} + diff --git a/packages/slutils/slutils-0.1.0/slfb/slfb.pro b/packages/slutils/slutils-0.1.0/slfb/slfb.pro new file mode 100644 index 0000000000..35db7f20b9 --- /dev/null +++ b/packages/slutils/slutils-0.1.0/slfb/slfb.pro @@ -0,0 +1,5 @@ +CONFIG = console +TEMPLATE = app +INCLUDEPATH += . + +SOURCES += slfb.c diff --git a/packages/slutils/slutils_0.1.0.bb b/packages/slutils/slutils_0.1.0.bb index 4b18d2855a..958fab46d5 100644 --- a/packages/slutils/slutils_0.1.0.bb +++ b/packages/slutils/slutils_0.1.0.bb @@ -1,9 +1,12 @@ DESCRIPTION = "Console utilities for certain hardware aspects of Sharp Linux based Zaurii" +DESCRIPTION_slfb = "A command-line utility to turn on/off the FrameBuffer on Linux 2.4-based Zaurii" +DESCRIPTION_slbl = "A command-line utility to control the BackLight on Linux 2.4-based Zaurii" +DESCRIPTION_sltime = "A ustility to save and restore the time on Sharp Linux based Zaurii" SECTION = "console/utils" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r3" +PR = "r4" inherit qmake update-rc.d @@ -12,7 +15,7 @@ SRC_URI = "file://sltime.sh" INITSCRIPT_NAME = "sltime" INITSCRIPT_PARAMS = "defaults 5" -export UTILS = "sltime slbl" +export UTILS = "sltime slbl slfb" do_fetch() { for u in ${UTILS} @@ -37,6 +40,7 @@ do_install() { install -m 0755 ${WORKDIR}/sltime.sh ${D}${sysconfdir}/init.d/sltime } -PACKAGES =+ "slbl" +PACKAGES =+ "slbl slfb" FILES_slbl = "${sbindir}/slbl" +FILES_slfb = "${sbindir}/slfb" diff --git a/packages/sqlite/sqlite3-3.2.5/.mtn2git_empty b/packages/sqlite/sqlite3-3.2.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.2.5/.mtn2git_empty diff --git a/packages/sqlite/sqlite3-3.2.5/cross-compile.patch b/packages/sqlite/sqlite3-3.2.5/cross-compile.patch new file mode 100644 index 0000000000..aaafaa590c --- /dev/null +++ b/packages/sqlite/sqlite3-3.2.5/cross-compile.patch @@ -0,0 +1,84 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +Index: sqlite-3.2.1/configure.ac +=================================================================== +--- sqlite-3.2.1.orig/configure.ac 2005-03-23 17:08:39.000000000 +0100 ++++ sqlite-3.2.1/configure.ac 2005-04-25 23:02:40.000000000 +0200 +@@ -186,10 +186,11 @@ + default_build_cflags="-g" + if test "$config_BUILD_CC" = ""; then + AC_PROG_CC +- if test "$cross_compiling" = "yes"; then +- AC_MSG_ERROR([unable to find a compiler for building build tools]) +- fi +- BUILD_CC=$CC ++# if test "$cross_compiling" = "yes"; then ++# AC_MSG_ERROR([unable to find a compiler for building build tools]) ++# fi ++# BUILD_CC=$CC ++ BUILD_CC=gcc + default_build_cflags=$CFLAGS + else + BUILD_CC=$config_BUILD_CC +@@ -539,55 +540,14 @@ + # Figure out what C libraries are required to compile programs + # that use "readline()" library. + # +-if test "$config_TARGET_READLINE_LIBS" != ""; then +- TARGET_READLINE_LIBS="$config_TARGET_READLINE_LIBS" +-else +- CC=$TARGET_CC +- LIBS="" +- AC_SEARCH_LIBS(tgetent, [readline ncurses curses termcap]) +- AC_CHECK_LIB([readline], [readline]) +- TARGET_READLINE_LIBS="$LIBS" +-fi ++TARGET_READLINE_LIBS="-lreadline" + AC_SUBST(TARGET_READLINE_LIBS) + + ########## + # Figure out where to get the READLINE header files. + # +-AC_MSG_CHECKING([readline header files]) +-found=no +-if test "$config_TARGET_READLINE_INC" != ""; then +- TARGET_READLINE_INC=$config_TARGET_READLINE_INC +- found=yes +-fi +-if test "$found" = "yes"; then +- AC_MSG_RESULT($TARGET_READLINE_INC) +-else +- AC_MSG_RESULT(not specified: still searching...) +- AC_CHECK_HEADER(readline.h, [found=yes]) +-fi +-if test "$found" = "no"; then +- for dir in /usr /usr/local /usr/local/readline /usr/contrib /mingw; do +- AC_CHECK_FILE($dir/include/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include" +- break +- fi +- AC_CHECK_FILE($dir/include/readline/readline.h, found=yes) +- if test "$found" = "yes"; then +- TARGET_READLINE_INC="-I$dir/include/readline" +- break +- fi +- done +-fi +-if test "$found" = "yes"; then +- if test "$TARGET_READLINE_LIBS" = ""; then +- TARGET_HAVE_READLINE=0 +- else +- TARGET_HAVE_READLINE=1 +- fi +-else +- TARGET_HAVE_READLINE=0 +-fi ++TARGET_READLINE_INC="" ++TARGET_HAVE_READLINE=1 + AC_SUBST(TARGET_READLINE_INC) + AC_SUBST(TARGET_HAVE_READLINE) + diff --git a/packages/sqlite/sqlite3-3.2.5/ldflags.patch b/packages/sqlite/sqlite3-3.2.5/ldflags.patch new file mode 100644 index 0000000000..7f40385f25 --- /dev/null +++ b/packages/sqlite/sqlite3-3.2.5/ldflags.patch @@ -0,0 +1,77 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- sqlite-3.2.5/Makefile.in~ldflags ++++ sqlite-3.2.5/Makefile.in +@@ -31,6 +31,10 @@ + # + TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src + ++# OE overrides ++# ++TARGET_LFLAGS = @TARGET_LFLAGS@ ++ + # Define -DNDEBUG to compile without debugging (i.e., for production usage) + # Omitting the define will cause extra debugging code to be inserted and + # includes extra comments when "EXPLAIN stmt" is used. +@@ -235,17 +239,17 @@ + | awk '{print $$5,$$6}' >last_change + + libsqlite3.la: $(LIBOBJ) +- $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \ ++ $(LTLINK) -o libsqlite3.la $(LIBOBJ) $(TARGET_LFLAGS) $(LIBPTHREAD) \ + ${ALLOWRELEASE} -rpath $(libdir) -version-info "8:6:8" + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -o libtclsqlite3.la tclsqlite.lo \ +- $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(LIBPTHREAD) \ ++ $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TARGET_LFLAGS) $(LIBPTHREAD) \ + -rpath $(libdir)/sqlite \ + -version-info "8:6:8" + + sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h +- $(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \ ++ $(LTLINK) $(TARGET_LFLAGS) $(READLINE_FLAGS) $(LIBPTHREAD) \ + -o sqlite3 $(TOP)/src/shell.c libsqlite3.la $(LIBREADLINE) + + # This target creates a directory named "tsrc" and fills it with +@@ -419,18 +423,18 @@ + + tclsqlite3: tclsqlite-shell.lo libsqlite3.la + $(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) + $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 $(TEMP_STORE) \ + -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + crashtest$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) $(TOP)/src/os_test.c + $(LTLINK) -DOS_TEST=1 -DTCLSH=1 -DSQLITE_TEST=1 \ + -o crashtest \ + $(TESTSRC) $(TOP)/src/os_test.c $(TOP)/src/tclsqlite.c \ +- libsqlite3.la $(LIBTCL) ++ libsqlite3.la $(TARGET_LFLAGS) $(LIBTCL) + + + +--- sqlite-3.2.5/configure.ac~ldflags ++++ sqlite-3.2.5/configure.ac +@@ -238,6 +238,13 @@ + TARGET_LINK=$config_TARGET_LINK + fi + AC_MSG_RESULT($TARGET_LINK) ++AC_MSG_CHECKING([switches on the target linker]) ++if test "$config_TARGET_LFLAGS" != ""; then ++ TARGET_LFLAGS=$config_TARGET_LFLAGS ++else ++ TARGET_LFLAGS=$BUILD_LFLAGS ++fi ++AC_MSG_RESULT($TARGET_LFLAGS) + AC_MSG_CHECKING([switches on the target compiler]) + if test "$config_TARGET_TFLAGS" != ""; then + TARGET_TFLAGS=$config_TARGET_TFLAGS diff --git a/packages/sqlite/sqlite3-3.2.5/libtool.patch b/packages/sqlite/sqlite3-3.2.5/libtool.patch new file mode 100644 index 0000000000..ccf9993ed2 --- /dev/null +++ b/packages/sqlite/sqlite3-3.2.5/libtool.patch @@ -0,0 +1,25 @@ +Index: sqlite-3.2.1/Makefile.in +=================================================================== +--- sqlite-3.2.1.orig/Makefile.in 2005-03-23 17:09:39.000000000 +0100 ++++ sqlite-3.2.1/Makefile.in 2005-04-25 23:11:20.000000000 +0200 +@@ -15,7 +15,10 @@ + # The toplevel directory of the source tree. This is the directory + # that contains this "Makefile.in" and the "configure.in" script. + # +-TOP = @srcdir@ ++TOP = $(srcdir) ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = . + + # C Compiler and options for use in building executables that + # will run on the platform that is doing the build. +@@ -96,7 +99,7 @@ + exec_prefix = @exec_prefix@ + libdir = @libdir@ + INSTALL = @INSTALL@ +-LIBTOOL = ./libtool ++LIBTOOL = @LIBTOOL@ + ALLOWRELEASE = @ALLOWRELEASE@ + + # libtool compile/link/install diff --git a/packages/sqlite/sqlite3_3.2.5.bb b/packages/sqlite/sqlite3_3.2.5.bb new file mode 100644 index 0000000000..a133f832a9 --- /dev/null +++ b/packages/sqlite/sqlite3_3.2.5.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "An Embeddable SQL Database Engine" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "readline ncurses" +LICENSE = "PD" + +SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \ + file://cross-compile.patch;patch=1 \ + file://libtool.patch;patch=1 \ + file://ldflags.patch;patch=1" +S = "${WORKDIR}/sqlite-${PV}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-tcl --enable-shared \ + --enable-threadsafe" +export config_BUILD_CC = "${BUILD_CC}" +export config_BUILD_CFLAGS = "${BUILD_CFLAGS}" +export config_BUILD_LIBS = "${BUILD_LDFLAGS}" +export config_TARGET_CC = "${CC}" +export config_TARGET_LINK = "${CCLD}" +export config_TARGET_CFLAGS = "${CFLAGS}" +export config_TARGET_LFLAGS = "${LDFLAGS}" + +do_compile_prepend() { + oe_runmake sqlite3.h + install -m 0644 sqlite3.h ${STAGING_INCDIR} +} + +do_stage() { + oe_libinstall -so libsqlite3 ${STAGING_LIBDIR} +} + +#do_install() { +# oe_runmake install DESTDIR=${D} prefix=${prefix} exec_prefix=${exec_prefix} +#} + +PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3" +FILES_sqlite3 = "${bindir}/*" +FILES_libsqlite = "${libdir}/*.so.*" +FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \ + ${libdir}/pkgconfig ${includedir}" +FILES_libsqlite-doc = "${docdir} ${mandir} ${infodir}" +AUTO_LIBNAME_PKGS = "libsqlite" diff --git a/packages/synergy/.mtn2git_empty b/packages/synergy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/synergy/.mtn2git_empty diff --git a/packages/synergy/synergy_1.2.4.bb b/packages/synergy/synergy_1.2.4.bb new file mode 100644 index 0000000000..0bd27f5e06 --- /dev/null +++ b/packages/synergy/synergy_1.2.4.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Synergy - control multiple computers with one keyboard and mouse" +HOMEPAGE = "http://synergy2.sourceforge.net/" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" +SECTION = "x11" +# NOTE: This depends on full x11, not diet-x11 +DEPENDS = "x11 xtst" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz" + +do_configure_prepend() { + grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::' +} + +inherit autotools diff --git a/packages/tslib/tslib/h6300/.mtn2git_empty b/packages/tslib/tslib/h6300/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/tslib/tslib/h6300/.mtn2git_empty diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh new file mode 100644 index 0000000000..21aaad9ca4 --- /dev/null +++ b/packages/tslib/tslib/h6300/tslib.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +TSLIB_TSDEVICE=`detect-stylus --device` +TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300 + +export TSLIB_TSDEVICE TSLIB_CONFFILE + diff --git a/packages/tslib/tslib/ts.conf-h6300 b/packages/tslib/tslib/ts.conf-h6300 new file mode 100644 index 0000000000..09309719f2 --- /dev/null +++ b/packages/tslib/tslib/ts.conf-h6300 @@ -0,0 +1,5 @@ +module_raw input +module pthres pmin=1 +module variance delta=30 +module dejitter delta=100 +module linear diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb index e010333994..d5a4c7ed30 100644 --- a/packages/tslib/tslib_cvs.bb +++ b/packages/tslib/tslib_cvs.bb @@ -9,7 +9,7 @@ PACKAGE_ARCH_mnci = "${MACHINE}" SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \ file://ts.conf \ - file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 \ + file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \ file://ts.conf-corgi file://ts.conf-corgi-2.4 \ file://tslib.sh" SRC_URI_append_mnci += " file://devfs.patch;patch=1" @@ -23,6 +23,7 @@ inherit autotools PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate" EXTRA_OECONF = "--enable-shared" EXTRA_OECONF_mnci = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " +EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 " do_stage () { oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR} @@ -39,9 +40,9 @@ do_install_append() { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ case ${MACHINE} in - h3600 | h3900 | h1940 | ipaq-pxa270) + h3600 | h3900 | h1940 | h6300 | ipaq-pxa270) install -d ${D}${datadir}/tslib - for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do + for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ done rm -f ${D}${sysconfdir}/ts.conf diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb index a596ec6824..ca959c1579 100644 --- a/packages/uicmoc/uicmoc-native_2.3.10.bb +++ b/packages/uicmoc/uicmoc-native_2.3.10.bb @@ -1,7 +1,7 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x" SECTION = "devel" PRIORITY = "optional" -LICENSE = "GPL/QPL" +LICENSE = "GPL QPL" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PR = "r0" diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb index 271dd1fcd3..f7024f90ba 100644 --- a/packages/uicmoc/uicmoc3-native_3.3.2.bb +++ b/packages/uicmoc/uicmoc3-native_3.3.2.bb @@ -1,7 +1,8 @@ DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x" SECTION = "devel" PRIORITY = "optional" -LICENSE = "GPL/QPL" +LICENSE = "GPL QPL" +PR = "r1" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \ file://no-examples.patch;patch=1" diff --git a/packages/upslug/upslug2-native_3.bb b/packages/upslug/upslug2-native_3.bb new file mode 100644 index 0000000000..c3744f3cf6 --- /dev/null +++ b/packages/upslug/upslug2-native_3.bb @@ -0,0 +1,3 @@ +include upslug2.inc + +inherit native diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc new file mode 100644 index 0000000000..0be0883cc9 --- /dev/null +++ b/packages/upslug/upslug2.inc @@ -0,0 +1,41 @@ +# This package builds the 'upslug2' binary upload/flash tool +# for the NSLU2. It is not useful for anything else. +PR = "r0" +DESCRIPTION = "NSLU2 binary upload tool (version 2)" +HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2" +MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL-2" + +# On Linux libpcap does not work. Using libpcap is sub-optimal - it +# is intended for packet capture not management of a new protocol +# stream - so you may want to try the linux options on other operating +# systems. +LIBPCAP_OECONF = "--with-libpcap" +LIBPCAP_OECONF_linux = "" +LIBPCAP_OECONF_linux-uclibc = "" +LIBPCAP_RDEPENDS = "libpcap" +LIBPCAP_RDEPENDS_linux = "" +LIBPCAP_RDEPENDS_linux-uclibc = "" + +RDEPENDS += "${LIBPCAP_RDEPENDS}" + +SRC_TAG = "upslug2_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug2;tag=${SRC_TAG}" +# For testing use this (tags and other changes take a day to +# propogate on sourceforge). Change 'jbowler' to your login name! +#SRC_URI = "cvs://jbowler@cvs.sourceforge.net/cvsroot/nslu;method=ext;rsh=ssh;module=upslug2;tag=${SRC_TAG}" + +inherit autotools + +S = "${WORKDIR}/upslug2" +PACKAGES = "${PN}" +EXTRA_OECONF += "${LIBPCAP_OECONF}" + +python () { + # Don't build upslug2 unless we're targeting an nslu2 + mach = bb.data.getVar("MACHINE", d, 1) + if mach != 'nslu2': + raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2") +} diff --git a/packages/upslug/upslug2_3.bb b/packages/upslug/upslug2_3.bb new file mode 100644 index 0000000000..de9c427303 --- /dev/null +++ b/packages/upslug/upslug2_3.bb @@ -0,0 +1 @@ +include upslug2.inc diff --git a/packages/x11/files/errordb-keysymdb-path-fix.patch b/packages/x11/files/errordb-keysymdb-path-fix.patch new file mode 100644 index 0000000000..f43d38065e --- /dev/null +++ b/packages/x11/files/errordb-keysymdb-path-fix.patch @@ -0,0 +1,22 @@ +--- X11/src/ErrDes.c.orig 2005-09-03 16:15:48 +0200 ++++ X11/src/ErrDes.c 2005-09-03 16:16:03 +0200 +@@ -56,7 +56,7 @@ + #include <stdio.h> + + #ifndef ERRORDB +-#define ERRORDB "/usr/lib/X11/XErrorDB" ++#define ERRORDB "/usr/share/X11/XErrorDB" + #endif + + /* +--- X11/src/StrKeysym.c.orig 2005-09-03 16:41:18 +0200 ++++ X11/src/StrKeysym.c 2005-09-03 16:41:33 +0200 +@@ -36,7 +36,7 @@ + #include "Key.h" + + #ifndef KEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "/usr/share/X11/XKeysymDB" + #endif + + static Bool initialized; diff --git a/packages/x11/x11_cvs.bb b/packages/x11/x11_cvs.bb index 691b2c71e2..3f394df062 100644 --- a/packages/x11/x11_cvs.bb +++ b/packages/x11/x11_cvs.bb @@ -1,6 +1,6 @@ PV = "6.2.1cvs${CVSDATE}" LICENSE = "XFree86" -PR = "r4" +PR = "r5" SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Greg Gilbert <greg@treke.net>" @@ -10,7 +10,8 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" PROVIDES = "x11" -SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11" +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11 \ + file://errordb-keysymdb-path-fix.patch;patch=1" S = "${WORKDIR}/X11" inherit autotools pkgconfig |