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.

(Portage version: 2.1.1_pre2-r2)

7 files changed, 131 insertions, 1 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/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
+}