diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-02-12 21:51:42 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-02-12 21:51:42 +0000 |
| commit | 7bf9ed5ae2ab1443dc063c78f932f1c625273378 (patch) | |
| tree | a4c906819d5d246f00305a1ce4c0c7c25ff0c5dd /packages | |
| parent | 4ff8b59a986c1d737129603a026a33b6cb016686 (diff) | |
| parent | 6b632d5626c5fd6936afa1e8a38352f3fef494c6 (diff) | |
merge of '26eef9824538dbeb602a9de19e679d9024dabece'
and '55734c4486f119a88c9e73fd18da42abdf708f5b'
Diffstat (limited to 'packages')
59 files changed, 181 insertions, 221 deletions
diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc index cd95777227..3184be72b4 100644 --- a/packages/abiword/abiword-2.5.inc +++ b/packages/abiword/abiword-2.5.inc @@ -1,8 +1,7 @@ DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" -SECTION = "gnome/office" HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" 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" diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb index d488820620..0715026684 100644 --- a/packages/abiword/abiword-plugins_2.4.5.bb +++ b/packages/abiword/abiword-plugins_2.4.5.bb @@ -1,15 +1,14 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -LICENSE="GPLv2" - -DEPENDS = "libwpd librsvg goffice poppler" -PR="r1" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "libwpd librsvg goffice poppler" +RDEPENDS='abiword' +PR = "r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" -RDEPENDS='abiword' inherit autotools diff --git a/packages/abiword/abiword-plugins_2.4.6.bb b/packages/abiword/abiword-plugins_2.4.6.bb index 28d076aaa4..21ac8ea909 100644 --- a/packages/abiword/abiword-plugins_2.4.6.bb +++ b/packages/abiword/abiword-plugins_2.4.6.bb @@ -1,15 +1,13 @@ -DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word"" -SECTION = "gnome/office" -HOMEPAGE="http://www.abiword.org"" -LICENSE="GPLv2" - -DEPENDS = "libwpd librsvg goffice poppler" -PR="r0" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word"" +HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "libwpd librsvg goffice poppler" +RDEPENDS = "abiword" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" -RDEPENDS='abiword' inherit autotools diff --git a/packages/abiword/abiword.inc b/packages/abiword/abiword.inc index c8f3243b9c..8569845394 100644 --- a/packages/abiword/abiword.inc +++ b/packages/abiword/abiword.inc @@ -1,8 +1,7 @@ -DESCRIPTION = "AbiWord is free word processing program similar to Microsoft(r) Word" -SECTION = "gnome/office" +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" HOMEPAGE = "http://www.abiword.org"" +SECTION = "x11/office" LICENSE = "GPLv2" - DEPENDS = "perl-native 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" diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index 912c419f8c..a22431eaf9 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -11,7 +11,8 @@ LICENSE = "GPL" 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" + file://hciattach-ti-bts.patch;patch=1 \ + file://handle-eintr.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... @@ -41,6 +42,7 @@ do_install_append() { 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/ + install -m 0755 ${S}/daemon/.libs/passkey-agent ${D}${base_bindir}/ } CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ diff --git a/packages/bluez/bluez-utils/handle-eintr.patch b/packages/bluez/bluez-utils/handle-eintr.patch new file mode 100644 index 0000000000..effe5d9696 --- /dev/null +++ b/packages/bluez/bluez-utils/handle-eintr.patch @@ -0,0 +1,23 @@ +--- bluez-utils-3.9.org/tools/hciattach.c 2007-01-28 20:16:48.000000000 +0000 ++++ bluez-utils-3.9/tools/hciattach.c 2007-02-12 16:50:49.000000000 +0000 +@@ -1135,7 +1256,7 @@ + int main(int argc, char *argv[]) + { + struct uart_t *u = NULL; +- int detach, printpid, opt, i, n, ld; ++ int detach, printpid, opt, i, n, ld, err; + int to = 5; + int init_speed = 0; + int send_break = 0; +@@ -1286,7 +1414,10 @@ + + while (!__io_canceled) { + p.revents = 0; +- if (poll(&p, 1, 500)) ++ err = poll(&p, 1, 500); ++ if (err < 0 && errno == EINTR) ++ continue; ++ if (err) + break; + } + diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb index d07c68b7d7..36410ee2ec 100644 --- a/packages/bluez/bluez-utils_3.9.bb +++ b/packages/bluez/bluez-utils_3.9.bb @@ -1 +1,3 @@ require bluez-utils.inc + +PR = "r2" diff --git a/packages/bmon/bmon_2.1.0.bb b/packages/bmon/bmon_2.1.0.bb index 32e956fb26..d6cd03f614 100644 --- a/packages/bmon/bmon_2.1.0.bb +++ b/packages/bmon/bmon_2.1.0.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Portable Bandwidth Monitor and rate estimator" HOMEPAGE = "http://people.suug.ch/~tgr/bmon/" -SECTION = "console/utilities" +SECTION = "console/utils" LICENSE = "MIT" # only works with libnl-0.5.0 DEPENDS = "libnl" -PR = "r0" SRC_URI = "http://people.suug.ch/~tgr/bmon/files/bmon-2.1.0.tar.gz \ file://no-strip.patch;patch=1" diff --git a/packages/ccxstream/ccxstream_1.0.15.bb b/packages/ccxstream/ccxstream_1.0.15.bb index cc42d895ca..466a116ec2 100644 --- a/packages/ccxstream/ccxstream_1.0.15.bb +++ b/packages/ccxstream/ccxstream_1.0.15.bb @@ -1,6 +1,6 @@ DESCRIPTION = "XStream Server" DEPENDS = "readline" -LICENSE = "GPL-2" +LICENSE = "GPLv2" PR = "r2" SRC_URI = "http://surfnet.dl.sourceforge.net/sourceforge/xbplayer/${P}.tar.gz \ diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb index 820700d56e..af90d5a20e 100644 --- a/packages/dcop/dcopidl-native_3.5.4.bb +++ b/packages/dcop/dcopidl-native_3.5.4.bb @@ -1,15 +1,13 @@ DESCRIPTION = "DCOP IDL parser" -SECTION = "kde/dev" +SECTION = "kde/devel" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" - SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl \ file://dcopidl-compile.patch;patch=1 " S = "${WORKDIR}/dcopidl" - inherit native qmake qt3e export OE_QMAKE_LINK="${CXX}" diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb index 29a4f71d3c..10969db923 100644 --- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb +++ b/packages/dcop/dcopidl2cpp-native_3.5.4.bb @@ -1,16 +1,14 @@ DESCRIPTION = "DCOP IDL parser" -SECTION = "kde/dev" +SECTION = "kde/devel" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "uicmoc3-native" - SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdelibs/dcop/;module=dcopidl2cpp " #\ # file://dcopidl-compile.patch;patch=1 " S = "${WORKDIR}/dcopidl2cpp" - inherit native qmake qt3e export OE_QMAKE_LINK="${CXX}" diff --git a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb index 9e1fc13da6..4abdb6c7b0 100644 --- a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb +++ b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Framebuffer VNC server keyboard events module" -SECTION = "kernel/module" +SECTION = "kernel/modules" LICENSE = "GPL" PR = "r1" diff --git a/packages/freeze/freeze.bb b/packages/freeze/freeze.bb index 48a0ba63d2..fa11fecb97 100644 --- a/packages/freeze/freeze.bb +++ b/packages/freeze/freeze.bb @@ -13,7 +13,7 @@ # as appropriate, directory is the sub-directory of 'packages'. # DESCRIPTION = "Freeze the bitbake files in the build" -SECTION = "console/networking" +SECTION = "console/network" PRIORITY = "optional" LICENSE = "MIT" PR = "r1" diff --git a/packages/freeze/unfreeze.bb b/packages/freeze/unfreeze.bb index ff280dee9c..f2232c304f 100644 --- a/packages/freeze/unfreeze.bb +++ b/packages/freeze/unfreeze.bb @@ -2,7 +2,7 @@ # configuration fails empty (they just contain a comment). # DESCRIPTION = "Unfreeze the bitbake files in the build" -SECTION = "console/networking" +SECTION = "console/network" PRIORITY = "optional" LICENSE = "MIT" PR = "r1" diff --git a/packages/gpephone/linphone_1.5.0.bb b/packages/gpephone/linphone_1.5.0.bb index 3720512150..bef090e22a 100644 --- a/packages/gpephone/linphone_1.5.0.bb +++ b/packages/gpephone/linphone_1.5.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SIP-based IP phone" HOMEPAGE = "http://www.linphone.org/?lang=us" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "libosip2 speex libogg alsa-lib readline" PR = "r0" diff --git a/packages/ipsec-tools/ipsec-tools_0.6.6.bb b/packages/ipsec-tools/ipsec-tools_0.6.6.bb index 0e2a82e370..9b0676aece 100644 --- a/packages/ipsec-tools/ipsec-tools_0.6.6.bb +++ b/packages/ipsec-tools/ipsec-tools_0.6.6.bb @@ -1,10 +1,9 @@ DESCRIPTION = "IPsec-Tools is a port of KAME's IPsec utilities to the \ Linux-2.6 IPsec implementation." HOMEPAGE = "http://ipsec-tools.sourceforge.net/" -SECTION = "console/net" +SECTION = "console/network" LICENSE = "BSD" DEPENDS = "virtual/kernel openssl readline flex" -PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/ipsec-tools/ipsec-tools-${PV}.tar.bz2 \ file://racoon-search-missing.patch;patch=1" diff --git a/packages/libaal/libaal_1.0.4.bb b/packages/libaal/libaal_1.0.4.bb index 0acfccc48d..af847f50c6 100644 --- a/packages/libaal/libaal_1.0.4.bb +++ b/packages/libaal/libaal_1.0.4.bb @@ -5,7 +5,7 @@ PR = "r1" DESCRIPTION = "Library for user-level code accessing Reiser4 filesystems" HOMEPAGE = "http://www.namesys.com" SECTION = "base" -LICENSE = "GPL-2" +LICENSE = "GPLv2" SRC_URI = "ftp://ftp.namesys.com/pub/reiser4progs/old-versions/${P}.tar.gz" diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb index b8c5ec6966..85114d6524 100644 --- a/packages/libidl/libidl_0.8.2.bb +++ b/packages/libidl/libidl_0.8.2.bb @@ -1,5 +1,5 @@ +SECTION = "x11/gnome/libs" LICENSE = "LGPL" -SECTION = "libs" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2" S = "${WORKDIR}/libIDL-${PV}" diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb index 2ca114be2c..7a5a0d454e 100644 --- a/packages/libidl/libidl_0.8.3.bb +++ b/packages/libidl/libidl_0.8.3.bb @@ -1,6 +1,6 @@ -LICENSE = "LGPL" DESCRIPTION = "Library for parsing CORBA IDL files" -SECTION = "gnome/libs" +SECTION = "x11/gnome/libs" +LICENSE = "LGPL" DEPENDS = "glib-2.0" PR = "r2" diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb index 916bfb6e5f..ccc93e291a 100644 --- a/packages/libidl/libidl_0.8.6.bb +++ b/packages/libidl/libidl_0.8.6.bb @@ -1,6 +1,6 @@ -LICENSE = "LGPL" DESCRIPTION = "Library for parsing CORBA IDL files" -SECTION = "gnome/libs" +SECTION = "x11/gnome/libs" +LICENSE = "LGPL" DEPENDS = "glib-2.0 libidl-native" PR = "r2" diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 43b8daa131..563f21440e 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SIP-based IP phone (console edition)" HOMEPAGE = "http://www.linphone.org/?lang=us" SECTION = "x11/utils" -LICENSE = "GPL-2" +LICENSE = "GPLv2" DEPENDS = "intltool libosip2 speex libogg alsa-lib readline" DEPENDS_${PN} = "liblinphone" diff --git a/packages/musicpd/glurp_0.11.3.bb b/packages/musicpd/glurp_0.11.3.bb index 4d9449c904..59cea4f8c9 100644 --- a/packages/musicpd/glurp_0.11.3.bb +++ b/packages/musicpd/glurp_0.11.3.bb @@ -1,9 +1,8 @@ DESCRIPTION = "glurp - frontend for mpd" HOMEPAGE = "http://www.musicpd.org/glurp.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "gtk+ libglade" -PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/glurp/glurp-${PV}.tar.gz" diff --git a/packages/musicpd/gmpc_0.11.2.bb b/packages/musicpd/gmpc_0.11.2.bb index 9468a07249..6ed2ada569 100644 --- a/packages/musicpd/gmpc_0.11.2.bb +++ b/packages/musicpd/gmpc_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "gtk+ libglade gnome-vfs" PR = "r1" diff --git a/packages/musicpd/gmpc_0.13.0.bb b/packages/musicpd/gmpc_0.13.0.bb index 3d9c668527..f8c99efb36 100644 --- a/packages/musicpd/gmpc_0.13.0.bb +++ b/packages/musicpd/gmpc_0.13.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "libmpd gtk+ libglade gnome-vfs" PR = "r0" diff --git a/packages/musicpd/gmpc_svn.bb b/packages/musicpd/gmpc_svn.bb index 9c03faa395..fbaea3e5f2 100644 --- a/packages/musicpd/gmpc_svn.bb +++ b/packages/musicpd/gmpc_svn.bb @@ -1,11 +1,10 @@ DESCRIPTION = "GTK+ Frontend for mpd" HOMEPAGE = "http://www.musicpd.org/gmpc.shtml" +SECTION = "x11/multimedia" LICENSE = "GPLv2" -SECTION = "gnome/multimedia" DEPENDS = "libmpd gtk+ libglade gnome-vfs gob2" SRCDATE = "20070120" PV = "0.13.0+svn${SRCDATE}" -PR = "r0" SRC_URI = "svn://svn.musicpd.org/gmpc;module=trunk;proto=https" S = "${WORKDIR}/trunk" diff --git a/packages/musicpd/libmpd_svn.bb b/packages/musicpd/libmpd_svn.bb index eea7b952a3..4c78eb15f4 100644 --- a/packages/musicpd/libmpd_svn.bb +++ b/packages/musicpd/libmpd_svn.bb @@ -1,10 +1,9 @@ DESCRIPTION = "Music Player Daemon (mpd) library" HOMEPAGE = "http://www.musicpd.org" +SECTION = "libs/multimedia" LICENSE = "GPLv2" -SECTION = "lib/multimedia" SRCDATE = "20070120" PV = "0.0.0+svn${SRCDATE}" -PR = "r0" SRC_URI = "svn://svn.musicpd.org/libmpd;module=trunk;proto=https" S = "${WORKDIR}/trunk" diff --git a/packages/musicpd/mpc_0.11.2.bb b/packages/musicpd/mpc_0.11.2.bb index 8806653357..8d3eaa183a 100644 --- a/packages/musicpd/mpc_0.11.2.bb +++ b/packages/musicpd/mpc_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/mpc.shtml" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" PR = "r1" SRC_URI = "http://mercury.chem.pitt.edu/~shank/mpc-${PV}.tar.gz" diff --git a/packages/musicpd/mpc_0.12.0.bb b/packages/musicpd/mpc_0.12.0.bb index 6d47f9418f..ccd6926fcd 100644 --- a/packages/musicpd/mpc_0.12.0.bb +++ b/packages/musicpd/mpc_0.12.0.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Command-line (scriptable) Music Player Daemon (mpd) Client" HOMEPAGE = "http://www.musicpd.org/mpc.shtml" -LICENSE = "GPLv2" SECTION = "console/multimedia" -PR = "r0" +LICENSE = "GPLv2" SRC_URI = "http://www.musicpd.org/uploads/files/mpc-${PV}.tar.bz2" EXTRA_OECONF = "--with-iconv-libraries=${STAGING_LIBDIR} \ diff --git a/packages/musicpd/mpd-alsa_0.11.5.bb b/packages/musicpd/mpd-alsa_0.11.5.bb index 1ba1fabd16..939ecec836 100644 --- a/packages/musicpd/mpd-alsa_0.11.5.bb +++ b/packages/musicpd/mpd-alsa_0.11.5.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd). This version is configured for alsa support" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao-alsa zlib libmikmod libmad flac audiofile virtual/libiconv" RDEPENDS = "libao-alsa" PR = "r3" diff --git a/packages/musicpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb index 493f677a50..9d3c5f90b0 100644 --- a/packages/musicpd/mpd_0.11.2.bb +++ b/packages/musicpd/mpd_0.11.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" -LICENSE = "GPLv2" SECTION = "console/multimedia" +LICENSE = "GPLv2" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" PR = "r2" diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb index d501d0e478..7a1d17ef5d 100644 --- a/ |