diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-08 15:05:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-08 15:05:56 +0000 |
| commit | e0116e23dea8e7d861c8e7871acdac215af2d414 (patch) | |
| tree | 1d339ebe13e664229702b9f743f1f75da4310885 /media-gfx/mandelbulber | |
| parent | Improve description. (diff) | |
| download | gentoo-2-e0116e23dea8e7d861c8e7871acdac215af2d414.tar.gz gentoo-2-e0116e23dea8e7d861c8e7871acdac215af2d414.tar.bz2 gentoo-2-e0116e23dea8e7d861c8e7871acdac215af2d414.zip | |
Include string.h where required for memcpy() or memset() since it's no longer implicitly pulled in by libpng since 1.6.0 wrt #464972 by Kacper Kowalik
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-gfx/mandelbulber')
| -rw-r--r-- | media-gfx/mandelbulber/ChangeLog | 10 | ||||
| -rw-r--r-- | media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch | 22 | ||||
| -rw-r--r-- | media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild | 13 |
3 files changed, 37 insertions, 8 deletions
diff --git a/media-gfx/mandelbulber/ChangeLog b/media-gfx/mandelbulber/ChangeLog index 963ff83cf4c6..b504aa5ba224 100644 --- a/media-gfx/mandelbulber/ChangeLog +++ b/media-gfx/mandelbulber/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/mandelbulber -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.10 2012/12/22 19:07:18 xarthisius Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/ChangeLog,v 1.11 2013/04/08 15:05:56 ssuominen Exp $ + + 08 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> + mandelbulber-1.12.1.ebuild, + +files/mandelbulber-1.12.1-memcpy_and_memset.patch: + Include string.h where required for memcpy() or memset() since it's no longer + implicitly pulled in by libpng since 1.6.0 wrt #464972 by Kacper Kowalik 22 Dec 2012; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml: Drop myself from metadata.xml diff --git a/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch b/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch new file mode 100644 index 000000000000..43fb0b982dbd --- /dev/null +++ b/media-gfx/mandelbulber/files/mandelbulber-1.12.1-memcpy_and_memset.patch @@ -0,0 +1,22 @@ +http://bugs.gentoo.org/464972 + +--- src/texture.cpp ++++ src/texture.cpp +@@ -5,6 +5,7 @@ + * Author: krzysztof + */ + #include <stdio.h> ++#include <string.h> + #include "texture.hpp" + #include "files.h" + +--- src/timeline.cpp ++++ src/timeline.cpp +@@ -6,6 +6,7 @@ + */ + + #include <cstdlib> ++#include <cstring> + + #include "timeline.hpp" + #include "files.h" diff --git a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild b/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild index bd1fe357c33b..76d112a7c73d 100644 --- a/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild +++ b/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild,v 1.1 2012/08/03 08:35:39 xarthisius Exp $ - -EAPI=4 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/mandelbulber/mandelbulber-1.12.1.ebuild,v 1.2 2013/04/08 15:05:56 ssuominen Exp $ +EAPI=5 inherit eutils toolchain-funcs versionator MY_P=${PN}$(replace_version_separator 2 '-' ) @@ -19,7 +18,7 @@ IUSE="" RDEPEND="x11-libs/gtk+:2 >=media-libs/libsndfile-1 - >=media-libs/libpng-1.4 + >=media-libs/libpng-1.4:0= virtual/jpeg" DEPEND="${RDEPEND} virtual/pkgconfig" @@ -27,7 +26,9 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} src_prepare() { - epatch "${FILESDIR}"/${PN}-1.11-qa.patch + epatch \ + "${FILESDIR}"/${PN}-1.11-qa.patch \ + "${FILESDIR}"/${P}-memcpy_and_memset.patch } src_compile() { |