Fix building with libpng14.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog
index 7398063647661a332a8b62358d2edb19b2d6a606..44e400773b5553d554f09bc9dae4fbe1c6ae21a7 100644 (file)
--- a/x11-misc/gaia/ChangeLog
+++ b/x11-misc/gaia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/gaia
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.22 2008/11/28 12:55:09 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.23 2010/03/11 12:35:25 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> gaia-0.1.2.ebuild,
+  +files/gaia-0.1.2-libpng14.patch:
+  Fix building with libpng14.
 
   28 Nov 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
   Change my email address

diff --git a/x11-misc/gaia/Manifest b/x11-misc/gaia/Manifest
index 7666dab60e3844a6f365a28d507473896265c0c0..0694158065ce90840208468dea30415c06af455d 100644 (file)
--- a/x11-misc/gaia/Manifest
+++ b/x11-misc/gaia/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gaia-0.1.2-curl-7.18.patch 757 RMD160 70e69019c8d7ec1572a4e74eb4725f2f6991e223 SHA1 5a4349171a06e3220f85665dc2976886138c856a SHA256 21f966965797e90b4e030c5ad647ea330f4c9ae0ee64a3cfd0082134c065511d
 AUX gaia-0.1.2-font_inclusion.patch 420 RMD160 b8e5ad61d0965f3f37f45529348a81174f6c5ff2 SHA1 82c0da939040745a6a99b7280179cc5f249e45d2 SHA256 51f5a41d84444467d06876e333b5e413a28593e2029ee92eabee789d6323a67a
 AUX gaia-0.1.2-gcc43.patch 491 RMD160 8bdd91b52079b748b2e642e834e7b0572eab4b50 SHA1 ec17facfca64a59b699179b96a587583663f3b65 SHA256 574cb19bb4d2357c256de67bcc271bbf00872208bb6b1d3597bc0357fd82c91e
+AUX gaia-0.1.2-libpng14.patch 534 RMD160 e4d9089964c5e25fc9c62c8beb5e866cce358a75 SHA1 b1e43c0a8c93907f179ecdc0a4bd3ca16bb8eeaf SHA256 f8fc10f93be34396282cd8b9dee2893ed28b3dce6554bb906fff3cec5cd6d12d
 AUX gaia-0.1.2-remove_dep_checks_gaia.patch 1606 RMD160 05e82dccadf9b5e8cca4390ba80497be922ffb97 SHA1 49c8babc90992f01df75ad7b8aedcf5905c02a8e SHA256 2c021559daa7fdf7c0d2d2f35755de3ca6e6465ee6a7ae153a4c5b4a9edfa6bb
 AUX gaia-0.1.2-remove_dep_checks_wwfetch.patch 403 RMD160 d2340c5d0d7c570b86e634d95c4c3c18a224f146 SHA1 d52e7cd29491496c5000267e9586582e51d97fd2 SHA256 6bbb3a1fc4429d93a63f3afc9020b3e19558b7db9ff4f4ce7ab3359f6f27c050
 AUX gaia-0.1.2-scons-0.98.patch 1369 RMD160 67349cf48cf105cfcb3e85fcf14a14f6194cc98f SHA1 e36dae887803b72f241fda057b21b529fb236d99 SHA256 65fdfe7b6902f4f4c2bc55b646e1cbb91b9b4cc5828b901c6c0cd1c45c05d495
 DIST gaia-0.1.2.tar.bz2 60241 RMD160 df1a050a7f8187a7e7196cb160a453a0ebbbf41d SHA1 5a2c65064010c7d00151f6f94b0bf0e2ae796bfa SHA256 9174671fa3e88f6f10d6e5acfe1d18e8e4d6177fa0e288632b4b70f978864c95
-EBUILD gaia-0.1.2.ebuild 1913 RMD160 a20a5a67e6209661f5dc920acdb6bdea1f0a9d7c SHA1 03d10c0061e7115ef9b97062491ba1bd388812de SHA256 76d8628f30b8500ffdf448926f2bb14a4cf26b0ea38c56da48588276df6eb5af
-MISC ChangeLog 2826 RMD160 9a0b1ab9e3f32fbdd6d68d27741fc6efd8e45e09 SHA1 811a372a0e9e9c76e4632287bfc2eb689b6520d2 SHA256 cdf48627203b44261f49ba012aaf319f9798e40b07059aec5c6456c5fe989bb1
+EBUILD gaia-0.1.2.ebuild 1945 RMD160 4ec8436db34570b247fcfc8503fd5c46cc03cc3f SHA1 0e2d67b6b5956edb445c0618457e2e54cb74d560 SHA256 91f82f51956e42aa1047b8206921d4963e5dcce330c808b43df736c277bd8f83
+MISC ChangeLog 2970 RMD160 954143252098d3260f6702896c918bc8cd393af8 SHA1 debeac23f9bdea7520701c359fbb2541976be005 SHA256 4ecef8e24e46735970f67af01c41a650a5c891ad8accce2a18a1eb6c2a703f81
 MISC metadata.xml 266 RMD160 6c7d2ad6c94f4caef0308b4bd1466e721b2828d0 SHA1 7fdcf34937cade65e2a7724dc16673587b6a38aa SHA256 90e5c12283200ba96bf92b033f259712e4c06edcaa33f68017447db1b5bf8b04
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkv6jUACgkQNQqtfCuFnePHgQCfUwp46AuAWBaxQDRWRoC5hGEb
-zPkAnRqHhMx/2OMoS3fM2Mx8pVXu6pFM
-=qwwb
------END PGP SIGNATURE-----

diff --git a/x11-misc/gaia/files/gaia-0.1.2-libpng14.patch b/x11-misc/gaia/files/gaia-0.1.2-libpng14.patch
new file mode 100644 (file)
index 0000000..34560af
--- /dev/null
+++ b/x11-misc/gaia/files/gaia-0.1.2-libpng14.patch
@@ -0,0 +1,21 @@
+--- programs/gaia/Texture.cc
++++ programs/gaia/Texture.cc
+@@ -276,8 +276,7 @@
+               png_byte sig[8] = {0};
+ 
+               fread(sig, 8, 1, infile);
+-
+-              if (!png_check_sig(sig, 8))
++              if (png_sig_cmp(sig, 0, 8))
+                       throw Exception("bad PNG signature");
+ 
+               /* create structures */
+@@ -308,7 +307,7 @@
+               switch (color_type) {
+               case PNG_COLOR_TYPE_GRAY:
+                       if (bit_depth < 8)
+-                              png_set_gray_1_2_4_to_8(png_ptr);
++                              png_set_expand_gray_1_2_4_to_8(png_ptr);
+                       m_glInternalFormat = GL_LUMINANCE8;
+                       m_glFormat = GL_LUMINANCE;
+                       break;

diff --git a/x11-misc/gaia/gaia-0.1.2.ebuild b/x11-misc/gaia/gaia-0.1.2.ebuild
index a8dbba429a1e8455d50692753f67a95a31a282e3..19b02b0b103819ea46bf18039bc434939e51b01b 100644 (file)
--- a/x11-misc/gaia/gaia-0.1.2.ebuild
+++ b/x11-misc/gaia/gaia-0.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/gaia-0.1.2.ebuild,v 1.10 2008/06/11 06:55:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/gaia-0.1.2.ebuild,v 1.11 2010/03/11 12:35:25 ssuominen Exp $
 
 inherit eutils
 
@@ -8,11 +8,10 @@ DESCRIPTION="Opensource 3D interface to the planet, based on NASA World Wind dat
 HOMEPAGE="http://sourceforge.net/projects/gaia-clean"
 SRC_URI="mirror://sourceforge/gaia-clean/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-
-IUSE="gps doc"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gps doc"
 
 RDEPEND="media-libs/jpeg
        media-libs/libpng
@@ -20,7 +19,6 @@ RDEPEND="media-libs/jpeg
        net-misc/curl
        virtual/opengl
        gps? ( sci-geosciences/gpsd )"
-
 DEPEND="${RDEPEND}
        dev-util/scons
        doc? ( app-doc/doxygen )"
@@ -28,9 +26,10 @@ DEPEND="${RDEPEND}
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}/${P}-scons-0.98.patch"
-       epatch "${FILESDIR}/${P}-gcc43.patch"
-       epatch "${FILESDIR}/${P}-curl-7.18.patch"
+       epatch "${FILESDIR}"/${P}-scons-0.98.patch \
+               "${FILESDIR}"/${P}-gcc43.patch \
+               "${FILESDIR}"/${P}-curl-7.18.patch \
+               "${FILESDIR}"/${P}-libpng14.patch
 
        # the binary would fail with a wrong hard coded path for font.png
        cd "${S}/programs/gaia/"