Version bump.

Package-Manager: portage-2.2_pre2

4 files changed, 152 insertions, 2 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/Manifest b/net-voip/linphone/Manifest
index 679228ef8863..7c24cf89730f 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX linphone-1.6.0-call.patch 344 RMD160 887c83861aec5e71914ebcca5c3bdff56e8ac513 SHA1 2a84da9c99154c68147c161f373a6b962ca2e7ce SHA256 7d1a5789adb3d2f02eaf0970acf567ae5901b2a61f84a94c2116e354a44aa822
 AUX linphone-1.99.0-core-amd64.patch 478 RMD160 dbf947ef3c774c6bd47278b0c0de63cbec33268d SHA1 7f45e8c9bc30c08fe0be3772c305baae59c7ec29 SHA256 5e8f06d015c84538cd2a2d927ecdca4595357bc1320e3540b4439bd24474f3a6
 AUX linphone-2.0.1-configure-gsm.patch 218 RMD160 bdaff175050cca87fa4af1c42913146790700e71 SHA1 af99fe37e776e2c1382ad08b17d16ea75b201400 SHA256 952953f4bd95b4f66abbbb74d0e7b9331fb5470d63732d2e8541328e92f2f378
 AUX linphone-2.0.1-mediastreamer-deps.patch 2171 RMD160 282caddf2314583a5c5620413b70811c6dee03d7 SHA1 03890f8ba07114b7eea31fc416509ae0a3f89836 SHA256 249c5863c31b2e040f73cd0d0a6b9667b42622c6c27e9e9b67121a9d5de60910
 AUX linphone-2.0.1-no-alsa.patch 937 RMD160 fcf6ebdf6cf8223ec3fef6dcdaef629a104a243c SHA1 35222fc6d7e0d36d6f9011093604cb773478eda1 SHA256 a2ab3fb6f45d9747227f8458b4068009990ae75aad01998366536fdc3b64dc22
 AUX linphone-2.0.1-speexdsp.patch 4124 RMD160 ce630327e4f691920ac1d868aff85cce813be1fb SHA1 c47d6e519f1e45c98ce74bdea794d5e97271b78a SHA256 d01c8f5bec88bfc5b87ebe5f1a13b8494a0f898c81741754b930cd07b34b8cef
+AUX linphone-2.1.1-ortp-deps.patch 2022 RMD160 f2abb4c2df5f551fada16c6f2b95b6d1c0be581d SHA1 4765cec6a181f8410b29ca5e76e7c2706469aaca SHA256 677f7f04f5f6ccef748adb4b77c0ac6cf0aebff3f70aa2a89249b4a06d3a5349
 DIST linphone-2.0.1.tar.gz 7638627 RMD160 89c120e5118c931daf9f58d1d988185a28bbcf05 SHA1 a8020c4643e7ca05aefe83e9c25e3ac8c3661574 SHA256 33f9e17eba38c55c6b2260e02c98db642dd47d3c38677478a05caa0ae702d16f
+DIST linphone-2.1.1.tar.gz 7662602 RMD160 9d51b97d213d6b81a911b73507b8f8df6b4d5d92 SHA1 93ac2c1e3afef9c9031856b9f836d7997eb9553c SHA256 ae69a6fb606046bccb5bfa20726bbc054ebe25abd1865f004e6205542523184e
 EBUILD linphone-2.0.1-r1.ebuild 3125 RMD160 bff762767665d9012cff5844a048eaf65310b98c SHA1 994a06a556020115dec68e5253c4ea495dcf8832 SHA256 3773b6ddc0c1bd3835a10d576367ede5f9f3d2e41dfc7552fea0376a9d6445fb
-MISC ChangeLog 8202 RMD160 c2cefc8871ce193290a3a22fb824cab1358b1b5d SHA1 2b8f1eface992c097f77d243191bc5179bd36472 SHA256 6b35441d154fc5e8ec79aa4dc4438e2f115f14e3b8a9df70840824a480a06ffc
+EBUILD linphone-2.1.1.ebuild 3069 RMD160 7de737c6b7c5fec1232e059c8fc53829065041bc SHA1 26b75e69ebd5376a5f2b7243c52918c3402b7dd8 SHA256 8e810dbb5b39a2f1427a5401d5e11754ad0c3d23fb55c3fc6ef9a260d79ec218
+MISC ChangeLog 8362 RMD160 d1998c551ef637a8d32f5e51f283d91c4bd8720d SHA1 2f8bbe277076f96dfb1d7c5adfe30cfa2eab7f0b SHA256 cef02487b4955b7a73f32120b69af85bd71df4899dba62ae70df79e32bfa856c
 MISC metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 SHA1 17015753e1e8e33227e3bf6260fff1a6447d32a0 SHA256 008abe484ed1f0a62e625789a99281919f3c933a222bbecef1bf9652728e6d38
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHuiK2j9hvisErhMIRAqc6AJkBYxsq1e2oy79k7hur7wSZdZD1JgCg32C4
+aDYyC9uguvGPep+P1yhkizg=
+=y9it
+-----END PGP SIGNATURE-----
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
+}