diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-10-12 08:15:38 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-10-12 08:15:38 +0000 |
| commit | 76c2e9cbfd8cf07cd44328cfd72fdb55b2583fce (patch) | |
| tree | 0da8c2d03846dcc11fe5cd6c4bd7c917285b1e5c /net-libs | |
| parent | Clean up old revision. (diff) | |
| download | gentoo-2-76c2e9cbfd8cf07cd44328cfd72fdb55b2583fce.tar.gz gentoo-2-76c2e9cbfd8cf07cd44328cfd72fdb55b2583fce.tar.bz2 gentoo-2-76c2e9cbfd8cf07cd44328cfd72fdb55b2583fce.zip | |
Fix building with make >= 3.82 wrt #339534 by Diego E. Pettenò.
(Portage version: 2.2_rc91/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/farsight2/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/farsight2/farsight2-0.0.20.ebuild | 11 | ||||
| -rw-r--r-- | net-libs/farsight2/files/farsight2-0.0.20-make-382.patch | 31 |
3 files changed, 44 insertions, 4 deletions
diff --git a/net-libs/farsight2/ChangeLog b/net-libs/farsight2/ChangeLog index ce269a00e918..825a2668febf 100644 --- a/net-libs/farsight2/ChangeLog +++ b/net-libs/farsight2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/farsight2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/ChangeLog,v 1.36 2010/09/04 14:47:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/ChangeLog,v 1.37 2010/10/12 08:15:38 ssuominen Exp $ + + 12 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> + farsight2-0.0.20.ebuild, +files/farsight2-0.0.20-make-382.patch: + Fix building with make >= 3.82 wrt #339534 by Diego E. Pettenò. 04 Sep 2010; Raúl Porcel <armin76@gentoo.org> farsight2-0.0.17.ebuild: alpha/ia64/sparc stable wrt #320205 diff --git a/net-libs/farsight2/farsight2-0.0.20.ebuild b/net-libs/farsight2/farsight2-0.0.20.ebuild index 7aca17cb7a70..509f5c34cebb 100644 --- a/net-libs/farsight2/farsight2-0.0.20.ebuild +++ b/net-libs/farsight2/farsight2-0.0.20.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.20.ebuild,v 1.2 2010/06/29 05:16:03 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/farsight2/farsight2-0.0.20.ebuild,v 1.3 2010/10/12 08:15:38 ssuominen Exp $ EAPI="2" +inherit autotools eutils DESCRIPTION="Farsight2 is an audio/video conferencing framework specifically designed for Instant Messengers." HOMEPAGE="http://farsight.freedesktop.org/" @@ -21,8 +22,7 @@ COMMONDEPEND=">=media-libs/gstreamer-0.10.26 >=dev-libs/glib-2.16 >=net-libs/libnice-0.0.9[gstreamer] python? ( - || ( >=dev-python/pygobject-2.16 >=dev-python/pygtk-2.12 ) - >=dev-python/pygobject-2.12 + >=dev-python/pygobject-2.16 >=dev-python/gst-python-0.10.10 ) upnp? ( net-libs/gupnp-igd )" @@ -36,6 +36,11 @@ DEPEND="${COMMONDEPEND} media-plugins/gst-plugins-speex ) dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-make-382.patch + eautoreconf +} + src_configure() { plugins="fsrtpconference,funnel,rtcpfilter,videoanyrate" use msn && plugins="${plugins},fsmsnconference" diff --git a/net-libs/farsight2/files/farsight2-0.0.20-make-382.patch b/net-libs/farsight2/files/farsight2-0.0.20-make-382.patch new file mode 100644 index 000000000000..a5291c6c08c1 --- /dev/null +++ b/net-libs/farsight2/files/farsight2-0.0.20-make-382.patch @@ -0,0 +1,31 @@ +http://bugs.gentoo.org/339534 + +--- farsight2-0.0.20/common/gtk-doc.mak ++++ farsight2-0.0.20/common/gtk-doc.mak +@@ -232,6 +232,6 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +--- farsight2-0.0.20/common/gtk-doc-plugins.mak ++++ farsight2-0.0.20/common/gtk-doc-plugins.mak +@@ -352,7 +352,7 @@ + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +--- farsight2-0.0.20/python/Makefile.am ++++ farsight2-0.0.20/python/Makefile.am +@@ -1,5 +1,4 @@ + PYDEFS=`pkg-config --variable=defsdir pygobject-2.0` +-[ -z "$PYDEFS" && PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`] + GSTPYDEFS=`pkg-config --variable=defsdir gst-python-0.10` + + AM_CPPFLAGS = \ |