Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	opencv.spec
@@ -1,227 +1,179 @@ -# norootforbuild +# +# spec file for package opencv +# +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%bcond_with ffmpeg Name: opencv -Version: 2.1.0 -Release: 16 +%define libname lib%{name} +%define soname 2_2 +Version: 2.2.0 +Release: 14 +Summary: Collection of algorithms for computer vision +Group: Development/Libraries/C and C++ License: BSD3c +Url: http://%{name}.willowgarage.com/wiki/ +Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/2.2/OpenCV-%{version}.tar.bz2 +Patch0: %{name}-2.2-libdir.patch +Patch1: %{name}-2.2-samples.patch +# PATCH-FIX-UPSTREAM %{name}-2.1-underlinking.patch sf#3083546 reddwarf@opensuse.org -- Link against libv4l2 +Patch3: %{name}-2.1-underlinking.patch +Patch4: %{name}-2.2-gcc46.patch +Patch5: %{name}-2.2-zlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkgconfig gcc-c++ zlib-devel libjpeg-devel libtiff-devel -BuildRequires: libjasper-devel python-devel gtk2-devel fdupes libraw1394-devel -BuildRequires: libxine-devel gstreamer-0_10-devel octave-devel swig -BuildRequires: libffmpeg-devel cmake lapack -BuildRequires: libunicap-devel libucil-devel gstreamer-0_10-plugins-base-devel -BuildRequires: libpng-devel +BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel +%if 0%{?suse_version} >= 1110 +BuildRequires: libdc1394-devel libv4l-devel libxine-devel +%else +BuildRequires: xine-devel +%endif +BuildRequires: OpenEXR-devel gtk2-devel libjasper-devel libjpeg-devel libtiff-devel +BuildRequires: cmake gcc-c++ libpng-devel python-devel zlib-devel +%if %{with ffmpeg} +BuildRequires: libffmpeg-devel +%endif +%if 0%{?suse_version} >= 1130 BuildRequires: python-numpy-devel - -Group: Development/Libraries/C and C++ -Summary: Open Computer Vision Library -URL: http://opencvlibrary.sourceforge.net/ -Source0: http://garr.dl.sourceforge.net/sourceforge/opencvlibrary/OpenCV-%{version}.tar.bz2 -Patch0: libopencv-libdir.patch -%if %suse_version >= 1130 -Patch1: opencv-libpng14.patch %endif %description -The Open Computer Vision Library is a collection of algorithms and sample -code for various computer vision problems. The library is compatible with -IPL and utilizes Intel Integrated Performance Primitives for better -performance. - -%package -n libopencv2-ffmpeg -Summary: Open Computer Vision Library - Shared libraries -Provides: libopencv-ffmpeg = %{version} -Group: System/Libraries -Requires: libopencv2 = %{version}-%{release} - -%description -n libopencv2-ffmpeg -The Open Computer Vision Library is a collection of algorithms and sample -code for various computer vision problems. The library is compatible with -IPL and utilizes Intel Integrated Performance Primitives for better -performance. - -This package only acts as a placeholder (empty package) to pull in -a libopencv2 build that has ffmpeg support. - -%package -n libopencv2 -Summary: Open Computer Vision Library - Shared libraries -Group: System/Libraries - -%description -n libopencv2 -The Open Computer Vision Library is a collection of algorithms and sample -code for various computer vision problems. The library is compatible with -IPL and utilizes Intel Integrated Performance Primitives for better -performance. +OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C +functions and a few C++ classes that implement some popular Image Processing and +Computer Vision algorithms. + +%package -n %{libname}%{soname} -This package contains the shared libraries. + +Summary: Development files for using the OpenCV library +Group: Development/Libraries/C and C++ + +%description -n %{libname}%{soname} +The Open Computer Vision Library is a collection of algorithms and sample code +for various computer vision problems. The library is compatible with IPL and +utilizes Intel Integrated Performance Primitives for better performance. %package devel -Summary: Open Computer Vision Library Development Package -Group: Development/Libraries/C and C++ -Requires: libopencv2 = %{version} -Requires: %name = %version -Requires: glibc-devel glib2-devel gtk2-devel atk-devel pango-devel cairo-devel -Requires: fontconfig-devel freetype2-devel libexpat-devel libpng-devel -Requires: xorg-x11-devel xorg-x11-libxcb-devel xorg-x11-libXrender-devel -Requires: xorg-x11-libX11-devel xorg-x11-libXau-devel pcre-devel zlib-devel -Requires: libtiff-devel libjasper-devel libjpeg-devel libxine-devel -Requires: libraw1394-devel libffmpeg-devel libunicap-devel libucil-devel -Provides: %{name}-devel-ffmpeg = %{version} -Provides: %{name}-ffmpeg-devel = %{version} +License: BSD3c + +Summary: Development files for using the OpenCV library +Group: Development/Libraries/C and C++ +Requires: %{libname}%{soname} = %{version} +Requires: %{name} = %{version} %description devel -This package contains all files needed to develop projects that use the Open -Computer Vision Library. +This package contains the OpenCV C/C++ library and header files, as well as +documentation. It should be installed if you want to develop programs that will +use the OpenCV library. %package -n python-%{name} -Summary: Open Computer Vision Library Python Bindings -Group: Development/Languages/Python -Requires: %{name} = %{version} -Provides: opencv-python -Obsoletes: opencv-python -Provides: python-%{name}-ffmpeg = %{version} -%{py_requires} + + +Summary: Python bindings for apps which use OpenCV +Group: Development/Libraries/Python +Requires: python-base %description -n python-%{name} -Development files for Open Computer Vision Library for Python +This package contains Python bindings for the OpenCV library. + +%package -n %{name}-doc + + +Summary: Documentation and examples for OpenCV +Group: Documentation/Other +# Since this package also contains examples that need -devel to be compiled +Recommends: %{name}-devel + +%description -n %{name}-doc +This package contains the documentation and examples for the OpenCV library. -%debug_package %prep -%setup -q -n OpenCV-%version +%setup -qn OpenCV-%{version} %patch0 -p1 -%if %suse_version >= 1130 %patch1 -p1 -%endif +%patch3 +%patch4 -p1 +%patch5 -p1 +# Windows specific and with wrong end of line +%{__rm} -f doc/packaging.txt +%{__chmod} +x samples/c/build_all.sh +sed -i 's/\r$//' samples/c/adaptiveskindetector.cpp \ + samples/c/latentsvmdetect.cpp \ + samples/gpu/hog.cpp \ + samples/python/camshift.py %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D__STDC_CONSTANT_MACROS" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D__STDC_CONSTANT_MACROS" -cmake \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_BUILD_TYPE=RELEASE \ - -DBUILD_LATEX_DOCS=OFF \ - -DBUILD_OCTAVE_SUPPORT=ON \ - -DBUILD_PYTHON_SUPPORT=ON \
[-] [+]	Deleted	libopencv-libdir.patch ^
@@ -1,154 +0,0 @@ -diff -uNr old-OpenCV-2.1.0//3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt ---- old-OpenCV-2.1.0//3rdparty/flann/CMakeLists.txt 2010-04-06 03:24:34.000000000 +0200 -+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-04-10 15:00:17.075951269 +0200 -@@ -89,8 +89,8 @@ - INSTALL ( - TARGETS flann # flann_s - RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) - - # INSTALL ( -diff -uNr old-OpenCV-2.1.0//CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt ---- old-OpenCV-2.1.0//CMakeLists.txt 2010-04-06 03:24:37.000000000 +0200 -+++ OpenCV-2.1.0/CMakeLists.txt 2010-04-10 14:59:29.918199133 +0200 -@@ -467,8 +467,8 @@ - - string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") - if(UNIX) -- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) -- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) -+ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) -+ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) - endif() - if(WIN32) - get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) -@@ -932,7 +932,7 @@ - # Set CMAKE_INCLUDE_DIRS_CONFIGCMAKE to the list of include directories: - - set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv") --set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib") -+set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") - - #exec_program(${CMAKE_COMMAND} ARGS "-E make_directory \"${CMAKE_BINARY_DIR}/unix-install/\"") - exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"") -@@ -965,19 +965,19 @@ - # Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use with "make install" - # prefix=/usr - # exec_prefix=${prefix} --# libdir=${exec_prefix}/lib -+# libdir=${exec_prefix}/lib${LIB_SUFFIX} - # includedir=${prefix}/include/opencv - # ------------------------------------------------------------------------------------------- - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\${prefix}") --set(libdir "\${exec_prefix}/lib") -+set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") - set(includedir "\${prefix}/include") - set(VERSION ${OPENCV_VERSION}) - - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE) - - if(UNIX) -- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig) -+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) - endif() - - -diff -uNr old-OpenCV-2.1.0//interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt ---- old-OpenCV-2.1.0//interfaces/ffopencv/CMakeLists.txt 2010-04-06 03:24:40.000000000 +0200 -+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-04-10 15:03:03.415953344 +0200 -@@ -40,6 +40,6 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main - ) -diff -uNr old-OpenCV-2.1.0//src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt ---- old-OpenCV-2.1.0//src/cv/CMakeLists.txt 2010-04-06 03:24:42.000000000 +0200 -+++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-04-10 15:02:08.313951640 +0200 -@@ -71,8 +71,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - - install(FILES ${lib_hdrs} - DESTINATION include/opencv -diff -uNr old-OpenCV-2.1.0//src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt ---- old-OpenCV-2.1.0//src/cvaux/CMakeLists.txt 2010-04-06 03:24:43.000000000 +0200 -+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-04-10 15:02:29.126952666 +0200 -@@ -76,8 +76,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - - install(FILES ${aux_hdrs_ext} - DESTINATION include/opencv -diff -uNr old-OpenCV-2.1.0//src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt ---- old-OpenCV-2.1.0//src/cxcore/CMakeLists.txt 2010-04-06 03:24:44.000000000 +0200 -+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-04-10 15:02:48.061200789 +0200 -@@ -71,8 +71,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - - # install each module headers separately - install(FILES ${lib_hdrs} -diff -uNr old-OpenCV-2.1.0//src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt ---- old-OpenCV-2.1.0//src/highgui/CMakeLists.txt 2010-04-06 03:24:44.000000000 +0200 -+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-04-10 15:04:03.528948330 +0200 -@@ -282,8 +282,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - - install(FILES ${highgui_ext_hdrs} - DESTINATION include/opencv -diff -uNr old-OpenCV-2.1.0//src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt ---- old-OpenCV-2.1.0//src/ml/CMakeLists.txt 2010-04-06 03:24:45.000000000 +0200 -+++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-04-10 15:04:41.115200799 +0200 -@@ -61,8 +61,8 @@ - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - - install(FILES ${lib_hdrs} - DESTINATION include/opencv -diff -uNr old-OpenCV-2.1.0//tests/cxts/CMakeLists.txt OpenCV-2.1.0/tests/cxts/CMakeLists.txt ---- old-OpenCV-2.1.0//tests/cxts/CMakeLists.txt 2010-04-06 03:24:46.000000000 +0200 -+++ OpenCV-2.1.0/tests/cxts/CMakeLists.txt 2010-04-10 15:05:02.496950347 +0200 -@@ -63,6 +63,6 @@ - if(WIN32) - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main -- LIBRARY DESTINATION lib COMPONENT main -- ARCHIVE DESTINATION lib COMPONENT main) -+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main -+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) - endif()
[-] [+]	Added	opencv-2.1-underlinking.patch ^
@@ -0,0 +1,12 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -403,6 +403,7 @@ if(UNIX) + endif() + if(WITH_V4L) + CHECK_MODULE(libv4l1 HAVE_LIBV4L) ++ CHECK_MODULE(libv4l2 HAVE_LIBV4L2) + CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L) + CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2) + else()
[-] [+]	Added	opencv-2.2-gcc46.patch ^
@@ -0,0 +1,11 @@ +diff -urN OpenCV-2.2.0-orig/modules/core/include/opencv2/core/core.hpp OpenCV-2.2.0/modules/core/include/opencv2/core/core.hpp +--- OpenCV-2.2.0-orig/modules/core/include/opencv2/core/core.hpp 2010-12-05 05:35:24.000000000 +0200 ++++ OpenCV-2.2.0/modules/core/include/opencv2/core/core.hpp 2010-12-23 19:47:11.414816501 +0200 +@@ -56,6 +56,7 @@ + #include <algorithm> + #include <cmath> + #include <complex> ++#include <cstddef> + #include <map> + #include <new> + #include <string>
[-] [+]	Added	opencv-2.2-libdir.patch ^
@@ -0,0 +1,112 @@ +diff -urN OpenCV-2.2.0-orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt +--- OpenCV-2.2.0-orig/CMakeLists.txt 2010-12-05 05:35:23.000000000 +0200 ++++ OpenCV-2.2.0/CMakeLists.txt 2010-12-23 16:53:04.711067058 +0200 +@@ -513,8 +513,8 @@ + + string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") + if(UNIX) +- set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) +- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) ++ set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) ++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages) + endif() + if(WIN32) + get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) +@@ -1066,7 +1066,7 @@ + # PROCESS SUBDIRECTORIES: + # ---------------------------------------------------------------------------- + # Save libs and executables in the same place +-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for libraries" ) ++set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} CACHE PATH "Output directory for libraries" ) + set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" ) + + if(WIN32) +@@ -1159,19 +1159,19 @@ + # Part 2/2: ${BIN_DIR}/unix-install/opencv.pc -> For use with "make install" + # prefix=/usr + # exec_prefix=${prefix} +-# libdir=${exec_prefix}/lib ++# libdir=${exec_prefix}/lib${LIB_SUFFIX} + # includedir=${prefix}/include/opencv + # ------------------------------------------------------------------------------------------- + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") +-set(libdir "\${exec_prefix}/lib") ++set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") + set(includedir "\${prefix}/include") + set(VERSION ${OPENCV_VERSION}) + + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/opencv.pc.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/opencv.pc" @ONLY IMMEDIATE) + + if(UNIX) +- install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib/pkgconfig) ++ install(FILES ${CMAKE_BINARY_DIR}/unix-install/opencv.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) + endif() + + +diff -urN OpenCV-2.2.0-orig/modules/ffmpeg/CMakeLists.txt OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt +--- OpenCV-2.2.0-orig/modules/ffmpeg/CMakeLists.txt 2010-12-05 05:35:24.000000000 +0200 ++++ OpenCV-2.2.0/modules/ffmpeg/CMakeLists.txt 2010-12-23 16:45:06.579817385 +0200 +@@ -49,6 +49,6 @@ + + install(TARGETS ${the_target} + RUNTIME DESTINATION bin COMPONENT main +- ARCHIVE DESTINATION lib COMPONENT main +- LIBRARY DESTINATION lib COMPONENT main ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main + ) +diff -urN OpenCV-2.2.0-orig/modules/gpu/CMakeLists.txt OpenCV-2.2.0/modules/gpu/CMakeLists.txt +--- OpenCV-2.2.0-orig/modules/gpu/CMakeLists.txt 2010-12-05 05:35:24.000000000 +0200 ++++ OpenCV-2.2.0/modules/gpu/CMakeLists.txt 2010-12-23 16:44:43.283817489 +0200 +@@ -124,8 +124,8 @@ + + install(TARGETS ${the_target} + RUNTIME DESTINATION bin COMPONENT main +- LIBRARY DESTINATION lib COMPONENT main +- ARCHIVE DESTINATION lib COMPONENT main) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) + + install(FILES ${lib_hdrs} + DESTINATION include/opencv2/${name} +diff -urN OpenCV-2.2.0-orig/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt +--- OpenCV-2.2.0-orig/modules/highgui/CMakeLists.txt 2010-12-05 05:35:24.000000000 +0200 ++++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2010-12-23 16:44:15.164942364 +0200 +@@ -302,8 +302,8 @@ + + install(TARGETS ${the_target} + RUNTIME DESTINATION bin COMPONENT main +- LIBRARY DESTINATION lib COMPONENT main +- ARCHIVE DESTINATION lib COMPONENT main) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) + + install(FILES ${highgui_ext_hdrs} + DESTINATION include/opencv2/highgui +diff -urN OpenCV-2.2.0-orig/OpenCVModule.cmake OpenCV-2.2.0/OpenCVModule.cmake +--- OpenCV-2.2.0-orig/OpenCVModule.cmake 2010-12-05 05:35:25.000000000 +0200 ++++ OpenCV-2.2.0/OpenCVModule.cmake 2010-12-23 16:42:56.638817731 +0200 +@@ -75,8 +75,8 @@ + + install(TARGETS ${the_target} + RUNTIME DESTINATION bin COMPONENT main +- LIBRARY DESTINATION lib COMPONENT main +- ARCHIVE DESTINATION lib COMPONENT main) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) + + install(FILES ${lib_hdrs} + DESTINATION include/opencv2/${name} +diff -urN OpenCV-2.2.0-orig/tests/cxts/CMakeLists.txt OpenCV-2.2.0/tests/cxts/CMakeLists.txt +--- OpenCV-2.2.0-orig/tests/cxts/CMakeLists.txt 2010-12-05 05:35:25.000000000 +0200 ++++ OpenCV-2.2.0/tests/cxts/CMakeLists.txt 2010-12-23 16:45:22.049817386 +0200 +@@ -64,6 +64,6 @@ + if(WIN32) + install(TARGETS ${the_target} + RUNTIME DESTINATION bin COMPONENT main +- LIBRARY DESTINATION lib COMPONENT main +- ARCHIVE DESTINATION lib COMPONENT main) ++ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT main ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT main) + endif()
[-] [+]	Added	opencv-2.2-samples.patch ^
@@ -0,0 +1,46 @@ +diff -urN OpenCV-2.2.0-orig/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt +--- OpenCV-2.2.0-orig/CMakeLists.txt 2010-12-05 05:35:23.000000000 +0200 ++++ OpenCV-2.2.0/CMakeLists.txt 2010-12-23 18:39:50.649066635 +0200 +@@ -1261,7 +1261,7 @@ + add_subdirectory(doc) + add_subdirectory(data) + +-if(BUILD_EXAMPLES OR INSTALL_PYTHON_EXAMPLES) ++if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR INSTALL_PYTHON_EXAMPLES) + add_subdirectory(samples) + endif() + +diff -urN OpenCV-2.2.0-orig/samples/CMakeLists.txt OpenCV-2.2.0/samples/CMakeLists.txt +--- OpenCV-2.2.0-orig/samples/CMakeLists.txt 2010-12-05 05:35:25.000000000 +0200 ++++ OpenCV-2.2.0/samples/CMakeLists.txt 2010-12-23 18:40:44.308817679 +0200 +@@ -3,9 +3,14 @@ + # + # ---------------------------------------------------------------------------- + ++if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES) + add_subdirectory(c) + add_subdirectory(cpp) + add_subdirectory(gpu) ++endif() ++if(INSTALL_PYTHON_EXAMPLES AND BUILD_NEW_PYTHON_SUPPORT) ++add_subdirectory(python) ++endif() + + if(0) + add_subdirectory(swig_python) +diff -urN OpenCV-2.2.0-orig/samples/python/CMakeLists.txt OpenCV-2.2.0/samples/python/CMakeLists.txt +--- OpenCV-2.2.0-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 ++++ OpenCV-2.2.0/samples/python/CMakeLists.txt 2010-12-23 18:41:18.875942736 +0200 +@@ -0,0 +1,12 @@ ++# ------------------------------------------------------------------------- ++# CMake file for Python samples. See root CMakeLists.txt ++# ------------------------------------------------------------------------- ++ ++file(GLOB PYTHON_SAMPLES *.py) ++if(NOT WIN32) ++install(FILES ${PYTHON_SAMPLES} ++ DESTINATION share/opencv/samples/python ++ PERMISSIONS OWNER_READ OWNER_EXECUTE ++ GROUP_READ GROUP_EXECUTE ++ WORLD_READ WORLD_EXECUTE) ++endif()
[-] [+]	Added	opencv-2.2-zlib.patch ^
@@ -0,0 +1,66 @@ +diff -urN OpenCV-2.2.0-orig/3rdparty/CMakeLists.txt OpenCV-2.2.0/3rdparty/CMakeLists.txt +--- OpenCV-2.2.0-orig/3rdparty/CMakeLists.txt 2010-12-05 05:35:23.000000000 +0200 ++++ OpenCV-2.2.0/3rdparty/CMakeLists.txt 2010-12-27 23:34:49.000000000 +0200 +@@ -3,7 +3,6 @@ + endif() + + add_subdirectory(lapack) +-add_subdirectory(zlib) + if(WITH_JASPER AND NOT JASPER_FOUND) + add_subdirectory(libjasper) + endif() +diff -urN OpenCV-2.2.0-orig/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt +--- OpenCV-2.2.0-orig/modules/core/CMakeLists.txt 2010-12-05 05:35:24.000000000 +0200 ++++ OpenCV-2.2.0/modules/core/CMakeLists.txt 2010-12-27 23:34:49.000000000 +0200 +@@ -1,3 +1,3 @@ + include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include") +-set(deps opencv_lapack zlib) ++set(deps opencv_lapack z) + define_opencv_module(core ${deps}) +diff -urN OpenCV-2.2.0-orig/modules/highgui/CMakeLists.txt OpenCV-2.2.0/modules/highgui/CMakeLists.txt +--- OpenCV-2.2.0-orig/modules/highgui/CMakeLists.txt 2010-12-05 05:35:24.000000000 +0200 ++++ OpenCV-2.2.0/modules/highgui/CMakeLists.txt 2010-12-27 23:34:49.000000000 +0200 +@@ -276,8 +276,8 @@ + endif() + + if(WITH_PNG AND NOT PNG_FOUND) +- add_dependencies(${the_target} libpng zlib) +- #target_link_libraries(${the_target} libpng zlib) ++ add_dependencies(${the_target} libpng z) ++ #target_link_libraries(${the_target} libpng z) + endif() + + if(WITH_TIFF AND NOT TIFF_FOUND) +@@ -285,7 +285,7 @@ + #target_link_libraries(${the_target} libtiff) + endif() + +-target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc zlib ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES}) ++target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_imgproc z ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JASPER_LIBRARIES} ${HIGHGUI_LIBRARIES} ${OPENEXR_LIBRARIES}) + + if(APPLE) + target_link_libraries(${the_target} "-lbz2 -framework Cocoa -framework QuartzCore") +diff -urN OpenCV-2.2.0-orig/OpenCVConfig.cmake.in OpenCV-2.2.0/OpenCVConfig.cmake.in +--- OpenCV-2.2.0-orig/OpenCVConfig.cmake.in 2010-12-05 05:35:25.000000000 +0200 ++++ OpenCV-2.2.0/OpenCVConfig.cmake.in 2010-12-27 23:35:08.000000000 +0200 +@@ -91,7 +91,7 @@ + + set(OpenCV_LIBS @OPENCV_LINKER_LIBS@ @IPP_LIBS@ @HIGHGUI_LIBRARIES@ ${OpenCV_LIBS}) + +- set(OPENCV_EXTRA_COMPONENTS @JPEG_LIBRARIES@ @PNG_LIBRARIES@ @TIFF_LIBRARIES@ @JASPER_LIBRARIES@ zlib opencv_lapack) ++ set(OPENCV_EXTRA_COMPONENTS @JPEG_LIBRARIES@ @PNG_LIBRARIES@ @TIFF_LIBRARIES@ @JASPER_LIBRARIES@ z opencv_lapack) + + if (CMAKE_MAJOR_VERSION GREATER 2 OR CMAKE_MINOR_VERSION GREATER 4) + foreach(__EXTRA_LIB ${OPENCV_EXTRA_COMPONENTS}) +diff -urN OpenCV-2.2.0-orig/OpenCVFindOpenEXR.cmake OpenCV-2.2.0/OpenCVFindOpenEXR.cmake +--- OpenCV-2.2.0-orig/OpenCVFindOpenEXR.cmake 2010-12-05 05:35:25.000000000 +0200 ++++ OpenCV-2.2.0/OpenCVFindOpenEXR.cmake 2010-12-27 23:34:49.000000000 +0200 +@@ -44,7 +44,7 @@ + IF (OPENEXR_INCLUDE_PATH AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) + SET(OPENEXR_FOUND TRUE) + SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "The include paths needed to use OpenEXR") +- SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} zlib CACHE STRING "The libraries needed to use OpenEXR") ++ SET(OPENEXR_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} z CACHE STRING "The libraries needed to use OpenEXR") + ENDIF () + + IF(OPENEXR_FOUND)
[-] [+]	Deleted	opencv-libpng14.patch ^
@@ -1,12 +0,0 @@ -diff -uNr OpenCV-2.1.0/src/highgui/grfmt_png.cpp old-OpenCV-2.1.0//src/highgui/grfmt_png.cpp ---- OpenCV-2.1.0/src/highgui/grfmt_png.cpp 2010-04-06 03:24:44.000000000 +0200 -+++ old-OpenCV-2.1.0//src/highgui/grfmt_png.cpp 2010-08-04 11:04:19.008240094 +0200 -@@ -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
	Changed	OpenCV-2.2.0.tar.bz2 ^