From 98ea866b5cd15ef6dc877c651d3e223a9e7d6cba Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Fri, 2 Feb 2007 13:36:13 +0000 Subject: [PATCH] Revbump: Add patch to avoid linphonec "call" to crash. Patch already sent upstream. Package-Manager: portage-2.1.2-r5 --- net-misc/linphone/ChangeLog | 9 ++- net-misc/linphone/Manifest | 25 ++++-- .../linphone/files/digest-linphone-1.6.0-r1 | 3 + .../linphone/files/linphone-1.6.0-call.patch | 10 +++ net-misc/linphone/linphone-1.6.0-r1.ebuild | 79 +++++++++++++++++++ 5 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 net-misc/linphone/files/digest-linphone-1.6.0-r1 create mode 100644 net-misc/linphone/files/linphone-1.6.0-call.patch create mode 100644 net-misc/linphone/linphone-1.6.0-r1.ebuild diff --git a/net-misc/linphone/ChangeLog b/net-misc/linphone/ChangeLog index 5f2ed806e4f6..96b97231a8fa 100644 --- a/net-misc/linphone/ChangeLog +++ b/net-misc/linphone/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/linphone # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.21 2007/01/30 15:12:44 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/ChangeLog,v 1.22 2007/02/02 13:36:13 drizzt Exp $ + +*linphone-1.6.0-r1 (02 Feb 2007) + + 02 Feb 2007; Timothy Redaelli + +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) diff --git a/net-misc/linphone/Manifest b/net-misc/linphone/Manifest index a023134f65d3..c81fd99977d4 100644 --- a/net-misc/linphone/Manifest +++ b/net-misc/linphone/Manifest @@ -17,6 +17,10 @@ AUX linphone-1.5.1-pkgconfig.patch 382 RMD160 7e017402b5ae09e9599543b920cf4d59e0 MD5 028f8a726199603e97f7b06cf641dc83 files/linphone-1.5.1-pkgconfig.patch 382 RMD160 7e017402b5ae09e9599543b920cf4d59e0b31d77 files/linphone-1.5.1-pkgconfig.patch 382 SHA256 e2c7d758905821d5b28d7a0b8298dc7254a89557835097df0b20452851d96805 files/linphone-1.5.1-pkgconfig.patch 382 +AUX linphone-1.6.0-call.patch 344 RMD160 887c83861aec5e71914ebcca5c3bdff56e8ac513 SHA1 2a84da9c99154c68147c161f373a6b962ca2e7ce SHA256 7d1a5789adb3d2f02eaf0970acf567ae5901b2a61f84a94c2116e354a44aa822 +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 DIST linphone-1.1.0.tar.gz 7334577 RMD160 0bbadf7aed244aadae48e1880108d8f01144ca56 SHA1 a586411305cb271429b64a4aba2e400a4430230f SHA256 2bd35760ec2e7b9ac8e501ca16ccaacdb96f5e753477fa7b35842336a8597984 DIST linphone-1.3.5.tar.gz 7411961 RMD160 51376621dd9f0b9e8ea1a30aa175680c7b94989d SHA1 d705efb0c840890c154f2bdca7f8a5cd5a15bba1 SHA256 b1036fde820c928b877a7065a8e396a7aaf262df125da96c6f6b56f02097a1f3 DIST linphone-1.5.1.tar.gz 7693808 RMD160 9ecf7e31847c9f8421046b01fd6b642357b18658 SHA1 b8ab45813268f11fe4dfd2db0776f3fa231aa8e3 SHA256 a747aa01db7e74acf57ee4e04fbe2540df13fb0d590f54d1e86b5b509e4ca72c @@ -34,14 +38,18 @@ EBUILD linphone-1.5.1.ebuild 1996 RMD160 c27a3a8d19f92bb69f955f3400a312633dfefca MD5 578baa0be0201a8ae98edde7de9add50 linphone-1.5.1.ebuild 1996 RMD160 c27a3a8d19f92bb69f955f3400a312633dfefcaa linphone-1.5.1.ebuild 1996 SHA256 4f7f3234f01a4f805bb819df453ab912ba554faad45b3f1cb8882210164e3b59 linphone-1.5.1.ebuild 1996 +EBUILD linphone-1.6.0-r1.ebuild 2045 RMD160 0777fd8a96c3a67023611a64567023e19df600de SHA1 3f19627ab330afbc2d65a96109c8f50251759428 SHA256 f505e742023ed3c420bef7368331a3c8a2c848ad264d54a172ad20a9360ada6a +MD5 b4ed159f59961e44f134bacda99787e0 linphone-1.6.0-r1.ebuild 2045 +RMD160 0777fd8a96c3a67023611a64567023e19df600de linphone-1.6.0-r1.ebuild 2045 +SHA256 f505e742023ed3c420bef7368331a3c8a2c848ad264d54a172ad20a9360ada6a linphone-1.6.0-r1.ebuild 2045 EBUILD linphone-1.6.0.ebuild 2004 RMD160 47cf2fe2856e96c0951bd1f0d966eabdaadc0c9e SHA1 0a1755bed635f0a07557dd94274cbfac036949c2 SHA256 200caf636a31e241c09eaef8f183da9e9986804b7cfc69b21b7fef1c45a1a049 MD5 96cd93bfc4b5a2698b91bbd8c30483d2 linphone-1.6.0.ebuild 2004 RMD160 47cf2fe2856e96c0951bd1f0d966eabdaadc0c9e linphone-1.6.0.ebuild 2004 SHA256 200caf636a31e241c09eaef8f183da9e9986804b7cfc69b21b7fef1c45a1a049 linphone-1.6.0.ebuild 2004 -MISC ChangeLog 5805 RMD160 f30b681d343c7c5b8bcc9878bd34b120a10e8570 SHA1 1471176c1831a4c17bc7b273c96e7e5a724d47d0 SHA256 507f768455aeb9fa2f903313a5ad2efe3430f390c99961c20ea6c77c6f8f14d4 -MD5 38f0eca86989ca321b35c9524e0d3fe2 ChangeLog 5805 -RMD160 f30b681d343c7c5b8bcc9878bd34b120a10e8570 ChangeLog 5805 -SHA256 507f768455aeb9fa2f903313a5ad2efe3430f390c99961c20ea6c77c6f8f14d4 ChangeLog 5805 +MISC ChangeLog 6043 RMD160 4d4214462baf12df769611fb7ee3bccfe00649cf SHA1 5384c55c8a65a1ba72efd3efe976b7645e3fffb7 SHA256 885efa94b91f9f2a200a5c17ec9c1c35b42f9e3270d98d3aef8bcfc3cc96f64b +MD5 e92e5497167ac210208d019abcedfc5e ChangeLog 6043 +RMD160 4d4214462baf12df769611fb7ee3bccfe00649cf ChangeLog 6043 +SHA256 885efa94b91f9f2a200a5c17ec9c1c35b42f9e3270d98d3aef8bcfc3cc96f64b ChangeLog 6043 MISC metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 SHA1 17015753e1e8e33227e3bf6260fff1a6447d32a0 SHA256 008abe484ed1f0a62e625789a99281919f3c933a222bbecef1bf9652728e6d38 MD5 4147a43d9c89e23a84621861984e010e metadata.xml 312 RMD160 e3c2d66f793654c3d1ab1b70aa2b3b87731c04e7 metadata.xml 312 @@ -58,10 +66,13 @@ SHA256 617a94dc2e02bf23a608b9ffdda330783593d26e99a5d6fdf56629b9d4dab667 files/di MD5 179b93d687e8c7d3b6da698e0a27ab33 files/digest-linphone-1.6.0 247 RMD160 d032d244344f72a9289be1cde51c45bf3c406063 files/digest-linphone-1.6.0 247 SHA256 691b7a287f343a087725811380276f4cfa765e801aece51233d3526932979348 files/digest-linphone-1.6.0 247 +MD5 179b93d687e8c7d3b6da698e0a27ab33 files/digest-linphone-1.6.0-r1 247 +RMD160 d032d244344f72a9289be1cde51c45bf3c406063 files/digest-linphone-1.6.0-r1 247 +SHA256 691b7a287f343a087725811380276f4cfa765e801aece51233d3526932979348 files/digest-linphone-1.6.0-r1 247 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFv2B1GDyatLGpTbYRAkldAKCOB5T5XV481SlF+mLRQExd9rUk/gCfePzX -7Se1p50tPpISLjVr+DmkBqc= -=5+Ln +iD8DBQFFwz5VGDyatLGpTbYRAiMDAKCZx1CmYpqqKQAl2RyQRdoaOAVEMwCggleI +07pBo8mgv5e45N7bHERJL9Q= +=7OTj -----END PGP SIGNATURE----- diff --git a/net-misc/linphone/files/digest-linphone-1.6.0-r1 b/net-misc/linphone/files/digest-linphone-1.6.0-r1 new file mode 100644 index 000000000000..dac887590160 --- /dev/null +++ b/net-misc/linphone/files/digest-linphone-1.6.0-r1 @@ -0,0 +1,3 @@ +MD5 fb345125e23c787df0818ff7caad5515 linphone-1.6.0.tar.gz 7720841 +RMD160 52a98387177da018c35b38fcb24e3f126b8dfb2e linphone-1.6.0.tar.gz 7720841 +SHA256 ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b linphone-1.6.0.tar.gz 7720841 diff --git a/net-misc/linphone/files/linphone-1.6.0-call.patch b/net-misc/linphone/files/linphone-1.6.0-call.patch new file mode 100644 index 000000000000..27fe669f8c1c --- /dev/null +++ b/net-misc/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-misc/linphone/linphone-1.6.0-r1.ebuild b/net-misc/linphone/linphone-1.6.0-r1.ebuild new file mode 100644 index 000000000000..c980236ca51d --- /dev/null +++ b/net-misc/linphone/linphone-1.6.0-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/linphone/linphone-1.6.0-r1.ebuild,v 1.1 2007/02/02 13:36:13 drizzt Exp $ + +MY_DPV="${PV%.*}.x" + +WANT_AUTOCONF="2.5" +WANT_AUTOMAKE="1.9" + +inherit eutils autotools + +DESCRIPTION="Linphone is a SIP phone with a GNOME interface." +HOMEPAGE="http://www.linphone.org" +SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${MY_DPV}/sources/${P}.tar.gz" +SLOT=1 +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="alsa gnome ilbc ipv6 novideo xv" + +RDEPEND="dev-libs/glib + dev-perl/XML-Parser + net-dns/bind-tools + >=net-libs/libosip-2.2.0 + >=media-libs/speex-1.1.6 + x86? ( xv? ( dev-lang/nasm ) ) + gnome? ( >=gnome-base/gnome-panel-2 + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=x11-libs/gtk+-2 ) + alsa? ( media-libs/alsa-lib ) + ilbc? ( dev-libs/ilbc-rfc3951 ) + !novideo? ( >=media-libs/libsdl-1.2.9 + media-video/ffmpeg + >=media-libs/libtheora-1.0_alpha7 )" +# portaudio? ( >=media-libs/portaudio-19_pre )" + +DEPEND="${RDEPEND}" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch + epatch "${FILESDIR}"/${P}-call.patch + ./autogen.sh +} + +src_compile() { + local withgnome myconf="" + + use gnome && withgnome="yes" || withgnome="no" + use x86 && myconf="--enable-truespeech" + + econf \ + --libdir=/usr/$(get_libdir)/linphone \ + --enable-gnome_ui=${withgnome} \ + $(use_with ilbc) \ + $(use_enable ipv6) \ + $(use_enable alsa) \ + $(use_enable !novideo video) \ + --disable-portaudio \ + ${myconf} || die "Unable to configure" + + emake || die "Unable to make" +} + +src_install () { + emake DESTDIR="${D}" install || die "Failed to install" + + dodoc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING INSTALL NEWS README + dodoc 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 +} -- 2.26.2