Add patch by David Nadlinger to make sure PNG_NO_ASSEMBLER_CODE is properly exported to pngconf.h (this is already fixed in libpng-1.4 betas) #136452 / #139052.

Package-Manager: portage-2.1.1_pre2-r2

8 files changed, 160 insertions, 19 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 3b90ffe78d3c..320119ecf485 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.88 2006/07/03 20:03:41 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.89 2006/07/06 04:24:29 vapier Exp $
+
+*libpng-1.2.12-r1 (06 Jul 2006)
+
+  06 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/libpng-1.2.12-no-asm.patch, +libpng-1.2.12-r1.ebuild:
+  Add patch by David Nadlinger to make sure PNG_NO_ASSEMBLER_CODE is properly
+  exported to pngconf.h (this is already fixed in libpng-1.4 betas) #136452 /
+  #139052.
 
   03 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> libpng-1.2.12.ebuild:
   Stable on sparc wrt security #138433
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index a772e301b407..b138c764312a 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -5,6 +5,10 @@ AUX 1.2.7-gentoo.diff 464 RMD160 536439602f48539452c626fe80a3022640ff1277 SHA1 b
 MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
 RMD160 536439602f48539452c626fe80a3022640ff1277 files/1.2.7-gentoo.diff 464
 SHA256 5e44bbb599b25c4909a7cfc8b3478847ebc6f10bfcc21e98e1609d83f4c1acc6 files/1.2.7-gentoo.diff 464
+AUX libpng-1.2.12-no-asm.patch 1885 RMD160 19da2d7ad292c01b120dbb8d5c817b1db8537d57 SHA1 7382d09563342a0ffa6d12b2f7b8ac18c30a092a SHA256 293b782f43787a57f0f60aae3198efead8099df67652fe9026a2ff3266e2bbfc
+MD5 c0960ea4127d955b2767930f001007be files/libpng-1.2.12-no-asm.patch 1885
+RMD160 19da2d7ad292c01b120dbb8d5c817b1db8537d57 files/libpng-1.2.12-no-asm.patch 1885
+SHA256 293b782f43787a57f0f60aae3198efead8099df67652fe9026a2ff3266e2bbfc files/libpng-1.2.12-no-asm.patch 1885
 AUX libpng-1.2.8-build.patch 3845 RMD160 e99732989a4c41980340cd8564c6e10e31b07501 SHA1 749ca740d8cfcdadffc85e49f92a33fd87831a4c SHA256 50d4375bc56b5923793893554ef64d9727c9651df672ac4f0beec2463034b105
 MD5 c13ed05aceb450c805e01fd39d16ae45 files/libpng-1.2.8-build.patch 3845
 RMD160 e99732989a4c41980340cd8564c6e10e31b07501 files/libpng-1.2.8-build.patch 3845
@@ -16,11 +20,15 @@ SHA256 1b44de20e24aebaf27623d0948b9d6cc7d60109315d0bc22f072cf55953ad304 files/li
 DIST libpng-1.2.10.tar.bz2 625176 RMD160 8dbbf8ef709e6b35cc715302a7d3a50bef1a88c8 SHA1 075fe05e25012470d0351187b57e8256b95d2e89 SHA256 f3e8363d23ed1a3bc82317dbf3d75f76a708bbe9b0a2d23bd617160106d02ca8
 DIST libpng-1.2.12.tar.bz2 621295 RMD160 c5c702869d73732d5e91e53a9e380fcbf89f3ae2 SHA1 44bd6821607ba09ac500279363871ad5974a01b5 SHA256 7d06103ce32bffa39730d1c12c4b4dcfd50a8f1c18d2462807cfe7c0c3ca0e64
 DIST libpng-1.2.8.tar.bz2 384970 RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c SHA1 b6d73493eea4095166118b298efecb54a8e3d2f5 SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
-DIST libpng-manual.txt 127770
+DIST libpng-manual.txt 127770 RMD160 e46eeef8a202a9775ed2e5394eae2ce44466349c SHA1 7770625fdbb4d47f9e2a54aa000d8b678248ec34 SHA256 2775c77d00f1eac5555013b8448e45624745fd692d1cb58f5c6b57408dfdd4d5
 EBUILD libpng-1.2.10.ebuild 1131 RMD160 79d87279292eef7e616e00de1b9ce4e5456f168c SHA1 d29ec11806547b800d98418c43e98124df00b352 SHA256 0e589707defe6db3b4ec21da94660078f207cc64af63b92d3326a345a6f8afd6
 MD5 ddc622257d53311ee9c7ac37a47606b8 libpng-1.2.10.ebuild 1131
 RMD160 79d87279292eef7e616e00de1b9ce4e5456f168c libpng-1.2.10.ebuild 1131
 SHA256 0e589707defe6db3b4ec21da94660078f207cc64af63b92d3326a345a6f8afd6 libpng-1.2.10.ebuild 1131
+EBUILD libpng-1.2.12-r1.ebuild 1288 RMD160 28e8705180d51a6d17cd0075028c345f4f2d9d7b SHA1 26cf29a1aa96957d0b0af0ec0bdc686607c7e80e SHA256 5147d1fa8f0214a6c4e1563ff3dccce6960ce685ec5ef982c67fd6df3a5487c5
+MD5 e04dad77a0906d66b7f137645f547e5e libpng-1.2.12-r1.ebuild 1288
+RMD160 28e8705180d51a6d17cd0075028c345f4f2d9d7b libpng-1.2.12-r1.ebuild 1288
+SHA256 5147d1fa8f0214a6c4e1563ff3dccce6960ce685ec5ef982c67fd6df3a5487c5 libpng-1.2.12-r1.ebuild 1288
 EBUILD libpng-1.2.12.ebuild 1120 RMD160 3095fc25450f207f07f9fafdcdd1109289d42828 SHA1 df40af3c5e8d31c3ae4de249793ac61eb8c2d677 SHA256 aa322fef83df1200eeeedde7ac26e2b29753ee3b679c78f84c89e8f34d3e44b0
 MD5 3bc48ced385a7cf4c4af656e0118db1d libpng-1.2.12.ebuild 1120
 RMD160 3095fc25450f207f07f9fafdcdd1109289d42828 libpng-1.2.12.ebuild 1120
@@ -29,27 +37,30 @@ EBUILD libpng-1.2.8-r1.ebuild 1838 RMD160 acd1d6bf78aec399321901615e4f4d0c8e0846
 MD5 a7fb6a341c48dee3484730bc531b5a44 libpng-1.2.8-r1.ebuild 1838
 RMD160 acd1d6bf78aec399321901615e4f4d0c8e0846f4 libpng-1.2.8-r1.ebuild 1838
 SHA256 8d3103e31521e4abdc5432bd591e490e4e4167f16c6230a3a3857c687a27b39e libpng-1.2.8-r1.ebuild 1838
-MISC ChangeLog 13243 RMD160 ab333c521edf28ff34546c60cec993a7adf9a28d SHA1 5d52ba75b9246629309573fd056ea8ed703673ed SHA256 9c4c1231554689b0b1bc6cff698dc5baa3afba67bd510fc4917fc86509f0ed92
-MD5 fe7d562661a5e0d1eff9c212a5d00f23 ChangeLog 13243
-RMD160 ab333c521edf28ff34546c60cec993a7adf9a28d ChangeLog 13243
-SHA256 9c4c1231554689b0b1bc6cff698dc5baa3afba67bd510fc4917fc86509f0ed92 ChangeLog 13243
+MISC ChangeLog 13555 RMD160 e41a465c397564e818fbd656c81e66b16810132e SHA1 bee2e3504b4255771009a5c154adb98ef725a5f5 SHA256 bd9ff8c12df3bf83be256fb7f15e76378982b7bb87b3f9151d29f9a0a521b07d
+MD5 ab054830fae6be399887ab35ca7de81c ChangeLog 13555
+RMD160 e41a465c397564e818fbd656c81e66b16810132e ChangeLog 13555
+SHA256 bd9ff8c12df3bf83be256fb7f15e76378982b7bb87b3f9151d29f9a0a521b07d ChangeLog 13555
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 6e6bc21f01de24a652054d9b887ae370 files/digest-libpng-1.2.10 306
-RMD160 3bf05c50b11431350fdde18756d759983b2bf18a files/digest-libpng-1.2.10 306
-SHA256 b2c10f5d9466cb2616503ef961ccdf79af8a93ec42ecdb64216a78c2e1c42938 files/digest-libpng-1.2.10 306
-MD5 144ff2b842f1cb53951afe17736b3025 files/digest-libpng-1.2.12 306
-RMD160 02c2ed9603726938d36299be0cd6c73a253dac33 files/digest-libpng-1.2.12 306
-SHA256 d621892779efd28148d57ce5a2274c56d130b224689423d5eded78897cbb4c2c files/digest-libpng-1.2.12 306
-MD5 ffc773b31e4d51e139450dda0f4fcb10 files/digest-libpng-1.2.8-r1 303
-RMD160 7c1cfe1936fc68ebd2656963f9db135861910339 files/digest-libpng-1.2.8-r1 303
-SHA256 dba1b69e0b6c4b403e0f35dc4ff5fa7b458e85431a6f3b7fd2826c6b75dcb6c4 files/digest-libpng-1.2.8-r1 303
+MD5 1a4e82354abd5b429f318c3f3260145c files/digest-libpng-1.2.10 476
+RMD160 1b634b3fd0f42fa7a95a001393a319c362449e1b files/digest-libpng-1.2.10 476
+SHA256 9b2654b04a6f551bf5a763454f32ba642edebe8cded342b08bb506e32a6150c5 files/digest-libpng-1.2.10 476
+MD5 039c9ad31482d4f4754c0218af9789c2 files/digest-libpng-1.2.12 476
+RMD160 9c20793ffa9971a8e2bb51ac79d77c876bfc0e52 files/digest-libpng-1.2.12 476
+SHA256 39f77f6d9126d1f3281661d4df1a0c01c09e561bb991b6de662c33520ff4bed7 files/digest-libpng-1.2.12 476
+MD5 039c9ad31482d4f4754c0218af9789c2 files/digest-libpng-1.2.12-r1 476
+RMD160 9c20793ffa9971a8e2bb51ac79d77c876bfc0e52 files/digest-libpng-1.2.12-r1 476
+SHA256 39f77f6d9126d1f3281661d4df1a0c01c09e561bb991b6de662c33520ff4bed7 files/digest-libpng-1.2.12-r1 476
+MD5 450583e117bedc111dfea542fbedcf2e files/digest-libpng-1.2.8-r1 473
+RMD160 bd86c066d684b55974c4f8cc91807561aeb66087 files/digest-libpng-1.2.8-r1 473
+SHA256 46e116e6c09015633bfd094400672f1ab2980a2b90753bb6ba257e66a9ce472f files/digest-libpng-1.2.8-r1 473
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEqXgsKRy60XGEcJIRAilqAKCyMrRglmnfVHO6FJwsrrg7ED1L6wCbBiCJ
-/A7Kzd5I/DySzWVVQ2/UzTo=
-=qvBp
+iD8DBQFErJCSamhnQswr0vIRAmGoAKCqboorYLySVysGGxlbw/gJEMjgngCfdcxV
+4AvhT9W2efE2c0CEFplOFAE=
+=16lQ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libpng/files/digest-libpng-1.2.10 b/media-libs/libpng/files/digest-libpng-1.2.10
index 5f86fb881aac..1de1d5b97737 100644
--- a/media-libs/libpng/files/digest-libpng-1.2.10
+++ b/media-libs/libpng/files/digest-libpng-1.2.10
@@ -2,3 +2,5 @@ MD5 4f23eebd59ddd01a8f91ff8c823dd7d6 libpng-1.2.10.tar.bz2 625176
 RMD160 8dbbf8ef709e6b35cc715302a7d3a50bef1a88c8 libpng-1.2.10.tar.bz2 625176
 SHA256 f3e8363d23ed1a3bc82317dbf3d75f76a708bbe9b0a2d23bd617160106d02ca8 libpng-1.2.10.tar.bz2 625176
 MD5 3c9069aa836541dc0e075187dcb21899 libpng-manual.txt 127770
+RMD160 e46eeef8a202a9775ed2e5394eae2ce44466349c libpng-manual.txt 127770
+SHA256 2775c77d00f1eac5555013b8448e45624745fd692d1cb58f5c6b57408dfdd4d5 libpng-manual.txt 127770
diff --git a/media-libs/libpng/files/digest-libpng-1.2.12 b/media-libs/libpng/files/digest-libpng-1.2.12
index 271409556c77..ccc7de460201 100644
--- a/media-libs/libpng/files/digest-libpng-1.2.12
+++ b/media-libs/libpng/files/digest-libpng-1.2.12
@@ -2,3 +2,5 @@ MD5 2287cfaad53a714acdf6eb75a7c1d15f libpng-1.2.12.tar.bz2 621295
 RMD160 c5c702869d73732d5e91e53a9e380fcbf89f3ae2 libpng-1.2.12.tar.bz2 621295
 SHA256 7d06103ce32bffa39730d1c12c4b4dcfd50a8f1c18d2462807cfe7c0c3ca0e64 libpng-1.2.12.tar.bz2 621295
 MD5 3c9069aa836541dc0e075187dcb21899 libpng-manual.txt 127770
+RMD160 e46eeef8a202a9775ed2e5394eae2ce44466349c libpng-manual.txt 127770
+SHA256 2775c77d00f1eac5555013b8448e45624745fd692d1cb58f5c6b57408dfdd4d5 libpng-manual.txt 127770
diff --git a/media-libs/libpng/files/digest-libpng-1.2.12-r1 b/media-libs/libpng/files/digest-libpng-1.2.12-r1
new file mode 100644
index 000000000000..ccc7de460201
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.2.12-r1
@@ -0,0 +1,6 @@
+MD5 2287cfaad53a714acdf6eb75a7c1d15f libpng-1.2.12.tar.bz2 621295
+RMD160 c5c702869d73732d5e91e53a9e380fcbf89f3ae2 libpng-1.2.12.tar.bz2 621295
+SHA256 7d06103ce32bffa39730d1c12c4b4dcfd50a8f1c18d2462807cfe7c0c3ca0e64 libpng-1.2.12.tar.bz2 621295
+MD5 3c9069aa836541dc0e075187dcb21899 libpng-manual.txt 127770
+RMD160 e46eeef8a202a9775ed2e5394eae2ce44466349c libpng-manual.txt 127770
+SHA256 2775c77d00f1eac5555013b8448e45624745fd692d1cb58f5c6b57408dfdd4d5 libpng-manual.txt 127770
diff --git a/media-libs/libpng/files/digest-libpng-1.2.8-r1 b/media-libs/libpng/files/digest-libpng-1.2.8-r1
index 5eb76861bc9f..85b14bf3ba93 100644
--- a/media-libs/libpng/files/digest-libpng-1.2.8-r1
+++ b/media-libs/libpng/files/digest-libpng-1.2.8-r1
@@ -2,3 +2,5 @@ MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
 RMD160 7de7456faaa4e4361b6b7ed74c87f0702f9cc88c libpng-1.2.8.tar.bz2 384970
 SHA256 9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b libpng-1.2.8.tar.bz2 384970
 MD5 3c9069aa836541dc0e075187dcb21899 libpng-manual.txt 127770
+RMD160 e46eeef8a202a9775ed2e5394eae2ce44466349c libpng-manual.txt 127770
+SHA256 2775c77d00f1eac5555013b8448e45624745fd692d1cb58f5c6b57408dfdd4d5 libpng-manual.txt 127770
diff --git a/media-libs/libpng/files/libpng-1.2.12-no-asm.patch b/media-libs/libpng/files/libpng-1.2.12-no-asm.patch
new file mode 100644
index 000000000000..defe23635d11
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.2.12-no-asm.patch
@@ -0,0 +1,61 @@
+backport from current 1.4 beta's to handle the bug where the
+PNG_NO_ASSEMBLER_CODE define is not exported properly
+
+http://bugs.gentoo.org/136346
+
+--- libpng-1.2.12/configure.ac
++++ libpng-1.2.12/configure.ac
+@@ -62,15 +62,12 @@
+ AC_TRY_COMPILE(
+   [#include "pnggccrd.c"],
+   [return 0;],
+-  LIBPNG_DEFINES=,
+-  LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)
+-if test "$LIBPNG_DEFINES"; then
+-    AC_MSG_RESULT(no)
+-else
+-    AC_MSG_RESULT(yes)
+-    LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
+-fi
++  [LIBPNG_NO_ASSEMBLER=yes; LIBPNG_DEFINES=""],
++  [LIBPNG_NO_ASSEMBLER=no ; LIBPNG_DEFINES="-DPNG_NO_ASSEMBLER_CODE=1"])
++LIBPNG_DEFINES="$LIBPNG_DEFINES -DPNG_CONFIGURE_LIBPNG"
++AC_MSG_RESULT($LIBPNG_NO_ASSEMBLER)
+ AC_SUBST(LIBPNG_DEFINES)
++AM_CONDITIONAL(LIBPNG_NO_ASSEMBLER, test "x$LIBPNG_NO_ASSEMBLER" = "xno")
+ 
+ AC_MSG_CHECKING([if libraries can be versioned])
+ GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
+--- libpng-1.2.12/Makefile.am
++++ libpng-1.2.12/Makefile.am
+@@ -87,6 +87,14 @@
+ 
+ CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
+
++pngconf.h: pngconf.h.in
++	sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h.tmp
++if LIBPNG_NO_ASSEMBLER
++	echo "#define PNG_NO_ASSEMBLER_CODE 1" >> pngconf.h.tmp
++endif
++	sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h.tmp
++	mv pngconf.h.tmp pngconf.h
++
+ $(PNGLIB_BASENAME).pc: libpng.pc
+ 	cp libpng.pc $@
+ 
+--- libpng-1.2.12/pngconf.h
++++ libpng-1.2.12/pngconf.h
+@@ -19,6 +19,13 @@
+ 
+ #define PNG_1_2_X
+ 
++/* Backported no-assembler fix from libpng-1.4.0beta8 */
++
++/* Makefile-supplied defines go here: */
++/* End of Makefile-supplied defines. */
++
++/* End of backported no-assembler fix */
++
+ /* 
+  * PNG_USER_CONFIG has to be defined on the compiler command line. This
+  * includes the resource compiler for Windows DLL configurations.
diff --git a/media-libs/libpng/libpng-1.2.12-r1.ebuild b/media-libs/libpng/libpng-1.2.12-r1.ebuild
new file mode 100644
index 000000000000..81db20fca995
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.12-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.12-r1.ebuild,v 1.1 2006/07/06 04:24:29 vapier Exp $
+
+inherit eutils autotools multilib
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2
+	doc? ( http://www.libpng.org/pub/png/libpng-manual.txt )"
+
+LICENSE="as-is"
+SLOT="1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="sys-libs/zlib"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd "${S}"
+	use doc && cp "${DISTDIR}"/libpng-manual.txt .
+
+	epatch "${FILESDIR}"/1.2.7-gentoo.diff
+
+	# Fixes for #136452
+	epatch "${FILESDIR}"/${P}-no-asm.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf || die
+	mv pngconf.h pngconf.h.in
+	emake pngconf.h || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
+	use doc && dodoc libpng-manual.txt
+}
+
+pkg_postinst() {
+	# the libpng authors really screwed around between 1.2.1 and 1.2.3
+	if [[ -f ${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1 ]] ; then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libpng.so.3.1.2.1
+	fi
+}