diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-04-10 04:46:15 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-10 04:46:15 +0000 |
commit | dcffd9797c849d7d742bbf247c4b3e23c36a4510 (patch) | |
tree | ab516766abd1d37d7ff4a48b630918ba01cb556a /media-libs/libpng | |
parent | arm/s390/sh stable (diff) | |
download | gentoo-2-dcffd9797c849d7d742bbf247c4b3e23c36a4510.tar.gz gentoo-2-dcffd9797c849d7d742bbf247c4b3e23c36a4510.tar.bz2 gentoo-2-dcffd9797c849d7d742bbf247c4b3e23c36a4510.zip |
old
(Portage version: 2.2_pre5)
Diffstat (limited to 'media-libs/libpng')
-rw-r--r-- | media-libs/libpng/files/1.2.7-gentoo.diff | 13 | ||||
-rw-r--r-- | media-libs/libpng/files/libpng-1.2.18-gray.patch | 20 | ||||
-rw-r--r-- | media-libs/libpng/files/libpng-1.2.21-null-termination.patch | 27 | ||||
-rw-r--r-- | media-libs/libpng/files/libpng-1.2.21-off-by-one.patch | 14 | ||||
-rw-r--r-- | media-libs/libpng/files/libpng-1.2.22-locale-syms.patch | 14 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.18-r1.ebuild | 38 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.20.ebuild | 37 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.21-r2.ebuild | 38 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.21-r3.ebuild | 38 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.22.ebuild | 37 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.23.ebuild | 36 | ||||
-rw-r--r-- | media-libs/libpng/libpng-1.2.24.ebuild | 36 |
12 files changed, 0 insertions, 348 deletions
diff --git a/media-libs/libpng/files/1.2.7-gentoo.diff b/media-libs/libpng/files/1.2.7-gentoo.diff deleted file mode 100644 index 230a93a67a49..000000000000 --- a/media-libs/libpng/files/1.2.7-gentoo.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- pngconf.h.orig 2004-09-11 23:35:25.000000000 -0700 -+++ pngconf.h 2004-09-11 23:35:52.000000000 -0700 -@@ -260,8 +260,8 @@ - /* If you encounter a compiler error here, see the explanation - * near the end of INSTALL. - */ -- __png.h__ already includes setjmp.h; -- __dont__ include it again.; -+#warning __png.h__ already includes setjmp.h; -+#warning __dont__ include it again.; - # endif - # endif /* __linux__ */ - diff --git a/media-libs/libpng/files/libpng-1.2.18-gray.patch b/media-libs/libpng/files/libpng-1.2.18-gray.patch deleted file mode 100644 index bf6564e8850c..000000000000 --- a/media-libs/libpng/files/libpng-1.2.18-gray.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix from upstream for a regression in grey handling - -http://bugs.gentoo.org/181318 - ---- pngrtran.c -+++ pngrtran.c -@@ -1293,9 +1293,11 @@ - if(rgb_error) - { - png_ptr->rgb_to_gray_status=1; -- if(png_ptr->transformations & PNG_RGB_TO_GRAY_WARN) -+ if((png_ptr->transformations & PNG_RGB_TO_GRAY) == -+ PNG_RGB_TO_GRAY_WARN) - png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel"); -- if(png_ptr->transformations & PNG_RGB_TO_GRAY_ERR) -+ if((png_ptr->transformations & PNG_RGB_TO_GRAY) == -+ PNG_RGB_TO_GRAY_ERR) - png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel"); - } - } diff --git a/media-libs/libpng/files/libpng-1.2.21-null-termination.patch b/media-libs/libpng/files/libpng-1.2.21-null-termination.patch deleted file mode 100644 index 96df6e0c9844..000000000000 --- a/media-libs/libpng/files/libpng-1.2.21-null-termination.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- libpng-1.2.21.orig/pngset.c 2007-10-07 16:56:56.062965000 -0500 -+++ libpng-1.2.21/pngset.c 2007-10-09 11:47:35.462755000 -0500 -@@ -689,9 +689,10 @@ - { - png_warning(png_ptr, "Insufficient memory to process iCCP chunk."); - return; - } -- png_strncpy(new_iccp_name, name, png_strlen(new_iccp_name)+1); -+ png_strncpy(new_iccp_name, name, png_strlen(name)); -+ new_iccp_name[png_strlen(name)] = '\0'; - new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen); - if (new_iccp_profile == NULL) - { - png_free (png_ptr, new_iccp_name); -@@ -979,9 +980,10 @@ - png_warning(png_ptr, - "Out of memory while processing sPLT chunk"); - } - /* TODO: use png_malloc_warn */ -- png_strncpy(to->name, from->name, png_strlen(from->name)+1); -+ png_strncpy(to->name, from->name, png_strlen(from->name)); -+ to->name[png_strlen(from->name)] = '\0'; - to->entries = (png_sPLT_entryp)png_malloc_warn(png_ptr, - from->nentries * png_sizeof(png_sPLT_entry)); - /* TODO: use png_malloc_warn */ - png_memcpy(to->entries, from->entries, - diff --git a/media-libs/libpng/files/libpng-1.2.21-off-by-one.patch b/media-libs/libpng/files/libpng-1.2.21-off-by-one.patch deleted file mode 100644 index 39a9534c24c4..000000000000 --- a/media-libs/libpng/files/libpng-1.2.21-off-by-one.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/194864 -http://sourceforge.net/mailarchive/forum.php?thread_name=47067C84.7010205%40playstation.sony.com&forum_name=png-mng-implement ---- pngset.c -+++ pngset.c -@@ -690,7 +690,8 @@ - png_warning(png_ptr, "Insufficient memory to process iCCP chunk."); - return; - } -- png_strncpy(new_iccp_name, name, png_strlen(new_iccp_name)+1); -+ png_strncpy(new_iccp_name, name, png_strlen(name)); -+ new_iccp_name[png_strlen(name)+1]=0; - new_iccp_profile = (png_charp)png_malloc_warn(png_ptr, proflen); - if (new_iccp_profile == NULL) - { diff --git a/media-libs/libpng/files/libpng-1.2.22-locale-syms.patch b/media-libs/libpng/files/libpng-1.2.22-locale-syms.patch deleted file mode 100644 index 649cc9d34989..000000000000 --- a/media-libs/libpng/files/libpng-1.2.22-locale-syms.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/195813 - ---- Makefile.in -+++ Makefile.in -@@ -1230,7 +1230,7 @@ - libpng.sym: png.h pngconf.h - rm -f $@ $@.new - $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ -- $(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ -- -e 's|^.*PNG_DATA_EXPORT[ ]*\([a-zA-Z0-9_]*\).*$$|\1|p' \ -+ $(SED) -n -e 's|^.*PNG_FUNCTION_EXPORT[ ]*\([[:alnum:]_]*\).*$$|\1|p' \ -+ -e 's|^.*PNG_DATA_EXPORT[ ]*\([[:alnum:]_]*\).*$$|\1|p' \ - >$@.new - mv $@.new $@ diff --git a/media-libs/libpng/libpng-1.2.18-r1.ebuild b/media-libs/libpng/libpng-1.2.18-r1.ebuild deleted file mode 100644 index 97886469c258..000000000000 --- a/media-libs/libpng/libpng-1.2.18-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.18-r1.ebuild,v 1.11 2007/10/12 14:50:11 vapier Exp $ - -inherit libtool multilib eutils - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/1.2.7-gentoo.diff - epatch "${FILESDIR}"/${P}-gray.patch #181318 - - # So we get sane .so versioning on FreeBSD - elibtoolize -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO -} - -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 -} diff --git a/media-libs/libpng/libpng-1.2.20.ebuild b/media-libs/libpng/libpng-1.2.20.ebuild deleted file mode 100644 index ff19e63897a0..000000000000 --- a/media-libs/libpng/libpng-1.2.20.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.20.ebuild,v 1.2 2007/10/12 14:50:11 vapier Exp $ - -inherit libtool multilib eutils flag-o-matic - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/1.2.7-gentoo.diff - - # So we get sane .so versioning on FreeBSD - elibtoolize -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO -} - -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 -} diff --git a/media-libs/libpng/libpng-1.2.21-r2.ebuild b/media-libs/libpng/libpng-1.2.21-r2.ebuild deleted file mode 100644 index f8f7fa83a5cd..000000000000 --- a/media-libs/libpng/libpng-1.2.21-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.21-r2.ebuild,v 1.2 2007/10/12 14:50:11 vapier Exp $ - -inherit libtool multilib eutils flag-o-matic - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/1.2.7-gentoo.diff - epatch "${FILESDIR}"/${P}-off-by-one.patch #194864 - - # So we get sane .so versioning on FreeBSD - elibtoolize -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO -} - -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 -} diff --git a/media-libs/libpng/libpng-1.2.21-r3.ebuild b/media-libs/libpng/libpng-1.2.21-r3.ebuild deleted file mode 100644 index 571216110639..000000000000 --- a/media-libs/libpng/libpng-1.2.21-r3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.21-r3.ebuild,v 1.10 2007/10/14 21:26:43 vapier Exp $ - -inherit libtool multilib eutils flag-o-matic - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/1.2.7-gentoo.diff - epatch "${FILESDIR}"/${P}-null-termination.patch #194864 - - # So we get sane .so versioning on FreeBSD - elibtoolize -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO -} - -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 -} diff --git a/media-libs/libpng/libpng-1.2.22.ebuild b/media-libs/libpng/libpng-1.2.22.ebuild deleted file mode 100644 index d40d639de5ac..000000000000 --- a/media-libs/libpng/libpng-1.2.22.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.22.ebuild,v 1.10 2007/12/11 23:14:31 vapier Exp $ - -inherit libtool multilib eutils - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/1.2.7-gentoo.diff - epatch "${FILESDIR}"/${P}-locale-syms.patch #195813 - # So we get sane .so versioning on FreeBSD - elibtoolize -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO -} - -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 -} diff --git a/media-libs/libpng/libpng-1.2.23.ebuild b/media-libs/libpng/libpng-1.2.23.ebuild deleted file mode 100644 index f900dcbe395d..000000000000 --- a/media-libs/libpng/libpng-1.2.23.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.23.ebuild,v 1.1 2007/11/09 18:04:53 vapier Exp $ - -inherit libtool multilib eutils - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/1.2.7-gentoo.diff - # So we get sane .so versioning on FreeBSD - elibtoolize -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO -} - -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 -} diff --git a/media-libs/libpng/libpng-1.2.24.ebuild b/media-libs/libpng/libpng-1.2.24.ebuild deleted file mode 100644 index ebc2302bad79..000000000000 --- a/media-libs/libpng/libpng-1.2.24.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.24.ebuild,v 1.8 2008/03/16 07:27:25 vapier Exp $ - -inherit libtool multilib eutils - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2" - -LICENSE="as-is" -SLOT="1.2" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" -IUSE="" - -DEPEND="sys-libs/zlib" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-1.2.24-pngconf-setjmp.patch - # So we get sane .so versioning on FreeBSD - elibtoolize -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO -} - -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 -} |