Version bump.

(Portage version: 2.2_pre2)

3 files changed, 138 insertions, 1 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 8efc4319553f..d77e7a7cfaf8 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.11 2008/02/02 21:33:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.12 2008/02/19 00:28:33 vapier Exp $
+
+*linphone-2.1.1 (19 Feb 2008)
+
+  19 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/linphone-2.1.1-ortp-deps.patch, +linphone-2.1.1.ebuild:
+  Version bump.
 
   02 Feb 2008; Michael Sterrett <mr_bones_@gentoo.org>
   -linphone-1.7.1.ebuild, -linphone-1.7.1-r1.ebuild, -linphone-2.0.1.ebuild:
diff --git a/net-voip/linphone/files/linphone-2.1.1-ortp-deps.patch b/net-voip/linphone/files/linphone-2.1.1-ortp-deps.patch
new file mode 100644
index 000000000000..426e6e90b1a9
--- /dev/null
+++ b/net-voip/linphone/files/linphone-2.1.1-ortp-deps.patch
@@ -0,0 +1,38 @@
+--- console/Makefile.in
++++ console/Makefile.in
+@@ -282,13 +282,13 @@
+ @BUILD_CONSOLE_TRUE@	-I$(top_srcdir)/mediastreamer2/include
+ 
+ @BUILD_CONSOLE_TRUE@linphonec_SOURCES = linphonec.c linphonec.h commands.c
+-@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(READLINE_LIBS) $(OSIP_LIBS)
++@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(READLINE_LIBS) $(OSIP_LIBS) $(ORTP_LIBS)
+ @BUILD_CONSOLE_TRUE@sipomatic_SOURCES = \
+ @BUILD_CONSOLE_TRUE@	sipomatic.c sipomatic.h
+ 
+ @BUILD_CONSOLE_TRUE@sipomatic_LDADD = $(INTLLIBS)  \
+ @BUILD_CONSOLE_TRUE@					$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+-@BUILD_CONSOLE_TRUE@			$(OSIP_LIBS)
++@BUILD_CONSOLE_TRUE@			$(OSIP_LIBS) $(ORTP_LIBS)
+ 
+ AM_CFLAGS = $(STRICT_OPTIONS)  -DENABLE_TRACE -D_ORTP_SOURCE $(VIDEO_CFLAGS) $(READLINE_CFLAGS) $(OSIP_CFLAGS)
+ 
+--- gtk/Makefile.in
++++ gtk/Makefile.in
+@@ -330,7 +330,7 @@
+ @BUILD_GTK_TRUE@	$(linphone_common_sources)
+ 
+ @BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
+-@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la
++@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la $(ORTP_LIBS)
+ 
+ AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
+ 		$(ORTP_CFLAGS) $(OSIP_CFLAGS)
+@@ -344,7 +344,7 @@
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
+ @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
+ @BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+-@BUILD_GNOME_APPLET_TRUE@				$(OSIP_LIBS)
++@BUILD_GNOME_APPLET_TRUE@				$(OSIP_LIBS) $(ORTP_LIBS)
+ 
+ @BUILD_GNOME_APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
+ @BUILD_GNOME_APPLET_TRUE@server_in_files = GNOME_LinphoneApplet.server.in
diff --git a/net-voip/linphone/linphone-2.1.1.ebuild b/net-voip/linphone/linphone-2.1.1.ebuild
new file mode 100644
index 000000000000..6928ec86f38a
--- /dev/null
+++ b/net-voip/linphone/linphone-2.1.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-2.1.1.ebuild,v 1.1 2008/02/19 00:28:33 vapier Exp $
+
+# Note: video support in linphone relies on swscaler being disabled
+#       in ffmpeg.  this is because the video code in linphone is old
+#       and uses the old interface.  solution: fix linphone's video
+#       code.  workaround: build ffmpeg w/out --enable-swscaler.
+
+inherit eutils
+
+DESCRIPTION="Voice Over IP phone (internet phone which uses SIP)"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa arts console gsm gtk ilbc ipv6 video xv"
+# XXX: Should "video" be split into ffmpeg/libsdl ?  They are two distinct
+#      things: libsdl is just for video display while ffmpeg is just for
+#      video capture ... but does anyone actually want a one-way linphone ?
+
+RDEPEND="dev-libs/glib
+	dev-perl/XML-Parser
+	net-dns/bind-tools
+	>=net-libs/libosip-3.0.3
+	>=net-libs/libeXosip-3.0.3
+	>=media-libs/speex-1.1.12
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	x86? ( xv? ( dev-lang/nasm ) )
+	gtk? (
+		>=x11-libs/gtk+-2
+		gnome-base/libglade
+	)
+	alsa? ( media-libs/alsa-lib )
+	arts? ( kde-base/arts )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	video? (
+		>=media-libs/libsdl-1.2.9
+		media-video/ffmpeg
+		>=media-libs/libtheora-1.0_alpha7
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+# use the bundled ortp until newer versions leave package.mask
+#	>=net-libs/ortp-0.9.0
+#	portaudio? ( >=media-libs/portaudio-19_pre )"
+# media-libs/gsm-1.0.12 fails on amd64 due to bug #192736
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/linphone-1.6.0-call.patch
+	epatch "${FILESDIR}"/linphone-2.0.1-configure-gsm.patch
+	epatch "${FILESDIR}"/linphone-2.0.1-speexdsp.patch #205893
+	epatch "${FILESDIR}"/linphone-2.0.1-mediastreamer-deps.patch
+	epatch "${FILESDIR}"/linphone-2.1.1-ortp-deps.patch
+}
+
+src_compile() {
+	export ac_cv_path_DOXYGEN=false
+	econf \
+		--disable-manual \
+		--disable-strict \
+		--libdir=/usr/$(get_libdir)/linphone \
+		--libexecdir=/usr/$(get_libdir)/linphone/exec \
+		$(use_enable console console_ui) \
+		$(use_enable gtk gtk_ui) \
+		$(use_with ilbc) \
+		$(use_enable ipv6) \
+		$(use_enable alsa) \
+		$(use_enable arts artsc) \
+		$(use_enable gsm) \
+		$(use_enable video) \
+		--disable-portaudio \
+		$(use_enable x86 truespeech) \
+		|| die "Unable to configure"
+		#--enable-external-ortp \
+		#$(use_enable portaudio)
+	emake || die "Unable to make"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "Failed to install"
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README README.arm TODO
+
+	# don't install mediastreamer/ortp includes, docs and pkgconfig files
+	# to avoid conflicts with net-libs/ortp
+	rm -r "${D}"/usr/include/{mediastreamer2,ortp} || die
+	rm -r "${D}"/usr/$(get_libdir)/linphone/pkgconfig/{mediastreamer,ortp}.pc || die
+	mv "${D}"/usr/$(get_libdir)/{linphone/,}pkgconfig || die
+}