From 8401b84c023ff41302bb7e4e7e04d22d9bf1a130 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 12 Jan 2016 19:47:18 +0000 Subject: [PATCH] pngcrush: bump version. --- ...-1.7.87.patch => pngcrush-1.7.92.patchset} | 24 +++++++++++++------ ...h-1.7.87.recipe => pngcrush-1.7.92.recipe} | 4 ++-- 2 files changed, 19 insertions(+), 9 deletions(-) rename media-gfx/pngcrush/patches/{pngcrush-1.7.87.patch => pngcrush-1.7.92.patchset} (55%) rename media-gfx/pngcrush/{pngcrush-1.7.87.recipe => pngcrush-1.7.92.recipe} (90%) diff --git a/media-gfx/pngcrush/patches/pngcrush-1.7.87.patch b/media-gfx/pngcrush/patches/pngcrush-1.7.92.patchset similarity index 55% rename from media-gfx/pngcrush/patches/pngcrush-1.7.87.patch rename to media-gfx/pngcrush/patches/pngcrush-1.7.92.patchset index 215fca135..ad41496d8 100644 --- a/media-gfx/pngcrush/patches/pngcrush-1.7.87.patch +++ b/media-gfx/pngcrush/patches/pngcrush-1.7.92.patchset @@ -1,7 +1,14 @@ -diff -up pngcrush-1.7.67-nolib/pngcrush.c.orig pngcrush-1.7.67-nolib/pngcrush.c ---- pngcrush-1.7.67-nolib/pngcrush.c.orig 2013-10-15 00:27:02.442236928 -0600 -+++ pngcrush-1.7.67-nolib/pngcrush.c 2013-10-15 00:27:50.849084416 -0600 -@@ -6146,6 +6146,8 @@ int main(int argc, char *argv[]) +From 00097b118a2055f1040370ff92ad97ff3f007349 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 12 Jan 2016 19:35:11 +0000 +Subject: haiku patch + + +diff --git a/pngcrush.c b/pngcrush.c +index c049657..de80835 100644 +--- a/pngcrush.c ++++ b/pngcrush.c +@@ -6461,6 +6461,8 @@ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED) png_uint_32 zbuf_size; png_uint_32 required_window; int channels = 0; @@ -10,12 +17,15 @@ diff -up pngcrush-1.7.67-nolib/pngcrush.c.orig pngcrush-1.7.67-nolib/pngcrush.c png_set_compression_strategy(write_ptr, z_strategy); png_set_compression_mem_level(write_ptr, -@@ -6167,8 +6169,6 @@ int main(int argc, char *argv[]) +@@ -6482,8 +6484,6 @@ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED) * a png_uint_32, by limiting the width and height used * to 15 bits. */ - png_uint_32 rowbytes; - png_uint_32 h = height; - rowbytes = png_get_rowbytes(read_ptr, read_info_ptr); - #ifndef PNGCRUSH_H + /* FIX THIS, does not work with libpng-1.7.0 + * because info_ptr->bit_depth has not been +-- +2.2.2 + diff --git a/media-gfx/pngcrush/pngcrush-1.7.87.recipe b/media-gfx/pngcrush/pngcrush-1.7.92.recipe similarity index 90% rename from media-gfx/pngcrush/pngcrush-1.7.87.recipe rename to media-gfx/pngcrush/pngcrush-1.7.92.recipe index 069195fda..4622fcbfe 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.87.recipe +++ b/media-gfx/pngcrush/pngcrush-1.7.92.recipe @@ -11,9 +11,9 @@ COPYRIGHT="1998-2009 Glenn Randers-Pehrson LICENSE="LibPNG" REVISION="1" SOURCE_URI="http://sourceforge.net/projects/pmt/files/pngcrush/$portVersion/pngcrush-$portVersion-nolib.tar.xz" -CHECKSUM_SHA256="e8aa7b626363908b234b830c9b08652e6ab48920422dc71e5d2570524da6018c" +CHECKSUM_SHA256="c49b4b13c646029b6ead77ed60626be52c5fa61d74428cdebe0ca43d195e9c36" SOURCE_DIR="pngcrush-${portVersion}-nolib" -PATCHES="pngcrush-$portVersion.patch" +PATCHES="pngcrush-$portVersion.patchset" ARCHITECTURES="x86 x86_gcc2 x86_64"