From e96c4df78c8fb4347e8a5f67ffbacbeeca0d4d3da412e1ca773f90aebefa22b7 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 14 Jan 2011 14:35:53 +0000 Subject: [PATCH] Accepting request 58141 from KDE:Distro:Factory Accepted submit request 58141 from user coolo OBS-URL: https://build.opensuse.org/request/show/58141 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=14 --- OpenCV-2.1.0.tar.bz2 | 3 - OpenCV-2.2.0.tar.bz2 | 3 + libpng14.patch | 13 ---- opencv-2.1-libdir.patch | 154 --------------------------------------- opencv-2.1-samples.patch | 60 --------------- opencv-2.2-gcc46.patch | 11 +++ opencv-2.2-libdir.patch | 112 ++++++++++++++++++++++++++++ opencv-2.2-samples.patch | 46 ++++++++++++ opencv-2.2-zlib.patch | 66 +++++++++++++++++ opencv-gcc-46.diff | 50 ------------- opencv.changes | 14 ++++ opencv.spec | 53 +++++--------- 12 files changed, 271 insertions(+), 314 deletions(-) delete mode 100644 OpenCV-2.1.0.tar.bz2 create mode 100644 OpenCV-2.2.0.tar.bz2 delete mode 100644 libpng14.patch delete mode 100644 opencv-2.1-libdir.patch delete mode 100644 opencv-2.1-samples.patch create mode 100644 opencv-2.2-gcc46.patch create mode 100644 opencv-2.2-libdir.patch create mode 100644 opencv-2.2-samples.patch create mode 100644 opencv-2.2-zlib.patch delete mode 100644 opencv-gcc-46.diff diff --git a/OpenCV-2.1.0.tar.bz2 b/OpenCV-2.1.0.tar.bz2 deleted file mode 100644 index 49866a4..0000000 --- a/OpenCV-2.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f -size 14459566 diff --git a/OpenCV-2.2.0.tar.bz2 b/OpenCV-2.2.0.tar.bz2 new file mode 100644 index 0000000..5891ad2 --- /dev/null +++ b/OpenCV-2.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e +size 19800873 diff --git a/libpng14.patch b/libpng14.patch deleted file mode 100644 index 82b48fd..0000000 --- a/libpng14.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/opencv-2.1-libdir.patch b/opencv-2.1-libdir.patch deleted file mode 100644 index c20cb52..0000000 --- a/opencv-2.1-libdir.patch +++ /dev/null @@ -1,154 +0,0 @@ -diff -urN OpenCV-2.1.0-orig/3rdparty/flann/CMakeLists.txt OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt ---- OpenCV-2.1.0-orig/3rdparty/flann/CMakeLists.txt 2010-04-06 04:24:34.000000000 +0300 -+++ OpenCV-2.1.0/3rdparty/flann/CMakeLists.txt 2010-04-13 17:05:44.000000000 +0300 -@@ -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 -urN OpenCV-2.1.0-orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt ---- OpenCV-2.1.0-orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300 -+++ OpenCV-2.1.0/CMakeLists.txt 2010-04-13 17:05:45.000000000 +0300 -@@ -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 -urN OpenCV-2.1.0-orig/interfaces/ffopencv/CMakeLists.txt OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt ---- OpenCV-2.1.0-orig/interfaces/ffopencv/CMakeLists.txt 2010-04-06 04:24:40.000000000 +0300 -+++ OpenCV-2.1.0/interfaces/ffopencv/CMakeLists.txt 2010-04-13 17:06:05.000000000 +0300 -@@ -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 -urN OpenCV-2.1.0-orig/src/cv/CMakeLists.txt OpenCV-2.1.0/src/cv/CMakeLists.txt ---- OpenCV-2.1.0-orig/src/cv/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300 -+++ OpenCV-2.1.0/src/cv/CMakeLists.txt 2010-04-13 17:07:32.000000000 +0300 -@@ -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 -urN OpenCV-2.1.0-orig/src/cvaux/CMakeLists.txt OpenCV-2.1.0/src/cvaux/CMakeLists.txt ---- OpenCV-2.1.0-orig/src/cvaux/CMakeLists.txt 2010-04-06 04:24:43.000000000 +0300 -+++ OpenCV-2.1.0/src/cvaux/CMakeLists.txt 2010-04-13 17:07:31.000000000 +0300 -@@ -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 -urN OpenCV-2.1.0-orig/src/cxcore/CMakeLists.txt OpenCV-2.1.0/src/cxcore/CMakeLists.txt ---- OpenCV-2.1.0-orig/src/cxcore/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300 -+++ OpenCV-2.1.0/src/cxcore/CMakeLists.txt 2010-04-13 17:07:30.000000000 +0300 -@@ -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 -urN OpenCV-2.1.0-orig/src/highgui/CMakeLists.txt OpenCV-2.1.0/src/highgui/CMakeLists.txt ---- OpenCV-2.1.0-orig/src/highgui/CMakeLists.txt 2010-04-06 04:24:44.000000000 +0300 -+++ OpenCV-2.1.0/src/highgui/CMakeLists.txt 2010-04-13 17:07:28.000000000 +0300 -@@ -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 -urN OpenCV-2.1.0-orig/src/ml/CMakeLists.txt OpenCV-2.1.0/src/ml/CMakeLists.txt ---- OpenCV-2.1.0-orig/src/ml/CMakeLists.txt 2010-04-06 04:24:45.000000000 +0300 -+++ OpenCV-2.1.0/src/ml/CMakeLists.txt 2010-04-13 17:07:20.000000000 +0300 -@@ -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 -urN OpenCV-2.1.0-orig/tests/cxts/CMakeLists.txt OpenCV-2.1.0/tests/cxts/CMakeLists.txt ---- OpenCV-2.1.0-orig/tests/cxts/CMakeLists.txt 2010-04-06 04:24:46.000000000 +0300 -+++ OpenCV-2.1.0/tests/cxts/CMakeLists.txt 2010-04-13 17:07:11.000000000 +0300 -@@ -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() diff --git a/opencv-2.1-samples.patch b/opencv-2.1-samples.patch deleted file mode 100644 index 95763ee..0000000 --- a/opencv-2.1-samples.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -urN OpenCV-2.1.0-orig/CMakeLists.txt OpenCV-2.1.0/CMakeLists.txt ---- OpenCV-2.1.0-orig/CMakeLists.txt 2010-04-06 04:24:37.000000000 +0300 -+++ OpenCV-2.1.0/CMakeLists.txt 2010-04-13 17:17:47.000000000 +0300 -@@ -1067,7 +1067,7 @@ - add_subdirectory(doc) - add_subdirectory(data) - --if(BUILD_EXAMPLES OR INSTALL_PYTHON_EXAMPLES OR INSTALL_OCTAVE_EXAMPLES) -+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES OR INSTALL_PYTHON_EXAMPLES OR INSTALL_OCTAVE_EXAMPLES) - add_subdirectory(samples) - endif() - -diff -urN OpenCV-2.1.0-orig/samples/CMakeLists.txt OpenCV-2.1.0/samples/CMakeLists.txt ---- OpenCV-2.1.0-orig/samples/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300 -+++ OpenCV-2.1.0/samples/CMakeLists.txt 2010-04-13 17:17:46.000000000 +0300 -@@ -3,6 +3,15 @@ - # - # ---------------------------------------------------------------------------- - -+if(BUILD_EXAMPLES OR INSTALL_C_EXAMPLES) - add_subdirectory(c) -+endif() -+if(INSTALL_PYTHON_EXAMPLES AND BUILD_NEW_PYTHON_SUPPORT) -+add_subdirectory(python) -+endif() -+if(INSTALL_PYTHON_EXAMPLES AND BUILD_SWIG_PYTHON_SUPPORT) - add_subdirectory(swig_python) -+endif() -+if(INSTALL_OCTAVE_EXAMPLES) - add_subdirectory(octave) -+endif() -diff -urN OpenCV-2.1.0-orig/samples/python/CMakeLists.txt OpenCV-2.1.0/samples/python/CMakeLists.txt ---- OpenCV-2.1.0-orig/samples/python/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 -+++ OpenCV-2.1.0/samples/python/CMakeLists.txt 2010-04-13 17:18:08.000000000 +0300 -@@ -0,0 +1,13 @@ -+# ------------------------------------------------------------------------- -+# 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() -+ -diff -urN OpenCV-2.1.0-orig/samples/swig_python/CMakeLists.txt OpenCV-2.1.0/samples/swig_python/CMakeLists.txt ---- OpenCV-2.1.0-orig/samples/swig_python/CMakeLists.txt 2010-04-06 04:24:42.000000000 +0300 -+++ OpenCV-2.1.0/samples/swig_python/CMakeLists.txt 2010-04-13 17:17:44.000000000 +0300 -@@ -5,7 +5,7 @@ - file(GLOB PYTHON_SAMPLES *.py) - if(NOT WIN32) - install(FILES ${PYTHON_SAMPLES} -- DESTINATION share/opencv/samples/python -+ DESTINATION share/opencv/samples/swig_python - PERMISSIONS OWNER_READ OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) diff --git a/opencv-2.2-gcc46.patch b/opencv-2.2-gcc46.patch new file mode 100644 index 0000000..88daed7 --- /dev/null +++ b/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 + #include + #include ++#include + #include + #include + #include diff --git a/opencv-2.2-libdir.patch b/opencv-2.2-libdir.patch new file mode 100644 index 0000000..db6650e --- /dev/null +++ b/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() diff --git a/opencv-2.2-samples.patch b/opencv-2.2-samples.patch new file mode 100644 index 0000000..9a31629 --- /dev/null +++ b/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() diff --git a/opencv-2.2-zlib.patch b/opencv-2.2-zlib.patch new file mode 100644 index 0000000..89336c8 --- /dev/null +++ b/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) diff --git a/opencv-gcc-46.diff b/opencv-gcc-46.diff deleted file mode 100644 index d0fa079..0000000 --- a/opencv-gcc-46.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- include/opencv/cxcore.hpp.orig -+++ include/opencv/cxcore.hpp -@@ -51,6 +51,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- 3rdparty/CMakeLists.txt.orig -+++ 3rdparty/CMakeLists.txt -@@ -1,6 +1,5 @@ - add_subdirectory(flann) - add_subdirectory(lapack) --add_subdirectory(zlib) - if(WITH_JASPER AND NOT JASPER_FOUND) - add_subdirectory(libjasper) - endif() ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -840,7 +840,7 @@ IF(NOT BUILD_SHARED_LIBS) - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} stdc++) - endif() - -- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann zlib opencv_lapack) -+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} flann z opencv_lapack) - endif() - - ---- src/cxcore/CMakeLists.txt.orig -+++ src/cxcore/CMakeLists.txt -@@ -53,7 +53,7 @@ set_target_properties(${the_target} PROP - ) - - # Add the required libraries for linking: --target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} opencv_lapack zlib flann) -+target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} opencv_lapack z flann) - - # Linker flag needed for Windows Mobile 5 and 6 SDKs - if(MSVC) -@@ -67,7 +67,7 @@ if(MSVC) - ) - endif() - --add_dependencies(${the_target} opencv_lapack zlib) -+add_dependencies(${the_target} opencv_lapack) - - install(TARGETS ${the_target} - RUNTIME DESTINATION bin COMPONENT main diff --git a/opencv.changes b/opencv.changes index d16dbdd..9e34d4a 100644 --- a/opencv.changes +++ b/opencv.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Dec 27 16:56:15 EET 2010 - koprok@nand.bg + +- Enable Python NumPy support +- SWIG is not required any more +- Enable OpenEXR support + +------------------------------------------------------------------- +Thu Dec 23 16:08:46 EET 2010 - koprok@nand.bg + +- Update to OpenCV 2.2.0. + More info at: + http://opencv.willowgarage.com/wiki/OpenCV%20Change%20Logs + ------------------------------------------------------------------- Sun Dec 12 13:39:48 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/opencv.spec b/opencv.spec index 633c122..c1e498a 100644 --- a/opencv.spec +++ b/opencv.spec @@ -1,5 +1,5 @@ # -# spec file for package opencv (Version 2.1.0) +# spec file for package opencv (Version 2.2.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,20 +20,20 @@ Name: opencv %define libname lib%{name} -%define soname 2 -Version: 2.1.0 +%define soname 2_2 +Version: 2.2.0 Release: 7 Summary: Collection of algorithms for computer vision Group: Development/Libraries License: BSD3c Url: http://%{name}.willowgarage.com/wiki/ -Source0: http://downloads.sourceforge.net/project/%{name}library/%{name}-unix/2.1/OpenCV-%{version}.tar.bz2 -Patch0: %{name}-2.1-libdir.patch -Patch1: %{name}-2.1-samples.patch -Patch2: libpng14.patch +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: opencv-gcc-46.diff +Patch4: %{name}-2.2-gcc46.patch +Patch5: %{name}-2.2-zlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel %if 0%{?suse_version} >= 1110 @@ -41,11 +41,14 @@ BuildRequires: libdc1394-devel libv4l-devel libxine-devel %else BuildRequires: xine-devel %endif -BuildRequires: gtk2-devel libjasper-devel libjpeg-devel libtiff-devel -BuildRequires: cmake gcc-c++ libpng-devel python-devel swig zlib-devel +BuildRequires: gtk2-devel libjasper-devel libjpeg-devel libtiff-devel OpenEXR-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 +%endif %description OpenCV means Intel® Open Source Computer Vision Library. It is a collection of C @@ -86,16 +89,6 @@ Requires: python-base %description -n python-%{name} This package contains Python bindings for the OpenCV library. -%package -n python-%{name}-compat - - -Summary: Old Python bindings for apps which use OpenCV -Group: Development/Libraries -Requires: python-base - -%description -n python-%{name}-compat -This package contains the old Python bindings for the OpenCV library. - %package -n %{name}-doc @@ -111,15 +104,15 @@ This package contains the documentation and examples for the OpenCV library. %setup -qn OpenCV-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %patch3 -%patch4 +%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/calibration_artificial.cpp \ - samples/c/grabcut.cpp \ + samples/c/latentsvmdetect.cpp \ + samples/gpu/hog.cpp \ samples/python/camshift.py %build @@ -134,7 +127,6 @@ cmake -DCMAKE_SKIP_RPATH=ON \ -DUSE_OMIT_FRAME_POINTER=OFF \ -DWITH_XINE=ON \ -DBUILD_TESTS=OFF \ - -DBUILD_SWIG_PYTHON_SUPPORT=ON \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ .. @@ -166,7 +158,8 @@ rm -rf %{buildroot} %files devel %defattr(0644, root, root, 0755) -%{_includedir}/%{name} +%{_includedir}/opencv +%{_includedir}/opencv2 %{_libdir}/lib*.so %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/%{name}/OpenCVConfig.cmake @@ -179,14 +172,6 @@ rm -rf %{buildroot} %{python_sitearch}/cv.so %endif -%files -n python-%{name}-compat -%defattr(-, root, root, 0755) -%if 0%{?suse_version} < 1120 -%{py_sitedir}/%{name} -%else -%{python_sitearch}/%{name} -%endif - %files -n %{name}-doc %defattr(-, root, root, 0755) %{_docdir}/%{name}-doc