diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-05-22 01:48:53 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-22 01:48:53 +0000 |
| commit | fe19b81b064bb612a85b11ac1b3ee8b40a7a72be (patch) | |
| tree | 3a4d0e8a051d7c05529a917730f9efa1c7394ede /packages | |
| parent | 405b9c56fd921db33cc33b723145eb0453bf89a8 (diff) | |
| parent | a6e39080788cf30c6d71977fae4ca2bf1e7bde8c (diff) | |
merge of 45908085bdceb2276493e588d8d89daba46b6d5c
and ec1cfabe499e84bf5627a49cc40bae42b557c638
Diffstat (limited to 'packages')
64 files changed, 6239 insertions, 112 deletions
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index db5ddf066d..e71f2cef87 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -15,9 +15,8 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://02dtl1_cs.sh" # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' and see if we break something with that -SRC_URI_append_familiar = " file://default-manfid-0x0-to-bcps.patch;patch=1" -SRC_URI_append_openzaurus = " file://default-manfid-0x0-to-bcps.patch;patch=1" +# 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}" diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb index e6ea8e03fb..c7cd02c70d 100644 --- a/packages/cherokee/cherokee_0.5.3.bb +++ b/packages/cherokee/cherokee_0.5.3.bb @@ -1,19 +1,17 @@ DESCRIPTION = "Cherokee Web Server fast and secure" +DESCRIPTION_cget = "Small downloader based in the Cherokee client library" LICENSE = "GPL" DEPENDS = "pcre gnutls" HOMEPAGE = "http://www.0x50.org/" +PR = "r1" + SRC_URI = "http://www.0x50.org/download/0.5/${PV}/${P}.tar.gz \ file://configure.patch;patch=1 \ file://Makefile.in.patch;patch=1 \ file://Makefile.cget.patch;patch=1 \ - file://util.patch;patch=1 \ -" - -inherit autotools - -PARALLEL_MAKE="" + file://util.patch;patch=1" -LEAD_SONAME = "libcherokee-base" +inherit autotools pkgconfig binconfig EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls" @@ -26,3 +24,10 @@ do_configure() { do_install_prepend () { $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c } + +PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base" + +FILES_cget = "${bindir}/cget" +FILES_libcherokee-server = "${libdir}/libcherokee-server*" +FILES_libcherokee-client = "${libdir}/libcherokee-client*" +FILES_libcherokee-base = "${libdir}/libcherokee-base*" diff --git a/packages/ckermit/ckermit_211.bb b/packages/ckermit/ckermit_211.bb index 9bf4c2859e..9a89c9fbbf 100644 --- a/packages/ckermit/ckermit_211.bb +++ b/packages/ckermit/ckermit_211.bb @@ -8,6 +8,7 @@ MAINTAINER = "Holger Schurig" HOMEPAGE = "http://www.columbia.edu/kermit/" SECTION = "console/network" SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz" +PR = "r1" # # From http://www.columbia.edu/kermit/ck80.html#license @@ -63,6 +64,11 @@ export BINDIR = "${bindir}" export MANDIR = "${mandir}/man1" export INFODIR = "${infodir}" +# Additional flags. For uclibc we add -DNOARROWKEYS which stops ckermit +# trying to look inside the stdio headers. +CKERMIT_ADDITIONAL = "" +CKERMIT_ADDITIONAL_linux-uclibc = "-DNOARROWKEYS" + do_compile () { # The original makefile doesn't differentiate between CC and CC_FOR_BUILD, # so we build wart manually. Note that you need a ckwart.o with the proper @@ -83,7 +89,8 @@ do_compile () { -DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \ -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ - -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI" + -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ + ${CKERMIT_ADDITIONAL}" } do_install () { diff --git a/packages/ezx/ezx-boot-usb-native_svn.bb b/packages/ezx/ezx-boot-usb-native_svn.bb index 6bcc80e4ce..80dcb3533d 100644 --- a/packages/ezx/ezx-boot-usb-native_svn.bb +++ b/packages/ezx/ezx-boot-usb-native_svn.bb @@ -1,9 +1,12 @@ DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage" DEPENDS = "libusb-native" SECTION = "devel" +AUTHOR = "Harald Welte" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" +PR = "r1" -SRC_URI = "svn://svn.openezx.org/trunk/src;module=boot_usb;proto=http" +SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http" S = "${WORKDIR}/boot_usb" inherit native diff --git a/packages/ezx/ezx-gpiotool_svn.bb b/packages/ezx/ezx-gpiotool_svn.bb index e483c4091c..c9b35f7df6 100644 --- a/packages/ezx/ezx-gpiotool_svn.bb +++ b/packages/ezx/ezx-gpiotool_svn.bb @@ -4,8 +4,9 @@ LICENSE = "GPL" HOMEPAGE = "http://openezx.org" AUTHOR = "Harald Welte" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +PR = "r1" -SRC_URI = "svn://svn.openezx.org/trunk/src;module=gpiotool;proto=http" +SRC_URI = "svn://svn.openezx.org/trunk/src/userspace;module=gpiotool;proto=http" S = "${WORKDIR}/gpiotool" do_compile() { diff --git a/packages/gimp/files/.mtn2git_empty b/packages/gimp/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gimp/files/.mtn2git_empty diff --git a/packages/gimp/files/configure-libwmf.patch b/packages/gimp/files/configure-libwmf.patch new file mode 100644 index 0000000000..ca3697cfa2 --- /dev/null +++ b/packages/gimp/files/configure-libwmf.patch @@ -0,0 +1,21 @@ +--- gimp-2.3.8/configure.in.orig 2006-05-31 10:16:40.000000000 +0100 ++++ gimp-2.3.8/configure.in 2006-05-31 10:18:56.000000000 +0100 +@@ -1342,7 +1342,10 @@ + # Check for libwmf2 + ################### + ++AC_ARG_WITH(libwmf, [ --without-libwmf build without libwmf support]) ++ + have_libwmf=no ++if test "x$with_libwmf" != xno; then + AC_PATH_PROG(WMF_CONFIG, libwmf-config, no) + if test "x$WMF_CONFIG" != "xno" ; then + have_libwmf=yes +@@ -1359,6 +1362,7 @@ + else + have_libwmf="no (libwmf not found)" + fi ++fi + AC_SUBST(LIBWMF) + AC_SUBST(WMF_CFLAGS) + diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb index 89d9be3e8d..84b35b1e8d 100644 --- a/packages/gimp/gimp_2.3.8.bb +++ b/packages/gimp/gimp_2.3.8.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ + file://configure-libwmf.patch;patch=1" DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" @@ -12,7 +13,8 @@ inherit autotools pkgconfig EXTRA_OECONF = " --disable-gtktest \ --disable-print \ --disable-python \ - --enable-mp" + --enable-mp \ + --without-libwmf" do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 024ba1d901..ff434d2a1b 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -90,11 +90,6 @@ do_munge() { # Integrate ports into tree mv ${WORKDIR}/ports ${S} - # Need to copy some extra folder content for sh arch. - OE bug #954 - case ${TARGET_ARCH} in - sh*) cp ${WORKDIR}/libc/sysdeps/sh/${TARGET_ARCH}/*.S ${WORKDIR}/libc/sysdeps/sh;; - esac - # http://www.handhelds.org/hypermail/oe/51/5135.html # Some files were moved around between directories on # 2005-12-21, which means that any attempt to check out diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 2cc568df6f..45174d0551 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -6,6 +6,11 @@ PRIORITY = "required" DEFAULT_PREFERENCE = "-1" PR = "r5" +# the -isystem in bitbake.conf screws up glibc do_stage +BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" +TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include" + + FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" diff --git a/packages/gnome/libsoup_2.2.7.bb b/packages/gnome/libsoup_2.2.7.bb index e97a11cc96..f01cb19dbc 100644 --- a/packages/gnome/libsoup_2.2.7.bb +++ b/packages/gnome/libsoup_2.2.7.bb @@ -14,5 +14,5 @@ FILES_${PN}-doc = "${datadir}" do_stage() { autotools_stage_all install -d ${STAGING_DATADIR}/pkgconfig - install -m 0644 ${D}${libdir}/pkgconfig/* ${STAGING_DATADIR}/pkgconfig/ + install -m 0644 ${S}/*.pc ${STAGING_DATADIR}/pkgconfig/ } diff --git a/packages/gpe-calendar/gpe-calendar_cvs.bb b/packages/gpe-calendar/gpe-calendar_cvs.bb index a891431ffb..f75987c762 100644 --- a/packages/gpe-calendar/gpe-calendar_cvs.bb +++ b/packages/gpe-calendar/gpe-calendar_cvs.bb @@ -2,14 +2,15 @@ LICENSE = "GPL" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.72+cvs${SRCDATE}" +PV = "0.73+cvs${SRCDATE}" PR = "r1" +PARALLEL_MAKE = "" inherit autotools gpe SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" -DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" +DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype" SECTION = "gpe" RDEPENDS = "gpe-icons" DESCRIPTION = "GPE calendar" diff --git a/packages/gpe-login/files/chvt-keylaunch.patch b/packages/gpe-login/files/chvt-keylaunch.patch new file mode 100644 index 0000000000..5e62a1107e --- /dev/null +++ b/packages/gpe-login/files/chvt-keylaunch.patch @@ -0,0 +1,11 @@ +--- gpe-login-0.86/gpe-login.keylaunchrc.orig 2006-05-28 20:38:39.846547024 +0200 ++++ gpe-login-0.86/gpe-login.keylaunchrc 2006-05-28 20:38:56.800969560 +0200 +@@ -1,3 +1,8 @@ + key=???XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh + key=???XF86PowerDown:-:/usr/bin/apm --suspend + key=???Held XF86PowerDown:-:bl toggle ++ ++# VT changing ++key=...*Left:-:~chvt 1 ++key=...*Right:-:~chvt 3 ++key=...*Escape:-:~/etc/init.d/gpe-dm stop diff --git a/packages/gpe-login/gpe-login-0.87/.mtn2git_empty b/packages/gpe-login/gpe-login-0.87/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gpe-login/gpe-login-0.87/.mtn2git_empty diff --git a/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch b/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch new file mode 100644 index 0000000000..798c059ccc --- /dev/null +++ b/packages/gpe-login/gpe-login-0.87/chvt-keylaunch.patch @@ -0,0 +1,12 @@ +--- /tmp/gpe-login.keylaunchrc 2006-05-29 23:46:42.806081576 +0200 ++++ gpe-login-0.87/gpe-login.keylaunchrc 2006-05-29 23:48:18.476537456 +0200 +@@ -1,3 +1,9 @@ + key=????XF86AudioRecord:xcalibrate:/usr/bin/gpe-xcalibrate.sh + key=????XF86PowerDown:-:/usr/bin/apm --suspend + key=????Held XF86PowerDown:-:bl toggle ++ ++# VT changing ++key=...*Left:-:~chvt 1 ++key=...*Right:-:~chvt 3 ++key=...*Escape:-:~/etc/init.d/gpe-dm stop ++ diff --git a/packages/gpe-login/gpe-login_0.86.bb b/packages/gpe-login/gpe-login_0.86.bb index f6eb0c921a..1dd6818903 100644 --- a/packages/gpe-login/gpe-login_0.86.bb +++ b/packages/gpe-login/gpe-login_0.86.bb @@ -7,7 +7,7 @@ PRIORITY = "optional" DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" RDEPENDS = "xkbd" RPROVIDES = "gpe-session-starter" -PR = "r0" +PR = "r1" #apply a patch to set the fontsize for bigdpi (200+) devices to 5 SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" @@ -16,3 +16,4 @@ SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" +SRC_URI_append += " file://chvt-keylaunch.patch;patch=1 " diff --git a/packages/gpe-login/gpe-login_0.87.bb b/packages/gpe-login/gpe-login_0.87.bb new file mode 100644 index 0000000000..5d7f00530c --- /dev/null +++ b/packages/gpe-login/gpe-login_0.87.bb @@ -0,0 +1,19 @@ +LICENSE = "GPL" +inherit gpe + +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd" +RPROVIDES = "gpe-session-starter" +PR = "r0" + +#apply a patch to set the fontsize for bigdpi (200+) devices to 5 +SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1" +SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1" + +SRC_URI += " file://chvt-keylaunch.patch;patch=1 " diff --git a/packages/gpe-today/gpe-today_cvs.bb b/packages/gpe-today/gpe-today_cvs.bb index 33af763f07..47e9c01a66 100644 --- a/packages/gpe-today/gpe-today_cvs.bb +++ b/packages/gpe-today/gpe-today_cvs.bb @@ -8,7 +8,7 @@ PRIORITY = "optional" S = "${WORKDIR}/${PN}" #Remove the dash below when 0.10 changes in PV -PV = "0.10+cvs-${SRCDATE}" +PV = "0.11+cvs-${SRCDATE}" PR = "r0" inherit gpe diff --git a/packages/keylaunch/files/80chvt-SUID b/packages/keylaunch/files/80chvt-SUID new file mode 100644 index 0000000000..e3b4efef5d --- /dev/null +++ b/packages/keylaunch/files/80chvt-SUID @@ -0,0 +1,25 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: chvt-SUID.sh +# Date: 28-May-06 + + +# +# Sets the SUID bit on chvt to allow changing to the VT from inside X by +# any user. Since a SUID binary still is a security risk, we chmod only +# when keylaunch is used and not by default. +# + +for target in /usr/bin/chvt.console-tools +do + if test "`ls -l "$target" | awk '{print $1}'|cut -c 2-4`" != "rws" + then + echo "Making [$target] SUID root..." + chmod u+s "$target" + else + echo "Ignoring [$target]" + fi +done diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/files/akita/keylaunchrc index 0379c719c4..27cce24e93 100644 --- a/packages/keylaunch/files/akita/keylaunchrc +++ b/packages/keylaunch/files/akita/keylaunchrc @@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar #key=....F19:-: #key=....F19:-: #key=....F10:-: + +# VT changing +key=...*Left:-:~chvt 1 +key=...*Right:-:~chvt 3 diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/files/spitz/keylaunchrc index f5e1fd70be..433221a586 100644 --- a/packages/keylaunch/files/spitz/keylaunchrc +++ b/packages/keylaunch/files/spitz/keylaunchrc @@ -22,3 +22,7 @@ key=....F18:-:gpe-calendar #key=....F19:-: #key=....F19:-: #key=....F10:-: + +# VT changing +key=...*Left:-:~chvt 1 +key=...*Right:-:~chvt 3 diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index c06c9c4587..67ed0923f2 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -13,7 +13,7 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ program is already running, keylaunch can bring its window to the front\ rather than just running another copy." PACKAGE_ARCH = "${MACHINE_ARCH}" -PR = "r4" +PR = "r5" SRC_URI += " file://keylaunchrc" diff --git a/packages/libeventdb/libeventdb_cvs.bb b/packages/libeventdb/libeventdb_cvs.bb index 83f938ff62..1a4a5c21ba 100644 --- a/packages/libeventdb/libeventdb_cvs.bb +++ b/packages/libeventdb/libeventdb_cvs.bb @@ -4,7 +4,7 @@ SECTION = "gpe/libs" PRIORITY = "optional" DEPENDS = "libgpewidget libgpepimc sqlite" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -PV = "0.21+cvs${SRCDATE}" +PV = "0.30+cvs${SRCDATE}" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/packages/libgpevtype/libgpevtype_cvs.bb b/packages/libgpevtype/libgpevtype_cvs.bb index 301cb37a5e..31c900dd7e 100644 --- a/packages/libgpevtype/libgpevtype_cvs.bb +++ b/packages/libgpevtype/libgpevtype_cvs.bb @@ -8,7 +8,7 @@ DEPENDS = "libmimedir" DEFAULT_PREFERENCE = "-1" S = "${WORKDIR}/${PN}" -PV = "0.16+cvs${SRCDATE}" +PV = "0.17+cvs${SRCDATE}" PR = "r0" inherit pkgconfig gpe autotools diff --git a/packages/libhandoff/libhandoff_cvs.bb b/packages/libhandoff/libhandoff_cvs.bb index 54ffafc5e9..2a1b70852d 100644 --- a/packages/libhandoff/libhandoff_cvs.bb +++ b/ |