# ChangeLog for media-libs/opencv
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.44 2011/09/06 20:56:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.45 2011/09/18 20:30:22 dilfridge Exp $
+
+*opencv-2.3.0 (18 Sep 2011)
+
+ 18 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org> +opencv-2.3.0.ebuild,
+ +files/opencv-2.3.0-convert_sets_to_options.patch,
+ +files/opencv-2.3.0-ffmpeg.patch, +files/opencv-2.3.0-numpy.patch,
+ +files/opencv-2.3.0-symlink.patch:
+ Version bump
06 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
opencv-2.2.0-r10.ebuild:
AUX opencv-2.2.0-ptrcvcapture.patch 512 RMD160 79e1f005b1aa494468edd3f57f944e0b51ac32d1 SHA1 7f49f7b25d93b734435dc572b65f0e2f45f42645 SHA256 d3c063e742abf7bc4898003d464a795ecf421a1d67a1abcdff9c712de0a3c7ad
AUX opencv-2.2.0-use_system_libs.patch 5117 RMD160 02a9c2e896ebc453ee63770e5f216e5d696bc103 SHA1 ba0ac15a4f60a7b875b9e28e51a2e41b1ba26fb9 SHA256 f83725b7b7fe8e47e98269abc803bb678cd0566646735d78f3e82c3f70b872de
AUX opencv-2.2.0-v4l_2.6.38.patch 1165 RMD160 1bf13eca350e015ce53611c77dc4e85d81fa8530 SHA1 64e4ea4df8d17843c73248bef778459660b556d9 SHA256 2d4e0c72c3f4e9c60cb10a5fc5a8512275c48e3f38ec3441a240ed49dd8a1b5b
+AUX opencv-2.3.0-convert_sets_to_options.patch 14590 RMD160 1fdf49d3981ddb4e222728c133ec68d2d5ffd17d SHA1 91a34455fc16be04ebc5e89bb9c093928fae39cd SHA256 60e50e5e66213fe174d220a546f40081def4604862e060ba9dce6cbd012a52ac
+AUX opencv-2.3.0-ffmpeg.patch 4940 RMD160 ad9e319212530581cecefe1880605000ff8d8dfe SHA1 002fe2cfe2b9ecd00ac0a83681c2d2291fd61c89 SHA256 4c181a768089366d3e124130629df4ac9a0a975a239c77031b7ab2d1e76fc861
+AUX opencv-2.3.0-numpy.patch 551 RMD160 d777f008d8b569076a78f91b6f06a25c4d08bb0f SHA1 766e8c14f4e407a5e252f3a9228f260be8f50e28 SHA256 5b835add26f1a20601126a8cde89b2ee7bb26211e426f35c11b85798d8de2378
+AUX opencv-2.3.0-symlink.patch 838 RMD160 787ef6c6ae59a4d614701fbafe48c8803cf29807 SHA1 08059632d29f08069c8abbc294e501487d97d201 SHA256 286f946ca13760406c8afcf71358758df0051fd51a74578058f263610c05c448
DIST OpenCV-2.1.0.tar.bz2 14459566 RMD160 e31cdbd30e7925e3725f5957616ffc59c58db247 SHA1 8e2d6b653296364ab2ca0fa5a5e6b0edfca114a7 SHA256 26061fd52ab0ab593c093ff94b5f5c09b956d7deda96b47019ff11932111397f
DIST OpenCV-2.2.0.tar.bz2 19800873 RMD160 57aedb7678964f43af3f1c838a8266c7b4869b01 SHA1 984ed71672d50391d0617fce2ef58e7590ec0fd7 SHA256 259982293db9e1e73dca2ca909fc332ac923bec64578a657d8bb8ab6ccdeb88e
+DIST OpenCV-2.3.0.tar.bz2 42849210 RMD160 79184b56236e3669fccbd2fb0ea0f30008ee81e9 SHA1 53b5d5aab835eb63d4546489b1c1246eeba1da29 SHA256 bcbfff0ff767f0cf2523707a307a5fd0db4853c19c3498f322c8c5839429940b
EBUILD opencv-2.1.0.ebuild 2962 RMD160 e6db74fcd2d4c76c3b1f0dc50b6623921ffc5d4f SHA1 9a266d3406186a1e6ca1c619cda3119ea3483413 SHA256 e0f1622906fcefd8f128e60291db8a23eecc5179286704080c8663c7663423b5
EBUILD opencv-2.2.0-r10.ebuild 4496 RMD160 e4f404e4d2368b27736501bd0d493e6e9dddb196 SHA1 50673483544b1760774a7c25629273b98e15df3a SHA256 979fe4eaf0b7ad221080e5663a973af68ad64385e7adb70017306328def340da
EBUILD opencv-2.2.0.ebuild 4148 RMD160 bd32696acc5bbaae6c496dff5460be0855bfaccb SHA1 572861477b75527a164907faa7db47ec5c908979 SHA256 70be9658a7986a911621455663a7470bdfcfd64ea7dc1d9e39ac659335c857dc
-MISC ChangeLog 7591 RMD160 9e0a1ae7aabdcdfdfd5f965694eda5e815d8ef09 SHA1 fa30d9f7e7fcce8ada9c5f62464baa0635855217 SHA256 1f369ec567021b4cae6af6cd951f5b21ef71d9bd237ab8f444084620273c44c9
+EBUILD opencv-2.3.0.ebuild 4125 RMD160 8f9b3757bb1e8bfbcac3d0c0e1bf4124e7625ae1 SHA1 f883eb2bd7454bf35dc5cb9f10b16f167531aedb SHA256 0c7a3f2140aa3fb9fcf655782a7a8eb034291a9dd14093fadce32077a7ae1e07
+MISC ChangeLog 7874 RMD160 4b2f85dbb3c0f24db0dd81b0c2da7f6e7b26d974 SHA1 d0e251a973511278b2977ef611f5d2c6ea7c6821 SHA256 d73d2ac86bf5547756c4a561ac7fe592e4e9036dcbbf183fbe6b122ff8d9a730
MISC metadata.xml 1222 RMD160 af816e937020baeeb1c1bf3a66b7cea79b7117e7 SHA1 bb559cf2dbbafaddf20df3a8cc2b792cbe2e55ea SHA256 1ccca688c78b618bb73ed9ab0f70b99a8ec6f8ffd7d03275861cf723e1d222f4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOZokZAAoJENwGBM22xffeZ1MQAJNfJPdQddJXmHBoGe8qD5iX
-sCZWFcZ6Wtut+X2FysHyFCcQKLMo4VSg83HoUz7Npx3NYCv6u/+52EqhhspPgw6Y
-EdrHObe+/mjnTs+lQi6RMRjcHth5UrgKR2lrQe8iSjYxbCI6hJJvs8PNxIq8guhV
-XsEbWWol7JYZ3iCgNVKgjfP+xT5Bt+EfBeMSWqzLz2AgL4vsX116R7iKw+yiaS2j
-PtlfOgTn79BHQmBXEB+73hC0hA7F9WX/oKy17ITmK/En2uuHRtlHUt1K8CN0eDio
-SlnOsOjpuEHbq9k1WXt06kQFp+RHu9D+g4u+QZ2mqzz6RuBPUGt2JQfK7S+O+RBY
-dRu2Qwj/j8HgTWYGQS20hMKJ5MK1H6pBAl/RXt93QSX4vSqz+hwMgDV+jj+bFrS0
-vtOOudo0rqa0/j0dpmF28V5yvWjynv8rYp1541ZaAUBJjYhrvaIS07bbehLAmUqo
-MUCV8LtGIcj+ON0vfg3t6d5MOuCV5kYmKDvXsyGs83znHu6R0OiCPQlJ74pnw9Ff
-SVKlMFji8pmYGDt42735aPvdMzUcvtx62wdMGROVVEqQIq/E6ZtkBFBJoQbxV9uG
-oaxeaK3GVGV9g0QlOo4g9/4mbJb+7OTsg2hYb6NXHQssYNXB8SZkjC1bar9e9v5d
-q1qSkl5cX+0NPKrgD+5t
-=6iNU
+iQIcBAEBCgAGBQJOdlT7AAoJENwGBM22xffe7bsP+weKtNaX1GWkKQgkwIR8aTFh
+mx7xXxjUQ1It1mpZgZrTwmRyB5XIyH3uzMeWCQkYOA6QfqBaWMUEoIkBDQWV4Xt0
+NvFRKIoAMrNN9HaU4xff/wXUZf0eUj+qN5bApxBdYoNDNiRd9gRUgX2BGFCKcttx
+huO5hoajNwgEuDCgS1Od7uBkWqhh7G+OlpvATneij/tTOHPdUNMP168I6UCP24u6
+73uMc3XsQe9ek2z+6oYkyuVsr+XoXNk6X2u6KBcF3aU1G7uamshpQdt/ieaxxodN
+2+hkWSveZiMW7nKMgPeLBlc88uSM7aYk3uQtiD1I5N/uLIBv7/BlyKHtz4JKGeL3
+vHBtxBTFiS/jjASZj8nAAkIGBnwvJDeZSA7FBO471aonNYeFTQx31EqfSGopHnlZ
+QiV21a2RK3QmCaJ9LWHjdvOkRbt1B0DLvdh8c17e56ns0s5tCTWxj2BYE1hf5tlh
+dbf3geYFMsRelKUFEpze+feJnoAY2S5Ngk28nnBEWCBahlExiMCLkK3Nt1FBHiRs
+Nuhbi/+XfPfkcymA4bIUlWAIJAkuGD7nzSvnzXfJydPSdw9hiOCt6Mb4XPKIRf/u
+ID+PYZTtuOYT+NmFgFU+oT1qRt+mV055lFYwuQRhmQT7nNO2AJQBD8KeEUEIBWWn
+3l0txnYQOplkJOy4wkwM
+=6Izh
-----END PGP SIGNATURE-----
--- /dev/null
+diff -ruN OpenCV-2.3.0-0-vanilla/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
+--- OpenCV-2.3.0-0-vanilla/CMakeLists.txt 2011-07-04 06:21:50.000000000 +0200
++++ OpenCV-2.3.0/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
+@@ -14,7 +14,7 @@
+ # Add these standard paths to the search paths for FIND_LIBRARY
+ # to find libraries from these locations first
+ if(UNIX)
+- set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib /usr/lib)
++ set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX})
+ endif()
+
+
+@@ -77,13 +77,13 @@
+ # Build static or dynamic libs?
+ # Default: dynamic libraries
+ # ----------------------------------------------------------------------------
+-set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
++OPTION(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" ON)
+
+ # ----------------------------------------------------------------------------
+ # Include debug info into debug libs?
+ # Default: yes
+ # ----------------------------------------------------------------------------
+-set(BUILD_WITH_DEBUG_INFO ON CACHE BOOL "Include debug info into debug libs")
++OPTION(BUILD_WITH_DEBUG_INFO "Include debug info into debug libs" ON)
+
+ # ----------------------------------------------------------------------------
+ # Current version number:
+@@ -285,20 +285,20 @@
+
+ # Build/install (or not) some apps:
+ # ===================================================
+-set(BUILD_EXAMPLES OFF CACHE BOOL "Build all examples")
+-set(INSTALL_C_EXAMPLES OFF CACHE BOOL "Install C examples")
+-set(INSTALL_PYTHON_EXAMPLES OFF CACHE BOOL "Install Python examples")
++option(BUILD_EXAMPLES "Build all examples" OFF)
++option(INSTALL_C_EXAMPLES "Install C examples" OFF)
++option(INSTALL_PYTHON_EXAMPLES "Install Python examples" OFF)
+
+ # Build tests:
+ # ===================================================
+-set(BUILD_TESTS ON CACHE BOOL "Build tests")
++option(BUILD_TESTS "Build tests" ON)
+
+ # Build 3rdparty libraries under unix
+ # ===================================================
+ if(WIN32)
+- set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries")
++ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" TRUE)
+ else()
+- set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries")
++ option(OPENCV_BUILD_3RDPARTY_LIBS "Build 3rd party libraries" FALSE)
+ endif()
+
+ include(OpenCVPCHSupport.cmake REQUIRED)
+@@ -324,8 +324,8 @@
+ #set(ENABLE_OPENMP ${DEFAULT_ENABLE_OPENMP} CACHE BOOL "")
+
+ if(CMAKE_COMPILER_IS_GNUCXX)
+- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)")
+- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC")
++ option(ENABLE_PROFILING "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF)
++ option(USE_OMIT_FRAME_POINTER "Enable -fomit-frame-pointer for GCC" ON)
+
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
+ set(X86_64 1)
+@@ -341,58 +341,58 @@
+
+ if(X86 OR X86_64)
+ # enable everything, since the available set of instructions is checked at runtime
+- set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math")
+- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions")
+- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions")
+- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions")
+- set(ENABLE_SSSE3 OFF CACHE BOOL "Enable SSSE3 instructions")
+- set(ENABLE_SSE41 OFF CACHE BOOL "Enable SSE4.1 instructions")
+- set(ENABLE_SSE42 OFF CACHE BOOL "Enable SSE4.2 instructions")
++ option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
++ option(ENABLE_SSE "Enable SSE instructions" ON)
++ option(ENABLE_SSE2 "Enable SSE2 instructions" ON)
++ option(ENABLE_SSE3 "Enable SSE3 instructions" OFF)
++ option(ENABLE_SSSE3 "Enable SSSE3 instructions" OFF)
++ option(ENABLE_SSE41 "Enable SSE4.1 instructions" OFF)
++ option(ENABLE_SSE42 "Enable SSE4.2 instructions" OFF)
+ endif()
+ endif()
+
+ if(MSVC)
+- set(ENABLE_SSE ON CACHE BOOL "Enable SSE instructions for MSVC")
+- set(ENABLE_SSE2 ON CACHE BOOL "Enable SSE2 instructions for MSVC")
++ option(ENABLE_SSE "Enable SSE instructions for MSVC" ON)
++ option(ENABLE_SSE2 "Enable SSE2 instructions for MSVC" ON)
+ if(CMAKE_C_COMPILER MATCHES "icc")
+- set(ENABLE_SSE3 OFF CACHE BOOL "Enable SSE3 instructions for ICC")
+- set(ENABLE_SSE4_1 OFF CACHE BOOL "Enable SSE4.1 instructions for ICC")
++ option(ENABLE_SSE3 "Enable SSE3 instructions for ICC" OFF)
++ option(ENABLE_SSE4_1 "Enable SSE4.1 instructions for ICC" OFF)
+ endif()
+ endif()
+
+ # allow fine grained control over which libraries not to link, even if
+ # they are available on the system
+ # ====================================================================
+-set(WITH_PNG ON CACHE BOOL "Include PNG support")
+-set(WITH_JPEG ON CACHE BOOL "Include JPEG support")
+-set(WITH_JASPER ON CACHE BOOL "Include JPEG2K support")
+-set(WITH_TIFF ON CACHE BOOL "Include TIFF support")
+-set(WITH_OPENEXR ON CACHE BOOL "Include ILM support via OpenEXR")
++option(WITH_PNG "Include PNG support" ON)
++option(WITH_JPEG "Include JPEG support" ON)
++option(WITH_JASPER "Include JPEG2K support" ON)
++option(WITH_TIFF "Include TIFF support" ON)
++option(WITH_OPENEXR "Include ILM support via OpenEXR" ON)
+
+ if(UNIX)
+- set(WITH_FFMPEG ON CACHE BOOL "Include FFMPEG support")
++ option(WITH_FFMPEG "Include FFMPEG support" ON)
+ if(NOT APPLE)
+- set(WITH_UNICAP OFF CACHE BOOL "Include Unicap support (GPL)")
+- set(WITH_GTK ON CACHE BOOL "Include GTK support")
+- set(WITH_GSTREAMER ON CACHE BOOL "Include Gstreamer support")
+- set(WITH_V4L ON CACHE BOOL "Include Video 4 Linux support")
+- set(WITH_XINE OFF CACHE BOOL "Include Xine support (GPL)")
++ option(WITH_UNICAP "Include Unicap support (GPL)" OFF)
++ option(WITH_GTK "Include GTK support" ON)
++ option(WITH_GSTREAMER "Include Gstreamer support" ON)
++ option(WITH_V4L "Include Video 4 Linux support" ON)
++ option(WITH_XINE "Include Xine support (GPL)" OFF)
+ endif()
+- set(WITH_PVAPI ON CACHE BOOL "Include Prosilica GigE support")
+- set(WITH_1394 ON CACHE BOOL "Include IEEE1394 support")
++ option(WITH_PVAPI "Include Prosilica GigE support" ON)
++ option(WITH_1394 "Include IEEE1394 support" ON)
+ endif()
+
+ if(APPLE)
+- set(WITH_CARBON OFF CACHE BOOL "Use Carbon for UI instead of Cocoa")
+- set(WITH_QUICKTIME OFF CACHE BOOL "Use QuickTime for Video I/O insted of QTKit")
++ option(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF)
++ option(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF)
+ endif()
+
+-set(WITH_TBB OFF CACHE BOOL "Include Intel TBB support")
+-set(WITH_IPP OFF CACHE BOOL "Include Intel IPP support")
+-set(WITH_EIGEN ON CACHE BOOL "Include Eigen2/Eigen3 support")
+-set(WITH_CUDA ON CACHE BOOL "Include NVidia Cuda Runtime support")
++option(WITH_TBB "Include TBB support" OFF)
++option(WITH_IPP "Include Intel IPP support" OFF)
++option(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
++option(WITH_CUDA "Include NVidia Cuda Runtime support" ON)
+
+-set(WITH_OPENNI OFF CACHE BOOL "Include OpenNI support")
++option(WITH_OPENNI "Include OpenNI support" OFF)
+
+ # ===================================================
+ # Macros that checks if module have been installed.
+@@ -586,13 +586,13 @@
+ include(OpenCVFindOpenEXR.cmake)
+ endif()
+
+-set(BUILD_DOCS ON CACHE BOOL "Build OpenCV Documentation")
++option(BUILD_DOCS "Build OpenCV Documentation" ON)
+
+ if(BUILD_DOCS)
+ include(OpenCVFindLATEX.cmake REQUIRED)
+ endif()
+
+-set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
++option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
+
+ if (WIN32)
+ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+@@ -619,11 +619,11 @@
+
+ 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_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
+ if(APPLE)
+ set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.")
+ else() #debian based assumed, install to the dist-packages.
+- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.")
++ set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
+ endif()
+ endif()
+ if(WIN32)
+@@ -665,8 +665,8 @@
+ #YV
+ ############################### QT ################################
+
+-set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")
+-set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")
++option(WITH_QT "Build with Qt Backend support" OFF)
++option(WITH_QT_OPENGL "Add OpenGL extension to Qt" OFF)
+
+ set(HAVE_QT 0)
+ set(HAVE_QT_OPENGL 0)
+@@ -876,8 +876,8 @@
+ ################## Extra HighGUI libs on Windows ###################
+
+ if(WIN32)
+- set(WITH_VIDEOINPUT ON CACHE BOOL "Build HighGUI with DirectShow support")
+-
++ option(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON)
++
+ set(HIGHGUI_LIBRARIES ${HIGHGUI_LIBRARIES} comctl32 gdi32 ole32)
+
+ if(WITH_VIDEOINPUT)
+@@ -956,7 +956,7 @@
+ # Set the maximum level of warnings:
+ # ----------------------------------------------------------------------------
+ # Should be set to true for development
+-set(OPENCV_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors")
++option(OPENCV_WARNINGS_ARE_ERRORS "Treat warnings as errors" OFF)
+
+ set(EXTRA_C_FLAGS "")
+ set(EXTRA_C_FLAGS_RELEASE "")
+@@ -1197,7 +1197,7 @@
+ if(WIN32)
+ set(OPENCV_DOC_INSTALL_PATH doc)
+ else()
+-set(OPENCV_DOC_INSTALL_PATH share/opencv/doc)
++set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION}/ CACHE PATH "Directory for documentation to install (without prefix)")
+ endif()
+
+
+@@ -1232,7 +1232,7 @@
+ set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../include/opencv" "\${THIS_OPENCV_CONFIG_PATH}/../../include\"")
+ set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
+
+-set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib\"")
++set(CMAKE_LIB_DIRS_CONFIGCMAKE "\"\${THIS_OPENCV_CONFIG_PATH}/../../lib${LIB_SUFFIX}\"")
+
+ exec_program(mkdir ARGS "-p \"${CMAKE_BINARY_DIR}/unix-install/\"" OUTPUT_VARIABLE RET_VAL)
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" IMMEDIATE @ONLY)
+@@ -1327,14 +1327,14 @@
+ # -------------------------------------------------------------------------------------------
+ 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()
+
+
+@@ -1354,7 +1354,7 @@
+ # CPack target
+ # ----------------------------------------------------------------------------
+
+-set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
++option(BUILD_PACKAGE "Build a installer with the SDK" ON)
+
+ if(BUILD_PACKAGE)
+
+diff -ruN OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake OpenCV-2.3.0/OpenCVModule.cmake
+--- OpenCV-2.3.0-0-vanilla/OpenCVModule.cmake 2011-07-04 06:21:59.000000000 +0200
++++ OpenCV-2.3.0/OpenCVModule.cmake 2011-09-18 19:32:20.000000000 +0200
+@@ -63,7 +63,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ )
+
+ if(PCHSupport_FOUND AND USE_PRECOMPILED_HEADERS)
+@@ -97,8 +97,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 -ruN OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt OpenCV-2.3.0/modules/gpu/CMakeLists.txt
+--- OpenCV-2.3.0-0-vanilla/modules/gpu/CMakeLists.txt 2011-07-04 06:21:58.000000000 +0200
++++ OpenCV-2.3.0/modules/gpu/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
+@@ -121,7 +121,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ )
+
+ # Add the required libraries for linking:
+@@ -149,8 +149,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 -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt OpenCV-2.3.0/modules/highgui/CMakeLists.txt
+--- OpenCV-2.3.0-0-vanilla/modules/highgui/CMakeLists.txt 2011-07-04 06:21:58.000000000 +0200
++++ OpenCV-2.3.0/modules/highgui/CMakeLists.txt 2011-09-18 19:32:20.000000000 +0200
+@@ -295,7 +295,7 @@
+ DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
+ ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
+ RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
+- INSTALL_NAME_DIR lib
++ INSTALL_NAME_DIR lib${LIB_SUFFIX}
+ LINK_INTERFACE_LIBRARIES ""
+ )
+
+@@ -362,8 +362,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
--- /dev/null
+diff -ruN OpenCV-2.3.0-0-vanilla/modules/highgui/src/cap_ffmpeg_impl.hpp OpenCV-2.3.0/modules/highgui/src/cap_ffmpeg_impl.hpp
+--- OpenCV-2.3.0-0-vanilla/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-07-04 06:21:58.000000000 +0200
++++ OpenCV-2.3.0/modules/highgui/src/cap_ffmpeg_impl.hpp 2011-09-18 20:27:05.000000000 +0200
+@@ -489,7 +489,7 @@
+ AVCodecContext *enc = &ic->streams[i]->codec;
+ #endif
+
+- if( CODEC_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
++ if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) {
+ AVCodec *codec = avcodec_find_decoder(enc->codec_id);
+ if (!codec ||
+ avcodec_open(enc, codec) < 0)
+@@ -576,15 +576,27 @@
+ continue;
+ }
+
+-#if LIBAVFORMAT_BUILD > 4628
+- avcodec_decode_video(video_st->codec,
+- picture, &got_picture,
+- packet.data, packet.size);
+-#else
+- avcodec_decode_video(&video_st->codec,
+- picture, &got_picture,
+- packet.data, packet.size);
+-#endif
++
++ AVPacket avpkt;
++ av_init_packet(&avpkt);
++ avpkt.data = packet.data;
++ avpkt.size = packet.size;
++ //
++ // HACK for CorePNG to decode as normal PNG by default
++ // same method used by ffmpeg
++ avpkt.flags = AV_PKT_FLAG_KEY;
++ avcodec_decode_video2(video_st->codec,
++ picture, &got_picture, &avpkt);
++//Functions Removed from ffmpeg on 4/19/11
++//#if LIBAVFORMAT_BUILD > 4628
++// avcodec_decode_video(video_st->codec,
++// picture, &got_picture,
++// packet.data, packet.size);
++//#else
++// avcodec_decode_video(&video_st->codec,
++// picture, &got_picture,
++// packet.data, packet.size);
++//#endif
+
+ if (got_picture) {
+ // we have a new picture, so memorize it
+@@ -822,24 +834,25 @@
+ #endif
+ };
+
+-static const char * icvFFMPEGErrStr(int err)
+-{
+- switch(err) {
+- case AVERROR_NUMEXPECTED:
+- return "Incorrect filename syntax";
+- case AVERROR_INVALIDDATA:
+- return "Invalid data in header";
+- case AVERROR_NOFMT:
+- return "Unknown format";
+- case AVERROR_IO:
+- return "I/O error occurred";
+- case AVERROR_NOMEM:
+- return "Memory allocation error";
+- default:
+- break;
+- }
+- return "Unspecified error";
+-}
++//Deprecated Errors, should be using AVERROR(EINVAL) to return error strings
++//static const char * icvFFMPEGErrStr(int err)
++//{
++// switch(err) {
++// case AVERROR_NUMEXPECTED:
++// return "Incorrect filename syntax";
++// case AVERROR_INVALIDDATA:
++// return "Invalid data in header";
++// case AVERROR_NOFMT:
++// return "Unknown format";
++// case AVERROR_IO:
++// return "I/O error occurred";
++// case AVERROR_NOMEM:
++// return "Memory allocation error";
++// default:
++// break;
++// }
++// return "Unspecified error";
++//}
+
+ /* function internal to FFMPEG (libavformat/riff.c) to lookup codec id by fourcc tag*/
+ extern "C" {
+@@ -918,7 +931,7 @@
+ #endif
+
+ #if LIBAVFORMAT_BUILD > 4621
+- c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, CODEC_TYPE_VIDEO);
++ c->codec_id = av_guess_codec(oc->oformat, NULL, oc->filename, NULL, AVMEDIA_TYPE_VIDEO);
+ #else
+ c->codec_id = oc->oformat->video_codec;
+ #endif
+@@ -930,7 +943,7 @@
+ //if(codec_tag) c->codec_tag=codec_tag;
+ codec = avcodec_find_encoder(c->codec_id);
+
+- c->codec_type = CODEC_TYPE_VIDEO;
++ c->codec_type = AVMEDIA_TYPE_VIDEO;
+
+ /* put sample parameters */
+ c->bit_rate = bitrate;
+@@ -1015,7 +1028,7 @@
+ AVPacket pkt;
+ av_init_packet(&pkt);
+
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index= video_st->index;
+ pkt.data= (uint8_t *)picture;
+ pkt.size= sizeof(AVPicture);
+@@ -1035,7 +1048,7 @@
+ pkt.pts = c->coded_frame->pts;
+ #endif
+ if(c->coded_frame->key_frame)
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index= video_st->index;
+ pkt.data= outbuf;
+ pkt.size= out_size;
+@@ -1237,7 +1250,7 @@
+ av_register_all ();
+
+ /* auto detect the output format from the name and fourcc code. */
+- fmt = guess_format(NULL, filename, NULL);
++ fmt = av_guess_format(NULL, filename, NULL);
+ if (!fmt)
+ return false;
+
+@@ -1260,7 +1273,7 @@
+ #endif
+
+ // alloc memory for context
+- oc = av_alloc_format_context();
++ oc = avformat_alloc_context();
+ assert (oc);
+
+ /* set file name */
+@@ -1336,7 +1349,7 @@
+ /* open the codec */
+ if ( (err=avcodec_open(c, codec)) < 0) {
+ char errtext[256];
+- sprintf(errtext, "Could not open codec '%s': %s", codec->name, icvFFMPEGErrStr(err));
++ sprintf(errtext, "Could not open codec '%s': %s", codec->name, AVERROR(EINVAL));
+ return false;
+ }
+
--- /dev/null
+diff -ruN OpenCV-2.3.0-1-ol1/CMakeLists.txt OpenCV-2.3.0-2-numpy/CMakeLists.txt
+--- OpenCV-2.3.0-1-ol1/CMakeLists.txt 2011-08-28 14:53:46.000000000 +0200
++++ OpenCV-2.3.0-2-numpy/CMakeLists.txt 2011-08-28 15:26:37.000000000 +0200
+@@ -640,7 +640,7 @@
+
+ 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 NumPy headers from: ${PYTHON_NUMPY_INCLUDE_DIRS}")
+ else()
--- /dev/null
+diff -ruN OpenCV-2.3.0-1-s2o/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt
+--- OpenCV-2.3.0-1-s2o/CMakeLists.txt 2011-09-18 18:40:04.000000000 +0200
++++ OpenCV-2.3.0/CMakeLists.txt 2011-09-18 18:55:47.000000000 +0200
+@@ -1240,7 +1240,7 @@
+ if(UNIX)
+ # For a command "FIND_PACKAGE(FOO)", CMake will look at the directory /usr/share|lib/cmake/FOO/FOOConfig.cmake, so:
+ install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake DESTINATION share/opencv/)
+- install(CODE "exec_program(ln ARGS -sf \"${CMAKE_INSTALL_PREFIX}/share/opencv\" \"${CMAKE_INSTALL_PREFIX}/share/OpenCV\")")
++ install(CODE "exec_program(ln ARGS -sf \"${CMAKE_INSTALL_PREFIX}/share/opencv\" \"$ENV{D}/${CMAKE_INSTALL_PREFIX}/share/OpenCV\")")
+ endif()
+
+ # --------------------------------------------------------------------------------------------
--- /dev/null
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.3.0.ebuild,v 1.1 2011/09/18 20:30:22 dilfridge Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils fortran-2 python
+
+MY_P=OpenCV-${PV}
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.willowgarage.com"
+SRC_URI="mirror://sourceforge/${PN}library/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test tiff v4l xine"
+
+# all tests fail, needs further investigation, bug 296681 - dilfridge
+RESTRICT=test
+
+RDEPEND="
+ app-arch/bzip2
+ sys-libs/zlib
+ sci-libs/flann
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-4 )
+ eigen? ( dev-cpp/eigen:2 )
+ ffmpeg? ( virtual/ffmpeg )
+ gstreamer? (
+ media-libs/gstreamer
+ media-libs/gst-plugins-base
+ )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ )
+ jpeg? ( virtual/jpeg )
+ jpeg2k? ( media-libs/jasper )
+ ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+ ipp? ( sci-libs/ipp )
+ openexr? ( media-libs/openexr )
+ png? ( media-libs/libpng )
+ python? ( dev-python/numpy )
+ qt4? (
+ x11-libs/qt-gui:4
+ opengl? ( x11-libs/qt-opengl:4 )
+ )
+ tiff? ( media-libs/tiff )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ doc? ( virtual/latex-base )
+ dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.0-convert_sets_to_options.patch"
+ "${FILESDIR}/${PN}-2.3.0-ffmpeg.patch"
+ "${FILESDIR}/${PN}-2.3.0-numpy.patch"
+ "${FILESDIR}/${PN}-2.3.0-symlink.patch"
+)
+
+CMAKE_BUILD_TYPE="Release"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ base_src_prepare
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(3rdparty)/ d' \
+ CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build doc DOCS)
+ $(cmake-utils_use_build examples)
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use_build python NEW_PYTHON_SUPPORT)
+ $(cmake-utils_use_build test TESTS)
+ $(cmake-utils_use_enable sse SSE)
+ $(cmake-utils_use_enable sse2 SSE2)
+ $(cmake-utils_use_enable sse3 SSE3)
+ $(cmake-utils_use_enable ssse3 SSSE3)
+ $(cmake-utils_use_with ipp)
+ $(cmake-utils_use_with ieee1394 1394)
+ $(cmake-utils_use_with cuda)
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ $(cmake-utils_use_with gstreamer)
+ $(cmake-utils_use_with gtk)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_with qt4 QT)
+ $(cmake-utils_use_with opengl QT_OPENGL)
+ $(cmake-utils_use_with tiff)
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with xine)
+ )
+
+ if use python && use examples; then
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+ else
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+ fi
+
+ # things we want to be hard off or not yet figured out
+ # unicap: https://bugs.gentoo.org/show_bug.cgi?id=175881
+ # openni: ???
+ mycmakeargs+=(
+ "-DUSE_OMIT_FRAME_POINTER=OFF"
+ "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+ "-DOPENCV_WARNINGS_ARE_ERRORS=OFF"
+ "-DBUILD_LATEX_DOCS=OFF"
+ "-DENABLE_POWERPC=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ "-DUSE_O2=OFF"
+ "-DUSE_O3=OFF"
+ "-DUSE_FAST_MATH=OFF"
+ "-DENABLE_SSE41=OFF"
+ "-DENABLE_SSE42=OFF"
+ "-DWITH_PVAPI=OFF"
+ "-DWITH_UNICAP=OFF"
+ "-DWITH_TBB=OFF"
+ "-DWITH_OPENNI=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${CMAKE_BUILD_DIR}/lib"
+ cmake-utils_src_test
+}
projects / gentoo.git / commitdiff