Date: Friday, January 22, 2010 @ 00:55:10 Author: eric Revision: 64766
upgpkg: netpbm 10.35.841-2 Rebuilt for libpng 1.4 and libjpeg 8 Added: netpbm/trunk/libpng-1.4.patch Modified: netpbm/trunk/PKGBUILD ------------------+ PKGBUILD | 12 +++++-- libpng-1.4.patch | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-01-22 04:44:26 UTC (rev 64765) +++ PKGBUILD 2010-01-22 05:55:10 UTC (rev 64766) @@ -4,7 +4,7 @@ pkgname=netpbm pkgver=10.35.841 -pkgrel=1 +pkgrel=2 pkgdesc="A toolkit for manipulation of graphic images" arch=(i686 x86_64) license=('custom' 'BSD' 'GPL' 'LGPL') @@ -17,16 +17,22 @@ # get doc with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ source=(ftp://ftp.archlinux.org/other/netpbm/$pkgname-$pkgver.tar.bz2 \ ftp://ftp.archlinux.org/other/netpbm/netpbm-doc-20090222.tar.bz2 \ - Makefile.config arch.patch netpbm-10.35-glibc.patch netpbm-10.35-jpeg7.patch) + Makefile.config arch.patch netpbm-10.35-glibc.patch netpbm-10.35-jpeg7.patch libpng-1.4.patch) md5sums=('04d94bf5eefd56e6443b4008196d5969' '20f5392fd1deacfa267bf64ab9d420c5'\ 'cfdb69f77f8ef06f8863fe02ce27db71' '88992e053dbfa9fdde2cccea32e6632b'\ - '8e278fba37c8f70f6a8658b98686dfad' '6a3da4565f6623f4875bd62871a8dda5') + '8e278fba37c8f70f6a8658b98686dfad' '6a3da4565f6623f4875bd62871a8dda5'\ + 'a644dd64e197cd5f29df2962742f01d5') +sha1sums=('e934e4b5a3ecaa448163b249bdb9546f51e28f87' 'c60e393e9eaf0cc9c5caf6a9294632ec012ea31b'\ + 'de15f60bc472c4ae920f4465889d4d57e9524ef6' '125c737470695efc23895844d14e886caae5ae67'\ + '5c79325ea6d97f939c09179d9f1983cb2f160c95' '682d0245d4ce3bb3b8d689656e40960231541a7f'\ + '20c46bd7e7303a5aa48a001bd7e4e5ec9c8d2b1e') build() { cd ${srcdir}/${pkgname} patch -p1 < ../arch.patch || return 1 patch -p0 < ../netpbm-10.35-glibc.patch || return 1 patch -p0 < ../netpbm-10.35-jpeg7.patch || return 1 + patch -p1 < ../libpng-1.4.patch || return 1 cp ../Makefile.config . if [ "${CARCH}" == "x86_64" ]; then Added: libpng-1.4.patch =================================================================== --- libpng-1.4.patch (rev 0) +++ libpng-1.4.patch 2010-01-22 05:55:10 UTC (rev 64766) @@ -0,0 +1,86 @@ +diff -Naur netpbm-orig/converter/other/pnmtopng.c netpbm/converter/other/pnmtopng.c +--- netpbm-orig/converter/other/pnmtopng.c 2010-01-22 00:13:48.000000000 -0500 ++++ netpbm/converter/other/pnmtopng.c 2010-01-22 00:21:33.000000000 -0500 +@@ -2604,7 +2604,7 @@ + info_ptr->num_palette = palette_size; + if (trans_size > 0) { + info_ptr->valid |= PNG_INFO_tRNS; +- info_ptr->trans = trans; ++ info_ptr->trans_alpha = trans; + info_ptr->num_trans = trans_size; /* omit opaque values */ + } + /* creating hIST chunk */ +@@ -2641,7 +2641,7 @@ + info_ptr->color_type == PNG_COLOR_TYPE_RGB) { + if (transparent > 0) { + info_ptr->valid |= PNG_INFO_tRNS; +- info_ptr->trans_values = ++ info_ptr->trans_color = + xelToPngColor_16(transcolor, maxval, png_maxval); + } + } else { +@@ -2653,10 +2653,10 @@ + if (info_ptr->valid && PNG_INFO_tRNS) + pm_message("Transparent color {gray, red, green, blue} = " + "{%d, %d, %d, %d}", +- info_ptr->trans_values.gray, +- info_ptr->trans_values.red, +- info_ptr->trans_values.green, +- info_ptr->trans_values.blue); ++ info_ptr->trans_color.gray, ++ info_ptr->trans_color.red, ++ info_ptr->trans_color.green, ++ info_ptr->trans_color.blue); + else + pm_message("No transparent color"); + } +diff -Naur netpbm-orig/converter/other/pngtopnm.c netpbm/converter/other/pngtopnm.c +--- netpbm-orig/converter/other/pngtopnm.c 2010-01-22 00:33:25.000000000 -0500 ++++ netpbm/converter/other/pngtopnm.c 2010-01-22 00:39:21.000000000 -0500 +@@ -476,7 +476,7 @@ + bool retval; + + if (info_ptr->valid & PNG_INFO_tRNS) { +- const png_color_16 * const transColorP = &info_ptr->trans_values; ++ const png_color_16 * const transColorP = &info_ptr->trans_color; + + + /* There seems to be a problem here: you can't compare real +@@ -569,8 +569,8 @@ + for (i = 0, foundGray = FALSE; + i < info_ptr->num_trans && !foundGray; + ++i) { +- if (info_ptr->trans[i] != 0 && +- info_ptr->trans[i] != maxval) { ++ if (info_ptr->trans_alpha[i] != 0 && ++ info_ptr->trans_alpha[i] != maxval) { + foundGray = TRUE; + } + } +@@ -641,7 +641,7 @@ + unsigned int i; + trans_mix = TRUE; + for (i = 0; i < info_ptr->num_trans; ++i) +- if (info_ptr->trans[i] != 0 && info_ptr->trans[i] != 255) { ++ if (info_ptr->trans_alpha[i] != 0 && info_ptr->trans_alpha[i] != 255) { + trans_mix = FALSE; + break; + } +@@ -879,7 +879,7 @@ + setXel(&xelrow[col], fgColor, bgColor, alpha_handling, + ((info_ptr->valid & PNG_INFO_tRNS) && + (fgColor.r == +- gamma_correct(info_ptr->trans_values.gray, ++ gamma_correct(info_ptr->trans_color.gray, + totalgamma))) ? + 0 : maxval); + } +@@ -908,7 +908,7 @@ + setXel(&xelrow[col], fgColor, bgColor, alpha_handling, + (info_ptr->valid & PNG_INFO_tRNS) && + index < info_ptr->num_trans ? +- info_ptr->trans[index] : maxval); ++ info_ptr->trans_alpha[index] : maxval); + } + break; +