From 3bc1ca955249c735ae33176f03f2dc22eda337ab Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 1 Jan 2017 09:32:32 +0000 Subject: [PATCH 1/2] libpng16: fix lib version and simplify future updates too. --- media-libs/libpng/libpng16-1.6.27.recipe | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/media-libs/libpng/libpng16-1.6.27.recipe b/media-libs/libpng/libpng16-1.6.27.recipe index a98317d50..037036eb4 100644 --- a/media-libs/libpng/libpng16-1.6.27.recipe +++ b/media-libs/libpng/libpng16-1.6.27.recipe @@ -7,7 +7,7 @@ COPYRIGHT="1998-2016 Glenn Randers-Pehrson 1996-1997 Andreas Dilger 1995-1996 Guy Eric Schalnat, Group 42, Inc." LICENSE="LibPNG" -REVISION="1" +REVISION="2" SOURCE_URI="http://downloads.sf.net/libpng/libpng-$portVersion.tar.gz" CHECKSUM_SHA256="c9d164ec247f426a525a7b89936694aefbc91fb7a50182b198898b8fc91174b4" SOURCE_DIR="libpng-$portVersion" @@ -15,10 +15,13 @@ SOURCE_DIR="libpng-$portVersion" ARCHITECTURES="x86_gcc2 x86 x86_64 arm ?ppc" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +# define libVersion as xy.z.0 when portVersion is x.y.z. +libVersion="${portVersion/\./}.0" + PROVIDES=" libpng16$secondaryArchSuffix = $portVersion compat >= 1.6 - lib:libpng$secondaryArchSuffix = 16.26.0 compat >= 16 - lib:libpng16$secondaryArchSuffix = 16.26.0 compat >= 16 + lib:libpng$secondaryArchSuffix = $libVersion compat >= 16 + lib:libpng16$secondaryArchSuffix = $libVersion compat >= 16 " REQUIRES=" haiku$secondaryArchSuffix @@ -32,8 +35,8 @@ PROVIDES_devel=" cmd:pngcp$secondaryArchSuffix = $portVersion compat >= 1.6 cmd:pngfix$secondaryArchSuffix = $portVersion compat >= 1.6 cmd:png_fix_itxt$secondaryArchSuffix = $portVersion compat >= 1.6 - devel:libpng$secondaryArchSuffix = 16.26.0 compat >= 16 - devel:libpng16$secondaryArchSuffix = 16.26.0 compat >= 16 + devel:libpng$secondaryArchSuffix = $libVersion compat >= 16 + devel:libpng16$secondaryArchSuffix = $libVersion compat >= 16 " REQUIRES_devel=" libpng16$secondaryArchSuffix == $portVersion base From 69e08eb9db9c8e4640536d1973e972864099bbcf Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 1 Jan 2017 11:14:15 +0000 Subject: [PATCH 2/2] libpng: bump to 1.5.28, drop libtool files. --- ...{libpng-1.5.27.recipe => libpng-1.5.28.recipe} | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) rename media-libs/libpng/{libpng-1.5.27.recipe => libpng-1.5.28.recipe} (81%) diff --git a/media-libs/libpng/libpng-1.5.27.recipe b/media-libs/libpng/libpng-1.5.28.recipe similarity index 81% rename from media-libs/libpng/libpng-1.5.27.recipe rename to media-libs/libpng/libpng-1.5.28.recipe index 0ae43b1ff..4e38ffd93 100644 --- a/media-libs/libpng/libpng-1.5.27.recipe +++ b/media-libs/libpng/libpng-1.5.28.recipe @@ -7,16 +7,19 @@ COPYRIGHT="1998-2016 Glenn Randers-Pehrson 1996-1997 Andreas Dilger 1995-1996 Guy Eric Schalnat, Group 42 Inc." LICENSE="LibPNG" -REVISION="2" +REVISION="1" SOURCE_URI="http://downloads.sourceforge.net/libpng/libpng-$portVersion.tar.gz" -CHECKSUM_SHA256="fa934f6ef7474889d408c66e26260b8dd34a048a239bff72372350425767d44b" +CHECKSUM_SHA256="7dd9931dbdd43865055eeba52778ace6df5712b7f6f80f73c2b16b912c124a87" ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +# define libVersion as xy.z.0 when portVersion is x.y.z. +libVersion="${portVersion/\./}.0" + PROVIDES=" libpng$secondaryArchSuffix = $portVersion compat >= 1.5 - lib:libpng15$secondaryArchSuffix = 15.27.0 compat >= 15 + lib:libpng15$secondaryArchSuffix = $libVersion compat >= 15 " REQUIRES=" haiku$secondaryArchSuffix @@ -27,8 +30,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.27.0 compat >= 15 - devel:libpng15$secondaryArchSuffix = 15.27.0 compat >= 15 + devel:libpng$secondaryArchSuffix = $libVersion compat >= 15 + devel:libpng15$secondaryArchSuffix = $libVersion compat >= 15 " REQUIRES_devel=" libpng$secondaryArchSuffix == $portVersion base @@ -61,6 +64,8 @@ INSTALL() { make install + rm $libDir/libpng*.la + rm -Rf $manDir/man5 prepareInstalledDevelLibs libpng libpng15