[arch-commits] Commit in vigra/trunk (PKGBUILD libpng-1.4.patch)

[Eric Bélanger]

    Date: Wednesday, January 20, 2010 @ 20:09:11
  Author: eric
Revision: 64521

upgpkg: vigra 1.6.0-2
    Rebuilt for libpng 1.4 and libjpeg 8

Added:
  vigra/trunk/libpng-1.4.patch
Modified:
  vigra/trunk/PKGBUILD

------------------+
 PKGBUILD         |   10 ++++++----
 libpng-1.4.patch |   14 ++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-21 00:54:57 UTC (rev 64520)
+++ PKGBUILD	2010-01-21 01:09:11 UTC (rev 64521)
@@ -4,19 +4,21 @@
 
 pkgname=vigra
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Computer vision library"
 arch=('i686' 'x86_64')
 url="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/"
 license=('custom:MIT')
 depends=('libpng' 'libtiff' 'gcc-libs' 'sh')
 options=('!libtool')
-source=(#http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}${pkgver}.tar.gz - offline?
-	http://ftp.de.debian.org/debian/pool/main/libv/libvigraimpex/libvigraimpex_1.6.0.orig.tar.gz)
-md5sums=('d62650a6f908e85643e557a236ea989c')
+source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}${pkgver}.tar.gz libpng-1.4.patch)
+md5sums=('d62650a6f908e85643e557a236ea989c' 'db610e48558eb323490ad21d636bac76')
+sha1sums=('9714a0c4efb77726a1140329e98e5db057f9a69f' '5f668c861f5fe927a4f51014afab94805db60c46') # - offline?
+#	http://ftp.de.debian.org/debian/pool/main/libv/libvigraimpex/libvigraimpex_1.6.0+dfsg.orig.tar.gz)
 
 build() {
   cd "${srcdir}"/${pkgname}${pkgver}
+  patch -p1 < ../libpng-1.4.patch || return 1
   ./configure --prefix=/usr --disable-static
   make || return 1
   make prefix="$pkgdir"/usr install-exec || return 1

Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	                        (rev 0)
+++ libpng-1.4.patch	2010-01-21 01:09:11 UTC (rev 64521)
@@ -0,0 +1,14 @@
+diff -Naur vigra1.6.0-orig/src/impex/png.cxx vigra1.6.0/src/impex/png.cxx
+--- vigra1.6.0-orig/src/impex/png.cxx	2010-01-20 19:46:57.000000000 -0500
++++ vigra1.6.0/src/impex/png.cxx	2010-01-20 19:47:55.000000000 -0500
+@@ -270,8 +270,8 @@
+         // expand gray values to at least one byte size
+         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+             if (setjmp(png->jmpbuf))
+-                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+-            png_set_gray_1_2_4_to_8(png);
++                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++            png_set_expand_gray_1_2_4_to_8(png);
+             bit_depth = 8;
+         }
+