From: Koen Kooi <koen@openembedded.org>
Date: Wed, 16 Feb 2005 19:01:17 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~14969
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=868e9cbdaae715ce90b765c636583d6ca555495d;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/02/16 19:59:14+01:00 (none)!koen
minisip_svn.bb, minisip-video_svn.bb:
  remove libsamplerate dep from minisip

BKrev: 4213987d-6o9MlUK9xGBy7RDVH4qog
---

diff --git a/packages/minisip/minisip-video_svn.bb b/packages/minisip/minisip-video_svn.bb
index e69de29bb2..cc9adf0e97 100644
--- a/packages/minisip/minisip-video_svn.bb
+++ b/packages/minisip/minisip-video_svn.bb
@@ -0,0 +1,26 @@
+PV = "0.6.2svn${CVSDATE}"
+LICENSE = GPL
+SECTION = "x11/utils"
+PR = "r0"
+MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>"
+CONFLICTS = "minisip"
+
+DESCRIPTION = "SIP user agent, with focus on security - video support"
+DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs-${CVSDATE} libglademm libmsip0 libmikey0"
+SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip"
+S = ${WORKDIR}/minisip
+
+
+
+FILES_${PN} += "${datadir}/minisip"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-ipaq --enable-video --with-avcodec=${STAGING_INCDIR}/ffmpeg"
+
+do_install_append () {
+	install -d ${D}${datadir}/pixmaps
+	install -d ${D}${datadir}/applications
+	install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png
+	install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop
+}
diff --git a/packages/minisip/minisip_svn.bb b/packages/minisip/minisip_svn.bb
index 0918e002e0..4c67124ac9 100644
--- a/packages/minisip/minisip_svn.bb
+++ b/packages/minisip/minisip_svn.bb
@@ -5,7 +5,7 @@ PR = "r0"
 MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>"
 
 DESCRIPTION = "SIP user agent, with focus on security"
-DEPENDS = "libsamplerate0 libglademm libmsip0 libmikey0"
+DEPENDS = "libglademm libmsip0 libmikey0"
 SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip"
 S = ${WORKDIR}/${PN}