[gentoo-commits] proj/kde:master commit in: media-libs/opencv/files/, media-libs/opencv/

[Tomas Chvatal]

commit:     a382e36d7c56582e836c39698a3d685f8ee75933
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 09:20:18 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 09:20:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a382e36d

Fixup numpy, libdir specs, more work into system_libs patch.

---
 .../files/2.2.0-convert_sets_to_options.patch      |  133 +++++++++++++++++++-
 media-libs/opencv/files/2.2.0-numpy.patch          |   12 ++
 .../opencv/files/2.2.0-use_system_libs.patch       |   35 +++---
 media-libs/opencv/opencv-2.2.0.ebuild              |    2 +
 4 files changed, 163 insertions(+), 19 deletions(-)

diff --git a/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch b/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch
index 8856495..af057fc 100644
--- a/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch
+++ b/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch
@@ -1,6 +1,6 @@
-diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
+diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0.new/CMakeLists.txt
 --- OpenCV-2.2.0.old/CMakeLists.txt	2010-12-05 04:35:23.000000000 +0100
-+++ OpenCV-2.2.0/CMakeLists.txt	2011-04-29 20:08:03.000000000 +0200
++++ OpenCV-2.2.0.new/CMakeLists.txt	2011-04-30 10:49:01.000000000 +0200
 @@ -13,7 +13,7 @@
  # Add these standard paths to the search paths for FIND_LIBRARY
  # to find libraries from these locations first
@@ -149,6 +149,17 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
  
  if(BUILD_NEW_PYTHON_SUPPORT)
      find_package(PythonInterp)
+@@ -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)
 @@ -543,8 +543,8 @@
  #YV
  ############################### QT ################################
@@ -226,3 +237,121 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
  
  if(BUILD_PACKAGE)
  
+diff -urN OpenCV-2.2.0.old/modules/ffmpeg/CMakeLists.txt OpenCV-2.2.0.new/modules/ffmpeg/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/ffmpeg/CMakeLists.txt	2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0.new/modules/ffmpeg/CMakeLists.txt	2011-04-30 10:51:26.000000000 +0200
+@@ -43,12 +43,12 @@
+                       VERSION ${OPENCV_VERSION}
+                       OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
+                       DEFINE_SYMBOL "CVAPI_EXPORTS"
+-                      ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++                      ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+                       RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+                       )
+ 
+ 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.old/modules/gpu/CMakeLists.txt OpenCV-2.2.0.new/modules/gpu/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/gpu/CMakeLists.txt	2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0.new/modules/gpu/CMakeLists.txt	2011-04-30 10:51:08.000000000 +0200
+@@ -96,9 +96,9 @@
+ # Additional target properties
+ set_target_properties(${the_target} PROPERTIES
+ 	DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+-	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ 	RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+-	INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
++	INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+ 	)
+ 
+ # Add the required libraries for linking:
+@@ -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.old/modules/highgui/CMakeLists.txt OpenCV-2.2.0.new/modules/highgui/CMakeLists.txt
+--- OpenCV-2.2.0.old/modules/highgui/CMakeLists.txt	2010-12-05 04:35:24.000000000 +0100
++++ OpenCV-2.2.0.new/modules/highgui/CMakeLists.txt	2011-04-30 10:53:11.000000000 +0200
+@@ -250,9 +250,9 @@
+ # Additional target properties
+ set_target_properties(${the_target} PROPERTIES
+ 	DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+-	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ 	RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+-	INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
++	INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+ 	LINK_INTERFACE_LIBRARIES ""
+ 	)
+ 
+@@ -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.old/OpenCVModule.cmake OpenCV-2.2.0.new/OpenCVModule.cmake
+--- OpenCV-2.2.0.old/OpenCVModule.cmake	2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0.new/OpenCVModule.cmake	2011-04-30 10:53:45.000000000 +0200
+@@ -51,9 +51,9 @@
+ 	# Additional target properties
+ 	set_target_properties(${the_target} PROPERTIES
+ 	    DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+-	    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++	    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ 	    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+-	    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
++	    INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
+ 	    )
+ 
+ 	# Add the required libraries for linking:
+@@ -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.old/tests/cxts/CMakeLists.txt OpenCV-2.2.0.new/tests/cxts/CMakeLists.txt
+--- OpenCV-2.2.0.old/tests/cxts/CMakeLists.txt	2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0.new/tests/cxts/CMakeLists.txt	2011-04-30 10:54:15.000000000 +0200
+@@ -51,7 +51,7 @@
+ # Additional target properties
+ set_target_properties(${the_target} PROPERTIES
+ 	DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+-	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
++	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}/"
+ 	RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
+ 	DEFINE_SYMBOL "CVAPI_EXPORTS"
+ 	)
+@@ -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/media-libs/opencv/files/2.2.0-numpy.patch b/media-libs/opencv/files/2.2.0-numpy.patch
new file mode 100644
index 0000000..0690eab
--- /dev/null
+++ b/media-libs/opencv/files/2.2.0-numpy.patch
@@ -0,0 +1,12 @@
+diff -up OpenCV-2.2.0/CMakeLists.txt.numpy OpenCV-2.2.0/CMakeLists.txt
+--- OpenCV-2.2.0/CMakeLists.txt.numpy	2010-12-07 17:54:56.369070005 +0100
++++ OpenCV-2.2.0/CMakeLists.txt	2010-12-07 17:58:31.987070004 +0100
+@@ -532,7 +532,7 @@ if(BUILD_NEW_PYTHON_SUPPORT)
+                     OUTPUT_STRIP_TRAILING_WHITESPACE)
+     if(PYTHON_NUMPY_PROCESS EQUAL 0)
+       set(PYTHON_USE_NUMPY 1)
+-      add_definitions(-D PYTHON_USE_NUMPY=1)
++      add_definitions(-DPYTHON_USE_NUMPY=1)
+       include_directories(AFTER ${PYTHON_NUMPY_INCLUDE_DIRS})
+       message(STATUS "    Use INCLUDE: ${PYTHON_NUMPY_INCLUDE_DIRS}")
+     else()

diff --git a/media-libs/opencv/files/2.2.0-use_system_libs.patch b/media-libs/opencv/files/2.2.0-use_system_libs.patch
index 9d5fb72..6685e92 100644
--- a/media-libs/opencv/files/2.2.0-use_system_libs.patch
+++ b/media-libs/opencv/files/2.2.0-use_system_libs.patch
@@ -1,11 +1,12 @@
 diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
 --- OpenCV-2.2.0.old/CMakeLists.txt	2010-12-05 04:35:23.000000000 +0100
-+++ OpenCV-2.2.0/CMakeLists.txt	2011-04-29 23:26:42.000000000 +0200
-@@ -193,6 +193,10 @@
++++ OpenCV-2.2.0/CMakeLists.txt	2011-04-29 23:48:20.000000000 +0200
+@@ -193,6 +193,11 @@
  # ----------------------------------------------------------------------------
  #       CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
  # ----------------------------------------------------------------------------
 +find_package(LAPACK REQUIRED)
++find_package(BLAS REQUIRED)
 +find_package(ZLIB REQUIRED)
 +find_package(PkgConfig REQUIRED)
 +pkg_check_modules(FLANN REQUIRED flann)
@@ -14,12 +15,12 @@ diff -urN OpenCV-2.2.0.old/CMakeLists.txt OpenCV-2.2.0/CMakeLists.txt
  # ===================================================
 diff -urN OpenCV-2.2.0.old/modules/core/CMakeLists.txt OpenCV-2.2.0/modules/core/CMakeLists.txt
 --- OpenCV-2.2.0.old/modules/core/CMakeLists.txt	2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/core/CMakeLists.txt	2011-04-29 23:17:16.000000000 +0200
++++ OpenCV-2.2.0/modules/core/CMakeLists.txt	2011-04-30 10:56:32.000000000 +0200
 @@ -1,3 +1,3 @@
 -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../../3rdparty/include")
 -set(deps opencv_lapack zlib)
 +include_directories("${ZLIB_INCLUDE_DIRS}")
-+set(deps ${LAPACK_LIBRARIES} ${ZLIB_LIBRARIES} ${FLANN_LIBRARIES})
++set(deps ${ZLIB_LIBRARIES} ${LAPACK_LIBRARIES})
  define_opencv_module(core ${deps})
 diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core/src/lapack.cpp
 --- OpenCV-2.2.0.old/modules/core/src/lapack.cpp	2010-12-05 04:35:24.000000000 +0100
@@ -36,13 +37,13 @@ diff -urN OpenCV-2.2.0.old/modules/core/src/lapack.cpp OpenCV-2.2.0/modules/core
  #undef abs
 diff -urN OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt OpenCV-2.2.0/modules/haartraining/CMakeLists.txt
 --- OpenCV-2.2.0.old/modules/haartraining/CMakeLists.txt	2010-12-05 04:35:24.000000000 +0100
-+++ OpenCV-2.2.0/modules/haartraining/CMakeLists.txt	2011-04-29 23:43:17.000000000 +0200
++++ OpenCV-2.2.0/modules/haartraining/CMakeLists.txt	2011-04-29 23:48:41.000000000 +0200
 @@ -18,7 +18,7 @@
      link_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/bin ${CMAKE_CURRENT_BINARY_DIR})
  endif()
  
 -set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine)
-+set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES})
++set(haartraining_libs opencv_core opencv_imgproc opencv_highgui opencv_objdetect opencv_calib3d opencv_haartraining_engine ${BLAS_LIBRARIES} ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES})
  
  link_libraries(${haartraining_libs})
  
@@ -80,15 +81,15 @@ diff -urN OpenCV-2.2.0.old/modules/highgui/src/grfmt_png.cpp OpenCV-2.2.0/module
  #ifdef HAVE_PNG
  
  /****************************************************************************************\
-diff -urN OpenCV-2.2.0.old/OpenCVModule.cmake OpenCV-2.2.0/OpenCVModule.cmake
---- OpenCV-2.2.0.old/OpenCVModule.cmake	2010-12-05 04:35:25.000000000 +0100
-+++ OpenCV-2.2.0/OpenCVModule.cmake	2011-04-29 23:43:42.000000000 +0200
-@@ -57,7 +57,7 @@
- 	    )
+diff -urN OpenCV-2.2.0.old/OpenCVFindOpenEXR.cmake OpenCV-2.2.0/OpenCVFindOpenEXR.cmake
+--- OpenCV-2.2.0.old/OpenCVFindOpenEXR.cmake	2010-12-05 04:35:25.000000000 +0100
++++ OpenCV-2.2.0/OpenCVFindOpenEXR.cmake	2011-04-30 10:57:21.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} CACHE STRING "The libraries needed to use OpenEXR")
+ ENDIF ()
  
- 	# Add the required libraries for linking:
--	target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})
-+	target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN} ${FLANN_LIBRARIES} ${LAPACK_LIBRARIES})
- 
- 	if(MSVC)
- 	    if(CMAKE_CROSSCOMPILING)
+ IF(OPENEXR_FOUND)

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
index 2dd6260..81e1cd7 100644
--- a/media-libs/opencv/opencv-2.2.0.ebuild
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}/${PV}-v4l_2.6.38.patch"
 	"${FILESDIR}/${PV}-use_system_libs.patch"
 	"${FILESDIR}/${PV}-libpng1.5.patch"
+	"${FILESDIR}/${PV}-numpy.patch"
 )
 
 S=${WORKDIR}/${MY_P}
@@ -143,6 +144,7 @@ src_configure() {
 
 	# things we want to be hardly enabled not worth useflag
 	mycmakeargs+=(
+		"-DCMAKE_SKIP_RPATH=ON"
 		"-DBUILD_SHARED_LIBS=ON"
 		"-DOPENCV_DOC_INSTALL_PATH=share/doc/${PF}"
 	)