Version bump.

Package-Manager: portage-2.1.4

7 files changed, 191 insertions, 10 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index 2b8476f2ef9e..b67dff357835 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-voip/linphone
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.4 2007/08/20 20:22:42 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.5 2008/01/14 12:51:25 vapier Exp $
+
+*linphone-2.0.1 (14 Jan 2008)
+
+  14 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/linphone-1.99.0-core-amd64.patch,
+  +files/linphone-2.0.1-configure-gsm.patch,
+  +files/linphone-2.0.1-mediastreamer-deps.patch, +linphone-2.0.1.ebuild:
+  Version bump.
 
 *linphone-1.7.1-r1 (20 Aug 2007)
 
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index eb5cd08882c0..08c72f080826 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -5,7 +5,20 @@ AUX linphone-1.6.0-call.patch 344 RMD160 887c83861aec5e71914ebcca5c3bdff56e8ac51
 MD5 a155bf4fc84697283517077854600c39 files/linphone-1.6.0-call.patch 344
 RMD160 887c83861aec5e71914ebcca5c3bdff56e8ac513 files/linphone-1.6.0-call.patch 344
 SHA256 7d1a5789adb3d2f02eaf0970acf567ae5901b2a61f84a94c2116e354a44aa822 files/linphone-1.6.0-call.patch 344
+AUX linphone-1.99.0-core-amd64.patch 478 RMD160 dbf947ef3c774c6bd47278b0c0de63cbec33268d SHA1 7f45e8c9bc30c08fe0be3772c305baae59c7ec29 SHA256 5e8f06d015c84538cd2a2d927ecdca4595357bc1320e3540b4439bd24474f3a6
+MD5 a0d9da857a4c753bff16589c20ae6cff files/linphone-1.99.0-core-amd64.patch 478
+RMD160 dbf947ef3c774c6bd47278b0c0de63cbec33268d files/linphone-1.99.0-core-amd64.patch 478
+SHA256 5e8f06d015c84538cd2a2d927ecdca4595357bc1320e3540b4439bd24474f3a6 files/linphone-1.99.0-core-amd64.patch 478
+AUX linphone-2.0.1-configure-gsm.patch 218 RMD160 bdaff175050cca87fa4af1c42913146790700e71 SHA1 af99fe37e776e2c1382ad08b17d16ea75b201400 SHA256 952953f4bd95b4f66abbbb74d0e7b9331fb5470d63732d2e8541328e92f2f378
+MD5 f8f42d3281c2d91492c4ff7e0e610e98 files/linphone-2.0.1-configure-gsm.patch 218
+RMD160 bdaff175050cca87fa4af1c42913146790700e71 files/linphone-2.0.1-configure-gsm.patch 218
+SHA256 952953f4bd95b4f66abbbb74d0e7b9331fb5470d63732d2e8541328e92f2f378 files/linphone-2.0.1-configure-gsm.patch 218
+AUX linphone-2.0.1-mediastreamer-deps.patch 2171 RMD160 282caddf2314583a5c5620413b70811c6dee03d7 SHA1 03890f8ba07114b7eea31fc416509ae0a3f89836 SHA256 249c5863c31b2e040f73cd0d0a6b9667b42622c6c27e9e9b67121a9d5de60910
+MD5 2eea70782859312a61e8542d74edb136 files/linphone-2.0.1-mediastreamer-deps.patch 2171
+RMD160 282caddf2314583a5c5620413b70811c6dee03d7 files/linphone-2.0.1-mediastreamer-deps.patch 2171
+SHA256 249c5863c31b2e040f73cd0d0a6b9667b42622c6c27e9e9b67121a9d5de60910 files/linphone-2.0.1-mediastreamer-deps.patch 2171
 DIST linphone-1.7.1.tar.gz 7537415 RMD160 da5959e3b79c0eeb48b72481b1390e98e7cdadfd SHA1 3134e38b00d82155219f88e38e5ff9199fea1976 SHA256 3a3c606e2313f9871f07e41dfbeb87f6edb404f7927f7737fc22ab1a59a59e48
+DIST linphone-2.0.1.tar.gz 7638627 RMD160 89c120e5118c931daf9f58d1d988185a28bbcf05 SHA1 a8020c4643e7ca05aefe83e9c25e3ac8c3661574 SHA256 33f9e17eba38c55c6b2260e02c98db642dd47d3c38677478a05caa0ae702d16f
 EBUILD linphone-1.7.1-r1.ebuild 2348 RMD160 514bbe5995aa1c19c9ea426ab1c95ae2c08537b0 SHA1 c6e49137c0da356ee0a51d93fc30cca92a861a97 SHA256 005f97a26ecdefb5a9a67853a11f4bb90ac5201cb93cf47e8efdd93a6dca04a3
 MD5 c0017602a2de4f81fc00b55c3381b74a linphone-1.7.1-r1.ebuild 2348
 RMD160 514bbe5995aa1c19c9ea426ab1c95ae2c08537b0 linphone-1.7.1-r1.ebuild 2348
@@ -14,10 +27,14 @@ EBUILD linphone-1.7.1.ebuild 2079 RMD160 1468451776de6dfd69b1efefe413a9be558ac51
 MD5 cc6ef2e51a0a52f971c5998a0d5d0571 linphone-1.7.1.ebuild 2079
 RMD160 1468451776de6dfd69b1efefe413a9be558ac51d linphone-1.7.1.ebuild 2079
 SHA256 92009903c30c552aa1ac3d81dd3d5a1336a61cf9bb6c6e58ac586952b41f863f linphone-1.7.1.ebuild 2079
-MISC ChangeLog 6804 RMD160 373676c16560e50bbde0cf8ea27c3621dbc94951 SHA1 76b17d4d65da69dfd08680b4cbce3278177ffa1b SHA256 f96a137012d4a7046bee392ab1574667c29354173c0c3a3c05814214dfdf50d4
-MD5 b4789c7150e91c74a6941f2941a12104 ChangeLog 6804
-RMD160 373676c16560e50bbde0cf8ea27c3621dbc94951 ChangeLog 6804
-SHA256 f96a137012d4a7046bee392ab1574667c29354173c0c3a3c05814214dfdf50d4 ChangeLog 6804
+EBUILD linphone-2.0.1.ebuild 2632 RMD160 e3c2a5bc1e75fcaf83f3a9f08b17964fc93f7ff2 SHA1 d689d7b25672f731aba7212ab598d819d1462bb9 SHA256 a077fa27dc273b017e1951148262445e0f5f8580cbbe080089fe5120c72e6955
+MD5 2281021ab8e2140b6cbffc1221b31736 linphone-2.0.1.ebuild 2632
+RMD160 e3c2a5bc1e75fcaf83f3a9f08b17964fc93f7ff2 linphone-2.0.1.ebuild 2632
+SHA256 a077fa27dc273b017e1951148262445e0f5f8580cbbe080089fe5120c72e6955 linphone-2.0.1.ebuild 2632
+MISC ChangeLog 7064 RMD160 ca8c450c4484f746fea58800135ccbfeb281c788 SHA1 dadef88623e6a6e58056d3e372b6dc7100e55d2a SHA256 3aa2d742ba3446768747490279fc2d35efbdba2027c8b5d881b3824caf5fc948
+MD5 340b3802c2c01fe2f50d5363390823fd ChangeLog 7064
+RMD160 ca8c450c4484f746fea58800135ccbfeb281c788 ChangeLog 7064
+SHA256 3aa2d742ba3446768747490279fc2d35efbdba2027c8b5d881b3824caf5fc948 ChangeLog 7064
 MISC metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 SHA1 17015753e1e8e33227e3bf6260fff1a6447d32a0 SHA256 008abe484ed1f0a62e625789a99281919f3c933a222bbecef1bf9652728e6d38
 MD5 4147a43d9c89e23a84621861984e010e metadata.xml 312
 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 metadata.xml 312
@@ -28,10 +45,13 @@ SHA256 12390b0f2c5828795cabbf7a38c1e2a977483149c7cc3b6fb3e43d8ef06b50b5 files/di
 MD5 b1a85909f9ad8a871756daa3354ecee8 files/digest-linphone-1.7.1-r1 247
 RMD160 02230d6293dfb7e015e22763e7536e71029f62f4 files/digest-linphone-1.7.1-r1 247
 SHA256 12390b0f2c5828795cabbf7a38c1e2a977483149c7cc3b6fb3e43d8ef06b50b5 files/digest-linphone-1.7.1-r1 247
+MD5 527393064be06ff9228f3acb01aae088 files/digest-linphone-2.0.1 247
+RMD160 964804940b794602f6fc98ae79eae6418e54e173 files/digest-linphone-2.0.1 247
+SHA256 0188b5b395f8a9f060e085021891a3d5f98850ed47c567a1a2f8f1edbd8a5ac7 files/digest-linphone-2.0.1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGyfgzp/wUKkr7RBoRAicYAKCSWPhUPus3tPkzUtZuzrqhmwq7cACbBpRM
-E1B0pyt/cvS/Tp6ngjpNahY=
-=Xoj4
+iD8DBQFHi1rTj9hvisErhMIRAivNAJ9tCP9K+VhOn+oF4Unlaos4IrycZACbBkNJ
+cDx4rn1ZyiMOORrRyA/iNdI=
+=Bvxb
 -----END PGP SIGNATURE-----
diff --git a/net-voip/linphone/files/digest-linphone-2.0.1 b/net-voip/linphone/files/digest-linphone-2.0.1
new file mode 100644
index 000000000000..dc7dd3302cdc
--- /dev/null
+++ b/net-voip/linphone/files/digest-linphone-2.0.1
@@ -0,0 +1,3 @@
+MD5 30ef5d5cec0f0ff74d84f8191779fd6b linphone-2.0.1.tar.gz 7638627
+RMD160 89c120e5118c931daf9f58d1d988185a28bbcf05 linphone-2.0.1.tar.gz 7638627
+SHA256 33f9e17eba38c55c6b2260e02c98db642dd47d3c38677478a05caa0ae702d16f linphone-2.0.1.tar.gz 7638627
diff --git a/net-voip/linphone/files/linphone-1.99.0-core-amd64.patch b/net-voip/linphone/files/linphone-1.99.0-core-amd64.patch
new file mode 100644
index 000000000000..7aea35496d77
--- /dev/null
+++ b/net-voip/linphone/files/linphone-1.99.0-core-amd64.patch
@@ -0,0 +1,11 @@
+--- linphone-1.99.0/coreapi/linphonecore.c
++++ linphone-1.99.0/coreapi/linphonecore.c
+@@ -1621,7 +1621,7 @@
+ 		snprintf(dtmf_body, 999, "Signal=%c\r\nDuration=250\r\n", dtmf);
+ 		osip_message_set_body(msg,dtmf_body,strlen(dtmf_body));
+ 		osip_message_set_content_type(msg,"application/dtmf-relay");
+-		snprintf(clen,sizeof(clen),"%i",strlen(dtmf_body));
++		snprintf(clen,sizeof(clen),"%zu",strlen(dtmf_body));
+ 		osip_message_set_content_length(msg,clen);
+ 		
+ 		eXosip_lock();
diff --git a/net-voip/linphone/files/linphone-2.0.1-configure-gsm.patch b/net-voip/linphone/files/linphone-2.0.1-configure-gsm.patch
new file mode 100644
index 000000000000..fe343f2efd30
--- /dev/null
+++ b/net-voip/linphone/files/linphone-2.0.1-configure-gsm.patch
@@ -0,0 +1,11 @@
+--- a/mediastreamer2/configure
++++ b/mediastreamer2/configure
+@@ -22174,7 +22174,7 @@
+ 
+ 
+ 
+-if test "$GSM_found" = "yes" ; then
++if test "$GSM_found" = "yes" && test "$enable_gsm" != "no" ; then
+ 	build_gsm=yes
+ fi
+ 
diff --git a/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch b/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch
new file mode 100644
index 000000000000..c7aae1725570
--- /dev/null
+++ b/net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch
@@ -0,0 +1,41 @@
+liblinphone.la does not seem to properly add -L paths to libmediastreamer.la,
+so force the issue to work around the link failure caused by the -rpath added
+to /usr/lib/linphone/ and having an already installed older version of linphone
+
+--- console/Makefile.in
++++ console/Makefile.in
+@@ -287,12 +287,12 @@
+ @BUILD_CONSOLE_TRUE@	-I$(osip_prefix)/include 
+ 
+ @BUILD_CONSOLE_TRUE@linphonec_SOURCES = linphonec.c linphonec.h commands.c
+-@BUILD_CONSOLE_TRUE@linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.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)
+ @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 \
++@BUILD_CONSOLE_TRUE@					$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
+ @BUILD_CONSOLE_TRUE@			$(OSIP_LIBS)
+ 
+ AM_CFLAGS = $(STRICT_OPTIONS)  -DENABLE_TRACE -D_ORTP_SOURCE $(VIDEO_CFLAGS) $(READLINE_CFLAGS) $(OSIP_CFLAGS)
+--- gtk/Makefile.in
++++ gtk/Makefile.in
+@@ -335,7 +335,7 @@
+ @BUILD_GTK_TRUE@	$(linphone_common_sources)
+ 
+ @BUILD_GTK_TRUE@linphone_LDADD = $(LIBGTK_LIBS) $(INTLLIBS) \
+-@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la
++@BUILD_GTK_TRUE@				$(top_builddir)/coreapi/liblinphone.la $(top_builddir)/mediastreamer2/src/libmediastreamer.la
+ 
+ AM_CFLAGS = $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
+ 		$(ORTP_CFLAGS) $(OSIP_CFLAGS)
+@@ -348,7 +348,7 @@
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_CFLAGS = $(AM_CFLAGS) $(GNOME_APPLETS_CFLAGS) -DLINPHONE_APPLET
+ @BUILD_GNOME_APPLET_TRUE@linphone_applet_LDADD = \
+ @BUILD_GNOME_APPLET_TRUE@				$(GNOME_APPLETS_LIBS) \
+-@BUILD_GNOME_APPLET_TRUE@				$(top_builddir)/coreapi/liblinphone.la \
++@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@serverdir = $(libdir)/bonobo/servers
diff --git a/net-voip/linphone/linphone-2.0.1.ebuild b/net-voip/linphone/linphone-2.0.1.ebuild
new file mode 100644
index 000000000000..a76b28069a9e
--- /dev/null
+++ b/net-voip/linphone/linphone-2.0.1.ebuild
@@ -0,0 +1,87 @@
+# 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.0.1.ebuild,v 1.1 2008/01/14 12:51:25 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 novideo xv"
+
+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 )
+	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 )
+	!novideo? (
+		>=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-1.99.0-core-amd64.patch
+	epatch "${FILESDIR}"/linphone-2.0.1-configure-gsm.patch
+	epatch "${FILESDIR}"/linphone-2.0.1-mediastreamer-deps.patch
+}
+
+src_compile() {
+	econf \
+		--disable-strict \
+		--libdir=/usr/$(get_libdir)/linphone \
+		$(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 !novideo 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 ortp includes, docs and pkgconfig files
+	# to avoid conflicts with net-libs/ortp
+	rm -rf "${D}"/usr/include/ortp
+	rm -rf "${D}"/usr/share/gtk-doc/html/ortp
+	rm -rf "${D}"/usr/$(get_libdir)/linphone/pkgconfig
+	rm -rf "${D}"/ortp
+}