Fix building with libpng14 wrt #309309 by Peter Alfredsen.

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

diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index 04235afd977b5dc6f4cf36e8797f1aa213bd5318..6e78213c2e93e8aec6d81be8431c8fb7dcce64e3 100644 (file)
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ming
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.60 2010/01/31 16:01:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.61 2010/03/14 14:44:47 ssuominen Exp $
+
+  14 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +files/ming-0.4.x-libpng14.patch, ming-0.4.0_rc2.ebuild:
+  Fix building with libpng14 wrt #309309 by Peter Alfredsen.
 
   31 Jan 2010; Raúl Porcel <armin76@gentoo.org> ming-0.4.0_rc2.ebuild:
   ia64/s390/sh/sparc stable wrt #297476

diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
index 5843117125de831b22f2b2780a5992624eed6297..14ed9a91555994637fdbed5e2ce6d234986879e4 100644 (file)
--- a/media-libs/ming/Manifest
+++ b/media-libs/ming/Manifest
@@ -3,12 +3,13 @@ AUX ming-0.2a-gentoo.diff 369 RMD160 9db5b5e84dd46c794e6502f51c67e5b146c35e51 SH
 AUX ming-0.2a-linking.patch 1115 RMD160 4857939ffbb2fd852f866e5135ac762d9d8a383a SHA1 70d6a3dbb81600a82b0f59f34b7fca9a4afddaf3 SHA256 1d81fd16680d1dbdbb797cd88874efd4f4bd76f0d159496c83a2d307244efdf4
 AUX ming-0.2a-make.patch 2243 RMD160 658072052ecc9c33f693f191419b2ecf90ad6815 SHA1 34059195be138931509a44d0a3166c97b3bc40ed SHA256 ac6c74ca729e4678e5dc7cee245bef0d33568e8cb063fdc65d81399a1fb62d84
 AUX ming-0.3.0--as-needed.patch 7840 RMD160 6104616ba1ab6cecf824d3167e4455bad7d633a8 SHA1 dfb11d85fba618779d2c8e5e50565edb96d50e0c SHA256 336c3ceeb7a5e9de4e5a97ac544af1d65376ca8007fddbed4d77f6f715a9a068
+AUX ming-0.4.x-libpng14.patch 539 RMD160 2bf1b3204ec8cfae1a084c846b3179b84f2670d9 SHA1 63ec02405840056876f25961d6f69a3f289b3e35 SHA256 bd8b84ca82228e57832aaae6cb4058e0c52981bbf12912fd9093bd64c6ebe727
 DIST ming-0.2a.tgz 316447 RMD160 2dc888ca8ffda1e219002081973de8855b3faf61 SHA1 9f8b4d9afcee51351b326e6f072352cc8ac013f5 SHA256 b986908e72228574efcc7d4a196ae4edf9a276399a1ada6aaf66aafe6142e744
 DIST ming-0.4.2.tar.bz2 14482816 RMD160 84386bcece2b77658f66bce64906f9484cdcd247 SHA1 5e9ac6607ae6f03c2957f7c27b7c593c8b2f625d SHA256 b8f599ea8b5cb5051a558c3cdffe5ac1badf8331e574f92d3c0f12fe25e9ddfb
 DIST ming_0.3.0-13.diff.gz 44050 RMD160 391c3ebeae85e93523c32d93cd99913cd405335d SHA1 61cf3e77b3589e27dc981cb5f1ce9b7e0a908127 SHA256 b510902798378a05d63eff457cad2a17cfb03aad878136354175fcc3b633f594
 DIST ming_0.3.0.orig.tar.gz 369259 RMD160 d1484c8ed5442f82d3311fe6164beb5dc9ce2ad9 SHA1 e9231132cca3a6e46d8d7988a490871c5c3fa112 SHA256 1eec7136f2b8548476f79335e2dc9cea78f31a0c09a1cccd07782ee4d74959d9
-EBUILD ming-0.2a.ebuild 1291 RMD160 910eadeca2a085b1269a532f663ec5c7f375dde3 SHA1 e9634e97e45ed60428c1fc7abbeda03d22248b73 SHA256 2f644837cf22fcf020acb4a8fe9f2a48b5bcc55dccaece870d45c486051c895d
+EBUILD ming-0.2a.ebuild 1293 RMD160 619c26d4cedd0f9e062bb254439f634cd0933874 SHA1 6ddea2de2db5bea7463c1d2452a71888361358e4 SHA256 e57465bb88206976f6a3d5ff47230bdf1230d17e21f684f88bf67c0d39e08ce7
 EBUILD ming-0.3.0-r1.ebuild 3029 RMD160 c418cecf4606f9dc6f45fabfb20a67e40d7872b6 SHA1 e7b8dbe4d40fd7c3429d173853d30e6671a42a8c SHA256 c28729e015182580230a84df67f7c633005186d972f3372e1451642ea84c5d3b
-EBUILD ming-0.4.0_rc2.ebuild 2394 RMD160 75502233454d28bce64cb7144f153d393afff973 SHA1 d283e30784aff77d707d6ca013857540c737d7ef SHA256 faa9b547cdd62c914d567f59e7cb15675ed461626ce55ece6c45f5260a186a16
-MISC ChangeLog 7818 RMD160 49a4cdea2dd11660822911cc691dd901e702c76f SHA1 9a05455def69753809c27f92e52afe0c31c160d3 SHA256 2073d99e6bb0a7f90ff720faac6aa637f9fe60a8be841865a1d6cea7e1fa6fe5
+EBUILD ming-0.4.0_rc2.ebuild 2446 RMD160 6b1aa265865f7b651274a75b7169d7b471340353 SHA1 54e114276899b66df07d7fbdaece111ef7ed4185 SHA256 719c5518613baccfaedff17359c10db74667e5543fe075411505dc4a168570b5
+MISC ChangeLog 7995 RMD160 59b0e78d70544f0ebf4a01fc65e6707a8b199d37 SHA1 09e18f09dc9964a2c46e794c7e719e3768290638 SHA256 5add2faad3eb45bd1a4d2e5310470448a83a0da2deeeebe658f2376a61adaf13
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1

diff --git a/media-libs/ming/files/ming-0.4.x-libpng14.patch b/media-libs/ming/files/ming-0.4.x-libpng14.patch
new file mode 100644 (file)
index 0000000..ce43fde
--- /dev/null
+++ b/media-libs/ming/files/ming-0.4.x-libpng14.patch
@@ -0,0 +1,20 @@
+--- src/blocks/pngdbl.c
++++ src/blocks/pngdbl.c
+@@ -49,7 +49,7 @@
+ 
+       if(fread(header, 1, 8, fp) != 8)
+               return NULL;
+-      if(!png_check_sig(header, 8))
++      if(png_sig_cmp(header, 0, 8))
+               return NULL;
+       result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+       if(!result)
+@@ -69,7 +69,7 @@
+       
+       if(SWFInput_read(input, header, 8) != 8)
+               return NULL;
+-      if(!png_check_sig(header, 8))
++      if(png_sig_cmp(header, 0, 8))
+               return NULL;
+       result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+       if(!result)

diff --git a/media-libs/ming/ming-0.2a.ebuild b/media-libs/ming/ming-0.2a.ebuild
index eaca9df00af6ae6e61ddd5d815fb3b865b573d5f..84d644c2f23c99fc8e521fe52337d39580f4771a 100644 (file)
--- a/media-libs/ming/ming-0.2a.ebuild
+++ b/media-libs/ming/ming-0.2a.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.28 2009/06/06 21:07:45 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.29 2010/03/14 14:44:47 ssuominen Exp $
 
 inherit eutils toolchain-funcs multilib
 
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 
 DESCRIPTION="An Open Source library for Flash movie generation."
 HOMEPAGE="http://www.opaque.net/ming/"

diff --git a/media-libs/ming/ming-0.4.0_rc2.ebuild b/media-libs/ming/ming-0.4.0_rc2.ebuild
index 032ae13201db35bc6b52243e7caf87e645bbf1a3..0ab9521a2fceb6f47b77238ceefbdbb5438bce0d 100644 (file)
--- a/media-libs/ming/ming-0.4.0_rc2.ebuild
+++ b/media-libs/ming/ming-0.4.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.0_rc2.ebuild,v 1.9 2010/01/31 16:01:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.4.0_rc2.ebuild,v 1.10 2010/03/14 14:44:47 ssuominen Exp $
 
 EAPI=1
 
@@ -38,6 +38,7 @@ RESTRICT="test"
 src_unpack() {
        unpack ${A}
        cd "${S}"
+       epatch "${FILESDIR}"/${PN}-0.4.x-libpng14.patch
 
        #Let's get rid of the TEXTRELS, link dynamic. Use gif.
        sed -i \