Hello community, here is the log from the commit of package opencv for openSUSE:Factory checked in at Wed Apr 7 21:12:06 CEST 2010. -------- --- opencv/opencv.changes 2010-03-18 07:33:34.000000000 +0100 +++ opencv/opencv.changes 2010-04-07 16:12:29.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 7 14:12:03 UTC 2010 - coolo@novell.com + +- fix build with libpng14 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libpng14.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opencv.spec ++++++ --- /var/tmp/diff_new_pack.Rvwyyz/_old 2010-04-07 21:11:21.000000000 +0200 +++ /var/tmp/diff_new_pack.Rvwyyz/_new 2010-04-07 21:11:21.000000000 +0200 @@ -22,7 +22,7 @@ %define libname lib%{name} %define soname 2 Version: 2.0.0 -Release: 2 +Release: 3 Summary: Collection of algorithms for computer vision Group: Development/Libraries License: BSD3c @@ -30,6 +30,7 @@ Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/2.0/OpenCV-%{version}.tar.bz2 Patch0: %{libname}-libdir.patch Patch1: %{libname}-samples.patch +Patch2: libpng14.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gstreamer-0_10-devel libdc1394-devel libv4l-devel libxine-devel BuildRequires: gtk2-devel libjasper-devel libjpeg-devel libtiff-devel @@ -45,6 +46,7 @@ %package -n %{libname}%{soname} + Summary: Development files for using the OpenCV library Group: Development/Libraries @@ -55,6 +57,7 @@ %package -n %{libname}-devel + Summary: Development files for using the OpenCV library Group: Development/Libraries Requires: %{libname}%{soname} = %{version} @@ -67,6 +70,7 @@ %package -n python-%{name} + Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: python-base @@ -76,6 +80,7 @@ %package -n python-%{name}-compat + Summary: Old Python bindings for apps which use OpenCV Group: Development/Libraries Requires: python-base @@ -85,6 +90,7 @@ %package -n %{name}-doc + Summary: Documentation and examples for OpenCV Group: Documentation # Since this package also contains examples that need -devel to be compiled @@ -97,6 +103,7 @@ %setup -qn OpenCV-%{version} %patch0 %patch1 +%patch2 -p1 # Windows specific and with wrong end of line %{__rm} -f doc/packaging.txt %{__chmod} +x samples/c/build_all.sh ++++++ libpng14.patch ++++++ Index: OpenCV-2.0.0/src/highgui/grfmt_png.cpp =================================================================== --- OpenCV-2.0.0.orig/src/highgui/grfmt_png.cpp 2009-10-01 02:20:58.000000000 +0200 +++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp 2010-04-07 15:57:36.000000000 +0200 @@ -223,7 +223,7 @@ bool PngDecoder::readData( Mat& img ) 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org