From 23e893fe00a6963d4350ed991c6443d86d694486 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 24 Nov 2014 18:05:01 +0000 Subject: [PATCH] libpng: bump version --- ...png-1.5.12.recipe => libpng-1.5.20.recipe} | 16 ++++++-------- .../libpng/patches/libpng-1.5.12.patchset | 22 ------------------- 2 files changed, 7 insertions(+), 31 deletions(-) rename media-libs/libpng/{libpng-1.5.12.recipe => libpng-1.5.20.recipe} (78%) delete mode 100644 media-libs/libpng/patches/libpng-1.5.12.patchset diff --git a/media-libs/libpng/libpng-1.5.12.recipe b/media-libs/libpng/libpng-1.5.20.recipe similarity index 78% rename from media-libs/libpng/libpng-1.5.12.recipe rename to media-libs/libpng/libpng-1.5.20.recipe index a4552a021..89f61613c 100644 --- a/media-libs/libpng/libpng-1.5.12.recipe +++ b/media-libs/libpng/libpng-1.5.20.recipe @@ -10,18 +10,16 @@ COPYRIGHT=" 1995-1996 Guy Eric Schalnat, Group 42, Inc. " LICENSE="LibPNG" -SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-1.5.12.tar.gz" -CHECKSUM_SHA256="aae4c469f5f03e7c180708fc547335ad1e29854bfdda992196e9c39d2447e9f6" -REVISION="4" +SRC_URI="http://prdownloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" +CHECKSUM_SHA256="ca16b85feea75604d6ee2072486afe3fb52d867b4105e0bc60dbea78b4bc2ee0" +REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PATCHES="libpng-1.5.12.patchset" - PROVIDES=" libpng$secondaryArchSuffix = $portVersion compat >= 1.5 - lib:libpng$secondaryArchSuffix = 15.12.0 compat >= 15 - lib:libpng15$secondaryArchSuffix = 15.12.0 compat >= 15 + lib:libpng$secondaryArchSuffix = 15.20.0 compat >= 15 + lib:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 " REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion @@ -72,8 +70,8 @@ PROVIDES_devel=" libpng${secondaryArchSuffix}_devel = $portVersion compat >= 1.5 cmd:libpng_config$secondaryArchSuffix = $portVersion compat >= 1.5 cmd:libpng15_config$secondaryArchSuffix = $portVersion compat >= 1.5 - devel:libpng$secondaryArchSuffix = 15.12.0 compat >= 15 - devel:libpng15$secondaryArchSuffix = 15.12.0 compat >= 15 + devel:libpng$secondaryArchSuffix = 15.20.0 compat >= 15 + devel:libpng15$secondaryArchSuffix = 15.20.0 compat >= 15 " REQUIRES_devel=" libpng$secondaryArchSuffix == $portVersion base diff --git a/media-libs/libpng/patches/libpng-1.5.12.patchset b/media-libs/libpng/patches/libpng-1.5.12.patchset deleted file mode 100644 index 9d93644d2..000000000 --- a/media-libs/libpng/patches/libpng-1.5.12.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From ca47ea510b8f381f4cd3f0dbf887faa0b95257ca Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Mon, 10 Jun 2013 23:42:11 +0200 -Subject: configure.ac: replace obsolete AM_CONFIG_HEADER - - -diff --git a/configure.ac b/configure.ac -index beeeb81..8f51ada 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,7 +31,7 @@ PNGLIB_RELEASE=12 - dnl End of version number stuff - - AC_CONFIG_SRCDIR([pngget.c]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - # Checks for programs. - AC_LANG([C]) --- -1.7.5 -