From 52f15736a455b7f6e0e056826fc421b6f5af9d91 Mon Sep 17 00:00:00 2001 From: miqlas Date: Sat, 26 Aug 2017 12:23:17 +0200 Subject: [PATCH] Opencv 3.3.0 (#1597) * opencv: WIP * OpenCV: bump version * Rev fix * Missing bits --- ...pencv-3.2.0.recipe => opencv-3.3.0.recipe} | 73 ++++++------ .../opencv/patches/opencv-3.2.0.patchset | 112 ------------------ .../opencv/patches/opencv-3.3.0.patchset | 78 ++++++++++++ 3 files changed, 117 insertions(+), 146 deletions(-) rename media-libs/opencv/{opencv-3.2.0.recipe => opencv-3.3.0.recipe} (70%) delete mode 100644 media-libs/opencv/patches/opencv-3.2.0.patchset create mode 100644 media-libs/opencv/patches/opencv-3.3.0.patchset diff --git a/media-libs/opencv/opencv-3.2.0.recipe b/media-libs/opencv/opencv-3.3.0.recipe similarity index 70% rename from media-libs/opencv/opencv-3.2.0.recipe rename to media-libs/opencv/opencv-3.3.0.recipe index 58a0af9f2..dbc74bc10 100644 --- a/media-libs/opencv/opencv-3.2.0.recipe +++ b/media-libs/opencv/opencv-3.3.0.recipe @@ -9,10 +9,10 @@ COPYRIGHT="2000-2016, Intel Corporation 2015-2016, OpenCV Foundation 2015-2016, Itseez Inc." LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/opencv/opencv/archive/$portVersion.tar.gz" SOURCE_FILENAME="opencv-$portVersion.tar.gz" -CHECKSUM_SHA256="b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35" +CHECKSUM_SHA256="95029eb5578af3b20b8c7f8f6f59db1b827c2d5aaaa74b6becb1de647cbdda5a" SOURCE_DIR="opencv-$portVersion" PATCHES="opencv-$portVersion.patchset" @@ -23,25 +23,27 @@ PROVIDES=" opencv$secondaryArchSuffix = $portVersion compat >= 3 cmd:opencv_annotation$secondaryArchSuffix= $portVersion cmd:opencv_createsamples$secondaryArchSuffix= $portVersion + cmd:opencv_interactive_calibration$secondaryArchSuffix= $portVersion cmd:opencv_traincascade$secondaryArchSuffix= $portVersion cmd:opencv_version$secondaryArchSuffix= $portVersion cmd:opencv_visualisation$secondaryArchSuffix= $portVersion - lib:libopencv_calib3d$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_core$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_features2d$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_flann$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_highgui$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_imgcodecs$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_imgproc$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_ml$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_objdetect$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_photo$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_shape$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_stitching$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_superres$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_video$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_videoio$secondaryArchSuffix = 3.2.0 compat >= 3 - lib:libopencv_videostab$secondaryArchSuffix = 3.2.0 compat >= 3 + lib:libopencv_calib3d$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_core$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_dnn$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_features2d$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_flann$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_highgui$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_imgcodecs$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_imgproc$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_ml$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_objdetect$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_photo$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_shape$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_stitching$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_superres$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_video$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_videoio$secondaryArchSuffix = 3.3.0 compat >= 3 + lib:libopencv_videostab$secondaryArchSuffix = 3.3.0 compat >= 3 " REQUIRES=" haiku$secondaryArchSuffix @@ -72,22 +74,23 @@ REQUIRES=" PROVIDES_devel=" opencv${secondaryArchSuffix}_devel = $portVersion compat >= 3 - devel:libopencv_calib3d$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_core$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_features2d$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_flann$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_highgui$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_imgcodecs$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_imgproc$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_ml$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_objdetect$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_photo$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_shape$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_stitching$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_superres$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_video$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_videoio$secondaryArchSuffix = 3.2.0 compat >= 3 - devel:libopencv_videostab$secondaryArchSuffix = 3.2.0 compat >= 3 + devel:libopencv_calib3d$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_core$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_dnn$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_features2d$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_flann$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_highgui$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_imgcodecs$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_imgproc$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_ml$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_objdetect$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_photo$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_shape$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_stitching$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_superres$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_video$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_videoio$secondaryArchSuffix = 3.3.0 compat >= 3 + devel:libopencv_videostab$secondaryArchSuffix = 3.3.0 compat >= 3 " REQUIRES_devel=" opencv$secondaryArchSuffix == $portVersion base @@ -140,6 +143,7 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage opencv$secondaryArchSuffix \ $libDir/libopencv_calib3d.so.$portVersion \ $libDir/libopencv_core.so.$portVersion \ + $libDir/libopencv_dnn.so.$portVersion \ $libDir/libopencv_features2d.so.$portVersion \ $libDir/libopencv_flann.so.$portVersion \ $libDir/libopencv_highgui.so.$portVersion \ @@ -189,6 +193,7 @@ INSTALL() prepareInstalledDevelLibs libopencv_calib3d \ libopencv_core \ + libopencv_dnn \ libopencv_features2d \ libopencv_flann \ libopencv_highgui \ diff --git a/media-libs/opencv/patches/opencv-3.2.0.patchset b/media-libs/opencv/patches/opencv-3.2.0.patchset deleted file mode 100644 index b3ec15bcd..000000000 --- a/media-libs/opencv/patches/opencv-3.2.0.patchset +++ /dev/null @@ -1,112 +0,0 @@ -From 2c12c6a1cba8a063d210fa477dc61f9872ad6117 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Fri, 7 Apr 2017 14:10:49 +0200 -Subject: Haiku is like BSD but with nicer icons (no -lrt -ldl) - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cc45f6f..5abc755 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -520,7 +520,7 @@ if(UNIX) - CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD) - if(ANDROID) - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log) -- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD") -+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD|Haiku") - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread) - elseif(EMSCRIPTEN) - # no need to link to system libs with emscripten --- -2.12.2 - - -From f7de64ae96e89b6b161442609e54e191ebc4919c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Fri, 7 Apr 2017 14:14:46 +0200 -Subject: Haiku build fix - - -diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp -index 3c8f39d..8039398 100644 ---- a/modules/core/src/system.cpp -+++ b/modules/core/src/system.cpp -@@ -64,7 +64,7 @@ Mutex* __initialization_mutex_initializer = &getInitializationMutex(); - # endif - #endif - --#if defined ANDROID || defined __linux__ || defined __FreeBSD__ -+#if defined ANDROID || defined __linux__ || defined __FreeBSD__ || defined __HAIKU__ - # include - # include - # include -@@ -198,7 +198,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix) - - #include - --#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ -+#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __HAIKU__ - #include - #include - #include --- -2.12.2 - - -From e6632eafd03dc6a052499a6a20a03f1e4e97a9ab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Fri, 7 Apr 2017 15:36:17 +0200 -Subject: FFMPEG test fix for Haiku - - -diff --git a/cmake/checks/ffmpeg_test.cpp b/cmake/checks/ffmpeg_test.cpp -index 7b49c38..23a5aab 100644 ---- a/cmake/checks/ffmpeg_test.cpp -+++ b/cmake/checks/ffmpeg_test.cpp -@@ -1,5 +1,9 @@ - #include - -+#ifdef __HAIKU__ -+ #define __STDC_CONSTANT_MACROS -+#endif -+ - extern "C" { - #include - #include --- -2.12.2 - - -From 7125a2bbd158a9f66944641c93bd3082ffb8e439 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Thu, 29 Jun 2017 10:46:03 +0200 -Subject: Disable stack protector for Haiku - - -diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 5bb0479..f1eca10 100644 ---- a/cmake/OpenCVCompilerOptions.cmake -+++ b/cmake/OpenCVCompilerOptions.cmake -@@ -398,6 +398,20 @@ if(NOT OPENCV_FP16_DISABLE AND NOT IOS) - endif() - endif() - -+# ---------------------------------------------------------------------------- -+# NO STACK PROTECTOR FOR HAIKU -+# ---------------------------------------------------------------------------- -+ -+if(${CMAKE_SYSTEM_NAME} MATCHES "Haiku") -+ set(OPENCV_EXTRA_C_FLAGS "${OPENCV_EXTRA_C_FLAGS} -fno-stack-protector") -+ set(OPENCV_EXTRA_CXX_FLAGS "${OPENCV_EXTRA_CXX_FLAGS} -fno-stack-protector") -+ set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} -fno-stack-protector") -+ set(OPENCV_EXTRA_FLAGS_DEBUG "${OPENCV_EXTRA_FLAGS_DEBUG} -fno-stack-protector") -+ set(OPENCV_EXTRA_EXE_LINKER_FLAGS "${OPENCV_EXTRA_EXE_LINKER_FLAGS} -fno-stack-protector") -+ set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} -fno-stack-protector") -+ set(OPENCV_EXTRA_EXE_LINKER_FLAGS_DEBUG "${OPENCV_EXTRA_EXE_LINKER_FLAGS_DEBUG} -fno-stack-protector") -+endif() -+ - #combine all "extra" options - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPENCV_EXTRA_FLAGS} ${OPENCV_EXTRA_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENCV_EXTRA_FLAGS} ${OPENCV_EXTRA_CXX_FLAGS}") --- -2.12.2 diff --git a/media-libs/opencv/patches/opencv-3.3.0.patchset b/media-libs/opencv/patches/opencv-3.3.0.patchset new file mode 100644 index 000000000..8c76752a8 --- /dev/null +++ b/media-libs/opencv/patches/opencv-3.3.0.patchset @@ -0,0 +1,78 @@ +From 2c12c6a1cba8a063d210fa477dc61f9872ad6117 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Fri, 7 Apr 2017 14:10:49 +0200 +Subject: Haiku is like BSD but with nicer icons (no -lrt -ldl) + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af5e2c1..f926e88 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -557,7 +557,7 @@ if(UNIX) + CHECK_INCLUDE_FILE(pthread.h HAVE_LIBPTHREAD) + if(ANDROID) + set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m log) +- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD") ++ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD|DragonFly|OpenBSD|Haiku") + set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread) + elseif(EMSCRIPTEN) + # no need to link to system libs with emscripten +-- +2.12.2 + + +From f7de64ae96e89b6b161442609e54e191ebc4919c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Fri, 7 Apr 2017 14:14:46 +0200 +Subject: Haiku build fix + + +diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp +index 3eeb5fe..73759d6 100644 +--- a/modules/core/src/system.cpp ++++ b/modules/core/src/system.cpp +@@ -66,7 +66,7 @@ Mutex* __initialization_mutex_initializer = &getInitializationMutex(); + # endif + #endif + +-#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ ++#if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ || defined __HAIKU__ + # include + # include + # include +@@ -202,7 +202,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix) + #include "omp.h" + #endif + +-#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ ++#if defined __linux__ || defined __APPLE__ || defined __EMSCRIPTEN__ || defined __FreeBSD__ || defined __HAIKU__ + #include + #include + #include +-- +2.12.2 + + +From e6632eafd03dc6a052499a6a20a03f1e4e97a9ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Fri, 7 Apr 2017 15:36:17 +0200 +Subject: FFMPEG test fix for Haiku + + +diff --git a/cmake/checks/ffmpeg_test.cpp b/cmake/checks/ffmpeg_test.cpp +index 4a7a3e0..8f293f9 100644 +--- a/cmake/checks/ffmpeg_test.cpp ++++ b/cmake/checks/ffmpeg_test.cpp +@@ -2,6 +2,10 @@ + + #include + ++#ifdef __HAIKU__ ++ #define __STDC_CONSTANT_MACROS ++#endif ++ + extern "C" { + #include + #include +-- +2.12.2