diff options
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/linphone/ChangeLog | 12 | ||||
| -rw-r--r-- | net-voip/linphone/Manifest | 17 | ||||
| -rw-r--r-- | net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch | 125 | ||||
| -rw-r--r-- | net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch | 12 | ||||
| -rw-r--r-- | net-voip/linphone/files/linphone-3.2.1-nls.patch | 16 | ||||
| -rw-r--r-- | net-voip/linphone/linphone-3.2.1.ebuild | 101 |
6 files changed, 270 insertions, 13 deletions
diff --git a/net-voip/linphone/ChangeLog b/net-voip/linphone/ChangeLog index 46c3da1a546b..04eed175f88b 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.40 2009/08/24 09:13:15 vapier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/ChangeLog,v 1.41 2010/02/18 18:57:38 pva Exp $ + +*linphone-3.2.1 (18 Feb 2010) + + 18 Feb 2010; Peter Volkov <pva@gentoo.org> +linphone-3.2.1.ebuild, + +files/linphone-3.2.1-external-mediastreamer.patch, + +files/linphone-3.2.1-log-window-crash.patch, + +files/linphone-3.2.1-nls.patch: + Version bump, fixes bug #285478. 24 Aug 2009; Mike Frysinger <vapier@gentoo.org> linphone-3.1.2.ebuild: Fix libtool mismatch troubles #282268 by rainer and drop pointless LINGUAS diff --git a/net-voip/linphone/Manifest b/net-voip/linphone/Manifest index c7b21763a742..c4495f3c2939 100644 --- a/net-voip/linphone/Manifest +++ b/net-voip/linphone/Manifest @@ -1,18 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX linphone-3.1.0-nls.patch 638 RMD160 ad4d07589cfaa2ecee6d9c53805728a53bbb211f SHA1 4ecaf5669d79ef1a73d9b3b3a57ef1e4b4f2ea80 SHA256 1877610ef4e763ecbce2e80cc3d8305df1d57c8f85fde5cb618a79ae769f44fc AUX linphone-3.1.1-external-mstreamer.patch 3480 RMD160 792cc66ccc779848ccb180e3d520ecf84dede8b5 SHA1 2ef2e5ac8a6dfe8a853b1d750ff402c13b3a39ee SHA256 c0799270a91357ff319763ed649fee938ede52f908b782a655bcc11baaf058ce +AUX linphone-3.2.1-external-mediastreamer.patch 3591 RMD160 8fefd2f6de05ec7c1c96db857ef179dcafb346bd SHA1 dbcc45c4792a093651ed83f92022369e4c2687bd SHA256 884dc152cd3aaf6cbbeecb8fd0e0ff9522d834171e724deee87145b2966f87d5 +AUX linphone-3.2.1-log-window-crash.patch 514 RMD160 2190f6023f4d97883316b3ff0aeb679a49fc7d2c SHA1 e7e5be8dae19ac9b16608daa9a205777e8905c76 SHA256 f0faa9d90aed4ea06fee608bc06785a757b8e6c25dea7ae6abdd954466a9759c +AUX linphone-3.2.1-nls.patch 426 RMD160 19c1292f26fc7d36846d115ef5423635c4d8c828 SHA1 48c2ee4547e2e6db065856a5f7563fc45fd5f9a0 SHA256 e35323e1166fcf826ac9c4e53db62fb522846a7b0316353edffc1fb74fd43758 DIST linphone-3.1.1.tar.gz 7809388 RMD160 a2c1bb3c96bb95cabbe605de463af2993ae3e9ff SHA1 820fad3d273975cc8493d3dabf7959ef59fe7c4d SHA256 d4f4cbf9da3c0437a9f2e181eea611adbefc6b4a7073cf8d8f3ac0fe795c8eff DIST linphone-3.1.2.tar.gz 7732132 RMD160 21738be63d1cda9a710d22aaac647c7b6a0a45b6 SHA1 a44e03849977ac8e99589b2a021948c9643cdc3d SHA256 2e676f2bc6aeed7753458079355fc64362c75b530913e9226cd4abd9257cbf17 +DIST linphone-3.2.1.tar.gz 7906185 RMD160 8ed4b172dc2b9ad90d8bf4da82dbbc8b16e6b169 SHA1 ff5434372465ccfd059de1a26f4712f30f5f9ed7 SHA256 b34bf066e07895b4d7b51a4a64e2a7524ab1cb755c996ef208293228c7bc4e69 EBUILD linphone-3.1.1.ebuild 3143 RMD160 44ede17982e7be057fe10dee54ad697acdf68dff SHA1 3153312e2de33d282bc90cb396b0c914c390e6fa SHA256 418435dbe82659645a064abf08aaab8ebbb176b7ffde05a447da6c437367ed54 EBUILD linphone-3.1.2.ebuild 2956 RMD160 ebb73e3e427fab649496aa2053f2c390f6643bb3 SHA1 0d9c70011ce130a88d81954d8fc103446464dca7 SHA256 1fcb722e87656eb524998e64915e18e0d8026a3a73485f6c265cc6d55b868956 -MISC ChangeLog 12349 RMD160 b983a7a0fe75dff84f6919cc92ada1361feb1258 SHA1 753cf4a86345acc6c14e3d80481041f57f91ff4f SHA256 ba41f8ba0d503e22a6f66a286351b65bab3d9a87f24770c467ff7b90aa0a65a6 +EBUILD linphone-3.2.1.ebuild 2999 RMD160 bf83c752b2c40cfd4f751027d2737f9ae52fe4c5 SHA1 2042ec53f17950dc98b00ce9e0265fbd15462876 SHA256 262fa944c70d066efda49851448ebadc73f335c4fded97a203a90c988db19be8 +MISC ChangeLog 12619 RMD160 16d952690dd58defdae674d9d70b6daa356c827f SHA1 21e4d43bc376121f67f67de079bfeff1980be592 SHA256 510c404df2bb2cb2b2591b110268ede5fd367d1f16c3ac0758c323d5b18b8c73 MISC metadata.xml 335 RMD160 0e09a4bd66327fe8397d95c19df4fa884886444b SHA1 b7056729ec82619f4edc4dfe90c5c53ec780f638 SHA256 008f606df7bbbc280b1a0b4a31a7b653858c7ccfe3c99f476547c037189f7fdf ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkqSWbEACgkQlPl3HsVfCDpbBwCdFQEzxBf0f+bigAyvvpVdaUe0 -+tAAn2vLWK0CjjqPNt2PhVw6IEpmOaom -=SDLh ------END PGP SIGNATURE----- diff --git a/net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch b/net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch new file mode 100644 index 000000000000..de39bcf57740 --- /dev/null +++ b/net-voip/linphone/files/linphone-3.2.1-external-mediastreamer.patch @@ -0,0 +1,125 @@ +=== modified file 'configure.in' +--- configure.in 2010-02-11 15:15:20 +0000 ++++ configure.in 2010-02-11 15:15:24 +0000 +@@ -328,7 +328,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) + +=== modified file 'console/Makefile.am' +--- console/Makefile.am 2010-02-11 15:13:22 +0000 ++++ console/Makefile.am 2010-02-11 15:16:28 +0000 +@@ -9,7 +9,7 @@ + -I$(top_srcdir)/coreapi\ + $(ORTP_CFLAGS) \ + -I$(top_srcdir)/exosip \ +- -I$(top_srcdir)/mediastreamer2/include ++ $(MSTREAMER_CFLAGS) + + + +@@ -22,7 +22,7 @@ + linphonec_SOURCES = linphonec.c linphonec.h commands.c + linphonec_CFLAGS=$(COMMON_CFLAGS) $(CONSOLE_FLAGS) + linphonec_LDADD = $(top_builddir)/coreapi/liblinphone.la $(READLINE_LIBS) \ +- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ ++ $(MSTREAMER_LIBS) \ + $(ORTP_LIBS) \ + $(SPEEX_LIBS) \ + $(OSIP_LIBS) +@@ -41,7 +41,7 @@ + + sipomatic_LDADD= $(INTLLIBS) \ + $(top_builddir)/coreapi/liblinphone.la \ +- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ ++ $(MSTREAMER_LIBS) \ + $(ORTP_LIBS) \ + $(SPEEX_LIBS) \ + $(OSIP_LIBS) + +=== modified file 'coreapi/Makefile.am' +--- coreapi/Makefile.am 2010-02-11 15:13:22 +0000 ++++ coreapi/Makefile.am 2010-02-11 15:18:19 +0000 +@@ -7,7 +7,7 @@ + + INCLUDES = \ + -I$(top_srcdir)\ +- -I$(top_srcdir)/mediastreamer2/include ++ $(MSTREAMER_CFLAGS) + + + lib_LTLIBRARIES=liblinphone.la +@@ -33,7 +33,7 @@ + + liblinphone_la_LIBADD= \ + $(EXOSIP_LIBS) \ +- $(top_builddir)/mediastreamer2/src/libmediastreamer.la \ ++ $(MSTREAMER_LIBS) \ + $(ORTP_LIBS) + + if BUILD_WIN32 + +=== modified file 'gtk-glade/Makefile.am' +--- gtk-glade/Makefile.am 2010-02-11 15:13:22 +0000 ++++ gtk-glade/Makefile.am 2010-02-11 15:16:28 +0000 +@@ -47,8 +47,8 @@ + loginframe.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) +@@ -77,7 +77,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) + + +=== added file 'm4/mstreamer.m4' +--- m4/mstreamer.m4 1970-01-01 00:00:00 +0000 ++++ m4/mstreamer.m4 2010-02-11 15:16:28 +0000 +@@ -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.2.1-log-window-crash.patch b/net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch new file mode 100644 index 000000000000..904a635b5187 --- /dev/null +++ b/net-voip/linphone/files/linphone-3.2.1-log-window-crash.patch @@ -0,0 +1,12 @@ +=== modified file 'gtk-glade/log.glade' +--- gtk-glade/log.glade 2010-02-12 09:04:09 +0000 ++++ gtk-glade/log.glade 2010-02-12 09:04:42 +0000 +@@ -13,6 +13,7 @@ + <property name="deletable">False</property> + <property name="has_separator">False</property> + <signal name="response" handler="gtk_widget_hide"/> ++ <signal name="delete-event" handler="gtk_widget_hide"/> + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + diff --git a/net-voip/linphone/files/linphone-3.2.1-nls.patch b/net-voip/linphone/files/linphone-3.2.1-nls.patch new file mode 100644 index 000000000000..ee8e5763d0be --- /dev/null +++ b/net-voip/linphone/files/linphone-3.2.1-nls.patch @@ -0,0 +1,16 @@ +=== modified file 'configure.in' +--- configure.in 2010-02-11 15:13:22 +0000 ++++ configure.in 2010-02-11 15:14:08 +0000 +@@ -54,7 +54,10 @@ + AC_SUBST(GUI_FLAGS) + + dnl localization tools +-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) ++AM_NLS ++if test "$USE_NLS" != "no"; then ++ ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) ++fi + dnl Initialize libtool + AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL + diff --git a/net-voip/linphone/linphone-3.2.1.ebuild b/net-voip/linphone/linphone-3.2.1.ebuild new file mode 100644 index 000000000000..6a8977113171 --- /dev/null +++ b/net-voip/linphone/linphone-3.2.1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-voip/linphone/linphone-3.2.1.ebuild,v 1.1 2010/02/18 18:57:38 pva 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="~amd64 ~ppc ~x86" +IUSE="doc gtk ipv6 ncurses nls video" + +RDEPEND=">=media-libs/mediastreamer-2.3.0[video?] + >=net-libs/libeXosip-3.0.2 + >=net-libs/libosip-3.0.0 + >=net-libs/ortp-0.16.1 + 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} + dev-util/pkgconfig + doc? ( app-text/sgmltools-lite ) + nls? ( dev-util/intltool + sys-devel/gettext )" + +IUSE_LINGUAS=" fr it de ja es pl cs nl sv pt_BR hu ru zh_CN" +IUSE="${IUSE} ${IUSE_LINGUAS// / linguas_}" + +# TODO: +# update ortp ? +# update mediastreamer ? + +# 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} +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-external-mediastreamer.patch + epatch "${FILESDIR}"/${P}-nls.patch + epatch "${FILESDIR}"/${P}-log-window-crash.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" + + # make sure to use host libtool version + rm -f m4/libtool.m4 m4/lt*.m4 #282268 + eautoreconf +} + +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" + dosym linphone-3 /usr/bin/linphone || die + dodoc AUTHORS BUGS ChangeLog NEWS README README.arm TODO +} |