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

Eric Bélanger eric at archlinux.org
Thu Jan 21 01:49:06 EST 2010


    Date: Thursday, January 21, 2010 @ 01:49:06
  Author: eric
Revision: 64579

upgpkg: opencv 2.0.0-4
    Rebuilt for libpng 1.4 and libjpeg 8

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

------------------+
 PKGBUILD         |    9 +++++----
 libpng-1.4.patch |   12 ++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-21 06:37:14 UTC (rev 64578)
+++ PKGBUILD	2010-01-21 06:49:06 UTC (rev 64579)
@@ -3,7 +3,7 @@
 
 pkgname=opencv
 pkgver=2.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Intel(R) Open Source Computer Vision Library"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,12 +11,13 @@
 depends=('jasper' 'gtk2' 'python' 'libtiff' 'libpng' 'xine-lib' 'gstreamer0.10-base' 'libdc1394' 'libv4l')
 makedepends=('cmake' 'pkgconfig')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/opencvlibrary/OpenCV-${pkgver}.tar.bz2)
-md5sums=('ed27520514baacc5edad7b06ad24130e')
+source=(http://downloads.sourceforge.net/opencvlibrary/OpenCV-${pkgver}.tar.bz2 libpng-1.4.patch)
+md5sums=('ed27520514baacc5edad7b06ad24130e' '301f9108f2ee875d889c279adadb254e')
+sha1sums=('2090c2aaff77c3b0cc669c2ee81bea389db0a366' '4de3772ac5e33c2b0050d1f7e6678027898d8545')
 
 build() {
   cd ${srcdir}
-
+  patch -p0 < libpng-1.4.patch || return 1
   mkdir build
   cd build
   cmake ../OpenCV-${pkgver} \

Added: libpng-1.4.patch
===================================================================
--- libpng-1.4.patch	                        (rev 0)
+++ libpng-1.4.patch	2010-01-21 06:49:06 UTC (rev 64579)
@@ -0,0 +1,12 @@
+diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp OpenCV-2.0.0/src/highgui/grfmt_png.cpp
+--- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp	2010-01-21 01:08:46.000000000 -0500
++++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp	2010-01-21 01:13:11.000000000 -0500
+@@ -223,7 +223,7 @@
+                 png_set_palette_to_rgb( png_ptr );
+ 
+             if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 )
+-                png_set_gray_1_2_4_to_8( png_ptr );
++                png_set_expand_gray_1_2_4_to_8( png_ptr );
+ 
+             if( CV_MAT_CN(m_type) > 1 && color )
+                 png_set_bgr( png_ptr ); // convert RGB to BGR



More information about the arch-commits mailing list