parent
eae1f7257f
commit
0b97baed5a
@ -1,5 +1,3 @@
|
||||
DIST opencv-2.4.12.zip 93261101 SHA256 2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05 WHIRLPOOL 86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
|
||||
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
|
||||
DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
|
||||
DIST opencv-3.1.0_contrib.zip 55182211 SHA256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4 SHA512 f0ceb8d9ed85efe948a40071793d164a82391a462c52ca71a6029e8b119afdab8b1453baaed2cd7d540001559849a62ec4b745d41345db225acff0531c76e762 WHIRLPOOL 589294c849a00426f4c52d07ab652e71e8bbc74efd0878fbaea2e089051fd118217b1a04f33258fcef2abe1729147282eb17a98c5463691aa3fd56af264ea6a0
|
||||
DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
|
||||
DIST opencv-3.1.0.tar.gz 76135587 SHA256 f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f WHIRLPOOL b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4
|
||||
DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a WHIRLPOOL 18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353
|
||||
|
@ -1,57 +0,0 @@
|
||||
--- opencv-2.4.11/work/opencv-2.4.11/CMakeLists.txt.old 2016-04-07 14:20:23.874972922 +0200
|
||||
+++ opencv-2.4.11/work/opencv-2.4.11/CMakeLists.txt 2016-04-07 14:21:15.689970743 +0200
|
||||
@@ -382,32 +382,32 @@
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
# don't use FindGit because it requires CMake 2.8.2
|
||||
-set(git_names git eg) # eg = easy git
|
||||
+#set(git_names git eg) # eg = easy git
|
||||
# Prefer .cmd variants on Windows unless running in a Makefile in the MSYS shell
|
||||
-if(CMAKE_HOST_WIN32)
|
||||
- if(NOT CMAKE_GENERATOR MATCHES "MSYS")
|
||||
- set(git_names git.cmd git eg.cmd eg)
|
||||
- endif()
|
||||
-endif()
|
||||
+#if(CMAKE_HOST_WIN32)
|
||||
+# if(NOT CMAKE_GENERATOR MATCHES "MSYS")
|
||||
+# set(git_names git.cmd git eg.cmd eg)
|
||||
+# endif()
|
||||
+#endif()
|
||||
|
||||
-find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
|
||||
-mark_as_advanced(GIT_EXECUTABLE)
|
||||
+#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client")
|
||||
+#mark_as_advanced(GIT_EXECUTABLE)
|
||||
|
||||
-if(GIT_EXECUTABLE)
|
||||
- execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
|
||||
- WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
|
||||
- OUTPUT_VARIABLE OPENCV_VCSVERSION
|
||||
- RESULT_VARIABLE GIT_RESULT
|
||||
- ERROR_QUIET
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- )
|
||||
- if(NOT GIT_RESULT EQUAL 0)
|
||||
- set(OPENCV_VCSVERSION "unknown")
|
||||
- endif()
|
||||
-else()
|
||||
+#if(GIT_EXECUTABLE)
|
||||
+# execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*"
|
||||
+# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
|
||||
+# OUTPUT_VARIABLE OPENCV_VCSVERSION
|
||||
+# RESULT_VARIABLE GIT_RESULT
|
||||
+# ERROR_QUIET
|
||||
+# OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
+# )
|
||||
+# if(NOT GIT_RESULT EQUAL 0)
|
||||
+# set(OPENCV_VCSVERSION "unknown")
|
||||
+# endif()
|
||||
+#else()
|
||||
# We don't have git:
|
||||
- set(OPENCV_VCSVERSION "unknown")
|
||||
-endif()
|
||||
+# set(OPENCV_VCSVERSION "unknown")
|
||||
+#endif()
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
@ -1,41 +0,0 @@
|
||||
--- opencv-3.0.0/work/opencv-3.0.0/CMakeLists.txt.old 2016-04-07 14:28:07.641953419 +0200
|
||||
+++ opencv-3.0.0/work/opencv-3.0.0/CMakeLists.txt 2016-04-07 14:28:47.713951734 +0200
|
||||
@@ -433,23 +433,23 @@
|
||||
# ----------------------------------------------------------------------------
|
||||
# Autodetect if we are in a GIT repository
|
||||
# ----------------------------------------------------------------------------
|
||||
-find_host_package(Git QUIET)
|
||||
+#find_host_package(Git QUIET)
|
||||
|
||||
-if(GIT_FOUND)
|
||||
- execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*"
|
||||
- WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
|
||||
- OUTPUT_VARIABLE OPENCV_VCSVERSION
|
||||
- RESULT_VARIABLE GIT_RESULT
|
||||
- ERROR_QUIET
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- )
|
||||
- if(NOT GIT_RESULT EQUAL 0)
|
||||
- set(OPENCV_VCSVERSION "unknown")
|
||||
- endif()
|
||||
-else()
|
||||
+#if(GIT_FOUND)
|
||||
+# execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*"
|
||||
+# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
|
||||
+# OUTPUT_VARIABLE OPENCV_VCSVERSION
|
||||
+# RESULT_VARIABLE GIT_RESULT
|
||||
+# ERROR_QUIET
|
||||
+# OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
+# )
|
||||
+# if(NOT GIT_RESULT EQUAL 0)
|
||||
+# set(OPENCV_VCSVERSION "unknown")
|
||||
+# endif()
|
||||
+#else()
|
||||
# We don't have git:
|
||||
- set(OPENCV_VCSVERSION "unknown")
|
||||
-endif()
|
||||
+# set(OPENCV_VCSVERSION "unknown")
|
||||
+#endif()
|
||||
|
||||
|
||||
# ----------------------------------------------------------------------------
|
@ -0,0 +1,48 @@
|
||||
diff -purN a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
|
||||
--- a/cmake/OpenCVFindLibsGrfmt.cmake 2015-12-18 15:02:16.000000000 +0000
|
||||
+++ b/cmake/OpenCVFindLibsGrfmt.cmake 2016-11-07 13:18:04.567340791 +0000
|
||||
@@ -18,7 +18,7 @@ endif()
|
||||
if(NOT ZLIB_FOUND)
|
||||
ocv_clear_vars(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)
|
||||
|
||||
- set(ZLIB_LIBRARY zlib)
|
||||
+ set(ZLIB_LIBRARY z)
|
||||
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/zlib")
|
||||
set(ZLIB_INCLUDE_DIRS "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}")
|
||||
set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
|
||||
@@ -40,7 +40,7 @@ if(WITH_TIFF)
|
||||
if(NOT TIFF_FOUND)
|
||||
ocv_clear_vars(TIFF_LIBRARY TIFF_LIBRARIES TIFF_INCLUDE_DIR)
|
||||
|
||||
- set(TIFF_LIBRARY libtiff)
|
||||
+ set(TIFF_LIBRARY tiff)
|
||||
set(TIFF_LIBRARIES ${TIFF_LIBRARY})
|
||||
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libtiff")
|
||||
set(TIFF_INCLUDE_DIR "${${TIFF_LIBRARY}_SOURCE_DIR}" "${${TIFF_LIBRARY}_BINARY_DIR}")
|
||||
@@ -79,7 +79,7 @@ if(WITH_JPEG)
|
||||
if(NOT JPEG_FOUND)
|
||||
ocv_clear_vars(JPEG_LIBRARY JPEG_LIBRARIES JPEG_INCLUDE_DIR)
|
||||
|
||||
- set(JPEG_LIBRARY libjpeg)
|
||||
+ set(JPEG_LIBRARY jpeg)
|
||||
set(JPEG_LIBRARIES ${JPEG_LIBRARY})
|
||||
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg")
|
||||
set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}")
|
||||
@@ -136,7 +136,7 @@ if(WITH_JASPER)
|
||||
if(NOT JASPER_FOUND)
|
||||
ocv_clear_vars(JASPER_LIBRARY JASPER_LIBRARIES JASPER_INCLUDE_DIR)
|
||||
|
||||
- set(JASPER_LIBRARY libjasper)
|
||||
+ set(JASPER_LIBRARY jasper)
|
||||
set(JASPER_LIBRARIES ${JASPER_LIBRARY})
|
||||
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjasper")
|
||||
set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}")
|
||||
@@ -169,7 +169,7 @@ if(WITH_PNG)
|
||||
if(NOT PNG_FOUND)
|
||||
ocv_clear_vars(PNG_LIBRARY PNG_LIBRARIES PNG_INCLUDE_DIR PNG_PNG_INCLUDE_DIR HAVE_LIBPNG_PNG_H PNG_DEFINITIONS)
|
||||
|
||||
- set(PNG_LIBRARY libpng)
|
||||
+ set(PNG_LIBRARY png)
|
||||
set(PNG_LIBRARIES ${PNG_LIBRARY})
|
||||
add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libpng")
|
||||
set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}")
|
@ -1,91 +0,0 @@
|
||||
From f529a1df2b17bcada1179ddcaf1352e3a5ba97b8 Mon Sep 17 00:00:00 2001
|
||||
From: Maksim Shabunin <maksim.shabunin@itseez.com>
|
||||
Date: Tue, 15 Dec 2015 17:51:08 +0300
|
||||
Subject: [PATCH] Fixed HAL headers location
|
||||
|
||||
diff --git opencv_contrib-master/modules/xfeatures2d/src/sift.cpp opencv_contrib-master/modules/xfeatures2d/src/sift.cpp
|
||||
index fc67c4d..9634fbb 100644
|
||||
--- opencv_contrib-master/modules/xfeatures2d/src/sift.cpp
|
||||
+++ opencv_contrib-master/modules/xfeatures2d/src/sift.cpp
|
||||
@@ -105,6 +105,7 @@
|
||||
#include "precomp.hpp"
|
||||
#include <iostream>
|
||||
#include <stdarg.h>
|
||||
+#include <opencv2/core/hal/hal.hpp>
|
||||
|
||||
namespace cv
|
||||
{
|
||||
@@ -337,9 +338,9 @@ static float calcOrientationHist( const Mat& img, Point pt, int radius,
|
||||
len = k;
|
||||
|
||||
// compute gradient values, orientations and the weights over the pixel neighborhood
|
||||
- hal::exp(W, W, len);
|
||||
- hal::fastAtan2(Y, X, Ori, len, true);
|
||||
- hal::magnitude(X, Y, Mag, len);
|
||||
+ cv::hal::exp32f(W, W, len);
|
||||
+ cv::hal::fastAtan2(Y, X, Ori, len, true);
|
||||
+ cv::hal::magnitude32f(X, Y, Mag, len);
|
||||
|
||||
for( k = 0; k < len; k++ )
|
||||
{
|
||||
@@ -620,9 +621,9 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc
|
||||
}
|
||||
|
||||
len = k;
|
||||
- hal::fastAtan2(Y, X, Ori, len, true);
|
||||
- hal::magnitude(X, Y, Mag, len);
|
||||
- hal::exp(W, W, len);
|
||||
+ cv::hal::fastAtan2(Y, X, Ori, len, true);
|
||||
+ cv::hal::magnitude32f(X, Y, Mag, len);
|
||||
+ cv::hal::exp32f(W, W, len);
|
||||
|
||||
for( k = 0; k < len; k++ )
|
||||
{
|
||||
|
||||
diff --git opencv_contrib-master/modules/optflow/src/motempl.cpp opencv_contrib-master/modules/optflow/src/motempl.cpp
|
||||
index ec18013..452ad63 100644
|
||||
--- opencv_contrib-master/modules/optflow/src/motempl.cpp
|
||||
+++ opencv_contrib-master/modules/optflow/src/motempl.cpp
|
||||
@@ -41,6 +41,7 @@
|
||||
|
||||
#include "precomp.hpp"
|
||||
#include "opencv2/core/utility.hpp"
|
||||
+#include "opencv2/core/hal/hal.hpp"
|
||||
#include "opencl_kernels_optflow.hpp"
|
||||
|
||||
namespace cv {
|
||||
@@ -212,7 +213,7 @@ void calcMotionGradient( InputArray _mhi, OutputArray _mask,
|
||||
float* orient_row = orient.ptr<float>(y);
|
||||
uchar* mask_row = mask.ptr<uchar>(y);
|
||||
|
||||
- hal::fastAtan2(dY_max_row, dX_min_row, orient_row, size.width, true);
|
||||
+ cv::hal::fastAtan2(dY_max_row, dX_min_row, orient_row, size.width, true);
|
||||
|
||||
// make orientation zero where the gradient is very small
|
||||
for( x = 0; x < size.width; x++ )
|
||||
diff --git opencv_contrib-master/modules/ximgproc/src/fgs_filter.cpp opencv_contrib-master/modules/ximgproc/src/fgs_filter.cpp
|
||||
index e89eb8f..39307e5 100644
|
||||
--- opencv_contrib-master/modules/ximgproc/src/fgs_filter.cpp
|
||||
+++ opencv_contrib-master/modules/ximgproc/src/fgs_filter.cpp
|
||||
@@ -35,7 +35,7 @@
|
||||
*/
|
||||
|
||||
#include "precomp.hpp"
|
||||
-#include "opencv2/hal/intrin.hpp"
|
||||
+#include "opencv2/core/hal/intrin.hpp"
|
||||
#include <vector>
|
||||
|
||||
namespace cv {
|
||||
diff --git opencv_contrib-master/modules/xphoto/src/grayworld_white_balance.cpp opencv_contrib-master/modules/xphoto/src/grayworld_white_balance.cpp
|
||||
index 4780497..15530d3 100644
|
||||
--- opencv_contrib-master/modules/xphoto/src/grayworld_white_balance.cpp
|
||||
+++ opencv_contrib-master/modules/xphoto/src/grayworld_white_balance.cpp
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "opencv2/xphoto.hpp"
|
||||
|
||||
#include "opencv2/core.hpp"
|
||||
-#include "opencv2/hal/intrin.hpp"
|
||||
+#include "opencv2/core/hal/intrin.hpp"
|
||||
|
||||
namespace cv { namespace xphoto {
|
||||
|
@ -1,214 +0,0 @@
|
||||
From ac8dd366e4a1877e0af16961a4094496bed955f7 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Alekhin <alexander.alekhin@itseez.com>
|
||||
Date: Sun, 13 Sep 2015 21:18:47 +0300
|
||||
Subject: [PATCH] ocl: fix "off" mode
|
||||
|
||||
diff --git opencv_contrib-master/modules/tracking/src/tldDetector.cpp opencv_contrib-master/modules/tracking/src/tldDetector.cpp
|
||||
index cbb783e..d61444b 100644
|
||||
--- opencv_contrib-master/modules/tracking/src/tldDetector.cpp
|
||||
+++ opencv_contrib-master/modules/tracking/src/tldDetector.cpp
|
||||
@@ -104,6 +104,7 @@ namespace cv
|
||||
return splus / (sminus + splus);
|
||||
}
|
||||
|
||||
+#ifdef HAVE_OPENCL
|
||||
double TLDDetector::ocl_Sr(const Mat_<uchar>& patch)
|
||||
{
|
||||
//int64 e1, e2, e3, e4;
|
||||
@@ -283,6 +284,7 @@ namespace cv
|
||||
//t = (e2 - e1) / getTickFrequency()*1000.0;
|
||||
//printf("Sr GPU: %f\n\n", t);
|
||||
}
|
||||
+#endif
|
||||
|
||||
// Calculate Conservative similarity of the patch (NN-Model)
|
||||
double TLDDetector::Sc(const Mat_<uchar>& patch)
|
||||
@@ -337,6 +339,7 @@ namespace cv
|
||||
return splus / (sminus + splus);
|
||||
}
|
||||
|
||||
+#ifdef HAVE_OPENCL
|
||||
double TLDDetector::ocl_Sc(const Mat_<uchar>& patch)
|
||||
{
|
||||
//int64 e1, e2, e3, e4;
|
||||
@@ -415,6 +418,7 @@ namespace cv
|
||||
return 0.0;
|
||||
return splus / (sminus + splus);
|
||||
}
|
||||
+#endif // HAVE_OPENCL
|
||||
|
||||
// Generate Search Windows for detector from aspect ratio of initial BBs
|
||||
void TLDDetector::generateScanGrid(int rows, int cols, Size initBox, std::vector<Rect2d>& res, bool withScaling)
|
||||
@@ -565,6 +569,7 @@ namespace cv
|
||||
return true;
|
||||
}
|
||||
|
||||
+#ifdef HAVE_OPENCL
|
||||
bool TLDDetector::ocl_detect(const Mat& img, const Mat& imgBlurred, Rect2d& res, std::vector<LabeledPatch>& patches, Size initSize)
|
||||
{
|
||||
patches.clear();
|
||||
@@ -696,6 +701,7 @@ namespace cv
|
||||
res = maxScRect;
|
||||
return true;
|
||||
}
|
||||
+#endif // HAVE_OPENCL
|
||||
|
||||
// Computes the variance of subimage given by box, with the help of two integral
|
||||
// images intImgP and intImgP2 (sum of squares), which should be also provided.
|
||||
diff --git opencv_contrib-master/modules/tracking/src/tldDetector.hpp opencv_contrib-master/modules/tracking/src/tldDetector.hpp
|
||||
index 3e11895..1caff57 100644
|
||||
--- opencv_contrib-master/modules/tracking/src/tldDetector.hpp
|
||||
+++ opencv_contrib-master/modules/tracking/src/tldDetector.hpp
|
||||
@@ -74,10 +74,12 @@ namespace cv
|
||||
inline double ensembleClassifierNum(const uchar* data);
|
||||
inline void prepareClassifiers(int rowstep);
|
||||
double Sr(const Mat_<uchar>& patch);
|
||||
- double ocl_Sr(const Mat_<uchar>& patch);
|
||||
double Sc(const Mat_<uchar>& patch);
|
||||
+#ifdef HAVE_OPENCL
|
||||
+ double ocl_Sr(const Mat_<uchar>& patch);
|
||||
double ocl_Sc(const Mat_<uchar>& patch);
|
||||
void ocl_batchSrSc(const Mat_<uchar>& patches, double *resultSr, double *resultSc, int numOfPatches);
|
||||
+#endif
|
||||
|
||||
std::vector<TLDEnsembleClassifier> classifiers;
|
||||
Mat *posExp, *negExp;
|
||||
diff --git opencv_contrib-master/modules/tracking/src/tldModel.cpp opencv_contrib-master/modules/tracking/src/tldModel.cpp
|
||||
index 0854022..47fc32a 100644
|
||||
--- opencv_contrib-master/modules/tracking/src/tldModel.cpp
|
||||
+++ opencv_contrib-master/modules/tracking/src/tldModel.cpp
|
||||
@@ -246,6 +246,7 @@ namespace cv
|
||||
dfprintf((stdout, "\n"));*/
|
||||
}
|
||||
|
||||
+#ifdef HAVE_OPENCL
|
||||
void TrackerTLDModel::ocl_integrateAdditional(const std::vector<Mat_<uchar> >& eForModel, const std::vector<Mat_<uchar> >& eForEnsemble, bool isPositive)
|
||||
{
|
||||
int positiveIntoModel = 0, negativeIntoModel = 0, positiveIntoEnsemble = 0, negativeIntoEnsemble = 0;
|
||||
@@ -315,6 +316,7 @@ namespace cv
|
||||
dfprintf((stdout, "positiveIntoEnsemble = %d ", positiveIntoEnsemble));
|
||||
dfprintf((stdout, "\n"));*/
|
||||
}
|
||||
+#endif // HAVE_OPENCL
|
||||
|
||||
//Push the patch to the model
|
||||
void TrackerTLDModel::pushIntoModel(const Mat_<uchar>& example, bool positive)
|
||||
diff --git opencv_contrib-master/modules/tracking/src/tldModel.hpp opencv_contrib-master/modules/tracking/src/tldModel.hpp
|
||||
index be9141a..ba7c926 100644
|
||||
--- opencv_contrib-master/modules/tracking/src/tldModel.hpp
|
||||
+++ opencv_contrib-master/modules/tracking/src/tldModel.hpp
|
||||
@@ -58,7 +58,9 @@ namespace cv
|
||||
void setBoudingBox(Rect2d boundingBox){ boundingBox_ = boundingBox; }
|
||||
void integrateRelabeled(Mat& img, Mat& imgBlurred, const std::vector<TLDDetector::LabeledPatch>& patches);
|
||||
void integrateAdditional(const std::vector<Mat_<uchar> >& eForModel, const std::vector<Mat_<uchar> >& eForEnsemble, bool isPositive);
|
||||
+#ifdef HAVE_OPENCL
|
||||
void ocl_integrateAdditional(const std::vector<Mat_<uchar> >& eForModel, const std::vector<Mat_<uchar> >& eForEnsemble, bool isPositive);
|
||||
+#endif
|
||||
Size getMinSize(){ return minSize_; }
|
||||
void printme(FILE* port = stdout);
|
||||
Ptr<TLDDetector> detector;
|
||||
diff --git opencv_contrib-master/modules/tracking/src/tldTracker.cpp opencv_contrib-master/modules/tracking/src/tldTracker.cpp
|
||||
index 0f1e2f7..a5190f5 100644
|
||||
--- opencv_contrib-master/modules/tracking/src/tldTracker.cpp
|
||||
+++ opencv_contrib-master/modules/tracking/src/tldTracker.cpp
|
||||
@@ -123,9 +123,11 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
|
||||
|
||||
if (i == 1)
|
||||
{
|
||||
+#ifdef HAVE_OPENCL
|
||||
if (ocl::haveOpenCL())
|
||||
DETECT_FLG = tldModel->detector->ocl_detect(imageForDetector, image_blurred, tmpCandid, detectorResults, tldModel->getMinSize());
|
||||
else
|
||||
+#endif
|
||||
DETECT_FLG = tldModel->detector->detect(imageForDetector, image_blurred, tmpCandid, detectorResults, tldModel->getMinSize());
|
||||
}
|
||||
|
||||
@@ -211,17 +213,21 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
|
||||
tldModel->integrateRelabeled(imageForDetector, image_blurred, detectorResults);
|
||||
//dprintf(("%d relabeled by nExpert\n", negRelabeled));
|
||||
pExpert.additionalExamples(examplesForModel, examplesForEnsemble);
|
||||
- if (ocl::haveOpenCL())
|
||||
- tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true);
|
||||
- else
|
||||
- tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, true);
|
||||
+#ifdef HAVE_OPENCL
|
||||
+ if (ocl::haveOpenCL())
|
||||
+ tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true);
|
||||
+ else
|
||||
+#endif
|
||||
+ tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, true);
|
||||
examplesForModel.clear(); examplesForEnsemble.clear();
|
||||
nExpert.additionalExamples(examplesForModel, examplesForEnsemble);
|
||||
|
||||
- if (ocl::haveOpenCL())
|
||||
- tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false);
|
||||
- else
|
||||
- tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, false);
|
||||
+#ifdef HAVE_OPENCL
|
||||
+ if (ocl::haveOpenCL())
|
||||
+ tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false);
|
||||
+ else
|
||||
+#endif
|
||||
+ tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, false);
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git opencv_contrib-master/modules/xfeatures2d/src/surf.cpp opencv_contrib-master/modules/xfeatures2d/src/surf.cpp
|
||||
index 673817e..af5ceaf6 100644
|
||||
--- opencv_contrib-master/modules/xfeatures2d/src/surf.cpp
|
||||
+++ opencv_contrib-master/modules/xfeatures2d/src/surf.cpp
|
||||
@@ -892,6 +892,7 @@ void SURF_Impl::detectAndCompute(InputArray _img, InputArray _mask,
|
||||
CV_Assert(!_img.empty() && CV_MAT_DEPTH(imgtype) == CV_8U && (imgcn == 1 || imgcn == 3 || imgcn == 4));
|
||||
CV_Assert(_descriptors.needed() || !useProvidedKeypoints);
|
||||
|
||||
+#ifdef HAVE_OPENCL
|
||||
if( ocl::useOpenCL() )
|
||||
{
|
||||
SURF_OCL ocl_surf;
|
||||
@@ -918,6 +919,7 @@ void SURF_Impl::detectAndCompute(InputArray _img, InputArray _mask,
|
||||
return;
|
||||
}
|
||||
}
|
||||
+#endif // HAVE_OPENCL
|
||||
|
||||
Mat img = _img.getMat(), mask = _mask.getMat(), mask1, sum, msum;
|
||||
|
||||
diff --git opencv_contrib-master/modules/xfeatures2d/src/surf.hpp opencv_contrib-master/modules/xfeatures2d/src/surf.hpp
|
||||
index 2c4e271..cf3fda1 100644
|
||||
--- opencv_contrib-master/modules/xfeatures2d/src/surf.hpp
|
||||
+++ opencv_contrib-master/modules/xfeatures2d/src/surf.hpp
|
||||
@@ -64,6 +64,7 @@ class SURF_Impl : public SURF
|
||||
bool upright;
|
||||
};
|
||||
|
||||
+#ifdef HAVE_OPENCL
|
||||
class SURF_OCL
|
||||
{
|
||||
public:
|
||||
@@ -145,6 +146,7 @@ class SURF_OCL
|
||||
|
||||
int status;
|
||||
};
|
||||
+#endif // HAVE_OPENCL
|
||||
|
||||
/*
|
||||
template<typename _Tp> void copyVectorToUMat(const std::vector<_Tp>& v, UMat& um)
|
||||
diff --git opencv_contrib-master/modules/xfeatures2d/src/surf.ocl.cpp opencv_contrib-master/modules/xfeatures2d/src/surf.ocl.cpp
|
||||
index b12ebd3..3d9845d 100644
|
||||
--- opencv_contrib-master/modules/xfeatures2d/src/surf.ocl.cpp
|
||||
+++ opencv_contrib-master/modules/xfeatures2d/src/surf.ocl.cpp
|
||||
@@ -43,6 +43,9 @@
|
||||
//
|
||||
//M*/
|
||||
#include "precomp.hpp"
|
||||
+
|
||||
+#ifdef HAVE_OPENCL
|
||||
+
|
||||
#include "surf.hpp"
|
||||
|
||||
#include <cstdio>
|
||||
@@ -461,3 +464,4 @@ bool SURF_OCL::calcOrientation(UMat &keypoints)
|
||||
}
|
||||
}
|
||||
|
||||
+#endif // HAVE_OPENCL
|
@ -1,75 +0,0 @@
|
||||
From 9862a8bac536981c1c1a74710741fb40db4beac7 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Alekhin <alexander.alekhin@itseez.com>
|
||||
Date: Wed, 23 Sep 2015 12:44:26 +0300
|
||||
Subject: [PATCH] fix invalid String usage
|
||||
|
||||
---
|
||||
modules/tracking/src/tldDetector.cpp | 6 +++---
|
||||
modules/ximgproc/samples/live_demo.cpp | 12 ++++++------
|
||||
2 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git opencv_contrib-master/modules/tracking/src/tldDetector.cpp opencv_contrib-master/modules/tracking/src/tldDetector.cpp
|
||||
index cbb783e..0916092 100644
|
||||
--- opencv_contrib-master/modules/tracking/src/tldDetector.cpp
|
||||
+++ opencv_contrib-master/modules/tracking/src/tldDetector.cpp
|
||||
@@ -122,7 +122,7 @@ namespace cv
|
||||
ocl::Kernel k;
|
||||
ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
|
||||
String error;
|
||||
- ocl::Program prog(src, NULL, error);
|
||||
+ ocl::Program prog(src, String(), error);
|
||||
k.create("NCC", prog);
|
||||
if (k.empty())
|
||||
printf("Kernel create failed!!!\n");
|
||||
@@ -198,7 +198,7 @@ namespace cv
|
||||
ocl::Kernel k;
|
||||
ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
|
||||
String error;
|
||||
- ocl::Program prog(src, NULL, error);
|
||||
+ ocl::Program prog(src, String(), error);
|
||||
k.create("batchNCC", prog);
|
||||
if (k.empty())
|
||||
printf("Kernel create failed!!!\n");
|
||||
@@ -355,7 +355,7 @@ namespace cv
|
||||
ocl::Kernel k;
|
||||
ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
|
||||
String error;
|
||||
- ocl::Program prog(src, NULL, error);
|
||||
+ ocl::Program prog(src, String(), error);
|
||||
k.create("NCC", prog);
|
||||
if (k.empty())
|
||||
printf("Kernel create failed!!!\n");
|
||||
diff --git opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
|
||||
index dd5dc1b..8e16de3 100644
|
||||
--- opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
|
||||
+++ opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
|
||||
@@ -189,7 +189,7 @@ int main()
|
||||
|
||||
//Thread trackbar
|
||||
cv::setNumThreads(g_numberOfCPUs); //speedup filtering
|
||||
- createTrackbar("Threads", NULL, &g_numberOfCPUs, cv::getNumberOfCPUs(), changeNumberOfCpuCallback);
|
||||
+ createTrackbar("Threads", String(), &g_numberOfCPUs, cv::getNumberOfCPUs(), changeNumberOfCpuCallback);
|
||||
|
||||
//Buttons to choose different modes
|
||||
createButton("Mode Details Enhancement", changeModeCallback, (void*)filterDetailEnhancement, QT_RADIOBOX, true);
|
||||
@@ -199,15 +199,15 @@ int main()
|
||||
|
||||
//sliders for Details Enhancement mode
|
||||
g_filterOp = filterDetailEnhancement; //set Details Enhancement as default filter
|
||||
- createTrackbar("Detail contrast", NULL, &g_contrastBase, 200);
|
||||
- createTrackbar("Detail level" , NULL, &g_detailsLevel, 200);
|
||||
+ createTrackbar("Detail contrast", String(), &g_contrastBase, 200);
|
||||
+ createTrackbar("Detail level" , String(), &g_detailsLevel, 200);
|
||||
|
||||
//sliders for Stylizing mode
|
||||
- createTrackbar("Style gamma", NULL, &g_edgesGamma, 300);
|
||||
+ createTrackbar("Style gamma", String(), &g_edgesGamma, 300);
|
||||
|
||||
//sliders for every mode
|
||||
- createTrackbar("Sigma Spatial", NULL, &g_sigmaSpatial, 200);
|
||||
- createTrackbar("Sigma Color" , NULL, &g_sigmaColor, 200);
|
||||
+ createTrackbar("Sigma Spatial", String(), &g_sigmaSpatial, 200);
|
||||
+ createTrackbar("Sigma Color" , String(), &g_sigmaColor, 200);
|
||||
|
||||
Mat rawFrame, outputFrame;
|
||||
Mat srcFrame, processedFrame;
|
@ -0,0 +1,23 @@
|
||||
From 10896129b39655e19e4e7c529153cb5c2191a1db Mon Sep 17 00:00:00 2001
|
||||
From: Vladislav Vinogradov <vlad.vinogradov@itseez.com>
|
||||
Date: Fri, 6 May 2016 11:37:32 +0300
|
||||
Subject: [PATCH] GraphCut deprecated in CUDA 7.5 and removed in 8.0
|
||||
|
||||
---
|
||||
modules/cudalegacy/src/graphcuts.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules/cudalegacy/src/graphcuts.cpp b/modules/cudalegacy/src/graphcuts.cpp
|
||||
index eb08c3c..1a1eb85 100644
|
||||
--- a/modules/cudalegacy/src/graphcuts.cpp
|
||||
+++ b/modules/cudalegacy/src/graphcuts.cpp
|
||||
@@ -42,7 +42,8 @@
|
||||
|
||||
#include "precomp.hpp"
|
||||
|
||||
-#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
|
||||
+// GraphCut has been removed in NPP 8.0
|
||||
+#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || (CUDART_VERSION >= 8000)
|
||||
|
||||
void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }
|
||||
void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }
|
@ -1,392 +0,0 @@
|
||||
diff -purN a/modules/hdf/cmake/FindHDF5.cmake b/modules/hdf/cmake/FindHDF5.cmake
|
||||
--- a/modules/hdf/cmake/FindHDF5.cmake 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/modules/hdf/cmake/FindHDF5.cmake 2015-09-16 17:53:05.000000000 +0100
|
||||
@@ -0,0 +1,379 @@
|
||||
+#.rst:
|
||||
+# FindHDF5
|
||||
+# --------
|
||||
+#
|
||||
+# Find HDF5, a library for reading and writing self describing array data.
|
||||
+#
|
||||
+#
|
||||
+#
|
||||
+# This module invokes the HDF5 wrapper compiler that should be installed
|
||||
+# alongside HDF5. Depending upon the HDF5 Configuration, the wrapper
|
||||
+# compiler is called either h5cc or h5pcc. If this succeeds, the module
|
||||
+# will then call the compiler with the -show argument to see what flags
|
||||
+# are used when compiling an HDF5 client application.
|
||||
+#
|
||||
+# The module will optionally accept the COMPONENTS argument. If no
|
||||
+# COMPONENTS are specified, then the find module will default to finding
|
||||
+# only the HDF5 C library. If one or more COMPONENTS are specified, the
|
||||
+# module will attempt to find the language bindings for the specified
|
||||
+# components. The only valid components are C, CXX, Fortran, HL, and
|
||||
+# Fortran_HL. If the COMPONENTS argument is not given, the module will
|
||||
+# attempt to find only the C bindings.
|
||||
+#
|
||||
+# On UNIX systems, this module will read the variable
|
||||
+# HDF5_USE_STATIC_LIBRARIES to determine whether or not to prefer a
|
||||
+# static link to a dynamic link for HDF5 and all of it's dependencies.
|
||||
+# To use this feature, make sure that the HDF5_USE_STATIC_LIBRARIES
|
||||
+# variable is set before the call to find_package.
|
||||
+#
|
||||
+# To provide the module with a hint about where to find your HDF5
|
||||
+# installation, you can set the environment variable HDF5_ROOT. The
|
||||
+# Find module will then look in this path when searching for HDF5
|
||||
+# executables, paths, and libraries.
|
||||
+#
|
||||
+# In addition to finding the includes and libraries required to compile
|
||||
+# an HDF5 client application, this module also makes an effort to find
|
||||
+# tools that come with the HDF5 distribution that may be useful for
|
||||
+# regression testing.
|
||||
+#
|
||||
+# This module will define the following variables:
|
||||
+#
|
||||
+# ::
|
||||
+#
|
||||
+# HDF5_INCLUDE_DIRS - Location of the hdf5 includes
|
||||
+# HDF5_INCLUDE_DIR - Location of the hdf5 includes (deprecated)
|
||||
+# HDF5_DEFINITIONS - Required compiler definitions for HDF5
|
||||
+# HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings.
|
||||
+# HDF5_CXX_LIBRARIES - Required libraries for the HDF5 C++ bindings
|
||||
+# HDF5_Fortran_LIBRARIES - Required libraries for the HDF5 Fortran bindings
|
||||
+# HDF5_HL_LIBRARIES - Required libraries for the HDF5 high level API
|
||||
+# HDF5_Fortran_HL_LIBRARIES - Required libraries for the high level Fortran
|
||||
+# bindings.
|
||||
+# HDF5_LIBRARIES - Required libraries for all requested bindings
|
||||
+# HDF5_FOUND - true if HDF5 was found on the system
|
||||
+# HDF5_VERSION - HDF5 version in format Major.Minor.Release
|
||||
+# HDF5_LIBRARY_DIRS - the full set of library directories
|
||||
+# HDF5_IS_PARALLEL - Whether or not HDF5 was found with parallel IO support
|
||||
+# HDF5_C_COMPILER_EXECUTABLE - the path to the HDF5 C wrapper compiler
|
||||
+# HDF5_CXX_COMPILER_EXECUTABLE - the path to the HDF5 C++ wrapper compiler
|
||||
+# HDF5_Fortran_COMPILER_EXECUTABLE - the path to the HDF5 Fortran wrapper compiler
|
||||
+# HDF5_DIFF_EXECUTABLE - the path to the HDF5 dataset comparison tool
|
||||
+
|
||||
+#=============================================================================
|
||||
+# Copyright 2015 Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
|
||||
+# Copyright 2009 Kitware, Inc.
|
||||
+#
|
||||
+# Distributed under the OSI-approved BSD License (the "License");
|
||||
+# see accompanying file Copyright.txt for details.
|
||||
+#
|
||||
+# This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
+# See the License for more information.
|
||||
+#=============================================================================
|
||||
+# (To distribute this file outside of CMake, substitute the full
|
||||
+# License text for the above reference.)
|
||||
+
|
||||
+# This module is maintained by Will Dicharry <wdicharry@stellarscience.com>.
|
||||
+
|
||||
+include(SelectLibraryConfigurations)
|
||||
+include(FindPackageHandleStandardArgs)
|
||||
+
|
||||
+# List of the valid HDF5 components
|
||||
+set( HDF5_VALID_COMPONENTS
|
||||
+ C
|
||||
+ CXX
|
||||
+ Fortran
|
||||
+ HL
|
||||
+ Fortran_HL
|
||||
+)
|
||||
+
|
||||
+# Validate the list of find components.
|
||||
+if( NOT HDF5_FIND_COMPONENTS )
|
||||
+ set( HDF5_LANGUAGE_BINDINGS "C" )
|
||||
+else()
|
||||
+ # add the extra specified components, ensuring that they are valid.
|
||||
+ foreach( component ${HDF5_FIND_COMPONENTS} )
|
||||
+ list( FIND HDF5_VALID_COMPONENTS ${component} component_location )
|
||||
+ if( ${component_location} EQUAL -1 )
|
||||
+ message( FATAL_ERROR
|
||||
+ "\"${component}\" is not a valid HDF5 component." )
|
||||
+ else()
|
||||
+ list( APPEND HDF5_LANGUAGE_BINDINGS ${component} )
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+endif()
|
||||
+
|
||||
+# try to find the HDF5 wrapper compilers
|
||||
+find_program( HDF5_C_COMPILER_EXECUTABLE
|
||||
+ NAMES h5cc h5pcc
|
||||
+ HINTS ENV HDF5_ROOT
|
||||
+ PATH_SUFFIXES bin Bin
|
||||
+ DOC "HDF5 Wrapper compiler. Used only to detect HDF5 compile flags." )
|
||||
+mark_as_advanced( HDF5_C_COMPILER_EXECUTABLE )
|
||||
+
|
||||
+find_program( HDF5_CXX_COMPILER_EXECUTABLE
|
||||
+ NAMES h5c++ h5pc++
|
||||
+ HINTS ENV HDF5_ROOT
|
||||
+ PATH_SUFFIXES bin Bin
|
||||
+ DOC "HDF5 C++ Wrapper compiler. Used only to detect HDF5 compile flags." )
|
||||
+mark_as_advanced( HDF5_CXX_COMPILER_EXECUTABLE )
|
||||
+
|
||||
+find_program( HDF5_Fortran_COMPILER_EXECUTABLE
|
||||
+ NAMES h5fc h5pfc
|
||||
+ HINTS ENV HDF5_ROOT
|
||||
+ PATH_SUFFIXES bin Bin
|
||||
+ DOC "HDF5 Fortran Wrapper compiler. Used only to detect HDF5 compile flags." )
|
||||
+mark_as_advanced( HDF5_Fortran_COMPILER_EXECUTABLE )
|
||||
+
|
||||
+find_program( HDF5_DIFF_EXECUTABLE
|
||||
+ NAMES h5diff
|
||||
+ HINTS ENV HDF5_ROOT
|
||||
+ PATH_SUFFIXES bin Bin
|
||||
+ DOC "HDF5 file differencing tool." )
|
||||
+mark_as_advanced( HDF5_DIFF_EXECUTABLE )
|
||||
+
|
||||
+# Invoke the HDF5 wrapper compiler. The compiler return value is stored to the
|
||||
+# return_value argument, the text output is stored to the output variable.
|
||||
+macro( _HDF5_invoke_compiler language output return_value )
|
||||
+ if( HDF5_${language}_COMPILER_EXECUTABLE )
|
||||
+ exec_program( ${HDF5_${language}_COMPILER_EXECUTABLE}
|
||||
+ ARGS -show
|
||||
+ OUTPUT_VARIABLE ${output}
|
||||
+ RETURN_VALUE ${return_value}
|
||||
+ )
|
||||
+ if( ${${return_value}} EQUAL 0 )
|
||||
+ # do nothing
|
||||
+ else()
|
||||
+ message( STATUS
|
||||
+ "Unable to determine HDF5 ${language} flags from HDF5 wrapper." )
|
||||
+ endif()
|
||||
+ endif()
|
||||
+endmacro()
|
||||
+
|
||||
+# Parse a compile line for definitions, includes, library paths, and libraries.
|
||||
+macro( _HDF5_parse_compile_line
|
||||
+ compile_line_var
|
||||
+ include_paths
|
||||
+ definitions
|
||||
+ library_paths
|
||||
+ libraries )
|
||||
+
|
||||
+ # Match the include paths
|
||||
+ string( REGEX MATCHALL "-I([^\" ]+)" include_path_flags
|
||||
+ "${${compile_line_var}}"
|
||||
+ )
|
||||
+ foreach( IPATH ${include_path_flags} )
|
||||
+ string( REGEX REPLACE "^-I" "" IPATH ${IPATH} )
|
||||
+ string( REPLACE "//" "/" IPATH ${IPATH} )
|
||||
+ list( APPEND ${include_paths} ${IPATH} )
|
||||
+ endforeach()
|
||||
+
|
||||
+ # Match the definitions
|
||||
+ string( REGEX MATCHALL "-D[^ ]*" definition_flags "${${compile_line_var}}" )
|
||||
+ foreach( DEF ${definition_flags} )
|
||||
+ list( APPEND ${definitions} ${DEF} )
|
||||
+ endforeach()
|
||||
+
|
||||
+ # Match the library paths
|
||||
+ string( REGEX MATCHALL "-L([^\" ]+|\"[^\"]+\")" library_path_flags
|
||||
+ "${${compile_line_var}}"
|
||||
+ )
|
||||
+
|
||||
+ foreach( LPATH ${library_path_flags} )
|
||||
+ string( REGEX REPLACE "^-L" "" LPATH ${LPATH} )
|
||||
+ string( REPLACE "//" "/" LPATH ${LPATH} )
|
||||
+ list( APPEND ${library_paths} ${LPATH} )
|
||||
+ endforeach()
|
||||
+
|
||||
+ # now search for the library names specified in the compile line (match -l...)
|
||||
+ # match only -l's preceded by a space or comma
|
||||
+ # this is to exclude directory names like xxx-linux/
|
||||
+ string( REGEX MATCHALL "[, ]-l([^\", ]+)" library_name_flags
|
||||
+ "${${compile_line_var}}" )
|
||||
+ # strip the -l from all of the library flags and add to the search list
|
||||
+ foreach( LIB ${library_name_flags} )
|
||||
+ string( REGEX REPLACE "^[, ]-l" "" LIB ${LIB} )
|
||||
+ list( APPEND ${libraries} ${LIB} )
|
||||
+ endforeach()
|
||||
+endmacro()
|
||||
+
|
||||
+# Try to find HDF5 using an installed hdf5-config.cmake
|
||||
+if( NOT HDF5_FOUND )
|
||||
+ find_package( HDF5 QUIET NO_MODULE )
|
||||
+ if( HDF5_FOUND )
|
||||
+ set( HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR} )
|
||||
+ set( HDF5_LIBRARIES )
|
||||
+ set( HDF5_C_TARGET hdf5 )
|
||||
+ set( HDF5_CXX_TARGET hdf5_cpp )
|
||||
+ set( HDF5_HL_TARGET hdf5_hl )
|
||||
+ set( HDF5_Fortran_TARGET hdf5_fortran )
|
||||
+ set( HDF5_Fortran_HL_TARGET hdf5_hl_fortran )
|
||||
+ foreach( _component ${HDF5_LANGUAGE_BINDINGS} )
|
||||
+ list( FIND HDF5_VALID_COMPONENTS ${_component} _component_location )
|
||||
+ get_target_property( _comp_location ${HDF5_${_component}_TARGET} LOCATION )
|
||||
+ if( _comp_location )
|
||||
+ set( HDF5_${_component}_LIBRARY ${_comp_location} CACHE PATH
|
||||
+ "HDF5 ${_component} library" )
|
||||
+ mark_as_advanced( HDF5_${_component}_LIBRARY )
|
||||
+ list( APPEND HDF5_LIBRARIES ${HDF5_${_component}_LIBRARY} )
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ endif()
|
||||
+endif()
|
||||
+
|
||||
+if( NOT HDF5_FOUND )
|
||||
+ _HDF5_invoke_compiler( C HDF5_C_COMPILE_LINE HDF5_C_RETURN_VALUE )
|
||||
+ _HDF5_invoke_compiler( CXX HDF5_CXX_COMPILE_LINE HDF5_CXX_RETURN_VALUE )
|
||||
+ _HDF5_invoke_compiler( Fortran HDF5_Fortran_COMPILE_LINE HDF5_Fortran_RETURN_VALUE )
|
||||
+
|
||||
+ # seed the initial lists of libraries to find with items we know we need
|
||||
+ set( HDF5_C_LIBRARY_NAMES_INIT hdf5 )
|
||||
+ set( HDF5_HL_LIBRARY_NAMES_INIT hdf5_hl ${HDF5_C_LIBRARY_NAMES_INIT} )
|
||||
+ set( HDF5_CXX_LIBRARY_NAMES_INIT hdf5_cpp ${HDF5_C_LIBRARY_NAMES_INIT} )
|
||||
+ set( HDF5_Fortran_LIBRARY_NAMES_INIT hdf5_fortran
|
||||
+ ${HDF5_C_LIBRARY_NAMES_INIT} )
|
||||
+ set( HDF5_Fortran_HL_LIBRARY_NAMES_INIT hdf5hl_fortran
|
||||
+ ${HDF5_Fortran_LIBRARY_NAMES_INIT} )
|
||||
+
|
||||
+ foreach( LANGUAGE ${HDF5_LANGUAGE_BINDINGS} )
|
||||
+ if( HDF5_${LANGUAGE}_COMPILE_LINE )
|
||||
+ _HDF5_parse_compile_line( HDF5_${LANGUAGE}_COMPILE_LINE
|
||||
+ HDF5_${LANGUAGE}_INCLUDE_FLAGS
|
||||
+ HDF5_${LANGUAGE}_DEFINITIONS
|
||||
+ HDF5_${LANGUAGE}_LIBRARY_DIRS
|
||||
+ HDF5_${LANGUAGE}_LIBRARY_NAMES
|
||||
+ )
|
||||
+
|
||||
+ # take a guess that the includes may be in the 'include' sibling
|
||||
+ # directory of a library directory.
|
||||
+ foreach( dir ${HDF5_${LANGUAGE}_LIBRARY_DIRS} )
|
||||
+ list( APPEND HDF5_${LANGUAGE}_INCLUDE_FLAGS ${dir}/../include )
|
||||
+ endforeach()
|
||||
+ endif()
|
||||
+
|
||||
+ # set the definitions for the language bindings.
|
||||
+ list( APPEND HDF5_DEFINITIONS ${HDF5_${LANGUAGE}_DEFINITIONS} )
|
||||
+
|
||||
+ # find the HDF5 include directories
|
||||
+ if(${LANGUAGE} MATCHES "Fortran")
|
||||
+ set(HDF5_INCLUDE_FILENAME hdf5.mod)
|
||||
+ else()
|
||||
+ set(HDF5_INCLUDE_FILENAME hdf5.h)
|
||||
+ endif()
|
||||
+
|
||||
+ find_path( HDF5_${LANGUAGE}_INCLUDE_DIR ${HDF5_INCLUDE_FILENAME}
|
||||
+ HINTS
|
||||
+ ${HDF5_${LANGUAGE}_INCLUDE_FLAGS}
|
||||
+ ENV
|
||||
+ HDF5_ROOT
|
||||
+ PATHS
|
||||
+ $ENV{HOME}/.local/include
|
||||
+ PATH_SUFFIXES
|
||||
+ include
|
||||
+ Include
|
||||
+ )
|
||||
+ mark_as_advanced( HDF5_${LANGUAGE}_INCLUDE_DIR )
|
||||
+ list( APPEND HDF5_INCLUDE_DIRS ${HDF5_${LANGUAGE}_INCLUDE_DIR} )
|
||||
+
|
||||
+ set( HDF5_${LANGUAGE}_LIBRARY_NAMES
|
||||
+ ${HDF5_${LANGUAGE}_LIBRARY_NAMES_INIT}
|
||||
+ ${HDF5_${LANGUAGE}_LIBRARY_NAMES} )
|
||||
+
|
||||
+ # find the HDF5 libraries
|
||||
+ foreach( LIB ${HDF5_${LANGUAGE}_LIBRARY_NAMES} )
|
||||
+ if( UNIX AND HDF5_USE_STATIC_LIBRARIES )
|
||||
+ # According to bug 1643 on the CMake bug tracker, this is the
|
||||
+ # preferred method for searching for a static library.
|
||||
+ # See http://www.cmake.org/Bug/view.php?id=1643. We search
|
||||
+ # first for the full static library name, but fall back to a
|
||||
+ # generic search on the name if the static search fails.
|
||||
+ set( THIS_LIBRARY_SEARCH_DEBUG lib${LIB}d.a ${LIB}d )
|
||||
+ set( THIS_LIBRARY_SEARCH_RELEASE lib${LIB}.a ${LIB} )
|
||||
+ else()
|
||||
+ set( THIS_LIBRARY_SEARCH_DEBUG ${LIB}d )
|
||||
+ set( THIS_LIBRARY_SEARCH_RELEASE ${LIB} )
|
||||
+ endif()
|
||||
+ find_library( HDF5_${LIB}_LIBRARY_DEBUG
|
||||
+ NAMES ${THIS_LIBRARY_SEARCH_DEBUG}
|
||||
+ HINTS ${HDF5_${LANGUAGE}_LIBRARY_DIRS}
|
||||
+ ENV HDF5_ROOT
|
||||
+ PATH_SUFFIXES lib Lib )
|
||||
+ find_library( HDF5_${LIB}_LIBRARY_RELEASE
|
||||
+ NAMES ${THIS_LIBRARY_SEARCH_RELEASE}
|
||||
+ HINTS ${HDF5_${LANGUAGE}_LIBRARY_DIRS}
|
||||
+ ENV HDF5_ROOT
|
||||
+ PATH_SUFFIXES lib Lib )
|
||||
+ select_library_configurations( HDF5_${LIB} )
|
||||
+ list(APPEND HDF5_${LANGUAGE}_LIBRARIES ${HDF5_${LIB}_LIBRARY})
|
||||
+ endforeach()
|
||||
+ list( APPEND HDF5_LIBRARY_DIRS ${HDF5_${LANGUAGE}_LIBRARY_DIRS} )
|
||||
+
|
||||
+ # Append the libraries for this language binding to the list of all
|
||||
+ # required libraries.
|
||||
+ list(APPEND HDF5_LIBRARIES ${HDF5_${LANGUAGE}_LIBRARIES})
|
||||
+ endforeach()
|
||||
+
|
||||
+ # We may have picked up some duplicates in various lists during the above
|
||||
+ # process for the language bindings (both the C and C++ bindings depend on
|
||||
+ # libz for example). Remove the duplicates. It appears that the default
|
||||
+ # CMake behavior is to remove duplicates from the end of a list. However,
|
||||
+ # for link lines, this is incorrect since unresolved symbols are searched
|
||||
+ # for down the link line. Therefore, we reverse the list, remove the
|
||||
+ # duplicates, and then reverse it again to get the duplicates removed from
|
||||
+ # the beginning.
|
||||
+ macro( _remove_duplicates_from_beginning _list_name )
|
||||
+ list( REVERSE ${_list_name} )
|
||||
+ list( REMOVE_DUPLICATES ${_list_name} )
|
||||
+ list( REVERSE ${_list_name} )
|
||||
+ endmacro()
|
||||
+
|
||||
+ if( HDF5_INCLUDE_DIRS )
|
||||
+ _remove_duplicates_from_beginning( HDF5_INCLUDE_DIRS )
|
||||
+ endif()
|
||||
+ if( HDF5_LIBRARY_DIRS )
|
||||
+ _remove_duplicates_from_beginning( HDF5_LIBRARY_DIRS )
|
||||
+ endif()
|
||||
+
|
||||
+ # If the HDF5 include directory was found, open H5pubconf.h to determine if
|
||||
+ # HDF5 was compiled with parallel IO support
|
||||
+ set( HDF5_IS_PARALLEL FALSE )
|
||||
+ set( HDF5_VERSION "" )
|
||||
+ foreach( _dir IN LISTS HDF5_INCLUDE_DIRS )
|
||||
+ foreach(_hdr "${_dir}/H5pubconf.h" "${_dir}/H5pubconf-64.h" "${_dir}/H5pubconf-32.h")
|
||||
+ if( EXISTS "${_hdr}" )
|
||||
+ file( STRINGS "${_hdr}"
|
||||
+ HDF5_HAVE_PARALLEL_DEFINE
|
||||
+ REGEX "HAVE_PARALLEL 1" )
|
||||
+ if( HDF5_HAVE_PARALLEL_DEFINE )
|
||||
+ set( HDF5_IS_PARALLEL TRUE )
|
||||
+ endif()
|
||||
+ unset(HDF5_HAVE_PARALLEL_DEFINE)
|
||||
+
|
||||
+ file( STRINGS "${_hdr}"
|
||||
+ HDF5_VERSION_DEFINE
|
||||
+ REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+" )
|
||||
+ if( "${HDF5_VERSION_DEFINE}" MATCHES
|
||||
+ "H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+).*\"" )
|
||||
+ set( HDF5_VERSION "${CMAKE_MATCH_1}" )
|
||||
+ endif()
|
||||
+ unset(HDF5_VERSION_DEFINE)
|
||||
+ endif()
|
||||
+ endforeach()
|
||||
+ endforeach()
|
||||
+ set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
|
||||
+ "HDF5 library compiled with parallel IO support" )
|
||||
+ mark_as_advanced( HDF5_IS_PARALLEL )
|
||||
+
|
||||
+ # For backwards compatibility we set HDF5_INCLUDE_DIR to the value of
|
||||
+ # HDF5_INCLUDE_DIRS
|
||||
+ if( HDF5_INCLUDE_DIRS )
|
||||
+ set( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
|
||||
+ endif()
|
||||
+
|
||||
+endif()
|
||||
+
|
||||
+find_package_handle_standard_args( HDF5
|
||||
+ REQUIRED_VARS HDF5_LIBRARIES HDF5_INCLUDE_DIRS
|
||||
+ VERSION_VAR HDF5_VERSION
|
||||
+)
|
||||
+
|
||||
diff -purN a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt
|
||||
--- a/modules/hdf/CMakeLists.txt 2015-12-17 17:11:31.000000000 +0000
|
||||
+++ b/modules/hdf/CMakeLists.txt 2016-09-19 15:24:47.958650311 +0100
|
||||
@@ -1,4 +1,4 @@
|
||||
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_LIST_DIR}/cmake)
|
||||
|
||||
find_package(HDF5)
|
||||
if(HDF5_FOUND)
|
@ -1,217 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
|
||||
|
||||
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
|
||||
HOMEPAGE="http://opencv.willowgarage.com"
|
||||
|
||||
SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.zip -> ${P}.zip"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/2.4"
|
||||
KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
|
||||
IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine"
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
# The following logic is intrinsic in the build system, but we do not enforce
|
||||
# it on the useflags since this just blocks emerging pointlessly:
|
||||
# gtk? ( !qt4 )
|
||||
# opengl? ( || ( gtk qt4 ) )
|
||||
# openmp? ( !threads )
|
||||
|
||||
RDEPEND="
|
||||
app-arch/bzip2
|
||||
sys-libs/zlib
|
||||
cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
|
||||
ffmpeg? (
|
||||
libav? ( media-video/libav:0= )
|
||||
!libav? ( media-video/ffmpeg:0= )
|
||||
)
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
)
|
||||
gtk? (
|
||||
dev-libs/glib:2
|
||||
x11-libs/gtk+:2
|
||||
opengl? ( x11-libs/gtkglext )
|
||||
)
|
||||
java? ( >=virtual/jre-1.6:* )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/jasper )
|
||||
ieee1394? (
|
||||
media-libs/libdc1394
|
||||
sys-libs/libraw1394
|
||||
)
|
||||
ipp? ( sci-libs/ipp )
|
||||
opencl? ( virtual/opencl )
|
||||
openexr? ( media-libs/openexr )
|
||||
opengl? ( virtual/opengl virtual/glu )
|
||||
png? ( media-libs/libpng:0= )
|
||||
python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qttest:4
|
||||
opengl? ( dev-qt/qtopengl:4 )
|
||||
)
|
||||
threads? ( dev-cpp/tbb )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
v4l? ( >=media-libs/libv4l-0.8.3 )
|
||||
vtk? ( sci-libs/vtk[rendering] )
|
||||
xine? ( media-libs/xine-lib )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
eigen? ( dev-cpp/eigen:3 )
|
||||
java? ( >=virtual/jdk-1.6 )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
java-pkg-opt-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" \
|
||||
"${FILESDIR}/${PN}-2.4.3-gcc47.patch" \
|
||||
"${FILESDIR}/${PN}-2.4.2-cflags.patch" \
|
||||
"${FILESDIR}/${PN}-2.4.8-javamagic.patch" \
|
||||
"${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \
|
||||
"${FILESDIR}/${P}-git-autodetect.patch"
|
||||
|
||||
# remove bundled stuff
|
||||
rm -rf 3rdparty
|
||||
sed -i \
|
||||
-e '/add_subdirectory(3rdparty)/ d' \
|
||||
CMakeLists.txt || die
|
||||
|
||||
java-pkg-opt-2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use openmp; then
|
||||
tc-has-openmp || die "Please switch to an openmp compatible compiler"
|
||||
fi
|
||||
|
||||
JAVA_ANT_ENCODING="iso-8859-1"
|
||||
# set encoding so even this cmake build will pick it up.
|
||||
export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
|
||||
java-ant-2_src_configure
|
||||
|
||||
# please dont sort here, order is the same as in CMakeLists.txt
|
||||
local mycmakeargs=(
|
||||
# the optinal dependency libraries
|
||||
$(cmake-utils_use_with ieee1394 1394)
|
||||
-DWITH_AVFOUNDATION=OFF
|
||||
-DWITH_CARBON=OFF
|
||||
$(cmake-utils_use_with eigen)
|
||||
$(cmake-utils_use_with ffmpeg)
|
||||
$(cmake-utils_use_with gstreamer)
|
||||
$(cmake-utils_use_with gtk)
|
||||
$(cmake-utils_use_with ipp)
|
||||
$(cmake-utils_use_with java)
|
||||
$(cmake-utils_use_with jpeg2k JASPER)
|
||||
$(cmake-utils_use_with jpeg)
|
||||
$(cmake-utils_use_with opencl)
|
||||
# $(cmake-utils_use_with opencl OPENCLAMDFFT)
|
||||
# $(cmake-utils_use_with opencl OPENCLAMDBLAS)
|
||||
$(cmake-utils_use_with openexr)
|
||||
$(cmake-utils_use_with opengl)
|
||||
$(cmake-utils_use_with openmp)
|
||||
-DWITH_OPENNI=OFF # not packaged
|
||||
$(cmake-utils_use_with png)
|
||||
$(cmake-utils_use_build python opencv_python)
|
||||
-DWITH_PVAPI=OFF # not packaged
|
||||
-DWITH_QUICKTIME=OFF
|
||||
$(cmake-utils_use_with threads TBB)
|
||||
$(cmake-utils_use_with tiff)
|
||||
-DWITH_UNICAP=OFF # not packaged
|
||||
$(cmake-utils_use_with v4l V4L)
|
||||
$(cmake-utils_use_with vtk VTK)
|
||||
-DWITH_LIBV4L=ON
|
||||
-DWITH_VIDEOINPUT=OFF # windows only
|
||||
-DWITH_XIMEA=OFF # windows only
|
||||
$(cmake-utils_use_with xine)
|
||||
# the build components
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
-DBUILD_ANDROID_EXAMPLES=OFF
|
||||
$(cmake-utils_use_build doc DOCS)
|
||||
$(cmake-utils_use_build examples)
|
||||
-DBUILD_PERF_TESTS=OFF
|
||||
$(cmake-utils_use_build testprograms TESTS)
|
||||
# install examples, tests etc
|
||||
$(cmake-utils_use examples INSTALL_C_EXAMPLES)
|
||||
$(cmake-utils_use testprograms INSTALL_TESTS)
|
||||
# build options
|
||||
$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
|
||||
-DENABLE_OMIT_FRAME_POINTER=OFF #
|
||||
-DENABLE_FAST_MATH=OFF #
|
||||
-DENABLE_SSE=OFF # these options do nothing but
|
||||
-DENABLE_SSE2=OFF # add params to CFLAGS
|
||||
-DENABLE_SSE3=OFF
|
||||
-DENABLE_SSSE3=OFF
|
||||
-DENABLE_SSE41=OFF
|
||||
-DENABLE_SSE42=OFF
|
||||
-DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic
|
||||
)
|
||||
|
||||
if use qt4; then
|
||||
mycmakeargs+=( "-DWITH_QT=4" )
|
||||
else
|
||||
mycmakeargs+=( "-DWITH_QT=OFF" )
|
||||
fi
|
||||
|
||||
if use cuda; then
|
||||
if [[ "$(gcc-version)" > "4.7" ]]; then
|
||||
ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well together. Disabling CUDA support."
|
||||
mycmakeargs+=( "-DWITH_CUDA=OFF" )
|
||||
mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
|
||||
mycmakeargs+=( "-DWITH_CUFFT=OFF" )
|
||||
else
|
||||
mycmakeargs+=( "-DWITH_CUDA=ON" )
|
||||
mycmakeargs+=( "-DWITH_CUBLAS=ON" )
|
||||
mycmakeargs+=( "-DWITH_CUFFT=ON" )
|
||||
fi
|
||||
else
|
||||
mycmakeargs+=( "-DWITH_CUDA=OFF" )
|
||||
mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
|
||||
mycmakeargs+=( "-DWITH_CUFFT=OFF" )
|
||||
fi
|
||||
|
||||
if use examples && use python; 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
|
||||
mycmakeargs+=(
|
||||
"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
|
||||
"-DBUILD_LATEX_DOCS=OFF"
|
||||
"-DBUILD_PACKAGE=OFF"
|
||||
"-DENABLE_PROFILING=OFF"
|
||||
)
|
||||
|
||||
# things we want to be hard enabled not worth useflag
|
||||
mycmakeargs+=(
|
||||
"-DCMAKE_SKIP_RPATH=ON"
|
||||
"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
|
||||
)
|
||||
|
||||
# hardcode cuda paths
|
||||
mycmakeargs+=(
|
||||
"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
|
||||
)
|
||||
|
||||
# workaround for bug 413429
|
||||
tc-export CC CXX
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
@ -1,221 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python{2_7,3_4} )
|
||||
|
||||
inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
|
||||
|
||||
DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
|
||||
HOMEPAGE="http://opencv.org"
|
||||
|
||||
SRC_URI="
|
||||
mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
|
||||
https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
|
||||
contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> ${PN}_contrib.zip )" # commit from 26.10.2015
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/3.0"
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
|
||||
IUSE="contrib cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
|
||||
REQUIRED_USE="
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
?? ( qt4 qt5 )
|
||||
"
|
||||
|
||||
# The following logic is intrinsic in the build system, but we do not enforce
|
||||
# it on the useflags since this just blocks emerging pointlessly:
|
||||
# gtk? ( !qt4 )
|
||||
# opengl? ( || ( gtk qt4 ) )
|
||||
# openmp? ( !threads )
|
||||
|
||||
RDEPEND="
|
||||
app-arch/bzip2
|
||||
sys-libs/zlib
|
||||
media-libs/libwebp
|
||||
cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
|
||||
ffmpeg? (
|
||||
libav? ( media-video/libav:0= )
|
||||
!libav? ( media-video/ffmpeg:0= )
|
||||
)
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
)
|
||||
gtk? (
|
||||
dev-libs/glib:2
|
||||
x11-libs/gtk+:2
|
||||
opengl? ( x11-libs/gtkglext )
|
||||
)
|
||||
java? ( >=virtual/jre-1.6:* )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/jasper )
|
||||
ieee1394? (
|
||||
media-libs/libdc1394
|
||||
sys-libs/libraw1394
|
||||
)
|
||||
ipp? ( sci-libs/ipp )
|
||||
opencl? ( virtual/opencl )
|
||||
openexr? ( media-libs/openexr )
|
||||
opengl? ( virtual/opengl virtual/glu )
|
||||
png? ( media-libs/libpng:0= )
|
||||
python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qttest:4
|
||||
opengl? ( dev-qt/qtopengl:4 )
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qttest:5
|
||||
dev-qt/qtconcurrent:5
|
||||
opengl? ( dev-qt/qtopengl:5 )
|
||||
)
|
||||
threads? ( dev-cpp/tbb )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
v4l? ( >=media-libs/libv4l-0.8.3 )
|
||||
vtk? ( sci-libs/vtk[rendering] )
|
||||
xine? ( media-libs/xine-lib )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
eigen? ( dev-cpp/eigen:3 )
|
||||
java? ( >=virtual/jdk-1.6 )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
java-pkg-opt-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${P}-gles.patch" \
|
||||
"${FILESDIR}/${P}-git-autodetect.patch"
|
||||
|
||||
# remove bundled stuff
|
||||
rm -rf 3rdparty
|
||||
sed -i \
|
||||
-e '/add_subdirectory(.*3rdparty.*)/ d' \
|
||||
CMakeLists.txt cmake/*cmake || die
|
||||
|
||||
#removing broken sample bug #558104
|
||||
if use contrib; then
|
||||
rm ../opencv_contrib-master/modules/ximgproc/samples/disparity_filtering.cpp || die
|
||||
fi
|
||||
|
||||
java-pkg-opt-2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use openmp; then
|
||||
tc-has-openmp || die "Please switch to an openmp compatible compiler"
|
||||
fi
|
||||
|
||||
JAVA_ANT_ENCODING="iso-8859-1"
|
||||
# set encoding so even this cmake build will pick it up.
|
||||
export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
|
||||
java-ant-2_src_configure
|
||||
|
||||
# please dont sort here, order is the same as in CMakeLists.txt
|
||||
local mycmakeargs=(
|
||||
# the optinal dependency libraries
|
||||
$(cmake-utils_use_with ieee1394 1394)
|
||||
-DWITH_AVFOUNDATION=OFF
|
||||
-DWITH_CARBON=OFF
|
||||
$(cmake-utils_use_with eigen)
|
||||
$(cmake-utils_use_with ffmpeg)
|
||||
$(cmake-utils_use_with gstreamer)
|
||||
$(cmake-utils_use_with gtk)
|
||||
$(cmake-utils_use_with ipp)
|
||||
$(cmake-utils_use_with java)
|
||||
$(cmake-utils_use_with jpeg2k JASPER)
|
||||
$(cmake-utils_use_with jpeg)
|
||||
$(cmake-utils_use_with opencl)
|
||||
# $(cmake-utils_use_with opencl OPENCLAMDFFT)
|
||||
# $(cmake-utils_use_with opencl OPENCLAMDBLAS)
|
||||
$(cmake-utils_use_with openexr)
|
||||
$(cmake-utils_use_with opengl)
|
||||
$(cmake-utils_use_with openmp)
|
||||
-DWITH_OPENNI=OFF # not packaged
|
||||
$(cmake-utils_use_with png)
|
||||
$(cmake-utils_use_build python opencv_python)
|
||||
-DWITH_PVAPI=OFF # not packaged
|
||||
-DWITH_QUICKTIME=OFF
|
||||
$(cmake-utils_use_with threads TBB)
|
||||
$(cmake-utils_use_with tiff)
|
||||
-DWITH_UNICAP=OFF # not packaged
|
||||
$(cmake-utils_use_with v4l V4L)
|
||||
$(cmake-utils_use_with vtk VTK)
|
||||
-DWITH_LIBV4L=ON
|
||||
-DWITH_VIDEOINPUT=OFF # windows only
|
||||
-DWITH_XIMEA=OFF # windows only
|
||||
$(cmake-utils_use_with xine)
|
||||
# the build components
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
-DBUILD_ANDROID_EXAMPLES=OFF
|
||||
$(cmake-utils_use_build doc DOCS)
|
||||
$(cmake-utils_use_build examples)
|
||||
$(cmake-utils_use_build java opencv_java) #for -java bug #555650
|
||||
-DBUILD_PERF_TESTS=OFF
|
||||
$(cmake-utils_use_build testprograms TESTS)
|
||||
# install examples, tests etc
|
||||
$(cmake-utils_use examples INSTALL_C_EXAMPLES)
|
||||
$(cmake-utils_use testprograms INSTALL_TESTS)
|
||||
# build options
|
||||
$(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
|
||||
-DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic
|
||||
)
|
||||
|
||||
if use qt4; then
|
||||
mycmakeargs+=( "-DWITH_QT=4" )
|
||||
elif use qt5; then
|
||||
mycmakeargs+=( "-DWITH_QT=5" )
|
||||
else
|
||||
mycmakeargs+=( "-DWITH_QT=OFF" )
|
||||
fi
|
||||
|
||||
if use contrib; then
|
||||
mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
|
||||
fi
|
||||
|
||||
if use cuda; then
|
||||
mycmakeargs+=( "-DWITH_CUDA=ON" )
|
||||
mycmakeargs+=( "-DWITH_CUBLAS=ON" )
|
||||
mycmakeargs+=( "-DWITH_CUFFT=ON" )
|
||||
else
|
||||
mycmakeargs+=( "-DWITH_CUDA=OFF" )
|
||||
mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
|
||||
mycmakeargs+=( "-DWITH_CUFFT=OFF" )
|
||||
fi
|
||||
|
||||
if use examples && use python; 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
|
||||
mycmakeargs+=(
|
||||
"-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
|
||||
"-DBUILD_LATEX_DOCS=OFF"
|
||||
"-DBUILD_PACKAGE=OFF"
|
||||
"-DENABLE_PROFILING=OFF"
|
||||
)
|
||||
|
||||
# things we want to be hard enabled not worth useflag
|
||||
mycmakeargs+=(
|
||||
"-DCMAKE_SKIP_RPATH=ON"
|
||||
"-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
|
||||
)
|
||||
|
||||
# hardcode cuda paths
|
||||
mycmakeargs+=(
|
||||
"-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
|
||||
)
|
||||
|
||||
# workaround for bug 413429
|
||||
tc-export CC CXX
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
@ -1,268 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
|
||||
|
||||
inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
|
||||
|
||||
DESCRIPTION="A collection of algorithms and sample code for
|
||||
various computer vision problems"
|
||||
HOMEPAGE="http://opencv.org"
|
||||
|
||||
SRC_URI="
|
||||
mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
|
||||
https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
|
||||
contrib? (
|
||||
https://github.com/Itseez/${PN}_contrib/archive/cd5993c6576267875adac300b9ddd1f881bb1766.zip -> ${P}_contrib.zip )" #commit from Sun, 27 Mar 2016 17:31:51
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/3.1" # subslot = libopencv* soname version
|
||||
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
|
||||
IUSE="contrib cuda +eigen examples ffmpeg gdal gphoto2 gstreamer gtk \
|
||||
ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png \
|
||||
+python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine"
|
||||
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
|
||||
?? ( qt4 qt5 )"
|
||||
|
||||
# The following logic is intrinsic in the build system, but we do not enforce
|
||||
# it on the useflags since this just blocks emerging pointlessly:
|
||||
# gtk? ( !qt4 )
|
||||
# opengl? ( || ( gtk qt4 ) )
|
||||
# openmp? ( !threads )
|
||||
|
||||
RDEPEND="
|
||||
app-arch/bzip2
|
||||
sys-libs/zlib
|
||||
cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
|
||||
ffmpeg? (
|
||||
libav? ( media-video/libav:0= )
|
||||
!libav? ( media-video/ffmpeg:0= )
|
||||
)
|
||||
gdal? ( sci-libs/gdal )
|
||||
gphoto2? ( media-libs/libgphoto2 )
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
)
|
||||
gtk? (
|
||||
dev-libs/glib:2
|
||||
x11-libs/gtk+:2
|
||||
opengl? ( x11-libs/gtkglext )
|
||||
)
|
||||
java? ( >=virtual/jre-1.6:* )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/jasper )
|
||||
ieee1394? (
|
||||
media-libs/libdc1394
|
||||
sys-libs/libraw1394
|
||||
)
|
||||
ipp? ( sci-libs/ipp )
|
||||
opencl? ( virtual/opencl )
|
||||
openexr? ( media-libs/openexr )
|
||||
opengl? ( virtual/opengl virtual/glu )
|
||||
png? ( media-libs/libpng:0= )
|
||||
python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qttest:4
|
||||
opengl? ( dev-qt/qtopengl:4 )
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qttest:5
|
||||
dev-qt/qtconcurrent:5
|
||||
opengl? ( dev-qt/qtopengl:5 )
|
||||
)
|
||||
threads? ( dev-cpp/tbb )
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
v4l? ( >=media-libs/libv4l-0.8.3 )
|
||||
vtk? ( sci-libs/vtk[rendering] )
|
||||
webp? ( media-libs/libwebp )
|
||||
xine? ( media-libs/xine-lib )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
eigen? ( dev-cpp/eigen:3 )
|
||||
java? ( >=virtual/jdk-1.6 )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.0.0-gles.patch
|
||||
"${FILESDIR}"/${PN}-3.1.0-cmake-no-opengl.patch
|
||||
"${FILESDIR}"/${P}-git-autodetect.patch
|
||||
"${FILESDIR}"/${P}-java-magic.patch
|
||||
"${FILESDIR}"/${P}-gentooify-python.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
java-pkg-opt-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# remove bundled stuff
|
||||
rm -rf 3rdparty || die "Removing 3rd party components failed"
|
||||
sed -i \
|
||||
-e '/add_subdirectory(.*3rdparty.*)/ d' \
|
||||
CMakeLists.txt cmake/*cmake || die
|
||||
|
||||
java-pkg-opt-2_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use openmp; then
|
||||
tc-has-openmp || die "Please switch to an openmp compatible compiler"
|
||||
fi
|
||||
|
||||
JAVA_ANT_ENCODING="iso-8859-1"
|
||||
# set encoding so even this cmake build will pick it up.
|
||||
export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
|
||||
java-ant-2_src_configure
|
||||
|
||||
# please dont sort here, order is the same as in CMakeLists.txt
|
||||
local mycmakeargs=(
|
||||
# Optional 3rd party components
|
||||
# ===================================================
|
||||
-DWITH_1394=$(usex ieee1394 ON OFF)
|
||||
-DWITH_AVFOUNDATION=OFF # IOS
|
||||
-DWITH_VTK=$(usex vtk ON OFF)
|
||||
-DWITH_EIGEN=$(usex eigen ON OFF)
|
||||
-DWITH_VFW=OFF # Video windows support
|
||||
-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
|
||||
-DWITH_GSTREAMER=$(usex gstreamer ON OFF)
|
||||
-DWITH_GSTREAMER_0_10=OFF # Don't want this
|
||||
-DWITH_GTK=$(usex gtk ON OFF)
|
||||
-DWITH_GTK_2_X=OFF
|
||||
-DWITH_IPP=$(usex ipp ON OFF)
|
||||
-DWITH_JASPER=$(usex jpeg2k ON OFF)
|
||||
-DWITH_JPEG=$(usex jpeg ON OFF)
|
||||
-DWITH_WEBP=$(usex webp ON OFF)
|
||||
-DWITH_OPENEXR=$(usex openexr ON OFF)
|
||||
-DWITH_OPENGL=$(usex opengl ON OFF)
|
||||
-DWITH_OPENNI=OFF # Not packaged
|
||||
-DWITH_OPENNI2=OFF # Not packaged
|
||||
-DWITH_PNG=$(usex png ON OFF)
|
||||
-DWITH_PVAPI=OFF # Not packaged
|
||||
-DWITH_GIGEAPI=OFF
|
||||
# Qt in CMakeList.txt here: See below
|
||||
-DWITH_WIN32UI=OFF # Windows only
|
||||
-DWITH_QUICKTIME=OFF
|
||||
-DWITH_TBB=$(usex threads ON OFF)
|
||||
-DWITH_OPENMP=$(usex openmp ON OFF)
|
||||
-DWITH_CSTRIPES=OFF
|
||||
-DWITH_PTHREADS_PF=ON
|
||||
-DWITH_TIFF=$(usex tiff ON OFF)
|
||||
-DWITH_UNICAP=OFF # Not packaged
|
||||
-DWITH_V4L=$(usex v4l ON OFF)
|
||||
-DWITH_LIBV4L=$(usex v4l ON OFF)
|
||||
-DWITH_DSHOW=ON # direct show supp
|
||||
-DWITH_MSMF=OFF
|
||||
-DWITH_XIMEA=OFF # Windows only
|
||||
-DWITH_XINE=$(usex xine ON OFF)
|
||||
-DWITH_CLP=OFF
|
||||
-DWITH_OPENCL=$(usex opencl ON OFF)
|
||||
-DWITH_OPENCL_SVM=OFF
|
||||
-DWITH_OPENCLAMDFFT=$(usex opencl ON OFF)
|
||||
-DWITH_OPENCLAMDBLAS=$(usex opencl ON OFF)
|
||||
-DWITH_DIRECTX=OFF
|
||||
-DWITH_INTELPERC=OFF
|
||||
-DWITH_JAVA=$(usex java ON OFF) # Ant needed, no compile flag
|
||||
-DWITH_IPP_A=OFF
|
||||
-DWITH_MATLAB=ON
|
||||
-DWITH_VA=$(usex vaapi ON OFF)
|
||||
-DWITH_VA_INTEL=$(usex vaapi ON OFF)
|
||||
-DWITH_GDAL=$(usex gdal ON OFF)
|
||||
-DWITH_GPHOTO2=$(usex gphoto2 ON OFF)
|
||||
# ===================================================
|
||||
# OpenCV build components
|
||||
# ===================================================
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
-DBUILD_ANDROID_EXAMPLES=OFF
|
||||
-DBUILD_DOCS=OFF # Doesn't install anyways.
|
||||
-DBUILD_EXAMPLES=$(usex examples ON OFF)
|
||||
-DBUILD_PERF_TESTS=OFF
|
||||
-DBUILD_TESTS=$(usex testprograms ON OFF)
|
||||
# ===================================================
|
||||
# OpenCV installation options
|
||||
# ===================================================
|
||||
-DINSTALL_C_EXAMPLES=$(usex examples ON OFF)
|
||||
-DINSTALL_TESTS=$(usex testprograms ON OFF)
|
||||
# ===================================================
|
||||
# OpenCV build options
|
||||
# ===================================================
|
||||
-DENABLE_PRECOMPILED_HEADERS=$(usex pch ON OFF)
|
||||
-DHAVE_opencv_java=$(usex java YES NO)
|
||||
)
|
||||
|
||||
if use qt4; then
|
||||
mycmakeargs+=( -DWITH_QT=4 )
|
||||
elif use qt5; then
|
||||
mycmakeargs+=( -DWITH_QT=5 )
|
||||
else
|
||||
mycmakeargs+=( -DWITH_QT=OFF )
|
||||
fi
|
||||
|
||||
if use cuda; then
|
||||
if [[ "$(gcc-version)" > "4.8" ]]; then
|
||||
# bug 577410
|
||||
# #error -- unsupported GNU version! gcc 4.9 and up are not supported!
|
||||
ewarn "CUDA and >=sys-devel/gcc-4.9 do not play well together. Disabling CUDA support."
|
||||
mycmakeargs+=( -DWITH_CUDA=OFF )
|
||||
mycmakeargs+=( -DWITH_CUBLAS=OFF )
|
||||
mycmakeargs+=( -DWITH_CUFFT=OFF )
|
||||
|
||||
else
|
||||
mycmakeargs+=( -DWITH_CUDA=ON )
|
||||
mycmakeargs+=( -DWITH_CUBLAS=ON )
|
||||
mycmakeargs+=( -DWITH_CUFFT=ON )
|
||||
mycmakeargs+=( -DCUDA_NPP_LIBRARY_ROOT_DIR="/opt/cuda" )
|
||||
fi
|
||||
else
|
||||
mycmakeargs+=( -DWITH_CUDA=OFF )
|
||||
mycmakeargs+=( -DWITH_CUBLAS=OFF )
|
||||
mycmakeargs+=( -DWITH_CUFFT=OFF )
|
||||
fi
|
||||
|
||||
use contrib && mycmakeargs+=(
|
||||
-DOPENCV_EXTRA_MODULES_PATH="${WORKDIR}/opencv_contrib-${PV}/modules"
|
||||
)
|
||||
|
||||
if use python; then
|
||||
# Set all python variables to load the correct Gentoo paths
|
||||
mycmakeargs+=(
|
||||
-DWITH_PYTHON=ON
|
||||
-DGENTOO_PYTHON_EXECUTABLE=${EPYTHON}
|
||||
-DGENTOO_PYTHON_INCLUDE_PATH="$(python_get_includedir)"
|
||||
-DGENTOO_PYTHON_LIBRARIES="$(python_get_library_path)"
|
||||
-DGENTOO_PYTHON_PACKAGES_PATH="$(python_get_sitedir)"
|
||||
-DGENTOO_PYTHON_MAJOR=${EPYTHON:6:1}
|
||||
-DGENTOO_PYTHON_MINOR=${EPYTHON:8:1}
|
||||
-DGENTOO_PYTHON_DEBUG_LIBRARIES="" # Absolutely no clue what this is
|
||||
)
|
||||
use examples && mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=ON )
|
||||
else
|
||||
mycmakeargs+=( -DINSTALL_PYTHON_EXAMPLES=OFF )
|
||||
fi
|
||||
|
||||
# things we want to be hard off or not yet figured out
|
||||
mycmakeargs+=(
|
||||
-DBUILD_PACKAGE=OFF
|
||||
-DENABLE_PROFILING=OFF
|
||||
)
|
||||
|
||||
# things we want to be hard enabled not worth useflag
|
||||
mycmakeargs+=(
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
-DOPENCV_DOC_INSTALL_PATH=
|
||||
)
|
||||
|
||||
# workaround for bug 413429
|
||||
tc-export CC CXX
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
@ -1 +1 @@
|
||||
Tue, 08 Nov 2016 06:43:15 +0000
|
||||
Tue, 08 Nov 2016 08:13:20 +0000
|
||||
|
@ -1 +1 @@
|
||||
Tue, 08 Nov 2016 06:43:15 +0000
|
||||
Tue, 08 Nov 2016 08:13:21 +0000
|
||||
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare setup test
|
||||
DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-2.8.12 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
|
||||
DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
|
||||
EAPI=5
|
||||
HOMEPAGE=http://opencv.willowgarage.com
|
||||
IUSE=cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l vtk xine python_targets_python2_7 elibc_FreeBSD java elibc_FreeBSD
|
||||
KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux
|
||||
LICENSE=BSD
|
||||
RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
|
||||
REQUIRED_USE=python? ( python_targets_python2_7 )
|
||||
SLOT=0/2.4
|
||||
SRC_URI=https://github.com/Itseez/opencv/archive/2.4.12.zip -> opencv-2.4.12.zip
|
||||
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=f5cb89a7cbb338556b4ba697bce6e496
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare setup test
|
||||
DEPEND=app-arch/bzip2 sys-libs/zlib media-libs/libwebp cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-2.8.12 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
|
||||
DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
|
||||
EAPI=5
|
||||
HOMEPAGE=http://opencv.org
|
||||
IUSE=contrib cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4 elibc_FreeBSD java elibc_FreeBSD
|
||||
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
|
||||
LICENSE=BSD
|
||||
RDEPEND=app-arch/bzip2 sys-libs/zlib media-libs/libwebp cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
|
||||
REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) ) ?? ( qt4 qt5 )
|
||||
SLOT=0/3.0
|
||||
SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/3.0.0/opencv-3.0.0.zip https://github.com/Itseez/opencv/archive/3.0.0.zip -> opencv-3.0.0.zip contrib? ( https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip -> opencv_contrib.zip )
|
||||
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=7d57f6da4b636c4feda90132a78189dd
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare setup test
|
||||
DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gphoto2? ( media-libs/libgphoto2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-2.8.12 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
|
||||
DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
|
||||
EAPI=6
|
||||
HOMEPAGE=http://opencv.org
|
||||
IUSE=contrib cuda +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 elibc_FreeBSD java elibc_FreeBSD
|
||||
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
|
||||
LICENSE=BSD
|
||||
RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gphoto2? ( media-libs/libgphoto2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
|
||||
REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) ) ?? ( qt4 qt5 )
|
||||
SLOT=0/3.1
|
||||
SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/3.1.0/opencv-3.1.0.zip https://github.com/Itseez/opencv/archive/3.1.0.zip -> opencv-3.1.0.zip contrib? ( https://github.com/Itseez/opencv_contrib/archive/cd5993c6576267875adac300b9ddd1f881bb1766.zip -> opencv-3.1.0_contrib.zip )
|
||||
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=9e65b2b2665a2feb719c17a83cffa671
|
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare pretend setup test
|
||||
DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit:0= ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gphoto2? ( media-libs/libgphoto2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-2.8.12 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
|
||||
DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
|
||||
EAPI=6
|
||||
HOMEPAGE=http://opencv.org
|
||||
IUSE=contrib cuda +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD java elibc_FreeBSD
|
||||
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
|
||||
LICENSE=BSD
|
||||
RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit:0= ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gphoto2? ( media-libs/libgphoto2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt4? ( dev-qt/qtgui:4 dev-qt/qttest:4 opengl? ( dev-qt/qtopengl:4 ) ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
|
||||
REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) ?? ( qt4 qt5 ) opengl? ( || ( gtk qt4 qt5 ) )
|
||||
SLOT=0/3.1
|
||||
SRC_URI=mirror://sourceforge/opencvlibrary/opencv-unix/3.1.0/opencv-3.1.0.zip https://github.com/Itseez/opencv/archive/3.1.0.zip -> opencv-3.1.0.zip contrib? ( https://github.com/Itseez/opencv_contrib/archive/cd5993c6576267875adac300b9ddd1f881bb1766.zip -> opencv-3.1.0_contrib.zip )
|
||||
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 a50950a73b5d5db46f42638e2996a087 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=7f848b3cde6181b8ae5ccade6d0c3478
|
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install preinst prepare pretend setup test
|
||||
DEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit:0= ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gflags? ( dev-cpp/gflags ) glog? ( dev-cpp/glog ) gphoto2? ( media-libs/libgphoto2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) contrib_hdf? ( sci-libs/hdf5 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp ) xine? ( media-libs/xine-lib ) virtual/pkgconfig eigen? ( dev-cpp/eigen:3 ) java? ( >=virtual/jdk-1.6 ) sys-devel/make >=dev-util/cmake-2.8.12 java? ( >=dev-java/java-config-2.2.0-r3 ) java? ( >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 )
|
||||
DESCRIPTION=A collection of algorithms and sample code for various computer vision problems
|
||||
EAPI=6
|
||||
HOMEPAGE=http://opencv.org
|
||||
IUSE=contrib cuda +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 elibc_FreeBSD java elibc_FreeBSD
|
||||
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
|
||||
LICENSE=BSD
|
||||
RDEPEND=app-arch/bzip2 sys-libs/zlib cuda? ( dev-util/nvidia-cuda-toolkit:0= ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) gdal? ( sci-libs/gdal ) gflags? ( dev-cpp/gflags ) glog? ( dev-cpp/glog ) gphoto2? ( media-libs/libgphoto2 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 opengl? ( x11-libs/gtkglext ) ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) ipp? ( sci-libs/ipp ) contrib_hdf? ( sci-libs/hdf5 ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt5? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qttest:5 dev-qt/qtconcurrent:5 opengl? ( dev-qt/qtopengl:5 ) ) tesseract? ( app-text/tesseract[opencl=] ) threads? ( dev-cpp/tbb ) tiff? ( media-libs/tiff:0 ) v4l? ( >=media-libs/libv4l-0.8.3 ) vtk? ( sci-libs/vtk[rendering] ) webp? ( media-libs/libwebp ) xine? ( media-libs/xine-lib ) java? ( >=dev-java/java-config-2.2.0-r3 )
|
||||
REQUIRED_USE=cuda? ( tesseract? ( opencl ) ) gflags? ( contrib ) glog? ( contrib ) contrib_cvv? ( contrib qt5 ) contrib_hdf? ( contrib ) contrib_sfm? ( contrib eigen gflags glog ) opengl? ( || ( gtk qt5 ) ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ) tesseract? ( contrib )
|
||||
SLOT=0/3.1
|
||||
SRC_URI=https://github.com/opencv/opencv/archive/3.1.0.tar.gz -> opencv-3.1.0.tar.gz contrib? ( https://github.com/opencv/opencv_contrib/archive/75b3ea9f72fdb083140fc63855b7677d67748376.tar.gz -> opencv-3.1.0_contrib-75b3ea9.tar.gz )
|
||||
_eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc java-ant-2 d1abcccd8e9c606be17deacfe5c7368a java-pkg-opt-2 40db73f27fc6458ec2105812a4f261c7 java-utils-2 a50950a73b5d5db46f42638e2996a087 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
|
||||
_md5_=332c688c2d0cb41f4853ac666a7fc3fa
|
@ -1 +1 @@
|
||||
Tue, 08 Nov 2016 06:43:15 +0000
|
||||
Tue, 08 Nov 2016 08:13:21 +0000
|
||||
|
@ -1 +1 @@
|
||||
Tue Nov 8 06:39:26 UTC 2016
|
||||
Tue Nov 8 08:09:34 UTC 2016
|
||||
|
@ -1 +1 @@
|
||||
Tue, 08 Nov 2016 07:00:01 +0000
|
||||
Tue, 08 Nov 2016 08:30:01 +0000
|
||||
|
@ -1 +1 @@
|
||||
1478587201 Tue 08 Nov 2016 06:40:01 AM UTC
|
||||
1478592601 Tue 08 Nov 2016 08:10:01 AM UTC
|
||||
|
@ -1 +1 @@
|
||||
Tue, 08 Nov 2016 06:43:15 +0000
|
||||
Tue, 08 Nov 2016 08:13:20 +0000
|
||||
|
Loading…
Reference in new issue