diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-28 07:57:01 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-28 07:57:01 +0000 |
| commit | 550a02544e868fd8a5cf546cff093f946aa2c42d (patch) | |
| tree | a06b5ed77e3704fca8993a2680c83e1a39c931df /media-libs/gstreamer | |
| parent | spelling (diff) | |
| download | gentoo-2-550a02544e868fd8a5cf546cff093f946aa2c42d.tar.gz gentoo-2-550a02544e868fd8a5cf546cff093f946aa2c42d.tar.bz2 gentoo-2-550a02544e868fd8a5cf546cff093f946aa2c42d.zip | |
Fix building with make >= 3.82 wrt #338866 by Diego E. Pettenò.
(Portage version: 2.2_rc87/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/gstreamer')
| -rw-r--r-- | media-libs/gstreamer/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/gstreamer/files/gstreamer-0.10.30-make-382.patch | 23 | ||||
| -rw-r--r-- | media-libs/gstreamer/gstreamer-0.10.30.ebuild | 10 |
3 files changed, 36 insertions, 3 deletions
diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog index 4785b8f2802e..6236e7394909 100644 --- a/media-libs/gstreamer/ChangeLog +++ b/media-libs/gstreamer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gstreamer # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.273 2010/09/11 09:50:12 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.274 2010/09/28 07:57:01 ssuominen Exp $ + + 28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> + gstreamer-0.10.30.ebuild, +files/gstreamer-0.10.30-make-382.patch: + Fix building with make >= 3.82 wrt #338866 by Diego E. Pettenò. 11 Sep 2010; <nixnut@gentoo.org> gstreamer-0.10.29.ebuild: ppc stable #329703 diff --git a/media-libs/gstreamer/files/gstreamer-0.10.30-make-382.patch b/media-libs/gstreamer/files/gstreamer-0.10.30-make-382.patch new file mode 100644 index 000000000000..bf8da141059d --- /dev/null +++ b/media-libs/gstreamer/files/gstreamer-0.10.30-make-382.patch @@ -0,0 +1,23 @@ +http://bugs.gentoo.org/338866 + +--- common/gtk-doc.mak ++++ 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 +--- common/gtk-doc-plugins.mak ++++ common/gtk-doc-plugins.mak +@@ -332,7 +332,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 + diff --git a/media-libs/gstreamer/gstreamer-0.10.30.ebuild b/media-libs/gstreamer/gstreamer-0.10.30.ebuild index 3d8c1b70dc90..2f62b1f44c7e 100644 --- a/media-libs/gstreamer/gstreamer-0.10.30.ebuild +++ b/media-libs/gstreamer/gstreamer-0.10.30.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.30.ebuild,v 1.1 2010/07/21 17:59:43 ford_prefect Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.10.30.ebuild,v 1.2 2010/09/28 07:57:01 ssuominen Exp $ EAPI=2 -inherit eutils multilib versionator +inherit autotools eutils multilib versionator # Create a major/minor combo for our SLOT and executables suffix PV_MAJ_MIN=$(get_version_component_range '1-2') @@ -25,8 +25,14 @@ RDEPEND=">=dev-libs/glib-2.20:2 # ^^ queue2 move, mustn't have both libgstcoreleements.so and libgstqueue2.so at runtime providing the element at once DEPEND="${RDEPEND} dev-util/pkgconfig + dev-util/gtk-doc-am nls? ( sys-devel/gettext )" +src_prepare() { + epatch "${FILESDIR}"/${P}-make-382.patch + eautoreconf +} + src_configure() { # Disable static archives, dependency tracking and examples # to speed up build time |