version bump to 3.1.0 and complete rewrite of the ebuild, bug 263420

Package-Manager: portage-2.1.6.7/cvs/Linux ppc

6 files changed, 272 insertions, 2 deletions

diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog
index b324fb657f14..2b65dcce722c 100644
--- a/net-voip/linphone/ChangeLog
+++ b/net-voip/linphone/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-voip/linphone
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.24 2009/04/24 04:12:34 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.25 2009/04/26 02:48:20 volkmar Exp $
+
+*linphone-3.1.0 (26 Apr 2009)
+
+  26 Apr 2009; Mounir Lamouri <volkmar@gentoo.org>
+  +files/linphone-3.1.0-external-mstreamer.patch,
+  +files/linphone-3.1.0-nls.patch,
+  +files/linphone-3.1.0-novideo-preferences.patch, +linphone-3.1.0.ebuild:
+  Version bump to 3.1.0 and complete rewrite of the ebuild. See bug 263420.
 
   24 Apr 2009; Mounir Lamouri <volkmar@gentoo.org> linphone-2.1.1.ebuild,
   linphone-3.0.0.ebuild:
diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest
index 8bcaeed592a4..1e961918406a 100644
--- a/net-voip/linphone/Manifest
+++ b/net-voip/linphone/Manifest
@@ -4,9 +4,14 @@ AUX linphone-2.0.1-mediastreamer-deps.patch 2171 RMD160 282caddf2314583a5c562041
 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
 AUX linphone-3.0.0-pkg-config.patch 8889 RMD160 0efdfe1ea146e43f76874e190c9a8f1a2c38a3c1 SHA1 c84923846d4237174bdcb873f01a63ac902e6f57 SHA256 3e3f7134a10ef0ea57f413d0548c1698e8f0190b2d6c9d05e5cf287f20d40f0b
+AUX linphone-3.1.0-external-mstreamer.patch 3481 RMD160 9b23118033fb3196e2db81a79a1a7a03d4168986 SHA1 50d5b8665a8a5b82cb71c3ab697f05f8a3f67221 SHA256 94d4bbaf6d464c9f23c6022d77878e0abfd5d1b94b80cc51325bc7184d79d4c2
+AUX linphone-3.1.0-nls.patch 462 RMD160 529ee4dab04c6884320dc4209f1e8381bb3b5ab6 SHA1 193ea55bd49e7205ab761179e6a30827b24d8ec6 SHA256 81d0dbe21f7ebfbef9f8883d79c19539aaa85b809d9d3411ca80e1f86b234157
+AUX linphone-3.1.0-novideo-preferences.patch 504 RMD160 f99f0e18c205e04f8e05feffdffdd7e6e89ad694 SHA1 0713194556b1225b16df10286a318c032a2f2fda SHA256 64cd56f325332eb6c4f8cca44df7ebc64c2fa65c54ff70622601e6c4981839c9
 DIST linphone-2.1.1.tar.gz 7662602 RMD160 9d51b97d213d6b81a911b73507b8f8df6b4d5d92 SHA1 93ac2c1e3afef9c9031856b9f836d7997eb9553c SHA256 ae69a6fb606046bccb5bfa20726bbc054ebe25abd1865f004e6205542523184e
 DIST linphone-3.0.0.tar.gz 7577336 RMD160 66f1083d54902c2ff91f544d84f8bad978a04b0d SHA1 52bd8250367523d59a13d5be4f779ab44eb3e25e SHA256 68657f5efe147bd00ec1375daf3fe13ae1c81f906bf9d81ab4fad8f0ef1fabec
+DIST linphone-3.1.0.tar.gz 7794213 RMD160 76ac19fcef7595d581f6a938124612ca8fd415a5 SHA1 a665ac78850ae0affe8f4119e9cba37e9e18adc7 SHA256 e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
 EBUILD linphone-2.1.1.ebuild 3059 RMD160 f719dc7e40a3f228e0c8889f6fcb1c71584c46ec SHA1 417c435cca9c0ba4f69f7d9809f8cd77a7399723 SHA256 b40efd1ba0be2690ca822b01331b2bd25a32315557935538dbeba0cfd5679138
 EBUILD linphone-3.0.0.ebuild 2348 RMD160 e7d9d5ba8acb886d9ca0430ce8f32b0b2c6a256b SHA1 3c1d5370d72db3423105297c627b05cc6ba825f9 SHA256 5f12b556e76e2151841dbd3ddf3bde8b457c087a18b41be3773bacc81cf1c6c3
-MISC ChangeLog 9801 RMD160 246aca452ef10faa013d5cfcf5a24cf3bf85c787 SHA1 58d2565c306da90fcbf90f42eada9d235a09a061 SHA256 c1d344038d6c4ab00c8780a1303ba0fd32b46ce27dadaae5ac9376daa02b0460
+EBUILD linphone-3.1.0.ebuild 3142 RMD160 76579afe8abf3c45092c320cce86dcea64b4c01b SHA1 8f1aa848186743e13748bc77e0ab3039adf33db2 SHA256 bf5448c845e055ca22544c5bd4594398eae1a6d40e06fefd3258c85db1338e83
+MISC ChangeLog 10120 RMD160 b53c372e75ed21c7b41e9a47a3d870610aea3a93 SHA1 2dde2c5b931da5ae9467244d08efa14df1302971 SHA256 9af36cdd240bcb66269994e166e8e2f3435d8c93f0caad1e3e30d46721e5e36d
 MISC metadata.xml 360 RMD160 789ba2306d13f301cd00ac88fe81093f0e3a4e7a SHA1 e3789e9ed4801d7baebef7f6f7d49f2a4dc36392 SHA256 124280ec5478de7b2486e393c271d71e55ae1bb7fe1421eb6e1a72781eef97a7
diff --git a/net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch b/net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch
new file mode 100644
index 000000000000..4c4092209086
--- /dev/null
+++ b/net-voip/linphone/files/linphone-3.1.0-external-mstreamer.patch
@@ -0,0 +1,115 @@
+--- configure.in.old	2009-04-23 18:32:59.000000000 -0400
++++ configure.in	2009-04-23 18:49:01.000000000 -0400
+@@ -258,7 +258,26 @@
+ 
+ AC_SUBST(STRICT_OPTIONS)
+ 
+-AC_CONFIG_SUBDIRS( mediastreamer2 )
++AC_ARG_ENABLE(external-mediastreamer,
++      [  --enable-external-mediastreamer Use external mediastreamer library],
++      [case "${enableval}" in
++        yes) external_mediastreamer=true ;;
++        no)  external_mediastreamer=false ;;
++        *) AC_MSG_ERROR(bad value ${enableval} for --enable-external-mediastreamer) ;;
++      esac],[external_mediastreamer=false])
++
++if test "$external_mediastreamer" = 'true'; then
++	LP_CHECK_MSTREAMER
++else
++	AC_CONFIG_SUBDIRS( mediastreamer2 )
++	MSTREAMER_CFLAGS="-I\$(top_srcdir)/mediastreamer2/include"
++	MSTREAMER_LIBS="\$(top_builddir)/mediastreamer2/src/libmediastreamer.la"
++fi
++
++AC_SUBST(MSTREAMER_CFLAGS)
++AC_SUBST(MSTREAMER_LIBS)
++
++AM_CONDITIONAL(EXTERNAL_MSTREAMER, [test "$external_mediastreamer" = 'true'])
+ 
+ dnl check for db2html (docbook) to generate html user manual
+ AC_CHECK_PROG(have_sgmltools,sgmltools, yes, no)
+--- console/Makefile.am.old	2009-04-23 18:38:26.000000000 -0400
++++ console/Makefile.am	2009-04-23 18:38:56.000000000 -0400
+@@ -7,7 +7,7 @@
+ 	-I$(top_srcdir)/coreapi\
+ 	$(ORTP_CFLAGS) \
+ 	-I$(top_srcdir)/exosip \
+-	-I$(top_srcdir)/mediastreamer2/include
++	$(MSTREAMER_CFLAGS)
+ 
+ 
+ 
+@@ -16,7 +16,7 @@
+ linphonec_SOURCES = linphonec.c linphonec.h commands.c
+ 
+ linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS)  \
+-		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
++		$(MSTREAMER_LIBS) \
+ 		$(ORTP_LIBS) \
+ 		$(SPEEX_LIBS) \
+ 		$(OSIP_LIBS)
+@@ -26,7 +26,7 @@
+ 
+ sipomatic_LDADD= 	$(INTLLIBS)  \
+ 			$(top_builddir)/coreapi/liblinphone.la \
+-			$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
++			$(MSTREAMER_LIBS) \
+ 			$(ORTP_LIBS) \
+ 			$(SPEEX_LIBS) \
+ 			$(OSIP_LIBS)
+--- coreapi/Makefile.am.old	2009-04-23 18:41:10.000000000 -0400
++++ coreapi/Makefile.am	2009-04-23 18:41:32.000000000 -0400
+@@ -7,7 +7,7 @@
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)\
+-	-I$(top_srcdir)/mediastreamer2/include
++	$(MSTREAMER_CFLAGS)
+ 
+ 
+ lib_LTLIBRARIES=liblinphone.la
+@@ -32,7 +32,7 @@
+ 
+ liblinphone_la_LIBADD= \
+ 		$(EXOSIP_LIBS) \
+-		$(top_builddir)/mediastreamer2/src/libmediastreamer.la 
++		$(MSTREAMER_LIBS)
+ 
+ 
+ AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
+--- gtk-glade/Makefile.am.old	2009-04-23 18:39:42.000000000 -0400
++++ gtk-glade/Makefile.am	2009-04-23 20:19:38.000000000 -0400
+@@ -34,8 +34,8 @@
+ 			buddylookup.c \
+ 			linphone.h
+ 
+-linphone_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
+-		$(top_builddir)/mediastreamer2/src/libmediastreamer.la \
++linphone_3_LDADD=$(ORTP_LIBS) \
++		$(MSTREAMER_LIBS) \
+ 		$(top_builddir)/coreapi/liblinphone.la \
+ 			$(LIBGTK_LIBS) $(INTLLIBS) \
+ 			$(LIBGLADE_LIBS)
+@@ -54,7 +54,7 @@
+ 
+ 
+ AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
+-		-I$(top_srcdir)/mediastreamer2/include/ \
++		$(MSTREAMER_CFLAGS) \
+ 		$(LIBGLADE_CFLAGS) $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
+ 		$(ORTP_CFLAGS) $(OSIP_CFLAGS) 
+ 
+--- m4/mstreamer.m4.old	1969-12-31 19:00:00.000000000 -0500
++++ m4/mstreamer.m4	2009-04-23 19:36:12.000000000 -0400
+@@ -0,0 +1,11 @@
++AC_DEFUN([LP_CHECK_MSTREAMER],[
++
++PKG_CHECK_MODULES([MSTREAMER], [mediastreamer >= 2.2.3], , [ms_failed=true])
++
++if test "$ms_failed" = "true"; then
++	AC_MSG_ERROR("External mediastreamer library not found")
++fi
++
++AC_SUBST([MSTREAMER_LIBS])
++AC_SUBST([MSTREAMER_CFLAGS])
++])
diff --git a/net-voip/linphone/files/linphone-3.1.0-nls.patch b/net-voip/linphone/files/linphone-3.1.0-nls.patch
new file mode 100644
index 000000000000..c6f031f9d558
--- /dev/null
+++ b/net-voip/linphone/files/linphone-3.1.0-nls.patch
@@ -0,0 +1,19 @@
+Allow to disable localization.
+
+Patch by Arfrever Frehtes Taifersar Arahesis
+
+--- configure.in
++++ configure.in
+@@ -30,7 +30,11 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ dnl localization tools
+-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
++AM_NLS
++if test "$USE_NLS" != "no"; then
++ m4_pattern_allow([AC_PROG_INTLTOOL])
++	ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL])
++fi
+ dnl Initialize libtool
+ AC_PROG_LIBTOOL
+ AM_PROG_LIBTOOL
diff --git a/net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch b/net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch
new file mode 100644
index 000000000000..671241c1d694
--- /dev/null
+++ b/net-voip/linphone/files/linphone-3.1.0-novideo-preferences.patch
@@ -0,0 +1,13 @@
+fix crash when compiled with --disable-video
+
+--- coreapi/linphonecore.c.old	2009-04-24 19:20:24.000000000 -0400
++++ coreapi/linphonecore.c	2009-04-24 19:21:10.000000000 -0400
+@@ -2108,7 +2108,7 @@
+ 	if (olddev!=NULL && olddev!=lc->video_conf.device){
+ 		toggle_video_preview(lc,FALSE);/*restart the video local preview*/
+ 	}
+-	if (lc->ready){
++	if (lc->ready && lc->video_conf.device){
+ 		vd=ms_web_cam_get_string_id(lc->video_conf.device);
+ 		if (vd && strstr(vd,"Static picture")!=NULL){
+ 			vd=NULL;
diff --git a/net-voip/linphone/linphone-3.1.0.ebuild b/net-voip/linphone/linphone-3.1.0.ebuild
new file mode 100644
index 000000000000..83d016d469af
--- /dev/null
+++ b/net-voip/linphone/linphone-3.1.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.1.0.ebuild,v 1.1 2009/04/26 02:48:20 volkmar Exp $
+
+EAPI="2"
+
+inherit eutils autotools multilib
+
+DESCRIPTION="Video softphone based on the SIP protocol"
+HOMEPAGE="http://www.linphone.org/"
+SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/stable/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc"
+IUSE="doc gtk ipv6 ncurses nls video"
+
+RDEPEND=">=media-libs/mediastreamer-2.2.3[video?]
+	>=net-libs/libeXosip-3.0.2
+	>=net-libs/libosip-3.0.0
+	>=net-libs/ortp-0.15.0_p1
+	gtk? ( dev-libs/glib:2
+		>=gnome-base/libglade-2.4.0:2.0
+		>=x11-libs/gtk+-2.4.0:2 )
+	ncurses? ( sys-libs/readline
+		sys-libs/ncurses )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-text/sgmltools-lite )
+	nls? ( dev-util/intltool
+		dev-util/pkgconfig )"
+
+IUSE_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru"
+
+for l in ${IUSE_LINGUAS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
+# TODO:
+# run-time test for ipv6 : does it need mediastreamer[ipv6] ?
+
+pkg_setup() {
+	if ! use gtk && ! use ncurses; then
+		ewarn "gtk and ncurses are disabled."
+		ewarn "At least one of these use flags are needed to get a front-end."
+		ewarn "Only liblinphone is going to be installed."
+	fi
+
+	strip-linguas ${IUSE_LINGUAS}
+
+	if [[ -z "${LINGUAS}" ]]; then
+		# no linguas set, using the default one
+		LINGUAS=" "
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-external-mstreamer.patch
+
+	# this patch removes need to gettext and intltool
+	# but intltool was needed for eautoreconf so I add m4_pattern_allow
+	# which is probably not the best way but it's working
+	epatch "${FILESDIR}"/${P}-nls.patch
+
+	# remove speex check, avoid bug when mediastreamer[-speex]
+	sed -i -e '/SPEEX/d' configure.in || die "patching configure.in failed"
+
+	# fix path to use lib64
+	sed -i -e "s:lib\(/liblinphone\):$(get_libdir)\1:" configure.in \
+		|| die "patching configure.in failed"
+
+	# removing bundled libs dir prevent them to be reconf
+	rm -rf mediastreamer2 oRTP || die "should not die"
+	# and references in Makefile.am
+	sed -i -e "s:oRTP::" -e "s:mediastreamer2::" Makefile.am \
+		|| die "patching Makefile.am failed"
+
+	eautoreconf
+
+	# fix crash
+	epatch "${FILESDIR}"/${P}-novideo-preferences.patch
+}
+
+src_configure() {
+	# strict: we don't want -Werror
+	# external-ortp,external-mediastreamer: prefer external libs
+	# truespeech: seems not used, TODO: ask in ml
+	# rsvp: breaking the build (not maintained anymore) --disable = --enable
+	# alsa, artsc and portaudio are used for bundled mediastreamer
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--disable-strict \
+		--enable-external-ortp \
+		--enable-external-mediastreamer \
+		--disable-truespeech \
+		--disable-dependency-tracking \
+		$(use_enable doc manual) \
+		$(use_enable gtk gtk_ui) \
+		$(use_enable ipv6) \
+		$(use_enable ncurses console_ui) \
+		$(use_enable nls) \
+		$(use_enable video)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO \
+		|| die "dodoc failed"
+}