summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-12-23 04:05:12 +0000
committerMike Frysinger <vapier@gentoo.org>2008-12-23 04:05:12 +0000
commit467caf8417dff299500c977b56689995cd167a16 (patch)
tree0c2140136807962f31f6818e616cdb42cc98ae3b /net-voip
parentclean for non-existant packages (diff)
downloadhistorical-467caf8417dff299500c977b56689995cd167a16.tar.gz
historical-467caf8417dff299500c977b56689995cd167a16.tar.bz2
historical-467caf8417dff299500c977b56689995cd167a16.zip
restore linphone and disable USE=video #189774
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.8 x86_64 RepoMan-Options: --force
Diffstat (limited to 'net-voip')
-rw-r--r--net-voip/linphone/ChangeLog246
-rw-r--r--net-voip/linphone/Manifest19
-rw-r--r--net-voip/linphone/files/linphone-1.6.0-call.patch10
-rw-r--r--net-voip/linphone/files/linphone-2.0.1-configure-gsm.patch11
-rw-r--r--net-voip/linphone/files/linphone-2.0.1-mediastreamer-deps.patch41
-rw-r--r--net-voip/linphone/files/linphone-2.0.1-speexdsp.patch122
-rw-r--r--net-voip/linphone/files/linphone-2.1.1-ortp-deps.patch38
-rw-r--r--net-voip/linphone/linphone-2.1.1.ebuild95
-rw-r--r--net-voip/linphone/metadata.xml11
9 files changed, 593 insertions, 0 deletions
diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
new file mode 100644
index 000000000000..be519de34f1d
--- /dev/null
+++ b/net-voip/linphone/ChangeLog
@@ -0,0 +1,246 @@
+# 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.20 2008/12/23 04:05:12 vapier Exp $
+
+ 23 Dec 2008; Mike Frysinger <vapier@gentoo.org> linphone-2.1.1.ebuild:
+ Disable USE=video #189774.
+
+ 11 Dec 2008; <ssuominen@gentoo.org> linphone-2.1.1.ebuild:
+ Fix speex dep. wrt #233381.
+
+ 31 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
+ linphone-2.1.1.ebuild:
+ nasm moved to DEPEND for bug #221451
+
+ 22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+ add GLEP 56 USE flag desc from use.local.desc
+
+ 16 Aug 2008; Torsten Veller <tove@gentoo.org> metadata.xml:
+ Remove stkn from metadata.xml (#27693)
+
+ 01 Aug 2008; nixnut <nixnut@gentoo.org> linphone-2.1.1.ebuild:
+ Stable on ppc wrt bug 210741
+
+ 23 Apr 2008; Markus Meier <maekke@gentoo.org> linphone-2.1.1.ebuild:
+ amd64/x86 stable, bug #210741
+
+*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:
+ clean out older ebuilds with missing local use flag
+
+ 22 Jan 2008; Mike Frysinger <vapier@gentoo.org> linphone-2.0.1-r1.ebuild:
+ Force disable building of the manual and running doxygen to save time and
+ such #206109 by Marcel Unbehaun.
+
+ 22 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/linphone-2.0.1-no-alsa.patch, linphone-2.0.1-r1.ebuild:
+ Fix from upstream for building with USE=-alsa.
+
+ 20 Jan 2008; Mike Frysinger <vapier@gentoo.org> linphone-2.0.1-r1.ebuild:
+ Change USE=novideo to USE=video and force newer gsm as the older one
+ installed broken libraries.
+
+ 16 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/linphone-2.0.1-speexdsp.patch, linphone-2.0.1-r1.ebuild:
+ Fix building with newer versions of speex #205893 by Chi-Thanh Christopher
+ Nguyen.
+
+*linphone-2.0.1-r1 (14 Jan 2008)
+
+ 14 Jan 2008; Mike Frysinger <vapier@gentoo.org> +linphone-2.0.1-r1.ebuild:
+ Stop installing mediastreamer headers/libs so that we can install the
+ external library package.
+
+*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)
+
+ 20 Aug 2007; Mike Frysinger <vapier@gentoo.org> +linphone-1.7.1-r1.ebuild:
+ Remove autotool garbage, dont force gtk interface on everyone (USE=gtk),
+ cleanup configure options, add support for USE=arts, and add some notes
+ about oRTP/ffmpeg.
+
+*linphone-1.7.1 (25 Apr 2007)
+
+ 25 Apr 2007; Stefan Schweizer <genstef@gentoo.org> -linphone-1.7.0.ebuild,
+ +linphone-1.7.1.ebuild:
+ Version bump thanks to Roman Zimmermann <mereandor@gmail.com> and karpi in
+ bug 174803
+
+*linphone-1.7.0 (14 Apr 2007)
+
+ 14 Apr 2007; Stefan Schweizer <genstef@gentoo.org>
+ +files/linphone-1.6.0-call.patch, +metadata.xml, +linphone-1.7.0.ebuild:
+ Version bump, move to net-voip, bug 112688, remove /ortp, bug 171181, fix
+ deps, bug 158551
+
+*linphone-1.6.0-r1 (02 Feb 2007)
+
+ 02 Feb 2007; Timothy Redaelli <drizzt@gentoo.org>
+ +files/linphone-1.6.0-call.patch, +linphone-1.6.0-r1.ebuild:
+ Revbump: Add patch to avoid linphonec "call" to crash.
+ Patch already sent upstream.
+
+*linphone-1.6.0 (30 Jan 2007)
+
+ 30 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> metadata.xml,
+ linphone-1.1.0.ebuild, linphone-1.3.5.ebuild, linphone-1.5.1.ebuild,
+ +linphone-1.6.0.ebuild:
+ Version bump
+
+ 18 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
+ linphone-1.3.5.ebuild:
+ stable x86, bug #147795
+
+ 26 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
+ +files/linphone-1.3.5-docs.diff, linphone-1.3.5.ebuild:
+ Added patch to remove obsolete developer-docs directory wrt bug #132824.
+
+ 26 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
+ +files/linphone-1.5.1-pkgconfig.patch, linphone-1.5.1.ebuild:
+ Added an explicit call to PKG_PROG_PKG_CONFIG (thx to Flameeyes) in
+ configure.in.
+
+*linphone-1.5.1 (26 Nov 2006)
+
+ 26 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> +linphone-1.5.1.ebuild:
+ Imported 1.5.1 version from voip overlay without USE portaudio.
+
+ 07 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+ linphone-1.1.0.ebuild:
+ removed optional dep that isn't in portage anymore
+
+ 01 Jul 2006; Lars Weiler <pylon@gentoo.org> linphone-1.3.5.ebuild:
+ Added ~ppc; bug #132672.
+
+ 09 May 2006; Stefan Schweizer <genstef@gentoo.org> linphone-1.3.5.ebuild:
+ Correctly used eautoreconf many thanks to Marcin Deranek <gringo@slonko.net>
+ in bug 132758
+
+*linphone-1.3.5 (05 May 2006)
+
+ 05 May 2006; Stefan Schweizer <genstef@gentoo.org>
+ +files/ilbc-1.2.0-makefile.diff, +linphone-1.3.5.ebuild:
+ Version bump, fixes bugs 108187,113199,116685 and 129194
+
+ 30 Sep 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.1.0.ebuild:
+ Dropping unnecessary gnome-panel dependency, thanks to
+ Thomas Fischer <fischer@unix-ag.uni-kl.de> in bug #107704.
+
+ 30 Sep 2005; Stefan Knoblich <stkn@gentoo.org> -linphone-0.10.2.ebuild,
+ -linphone-1.0.1.ebuild:
+ Removed old ebuilds.
+
+ 30 Sep 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.1.0.ebuild:
+ Stable on x86.
+
+ 02 Sep 2005; <dang@gentoo.org> linphone-1.1.0.ebuild:
+ Marked ~amd64
+
+*linphone-1.1.0 (29 Aug 2005)
+
+ 29 Aug 2005; Stefan Knoblich <stkn@gentoo.org> +linphone-1.1.0.ebuild:
+ Version bump, linphone libs are now put into /usr/lib/linphone and ortp
+ headers are removed to avoid conflicts with net-libs/ortp.
+
+ 15 Jul 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.0.1.ebuild,
+ +linphone-1.0.1-ipv6-include.diff:
+ Always include <netdb.h> in coreapi/linphonecore.c even if USE flag is set
+ -ipv6, fixes #99083. Thanks to Anders Hellgen pointing out that patch from
+ 0.12.x is still needed.
+
+ 14 Jul 2005; Stefan Knoblich <stkn@gentoo.org> linphone-1.0.1.ebuild:
+ Indentation fixes, added missing dodoc, replaced einstall with make
+ (einstall completely broke file locations), added missing
+ dev-perl/XML-Parser and speex dependencies.
+
+*linphone-1.0.1 (14 Jul 2005)
+
+ 14 Jul 2005; John Mylchreest <johnm@gentoo.org> +metadata.xml,
+ +linphone-0.10.2.ebuild, +linphone-1.0.1.ebuild:
+ moving from net-im, updating to the latest version and closing all bugs.
+
+ 03 Aug 2004; David Holm <dholm@gentoo.org> linphone-0.12.2.ebuild:
+ Added to ~ppc.
+
+*linphone-0.12.2 (30 Jul 2004)
+
+ 30 Jul 2004; <stkn@gentoo.org> +files/linphone-0.12.2-include-fix.diff,
+ +linphone-0.12.2.ebuild:
+ version bump
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> linphone-0.12.1.ebuild:
+ Fix use invocation
+
+ 27 Apr 2004; Aron Griffis <agriffis@gentoo.org> linphone-0.12.1.ebuild:
+ Add inherit eutils
+
+ 12 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> linphone-0.12.1.ebuild:
+ marked ~amd64
+
+ 14 Mar 2004; Stefan Knoblich <stkn@gentoo.org> linphone-0.10.2.ebuild,
+ linphone-0.12.0.ebuild, linphone-0.12.1.ebuild:
+ updated depdendencies (linphone won't build with libosip-2.x)
+
+ 07 Jan 2004; Sven Blumenstein <bazik@gentoo.org> linphone-0.12.1.ebuild:
+ Removed KEYWORD's of untested archs again.
+ Please dont add new ebuilds with
+ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm"
+ if you didnt test on these archs! Fill a bug or talk
+ to the arch lead if you want it tested. Thanks!
+
+*linphone-0.12.1 (03 Jan 2004)
+
+ 03 Jan 2004; Stefan Knoblich <stkn@gentoo.org> linphone-0.10.2.ebuild,
+ linphone-0.12.0.ebuild, linphone-0.12.1.ebuild, linphone-0.9.0-r1.ebuild,
+ linphone-0.12.1-include-fix.diff:
+ removed old linphone-0.9, copyright header updated for 2004, added
+ linphone-0.12.1
+
+ 31 Dec 2003; Sven Blumenstein <bazik@gentoo.org> linphone-0.10.2.ebuild,
+ linphone-0.12.0.ebuild, linphone-0.9.0-r1.ebuild:
+ Fixed handling of the (optional) x86-only DEPEND
+ dev-lang/nasm and removed KEYWORD's of untested archs.
+
+ 07 Dec 2003; Heinrich Wendel <lanius@gentoo.org> linphone-0.10.2.ebuild,
+ linphone-0.9.0-r1.ebuild:
+ fixed alsa dep
+
+*linphone-0.12.0 (04 Oct 2003)
+
+ 04 Oct 2003; Stefan Knoblich <stkn@gentoo.org> linphone-0.12.0.ebuild:
+ Version bumped. Changed dependency from alsa-driver to alsa-lib.
+
+ 26 Sep 2003; Martin Holzer <mholzer@gentoo.org> linphone-0.10.2.ebuild:
+ Added IUSE flags. Closes #29265.
+
+ 12 Jun 2003; <msterret@gentoo.org> linphone-0.10.2.ebuild:
+ added header from skel.ebuild
+
+*linphone-0.10.2 (04 May 2003)
+
+ 04 May 2003; Martin Holzer <mholzer@gentoo.org> linphone-0.10.2.ebuild:
+ Version bumped. Ebuild submitted by Jiri VERUNEK <verunek@vol.cz> in #20391.
+
+*linphone-0.9.0-r1 (20 Mar 2003)
+
+ 20 Mar 2003; Seemant Kulleen <seemant@gentoo.org> linphone-0.9.0-r1.ebuild:
+ removed pic stuff
+
+*linphone-0.9.0 (05 Sep 2002)
+
+ 05 Sep 2002; Daniel Robbins <drobbins@gentoo.org> This ebuild was created by
+ gaarde (Paul Belt) or someone else using his account. Looks ok, so moving to
+ its proper place in net-im (was in net-dialup before.)
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
new file mode 100644
index 000000000000..df4c938d9901
--- /dev/null
+++ b/net-voip/linphone/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX linphone-1.6.0-call.patch 344 RMD160 887c83861aec5e71914ebcca5c3bdff56e8ac513 SHA1 2a84da9c99154c68147c161f373a6b962ca2e7ce SHA256 7d1a5789adb3d2f02eaf0970acf567ae5901b2a61f84a94c2116e354a44aa822
+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-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.1.1.tar.gz 7662602 RMD160 9d51b97d213d6b81a911b73507b8f8df6b4d5d92 SHA1 93ac2c1e3afef9c9031856b9f836d7997eb9553c SHA256 ae69a6fb606046bccb5bfa20726bbc054ebe25abd1865f004e6205542523184e
+EBUILD linphone-2.1.1.ebuild 3117 RMD160 d544d001f63cda6902f15ab8671d6121c370b85e SHA1 0045f568c0bd14629cab8663a61ddfd2bc044bfa SHA256 591f3cc2cfa9ae74592d171bdb131b9f70c819675562e2b8d4ea26828b4e3493
+MISC ChangeLog 9095 RMD160 0053739c84e111c8696ea7aff007366ef7b5b319 SHA1 4441eab85a07f9561df6d22c939d7f02acbbe221 SHA256 a3561f2776b6b88dc9ad90d963d5d6f10d3ba3b3679e92a21336c9bb915409ca
+MISC metadata.xml 411 RMD160 df360127c5f499e65adb9645f229bcb1fd07a1e7 SHA1 1dad7bde2715614c5a1e50ce50c95862c55366f0 SHA256 847128e75bea9e74ca6bb1caec56d4081f57c89c3a5eb6186baf6f68dea97234
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklQbeoACgkQn/5bYzqsSmFYZACgxFUhEfJvib1e88JmdWkAr7Nj
+mi4Aniixs9AXiFBEStgWkX+j5yiU/7E5
+=myCN
+-----END PGP SIGNATURE-----
diff --git a/net-voip/linphone/files/linphone-1.6.0-call.patch b/net-voip/linphone/files/linphone-1.6.0-call.patch
new file mode 100644
index 000000000000..27fe669f8c1c
--- /dev/null
+++ b/net-voip/linphone/files/linphone-1.6.0-call.patch
@@ -0,0 +1,10 @@
+--- linphone-1.6.0.old/console/commands.c 2007-02-02 13:57:55.000000000 +0100
++++ linphone-1.6.0/console/commands.c 2007-02-02 14:25:51.000000000 +0100
+@@ -287,6 +287,7 @@
+ static int
+ lpc_cmd_call(LinphoneCore *lc, char *args)
+ {
++ if ( ! args || ! *args ) return 0;
+ if ( lc->call != NULL )
+ {
+ printf("Terminate current call first.\n");
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/files/linphone-2.0.1-speexdsp.patch b/net-voip/linphone/files/linphone-2.0.1-speexdsp.patch
new file mode 100644
index 000000000000..c0bd4156c1fa
--- /dev/null
+++ b/net-voip/linphone/files/linphone-2.0.1-speexdsp.patch
@@ -0,0 +1,122 @@
+http://bugs.gentoo.org/205893
+
+--- linphone-2.0.1/mediastreamer2/configure
++++ linphone-2.0.1/mediastreamer2/configure
+@@ -21907,6 +21915,117 @@
+ build_speex=yes
+ fi
+
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for SPEEXDSP" >&5
++echo $ECHO_N "checking for SPEEXDSP... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SPEEXDSP_CFLAGS"; then
++ pkg_cv_SPEEXDSP_CFLAGS="$SPEEXDSP_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speexdsp >= 1.2beta3\"") >&5
++ ($PKG_CONFIG --exists --print-errors "speexdsp >= 1.2beta3") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_SPEEXDSP_CFLAGS=`$PKG_CONFIG --cflags "speexdsp >= 1.2beta3" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$SPEEXDSP_LIBS"; then
++ pkg_cv_SPEEXDSP_LIBS="$SPEEXDSP_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"speexdsp >= 1.2beta3\"") >&5
++ ($PKG_CONFIG --exists --print-errors "speexdsp >= 1.2beta3") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_SPEEXDSP_LIBS=`$PKG_CONFIG --libs "speexdsp >= 1.2beta3" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "speexdsp >= 1.2beta3"`
++ else
++ SPEEXDSP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "speexdsp >= 1.2beta3"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$SPEEXDSP_PKG_ERRORS" >&5
++
++ { { echo "$as_me:$LINENO: error: Package requirements (speexdsp >= 1.2beta3) were not met:
++
++$SPEEXDSP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
++and SPEEXDSP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&5
++echo "$as_me: error: Package requirements (speexdsp >= 1.2beta3) were not met:
++
++$SPEEXDSP_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
++and SPEEXDSP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++ { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
++and SPEEXDSP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables SPEEXDSP_CFLAGS
++and SPEEXDSP_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
++else
++ SPEEXDSP_CFLAGS=$pkg_cv_SPEEXDSP_CFLAGS
++ SPEEXDSP_LIBS=$pkg_cv_SPEEXDSP_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ SPEEX_LIBS="$SPEEX_LIBS $SPEEXDSP_LIBS"
++fi
++
+
+
+
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..16f14de751fa
--- /dev/null
+++ b/net-voip/linphone/linphone-2.1.1.ebuild
@@ -0,0 +1,95 @@
+# 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.7 2008/12/23 04:05:12 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 xv"
+# video disabled for #189774
+# 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.2_beta3
+ gsm? ( >=media-sound/gsm-1.0.12-r1 )
+ 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}
+ x86? ( xv? ( dev-lang/nasm ) )
+ 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
+# $(use_enable video)
+ econf \
+ --disable-video \
+ --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) \
+ --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
+}
diff --git a/net-voip/linphone/metadata.xml b/net-voip/linphone/metadata.xml
new file mode 100644
index 000000000000..056956188634
--- /dev/null
+++ b/net-voip/linphone/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>voip</herd>
+ <use>
+ <flag name='console'>Build console interface</flag>
+ <flag name='gsm'>Include support for the gsm audio codec</flag>
+ <flag name='ilbc'>Build ILBC codec plugin</flag>
+ <flag name='video'>Enable video support (display/capture)</flag>
+ </use>
+</pkgmetadata>