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

[Tomas Chvatal]

commit:     b70796f56eb95c87991e6c7b4a9fee850e003153
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 19:08:16 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 19:08:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b70796f5

[media-libs/opencv] Add initial 2.2.0 ebuild that could in theory compile.

---
 .../files/2.2.0-convert_sets_to_options.patch      |  228 ++++++++++++++++++++
 media-libs/opencv/metadata.xml                     |   21 ++
 media-libs/opencv/opencv-2.2.0.ebuild              |  139 ++++++++++++
 3 files changed, 388 insertions(+), 0 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
new file mode 100644
index 0000000..8856495
--- /dev/null
+++ b/media-libs/opencv/files/2.2.0-convert_sets_to_options.patch
@@ -0,0 +1,228 @@
+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 20:08:03.000000000 +0200
+@@ -13,7 +13,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()
+ # it _must_ go before PROJECT(OpenCV) in order to work
+ if (NOT CMAKE_INSTALL_PREFIX)
+@@ -94,7 +94,7 @@
+ # 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)
+ IF(BUILD_SHARED_LIBS)
+     SET(OPENCV_BUILD_SHARED_LIB 1) # For cvconfig.h, etc.
+ ELSE(BUILD_SHARED_LIBS)
+@@ -196,13 +196,13 @@
+ 
+ # 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
+ # ===================================================
+@@ -229,12 +229,12 @@
+ #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 arm*)
+         # We can use only -O2 because the -O3 causes gcc crash
+-        set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC")
+-        set(USE_FAST_MATH ON CACHE BOOL "Enable -ffast-math for GCC")
++        option(USE_O2 "Enable -O2 for GCC" ON)
++        option(USE_FAST_MATH "Enable -ffast-math for GCC" ON)
+     endif()
+ 
+     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*)
+@@ -255,56 +255,56 @@
+     endif()
+ 
+     if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*)
+-        set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC")
+-        set(ENABLE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC")
++        option(USE_O3 "Enable -O3 for GCC" ON)
++        option(ENABLE_POWERPC "Enable PowerPC for GCC" ON)
+     endif ()
+ 
+     if(X86 OR X86_64)
+         # enable everything, since the available set of instructions is checked at runtime
+-        set(USE_O3 ON CACHE BOOL "Enable -O3")
+-        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")
++        set(USE_O3 "Enable -O3" ON)
++        set(USE_FAST_MATH "Enable -ffast-math" 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()
+ 
+ # 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 TBB support")
+-set(WITH_EIGEN2 ON CACHE BOOL "Include Eigen2/Eigen3 support")
+-set(WITH_CUDA OFF CACHE BOOL "Include NVidia Cuda Runtime support")
++option(WITH_TBB "Include TBB support" OFF)
++option(WITH_EIGEN2 "Include Eigen2/Eigen3 support" ON)
++option(WITH_CUDA "Include NVidia Cuda Runtime support" OFF)
+ 
+ if(WIN32)
+-        set(WITH_VIDEOINPUT ON CACHE BOOL "Enable VideoInput support")
++        option(WITH_VIDEOINPUT "Enable VideoInput support" ON)
+ endif()
+ 
+ # ===================================================
+@@ -496,7 +496,7 @@
+     include(OpenCVFindOpenEXR.cmake)
+ endif()
+ 
+-set(BUILD_NEW_PYTHON_SUPPORT ON CACHE BOOL "Build with Python support")
++option(BUILD_NEW_PYTHON_SUPPORT "Build with Python support" ON)
+ 
+ if(BUILD_NEW_PYTHON_SUPPORT)
+     find_package(PythonInterp)
+@@ -543,8 +543,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)
+@@ -823,15 +823,12 @@
+ 
+ 
+ ################## LATEX ##################
+-set(BUILD_LATEX_DOCS OFF CACHE BOOL "Build LaTeX OpenCV Documentation")
++option(BUILD_LATEX_DOCS "Build LaTeX OpenCV Documentation" OFF)
+ 
+ ################### DOXYGEN ###############
+ 
+ find_package(Doxygen)
+-
+-if(DOXYGEN_FOUND)
+-    set(BUILD_DOXYGEN_DOCS ON CACHE BOOL "Generate HTML docs using Doxygen")
+-endif()
++option(BUILD_DOXYGEN_DOCS "Generate HTML docs using Doxygen" ON)
+ 
+ # ----------------------------------------------------------------------------
+ #                   UPDATE CONFIG FILES & SCRIPTS:
+@@ -863,7 +860,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 "")
+@@ -1070,9 +1067,9 @@
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for applications" )
+ 
+ if(WIN32)
+-set(OPENCV_DOC_INSTALL_PATH doc)
++set(OPENCV_DOC_INSTALL_PATH doc CACHE PATH "Directory for documentation to install (without prefix)")
+ 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()
+ 
+ # --------------------------------------------------------------------------------------------
+@@ -1106,7 +1103,7 @@
+ set(CMAKE_INCLUDE_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/include/opencv" "${CMAKE_INSTALL_PREFIX}/include")
+ set(CMAKE_BASE_INCLUDE_DIRS_CONFIGCMAKE "\"\"")
+ 
+-set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/lib")
++set(CMAKE_LIB_DIRS_CONFIGCMAKE "${CMAKE_INSTALL_PREFIX}/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)
+@@ -1164,7 +1161,7 @@
+ # -------------------------------------------------------------------------------------------
+ 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})
+ 
+@@ -1191,7 +1188,7 @@
+ #   CPack target
+ # ----------------------------------------------------------------------------
+ 
+-set(BUILD_PACKAGE OFF CACHE BOOL "Build a installer with the SDK")
++option(BUILD_PACKAGE "Build a installer with the SDK" OFF)
+ 
+ if(BUILD_PACKAGE)
+ 

diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
new file mode 100644
index 0000000..1765e23
--- /dev/null
+++ b/media-libs/opencv/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<maintainer>
+	<email>dilfridge@g.o</email>
+	<name>Andreas K. Huettel</name>
+</maintainer>
+<longdescription>
+OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
+Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
+Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics.
+</longdescription>
+<use>
+	<flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+	<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
+	<flag name="ipp">Enable Intel Integrated Primitive support</flag>
+	<flag name="sse3">Enable optimization for SSE3 capable chips</flag>
+	<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
+</use>
+</pkgmetadata>

diff --git a/media-libs/opencv/opencv-2.2.0.ebuild b/media-libs/opencv/opencv-2.2.0.ebuild
new file mode 100644
index 0000000..7cc0051
--- /dev/null
+++ b/media-libs/opencv/opencv-2.2.0.ebuild
@@ -0,0 +1,139 @@
+# 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.1.0.ebuild,v 1.7 2011/04/14 12:39:11 scarabeus Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit base cmake-utils 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 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="cuda doc eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k openexr opengl png python qt4 sse sse2 sse3 ssse3 test threads tiff v4l xine"
+
+RDEPEND="
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	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 )
+	)
+	threads? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	v4l? ( media-libs/libv4l )
+	xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[-nodot] )
+	dev-util/pkgconfig
+"
+
+# REQUIRED_USE="opengl? ( qt )"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-convert_sets_to_options.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build doc DOXYGEN_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_use 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 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 threads TBB)
+		$(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: http://bugs.gentoo.org/show_bug.cgi?id=175881
+	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"
+	)
+
+	# things we want to be hardly enabled not worth useflag
+	mycmakeargs+=(
+		"-DBUILD_SHARED_LIBS=ON"
+		"-DOPENCV_DOC_INSTALL_PATH=share/doc/${PF}"
+		"-DOPENCV_EXTRA_C_FLAGS=${CXXFLAGS}"
+	)
+
+	cmake-utils_src_configure
+}