summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/flite/flite-1.2/configure-with-audio.patch20
-rw-r--r--packages/flite/flite_1.2.bb11
-rw-r--r--packages/gaim/files/desktop-name_1.4.0.patch11
-rw-r--r--packages/gaim/gaim_1.4.0.bb9
-rw-r--r--packages/gpgme/gpgme_1.0.3.bb22
-rw-r--r--packages/gpsd/gpsd_2.28.bb (renamed from packages/gpsd/gpsd_2.26.bb)0
-rw-r--r--packages/kdepimpi/kdepimpi_2.1.16.bb (renamed from packages/kdepimpi/kdepimpi_2.1.13.bb)0
-rw-r--r--packages/kdepimpi/pwmpi_2.1.16.bb (renamed from packages/kdepimpi/pwmpi_2.1.13.bb)0
-rw-r--r--packages/linux/nslu2-kernel.inc8
-rw-r--r--packages/lzma/lzma-native_4.17.bb15
-rw-r--r--packages/parted/.mtn2git_empty0
-rw-r--r--packages/parted/parted_1.6.23.bb13
-rw-r--r--packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch92
-rw-r--r--packages/sylpheed/sylpheed_2.0.0beta6.bb30
-rw-r--r--packages/zaurus-updater/tosa/updater.sh6
15 files changed, 220 insertions, 17 deletions
diff --git a/packages/flite/flite-1.2/configure-with-audio.patch b/packages/flite/flite-1.2/configure-with-audio.patch
new file mode 100644
index 0000000000..4f320ac068
--- /dev/null
+++ b/packages/flite/flite-1.2/configure-with-audio.patch
@@ -0,0 +1,20 @@
+*** flite-1.2-release/configure.in~ Tue Feb 18 01:45:45 2003
+--- flite-1.2-release/configure.in Mon Jul 18 22:01:25 2005
+***************
+*** 144,150 ****
+ dnl
+ AC_ARG_WITH( audio,
+ [ --with-audio with specific audio support (none linux freebsd etc) ],
+! AUDIODRIVER=$with_audio )
+
+ if test "x$AUDIODEFS" = x; then
+ case "$AUDIODRIVER" in
+--- 144,151 ----
+ dnl
+ AC_ARG_WITH( audio,
+ [ --with-audio with specific audio support (none linux freebsd etc) ],
+! [AUDIODRIVER=$with_audio
+! AUDIODEFS=])
+
+ if test "x$AUDIODEFS" = x; then
+ case "$AUDIODRIVER" in
diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb
index b8696fd829..c9a3e71e92 100644
--- a/packages/flite/flite_1.2.bb
+++ b/packages/flite/flite_1.2.bb
@@ -1,14 +1,15 @@
-SECTION = "console/utils"
-HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
-DESCRIPTION = "festival light speech synthesizer"
+DESCRIPTION = "flite - the festival light speech synthesizer"
PRIORITY = "optional"
+HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/"
+SECTION = "console/utils"
LICENSE = "flite"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r1"
+MAINTAINER = "Patrick Ohly <Patrick.Ohly@gmx.de>"
+PR = "r2"
PARALLEL_MAKE = ""
SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \
+ file://configure-with-audio.patch;patch=1 \
file://fix-read-only-assignments.patch;patch=1"
S = "${WORKDIR}/flite-${PV}-release"
diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/gaim/files/desktop-name_1.4.0.patch
new file mode 100644
index 0000000000..3cfaa5771e
--- /dev/null
+++ b/packages/gaim/files/desktop-name_1.4.0.patch
@@ -0,0 +1,11 @@
+--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200
++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+
+-Name=Gaim Internet Messenger
++Name=Gaim
+ Name[ca]=Missatger d'Internet Gaim
+ Name[cs]=Gaim Internet Messenger
+ Name[da]=Gaim - internet beskeder
diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb
new file mode 100644
index 0000000000..ec55ea5b94
--- /dev/null
+++ b/packages/gaim/gaim_1.4.0.bb
@@ -0,0 +1,9 @@
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
+ file://desktop-name_1.4.0.patch;patch=1"
+
+include gaim.inc
+
+CFLAGS += "-D_GNU_SOURCE"
+
diff --git a/packages/gpgme/gpgme_1.0.3.bb b/packages/gpgme/gpgme_1.0.3.bb
new file mode 100644
index 0000000000..8292991a89
--- /dev/null
+++ b/packages/gpgme/gpgme_1.0.3.bb
@@ -0,0 +1,22 @@
+LICENSE = "GPL"
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
+PR = "r1"
+
+DEPENDS = "libgpg-error pth libassuan"
+
+EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
+
+inherit autotools binconfig
+
+do_stage() {
+ autotools_stage_includes
+
+ install -d ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR}
+
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
+}
+
diff --git a/packages/gpsd/gpsd_2.26.bb b/packages/gpsd/gpsd_2.28.bb
index cd5e223142..cd5e223142 100644
--- a/packages/gpsd/gpsd_2.26.bb
+++ b/packages/gpsd/gpsd_2.28.bb
diff --git a/packages/kdepimpi/kdepimpi_2.1.13.bb b/packages/kdepimpi/kdepimpi_2.1.16.bb
index f3dde1a2fd..f3dde1a2fd 100644
--- a/packages/kdepimpi/kdepimpi_2.1.13.bb
+++ b/packages/kdepimpi/kdepimpi_2.1.16.bb
diff --git a/packages/kdepimpi/pwmpi_2.1.13.bb b/packages/kdepimpi/pwmpi_2.1.16.bb
index 904f640955..904f640955 100644
--- a/packages/kdepimpi/pwmpi_2.1.13.bb
+++ b/packages/kdepimpi/pwmpi_2.1.16.bb
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index 44f466ef49..f5d7135c88 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -211,10 +211,12 @@ inherit kernel
ARCH = "arm"
KERNEL_IMAGETYPE = "zImage"
-# To specify the console set KERNEL_CONSOLE in the .bb
-# file. The default is currently set in machine/nslu2.conf
+# To specify the console set KERNEL_CONSOLE in the .bb file.
+# CMDLINE_ROOT contains the boot options
CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s"
-CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+# Add distro specific debug (or non-debug) options to this
+CMDLINE_DEBUG ?= ""
+CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}"
# Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as
# required. Notice that this has to be done for each separately built
diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb
index a47cd1d8da..174ed700e4 100644
--- a/packages/lzma/lzma-native_4.17.bb
+++ b/packages/lzma/lzma-native_4.17.bb
@@ -1,19 +1,22 @@
DESCRIPTION = "LZMA is a general compression method. LZMA provides high compression ratio and very fast decompression."
HOMEPAGE = "http://www.7-zip.org/"
LICENSE = "LGPL"
+PR = "r1"
SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \
- file://lzma-406-zlib-stream.patch;patch=1"
-S = "${WORKDIR}"
+ file://lzma-406-zlib-stream.patch;patch=1;pnum=2"
+S = "${WORKDIR}/SRC"
inherit native
+CFLAGS += "-c -I${S}"
+
do_compile() {
- make -C ${S}/SRC/7zip/Compress/LZMA_Alone
- make -C ${S}/SRC/7zip/Compress/LZMA_Lib
+ oe_runmake -C 7zip/Compress/LZMA_Alone
+ oe_runmake -C 7zip/Compress/LZMA_Lib
}
do_stage () {
- install -m 0755 ${S}/SRC/7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR}
- oe_libinstall -a ${S}/SRC/7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR}
+ install -m 0755 7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR}
+ oe_libinstall -a 7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR}
}
diff --git a/packages/parted/.mtn2git_empty b/packages/parted/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/parted/.mtn2git_empty
diff --git a/packages/parted/parted_1.6.23.bb b/packages/parted/parted_1.6.23.bb
new file mode 100644
index 0000000000..d4182487fe
--- /dev/null
+++ b/packages/parted/parted_1.6.23.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "parted, the GNU partition resizing program"
+HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
+LICENSE = "GPLv2"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+SECTION = "console/tools"
+DEPENDS = "readline e2fsprogs-libs"
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-Werror"
+
+inherit autotools
diff --git a/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch
new file mode 100644
index 0000000000..b0a03c6a32
--- /dev/null
+++ b/packages/sylpheed/files/sylpheed-gnutls_2.0.0beta6.patch
@@ -0,0 +1,92 @@
+--- sylpheed-2.0.0beta6/config.h.in.old 2005-07-18 11:57:23.000000000 +0200
++++ sylpheed-2.0.0beta6/config.h.in 2005-07-18 11:59:57.000000000 +0200
+@@ -263,6 +263,9 @@
+ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
+ #undef TM_IN_SYS_TIME
+
++/* Define if you use GnuTLS to support SSL. */
++#undef USE_GNUTLS
++
+ /* Define if you use GPGME to support OpenPGP. */
+ #undef USE_GPGME
+
+@@ -273,6 +276,9 @@
+ #undef USE_LDAP
+
+ /* Define if you use OpenSSL to support SSL. */
++#undef USE_OPENSSL
++
++/* Define if SSL is supported. */
+ #undef USE_SSL
+
+ /* Whether to use multithread or not */
+--- sylpheed-2.0.0beta6/configure.in.old 2005-07-18 12:00:24.000000000 +0200
++++ sylpheed-2.0.0beta6/configure.in 2005-07-18 12:04:33.000000000 +0200
+@@ -202,7 +202,8 @@
+ #include <openssl/opensslv.h>
+ ], [ return OPENSSL_VERSION_NUMBER; ],
+ [ AC_MSG_RESULT(yes)
+- AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ],
++ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.)
++ AC_DEFINE(USE_OPENSSL, 1, Define if you use OpenSSL to support SSL.) ],
+ [ AC_MSG_RESULT(no)
+ LIBS="$ac_save_LIBS"
+ ac_cv_enable_ssl=no ])
+@@ -211,6 +212,27 @@
+ AC_MSG_RESULT(no)
+ fi
+
++AC_ARG_ENABLE(gnutls,
++ [ --enable-gnutls Enable SSL support using GnuTLS [default=no]],
++ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no])
++AC_MSG_CHECKING([whether to use GnuTLS])
++if test $ac_cv_enable_gnutls = yes; then
++ AC_MSG_RESULT(yes)
++ AC_MSG_CHECKING([if GnuTLS is available])
++ LIBS="$LIBS -lgnutls-openssl"
++ AC_TRY_LINK([
++#include <gnutls/openssl.h>
++], [ return OPENSSL_VERSION_NUMBER; ],
++ [ AC_MSG_RESULT(yes)
++ AC_DEFINE(USE_SSL, 1, Define if SSL is supported.)
++ AC_DEFINE(USE_GNUTLS, 1, Define if you use GnuTLS to support SSL.) ],
++ [ AC_MSG_RESULT(no)
++ LIBS="$ac_save_LIBS"
++ ac_cv_enable_gnutls=no ])
++else
++ AC_MSG_RESULT(no)
++fi
++
+ dnl Check for X-Face support
+ AC_ARG_ENABLE(compface,
+ [ --disable-compface Do not use compface (X-Face)],
+@@ -350,6 +372,7 @@
+ echo "JPilot : $ac_cv_enable_jpilot"
+ echo "LDAP : $ac_cv_enable_ldap"
+ echo "OpenSSL : $ac_cv_enable_ssl"
++echo "GnuTLS : $ac_cv_enable_gnutls"
+ echo "iconv : $am_cv_func_iconv"
+ echo "compface : $ac_cv_enable_compface"
+ echo "IPv6 : $ac_cv_enable_ipv6"
+--- sylpheed-2.0.0beta6/src/ssl.h.old 2005-07-18 12:09:35.000000000 +0200
++++ sylpheed-2.0.0beta6/src/ssl.h 2005-07-18 12:11:15.000000000 +0200
+@@ -27,11 +27,19 @@
+ #if USE_SSL
+
+ #include <glib.h>
++#if USE_OPENSSL
+ #include <openssl/crypto.h>
+ #include <openssl/x509.h>
+ #include <openssl/pem.h>
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
++#else
++#if USE_GNUTLS
++#include <gnutls/openssl.h>
++#else
++#error Must select either GnuTLS or OpenSSL
++#endif
++#endif
+
+ #include "socket.h"
+
diff --git a/packages/sylpheed/sylpheed_2.0.0beta6.bb b/packages/sylpheed/sylpheed_2.0.0beta6.bb
new file mode 100644
index 0000000000..4fab8e8bb8
--- /dev/null
+++ b/packages/sylpheed/sylpheed_2.0.0beta6.bb
@@ -0,0 +1,30 @@
+SECTION = "x11/network"
+DESCRIPTION = "Mail user agent"
+DEPENDS = "gtk+ gpgme gnutls"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://sylpheed.good-day.net/sylpheed/v2.0beta/sylpheed-2.0.0beta6.tar.bz2 \
+ file://sylpheed-gnutls_2.0.0beta6.patch;patch=1"
+
+FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
+FILES_${PN}-doc += "${datadir}"
+
+EXTRA_OECONF = "--enable-gnutls"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_configure_prepend() {
+ mkdir -p m4
+}
+
+inherit autotools
+
+do_install_append() {
+ install -d ${D}${datadir}/applications
+ install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
+ install -d ${D}${datadir}/pixmaps
+ install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
+}
+
diff --git a/packages/zaurus-updater/tosa/updater.sh b/packages/zaurus-updater/tosa/updater.sh
index e22edbf19a..5adfa97a1e 100644
--- a/packages/zaurus-updater/tosa/updater.sh
+++ b/packages/zaurus-updater/tosa/updater.sh
@@ -67,7 +67,7 @@ then
./consolescroll
fi
-for TARGETFILE in zImage zimage ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN
+for TARGETFILE in zImage zimage.bin ZIMAGE initrd.bin INITRD.BIN mversion.bin MVERSION.BIN
do
if [ -e $TARGETFILE ]
then
@@ -78,8 +78,8 @@ do
#echo $TARGETFILE':'$DATASIZE'bytes'
TARGETTYPE=Invalid
case "$TARGETFILE" in
-## zImage) TARGETTYPE=Kernel;;
- zimage) TARGETTYPE=Kernel;;
+ zImage) TARGETTYPE=Kernel;;
+ zimage.bin) TARGETTYPE=Kernel;;
ZIMAGE) TARGETTYPE=Kernel;;
initrd.bin) TARGETTYPE=RoFs;;
INITRD.BIN) TARGETTYPE=RoFs;;