aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-07-18 14:57:13 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-07-18 14:57:13 +0000
commit5fa68f1d5a5bb5496c4e917442f94bcb34284b50 (patch)
treef24782e1f42ee0217ed4d81c4ce4cc130db3c880
parentbc86c2382d5d916cb0ad68209750059c75a14385 (diff)
downloadopenembedded-5fa68f1d5a5bb5496c4e917442f94bcb34284b50.tar.gz
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages 2004/07/18 16:57:04+02:00 uni-frankfurt.de!mickey opie-mediaplayer1-libmpeg3plugin: fix depends and share source w/ mediaplayer 2004/07/18 16:54:11+02:00 uni-frankfurt.de!mickey mark iputils and fbvnc as broken. upgrade lsh BKrev: 40fa8fc9KMex6ARSrZEarVnH3Pu5wg
-rw-r--r--fbvncserver/fbvncserver-kmodule_0.9.4.oe1
-rw-r--r--iputils/iputils_20020927.oe1
-rw-r--r--lsh/lsh_1.4.3.oe33
-rw-r--r--lsh/lsh_1.5.5.oe0
-rw-r--r--opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe9
5 files changed, 8 insertions, 36 deletions
diff --git a/fbvncserver/fbvncserver-kmodule_0.9.4.oe b/fbvncserver/fbvncserver-kmodule_0.9.4.oe
index 3860f7848c..d69d71c9b6 100644
--- a/fbvncserver/fbvncserver-kmodule_0.9.4.oe
+++ b/fbvncserver/fbvncserver-kmodule_0.9.4.oe
@@ -1,3 +1,4 @@
+BROKEN = "1"
DESCRIPTION = "framebuffer VNC server keyboard events module"
SRC_URI = "http://sdgsystems.com/download/fbvncserver-${PV}.tar.gz \
diff --git a/iputils/iputils_20020927.oe b/iputils/iputils_20020927.oe
index c8bc3f0594..30e3bd071c 100644
--- a/iputils/iputils_20020927.oe
+++ b/iputils/iputils_20020927.oe
@@ -1,3 +1,4 @@
+BROKEN = "1"
DEPENDS = "docbook-utils-native"
DESCRIPTION = "Utilities for the IP protocol."
diff --git a/lsh/lsh_1.4.3.oe b/lsh/lsh_1.4.3.oe
deleted file mode 100644
index 5aefa6b277..0000000000
--- a/lsh/lsh_1.4.3.oe
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "lsh is a GNU GPL-licensed implementation of the SSH \
-(version 2) protocol. It includes a server, a client, and some \
-utility programs."
-DEPENDS = "zlib gmp liboop"
-
-SRC_URI = "http://www.lysator.liu.se/~nisse/archive/lsh-${PV}.tar.gz"
-S = "${WORKDIR}/lsh-${PV}"
-
-inherit autotools
-configopts = " --enable-debug-alloc Enable memory allocation sanity checks \
- --enable-debug-trace Enable tracing support \
- --enable-gcov Instrument for gcov (requires a modern gcc) \
- --without-pty Disable pty support \
- --disable-srp Disable the (experimental) support for SRP \
- --disable-kerberos Don't support kerberos \
- --disable-pam Don't support PAM \
- --disable-datafellows-workarounds \
- --enable-initgroups-workaround \
- --disable-tcp-forward Disable tcp forwarding \
- --disable-x11-forward Disable x11 forwarding (proxy only) \
- --disable-agent-forward Disable auth-agent forwarding (proxy only) \
- --disable-ipv6 Disable IPv6 support \
- --disable-utmp Disable utmp and wtmp support \
- --without-zlib Don't use zlib compression \
- --with-tcpwrappers Use tcp-wrappers for filtering connections \
- --with-sshd1=PROGRAM support fallback to SSH1 daemon \
- --with-scheme=PROGRAM Use a particular scheme implementation \
- --without-system-argp Don't use the system's argp \
- --with-include-path A colon-separated list of directories to search for \
- --with-lib-path A colon-separated list of directories to search for \
- --with-x use the X Window System"
-EXTRA_OECONF = "--disable-srp --disable-kerberos --disable-pam \
- --without-x"
diff --git a/lsh/lsh_1.5.5.oe b/lsh/lsh_1.5.5.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/lsh/lsh_1.5.5.oe
diff --git a/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe b/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe
index 83543b5d40..cef0ba3796 100644
--- a/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe
+++ b/opie-mediaplayer1-libmpeg3plugin/opie-mediaplayer1-libmpeg3plugin_cvs.oe
@@ -2,14 +2,17 @@ DESCRIPTION = "Mpeg video file plugin using libmad"
SECTION = "opie/codecs"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = "virtual/libqpe"
+DEPENDS = "opie-mediaplayer"
+RDEPENDS = "opie-mediaplayer"
PV = "1.1.5-cvs-${CVSDATE}"
APPNAME = "mpeg3plugin"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer/libmpeg3;date=${CVSDATE} "
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer;date=${CVSDATE} "
-S = "${WORKDIR}/libmpeg3"
+S = "${WORKDIR}/opieplayer/libmpeg3"
inherit opie
+EXTRA_QMAKEVARS_POST += "DEFINES+=USE_FIXED_POINT"
+
# FILES plugins/codecs/libmpeg3plugin.so