diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2013-04-07 13:46:33 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2013-04-07 13:46:33 +0000 |
| commit | 05df16a2f522aa53d1c26ff26920619d72aa4501 (patch) | |
| tree | 4635908677c16ae11a5d44ad3e889773720d84da | |
| parent | 304.88, 310.44 and 313.30 stable for amd64 and x86, wrt bug #464248 (diff) | |
| download | gentoo-2-05df16a2f522aa53d1c26ff26920619d72aa4501.tar.gz gentoo-2-05df16a2f522aa53d1c26ff26920619d72aa4501.tar.bz2 gentoo-2-05df16a2f522aa53d1c26ff26920619d72aa4501.zip | |
Depend on autotools-1.11. Fixes #456370 by Diego Elio Pettenò <flameeyes@gentoo.org> Fix building with libpng-1.6 wrt #464764 by Lars Wendler <polynomial-c@gentoo.org>
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 895192F9)
| -rw-r--r-- | sci-astronomy/celestia/ChangeLog | 13 | ||||
| -rw-r--r-- | sci-astronomy/celestia/celestia-1.6.1-r1.ebuild (renamed from sci-astronomy/celestia/celestia-1.6.1.ebuild) | 12 | ||||
| -rw-r--r-- | sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch | 1 | ||||
| -rw-r--r-- | sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch | 25 |
4 files changed, 45 insertions, 6 deletions
diff --git a/sci-astronomy/celestia/ChangeLog b/sci-astronomy/celestia/ChangeLog index 88f55fa91f63..c4468b8fc2ab 100644 --- a/sci-astronomy/celestia/ChangeLog +++ b/sci-astronomy/celestia/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sci-astronomy/celestia -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.86 2012/08/05 14:56:28 bicatali Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/ChangeLog,v 1.87 2013/04/07 13:46:33 xarthisius Exp $ + +*celestia-1.6.1-r1 (07 Apr 2013) + + 07 Apr 2013; Kacper Kowalik <xarthisius@gentoo.org> +celestia-1.6.1-r1.ebuild, + +files/celestia-1.6.1-libpng16.patch, -celestia-1.6.1.ebuild, + files/celestia-1.6.1-gcc46.patch: + Depend on autotools-1.11. Fixes #456370 by Diego Elio Pettenò + <flameeyes@gentoo.org> Fix building with libpng-1.6 wrt #464764 by Lars + Wendler <polynomial-c@gentoo.org> 05 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> celestia-1.6.1.ebuild, metadata.xml: diff --git a/sci-astronomy/celestia/celestia-1.6.1.ebuild b/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild index 891a9888fb90..97db6bfd7531 100644 --- a/sci-astronomy/celestia/celestia-1.6.1.ebuild +++ b/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild @@ -1,8 +1,9 @@ -# 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/sci-astronomy/celestia/celestia-1.6.1.ebuild,v 1.14 2012/08/05 14:56:28 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/celestia/celestia-1.6.1-r1.ebuild,v 1.1 2013/04/07 13:46:33 xarthisius Exp $ -EAPI=4 +EAPI=5 +WANT_AUTOMAKE="1.11" inherit eutils flag-o-matic gnome2 autotools pax-utils @@ -18,7 +19,7 @@ IUSE="cairo gnome gtk nls pch theora threads" RDEPEND=" virtual/opengl virtual/jpeg - media-libs/libpng + media-libs/libpng:0= <dev-lang/lua-5.2 gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) ) gnome? ( @@ -63,6 +64,9 @@ src_prepare() { # gcc-47, #414015 epatch "${FILESDIR}"/${P}-gcc47.patch + # libpng16 #464764 + epatch "${FILESDIR}"/${P}-libpng16.patch + # remove flags to let the user decide local for cf in -O2 -ffast-math \ diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch b/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch index ddf4036f2d66..96967e36f9dc 100644 --- a/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch +++ b/sci-astronomy/celestia/files/celestia-1.6.1-gcc46.patch @@ -1,4 +1,5 @@ http://bugs.gentoo.org/show_bug.cgi?id=366073 +http://celestia.svn.sourceforge.net/viewvc/celestia?view=revision&revision=5178 Patch written by Nils Larsson <ni1s@nerdshack.com> --- src/celengine/frametree.h diff --git a/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch b/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch new file mode 100644 index 000000000000..78911cb55755 --- /dev/null +++ b/sci-astronomy/celestia/files/celestia-1.6.1-libpng16.patch @@ -0,0 +1,25 @@ +image.cpp:530:61: error: ‘memcpy’ was not declared in this scope + +https://bugs.gentoo.org/show_bug.cgi?id=464764 + +Patch written by Lars Wendler <polynomial-c@gentoo.org> +--- a/celestia/src/celengine/image.cpp ++++ b/celestia/src/celengine/image.cpp +@@ -42,6 +42,7 @@ extern "C" { + #include "jpeglib.h" + #else + #include <cstdio> ++#include <string.h> + #include <jpeglib.h> + #endif + } +--- a/celestia/src/celengine/texture.cpp ++++ b/celestia/src/celengine/texture.cpp +@@ -28,6 +28,7 @@ + #include <cstdlib> + #include <cstdio> + #include <cassert> ++#include <string.h> + + #ifndef _WIN32 + #ifndef TARGET_OS_MAC |