From 2628556840e11b3e3ef7d6d1ffc6ebfd25c9b564 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Tue, 12 Apr 2016 12:41:32 +0000 Subject: [PATCH] pngcrush: bump to version 1.8.1, add license, strip runtime. --- .../pngcrush/patches/pngcrush-1.8.0.patchset | 20 -------- ....7.92.patchset => pngcrush-1.8.1.patchset} | 6 +-- media-gfx/pngcrush/pngcrush-1.7.92.recipe | 49 ------------------- ...ush-1.8.0.recipe => pngcrush-1.8.1.recipe} | 8 +-- 4 files changed, 8 insertions(+), 75 deletions(-) delete mode 100644 media-gfx/pngcrush/patches/pngcrush-1.8.0.patchset rename media-gfx/pngcrush/patches/{pngcrush-1.7.92.patchset => pngcrush-1.8.1.patchset} (87%) delete mode 100644 media-gfx/pngcrush/pngcrush-1.7.92.recipe rename media-gfx/pngcrush/{pngcrush-1.8.0.recipe => pngcrush-1.8.1.recipe} (84%) diff --git a/media-gfx/pngcrush/patches/pngcrush-1.8.0.patchset b/media-gfx/pngcrush/patches/pngcrush-1.8.0.patchset deleted file mode 100644 index 3d32a185b..000000000 --- a/media-gfx/pngcrush/patches/pngcrush-1.8.0.patchset +++ /dev/null @@ -1,20 +0,0 @@ ---- a/pngcrush.c -+++ b/pngcrush.c -@@ -6363,6 +6363,8 @@ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED - png_uint_32 zbuf_size; - png_uint_32 required_window; - int channels = 0; -+ png_uint_32 rowbytes; -+ png_uint_32 h = height; - png_set_compression_strategy(write_ptr, - z_strategy); - png_set_compression_mem_level(write_ptr, -@@ -6384,8 +6386,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; - - /* FIX THIS, does not work with libpng-1.7.0 - * because info_ptr->bit_depth has not been diff --git a/media-gfx/pngcrush/patches/pngcrush-1.7.92.patchset b/media-gfx/pngcrush/patches/pngcrush-1.8.1.patchset similarity index 87% rename from media-gfx/pngcrush/patches/pngcrush-1.7.92.patchset rename to media-gfx/pngcrush/patches/pngcrush-1.8.1.patchset index ad41496d8..e61bc8c60 100644 --- a/media-gfx/pngcrush/patches/pngcrush-1.7.92.patchset +++ b/media-gfx/pngcrush/patches/pngcrush-1.8.1.patchset @@ -5,10 +5,10 @@ Subject: haiku patch diff --git a/pngcrush.c b/pngcrush.c -index c049657..de80835 100644 +index 5f8178c..e0b9937 100644 --- a/pngcrush.c +++ b/pngcrush.c -@@ -6461,6 +6461,8 @@ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED) +@@ -6417,6 +6417,8 @@ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED) png_uint_32 zbuf_size; png_uint_32 required_window; int channels = 0; @@ -17,7 +17,7 @@ index c049657..de80835 100644 png_set_compression_strategy(write_ptr, z_strategy); png_set_compression_mem_level(write_ptr, -@@ -6482,8 +6484,6 @@ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED) +@@ -6438,8 +6440,6 @@ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED) * a png_uint_32, by limiting the width and height used * to 15 bits. */ diff --git a/media-gfx/pngcrush/pngcrush-1.7.92.recipe b/media-gfx/pngcrush/pngcrush-1.7.92.recipe deleted file mode 100644 index 9e735237f..000000000 --- a/media-gfx/pngcrush/pngcrush-1.7.92.recipe +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY="An optimizer for PNG files" -DESCRIPTION="Pngcrush is an optimizer for PNG (Portable Network Graphics) files. It can be \ -run from a commandline in an MSDOS window, or from a UNIX or LINUX \ -commandline. Its main purpose is to reduce the size of the PNG IDAT datastream \ -by trying various compression levels and PNG filter methods. It also can be \ -used to remove unwanted ancillary chunks, or to add certain chunks including \ -gAMA, tRNS, iCCP, and textual chunks." -HOMEPAGE="http://pmt.sourceforge.net/pngcrush/" -COPYRIGHT="1998-2009 Glenn Randers-Pehrson - 2005 Greg Roelofs" -LICENSE="LibPNG" -REVISION="1" -SOURCE_URI="http://sourceforge.net/projects/pmt/files/pngcrush/$portVersion/pngcrush-$portVersion-nolib.tar.xz" -CHECKSUM_SHA256="c49b4b13c646029b6ead77ed60626be52c5fa61d74428cdebe0ca43d195e9c36" -SOURCE_DIR="pngcrush-${portVersion}-nolib" -PATCHES="pngcrush-$portVersion.patchset" - -ARCHITECTURES="x86 x86_gcc2 x86_64" - -PROVIDES=" - pngcrush = $portVersion compat >= 1.7 - cmd:pngcrush = $portVersion compat >= 1.7 - " -REQUIRES=" - haiku - lib:libpng16 - lib:libz - " - -BUILD_REQUIRES=" - devel:libpng16 - devel:libz - " -BUILD_PREREQUIRES=" - haiku_devel - cmd:make - cmd:gcc - " - -BUILD() -{ - make LIBS="-L$libDir -lpng -lz" -} - -INSTALL() -{ - mkdir -p $binDir - cp -af pngcrush $binDir -} diff --git a/media-gfx/pngcrush/pngcrush-1.8.0.recipe b/media-gfx/pngcrush/pngcrush-1.8.1.recipe similarity index 84% rename from media-gfx/pngcrush/pngcrush-1.8.0.recipe rename to media-gfx/pngcrush/pngcrush-1.8.1.recipe index fa920c017..6d28f6751 100644 --- a/media-gfx/pngcrush/pngcrush-1.8.0.recipe +++ b/media-gfx/pngcrush/pngcrush-1.8.1.recipe @@ -11,7 +11,7 @@ COPYRIGHT="1998-2002, 2006-2016 Glenn Randers-Pehrson LICENSE="LibPNG" REVISION="1" SOURCE_URI="http://downloads.sf.net/pmt/pngcrush-$portVersion-nolib.tar.xz" -CHECKSUM_SHA256="baa7048351c341e3a0c4769db7093b3206d46aa66ca93ac039c896ace63563bf" +CHECKSUM_SHA256="29dfdc0e4302a10a58f1785ebc08ec5f57b6b2d3f36688dcb69ee058eb8a7ac0" SOURCE_DIR="pngcrush-${portVersion}-nolib" PATCHES="pngcrush-$portVersion.patchset" @@ -35,6 +35,7 @@ BUILD_PREREQUIRES=" haiku_devel cmd:make cmd:gcc + cmd:install " BUILD() @@ -44,6 +45,7 @@ BUILD() INSTALL() { - mkdir -p $binDir - cp -af pngcrush $binDir + install -d -m 755 $binDir $docDir + install -t $binDir -c -m 555 -s pngcrush + install -t $docDir -c -m 444 LICENSE }