From 2383d44d67f106f41a53ada354785876be375aed Mon Sep 17 00:00:00 2001 From: "Ivan S. Titov" Date: Mon, 16 Dec 2024 17:03:48 +0100 Subject: [PATCH] drop opencv --- media-libs/opencv/Manifest | 8 - .../files/opencv-3.4.0-disable-download.patch | 29 - ...ncv-3.4.1-cuda-add-relaxed-constexpr.patch | 14 - .../files/opencv-4.1.2-opencl-license.patch | 10 - ...-4.4.0-disable-native-cpuflag-detect.patch | 26 - ...ncv-4.5.0-link-with-cblas-for-lapack.patch | 18 - .../opencv-4.6.0-fix-build-examples.patch | 21 - .../files/opencv-4.6.0-fix-ffmpeg-5.patch | 19 - .../files/opencv-4.8.0-arm64-fp16.patch | 272 -------- .../files/opencv-4.8.0-fix-flatbuffer.patch | 31 - .../files/opencv-4.8.0-fix-protobuf.patch | 20 - media-libs/opencv/files/opencv-cuda.patch | 36 - media-libs/opencv/metadata.xml | 48 -- media-libs/opencv/opencv-4.8.0-r1.ebuild | 591 ----------------- media-libs/opencv/opencv-4.8.1.ebuild | 614 ------------------ 15 files changed, 1757 deletions(-) delete mode 100644 media-libs/opencv/Manifest delete mode 100644 media-libs/opencv/files/opencv-3.4.0-disable-download.patch delete mode 100644 media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch delete mode 100644 media-libs/opencv/files/opencv-4.1.2-opencl-license.patch delete mode 100644 media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch delete mode 100644 media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch delete mode 100644 media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch delete mode 100644 media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch delete mode 100644 media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch delete mode 100644 media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch delete mode 100644 media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch delete mode 100644 media-libs/opencv/files/opencv-cuda.patch delete mode 100644 media-libs/opencv/metadata.xml delete mode 100644 media-libs/opencv/opencv-4.8.0-r1.ebuild delete mode 100644 media-libs/opencv/opencv-4.8.1.ebuild diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest deleted file mode 100644 index 4c83059fb..000000000 --- a/media-libs/opencv/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23 -DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b -DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e -DIST opencv-4.8.0.tar.gz 91992565 BLAKE2B eede5479acdcef7dfb49d260b696ed14e85a27b8cd7211934d3fa9df9a46072daca9e1b7c50d1d56633d5e7bdf96e4a5731c8ea0e04886dc381e7864357ed8de SHA512 48738c3e7460a361274357aef1dd427082ccd59f749d6317d92a414b3741ce6116ea15ed4fedd2d47a25e456c705f3ba114357558646097bfc0e6dba9b3b865c -DIST opencv-4.8.0_contrib.tar.gz 59201076 BLAKE2B e30c4f17e1e89c8b0821bbf8ea44b6b4ce505ad2761222a8b119c5aee5ae4ef50e06a73f41fee3b2fa60b71c736989904f6d1fb31a16abfe39e605e2d32d851b SHA512 81cc41cfe1ea03e60b0657edeaa76a90926e5e79a9f93a482e17bc9edbf1b5ce36b13d108fd8fb097f2fb3d6381fbeb102811f44bfc761c2de7f69bf3c5298a1 -DIST opencv-4.8.1.tar.gz 92006711 BLAKE2B 54728a37e3e8a528bd8d2e6df5963a996820a51160d05ac72b350234ce5372f99c037af96e13c55de1452e517fffb478c2335b9e1cbc07a36c78f99351eabd58 SHA512 b98d89b8e7b8ae8138bce00c5226816b761b53fbeb8f28ca516e08c5d130f216f9388a81785cd6684034530f768e097cbe12f19a9361f362b7d2048bfc427a65 -DIST opencv-4.8.1_contrib.tar.gz 59200293 BLAKE2B 8cf3ee60cb38a9fa2649013b9b4704022abe5cc65c331078dc7ea87028bc99df8b0de12f835905f5bb5c00a811f256754cac018ca8e02739ac5c6fe36aa4346d SHA512 e3df49e6a1411f55eebbc02f4534ddefabff961b4f63c69b21fe06ff3df894773a8643ab0cb123b83c2bdc8fa02698b332d3c243e8546c894e6c6c8ecaa65500 -DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 diff --git a/media-libs/opencv/files/opencv-3.4.0-disable-download.patch b/media-libs/opencv/files/opencv-3.4.0-disable-download.patch deleted file mode 100644 index 245ad3b3d..000000000 --- a/media-libs/opencv/files/opencv-3.4.0-disable-download.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/CMakeLists.txt 2018-05-13 20:47:11.635871328 +0200 -+++ b/CMakeLists.txt 2018-05-13 20:47:49.289872617 +0200 -@@ -187,6 +187,7 @@ - # ---------------------------------------------------------------------------- - - OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable non-free algorithms" OFF) -+OCV_OPTION(ENABLE_DOWNLOAD "Enable download during configure" ON) - - # 3rd party libs - OCV_OPTION(BUILD_ZLIB "Build zlib from source" WIN32 OR APPLE) - ---- a/cmake/OpenCVDownload.cmake 2018-05-13 21:22:14.966943336 +0200 -+++ b/cmake/OpenCVDownload.cmake 2018-05-13 21:23:15.959945424 +0200 -@@ -32,6 +32,7 @@ - - - function(ocv_download) -+ if(ENABLE_DOWNLOAD) - cmake_parse_arguments(DL "UNPACK;RELATIVE_URL" "FILENAME;HASH;DESTINATION_DIR;ID;STATUS" "URL" ${ARGN}) - - macro(ocv_download_log) -@@ -236,4 +237,7 @@ - if(OCV_DOWNLOAD_HASH_NAME) - set(${OCV_DOWNLOAD_HASH_NAME} "${DL_HASH}" CACHE INTERNAL "") - endif() -+ else() -+ message( "Download was disabled during configure phase by ENABLE_DOWNLOAD=OFF" ) -+ endif() - endfunction() diff --git a/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch b/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch deleted file mode 100644 index 11ca6aa86..000000000 --- a/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake ---- a/cmake/FindCUDA.cmake 2018-05-26 12:57:45.698858052 +0100 -+++ b/cmake/FindCUDA.cmake 2018-05-26 16:49:01.196390803 +0100 -@@ -447,8 +447,8 @@ - # Parse HOST_COMPILATION mode. - option(CUDA_HOST_COMPILATION_CPP "Generated file extension" ON) - --# Extra user settable flags --set(CUDA_NVCC_FLAGS "" CACHE STRING "Semi-colon delimit multiple arguments.") -+ #Extra user settable flags -+set(CUDA_NVCC_FLAGS "--expt-relaxed-constexpr;" CACHE STRING "Semi-colon delimit multiple arguments.") - - if(CMAKE_GENERATOR MATCHES "Visual Studio") - set(_CUDA_MSVC_HOST_COMPILER "$(VCInstallDir)Tools/MSVC/$(VCToolsVersion)/bin/Host$(Platform)/$(PlatformTarget)") diff --git a/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch b/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch deleted file mode 100644 index f69a88db0..000000000 --- a/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/cmake/OpenCVDetectOpenCL.cmake.ORIG 2019-11-29 11:29:00.642852106 +0100 -+++ b/cmake/OpenCVDetectOpenCL.cmake 2019-11-29 11:37:57.088822546 +0100 -@@ -5,7 +5,6 @@ - else() - set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library") - set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory") -- ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt") - endif() - mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) - diff --git a/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch b/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch deleted file mode 100644 index 89ac1ff47..000000000 --- a/media-libs/opencv/files/opencv-4.4.0-disable-native-cpuflag-detect.patch +++ /dev/null @@ -1,26 +0,0 @@ - cmake/OpenCVCompilerOptimizations.cmake | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/cmake/OpenCVCompilerOptimizations.cmake b/cmake/OpenCVCompilerOptimizations.cmake -index 970dd28903..b56892bb12 100644 ---- a/cmake/OpenCVCompilerOptimizations.cmake -+++ b/cmake/OpenCVCompilerOptimizations.cmake -@@ -156,12 +156,12 @@ if(";${CPU_BASELINE};" MATCHES ";NATIVE;" OR ";${CPU_BASELINE};" MATCHES ";HOST; - set(_add_native_flag ON) - elseif(";${CPU_BASELINE};" MATCHES ";DETECT;") - set(CPU_BASELINE_DETECT ON) --elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ") -- if(DEFINED CPU_BASELINE) -- message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.") -- endif() -- set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") -- set(CPU_BASELINE_DETECT ON) -+#elseif(" ${CMAKE_CXX_FLAGS} " MATCHES " -march=native | -xHost | /QxHost ") -+# if(DEFINED CPU_BASELINE) -+# message(STATUS "CPU: Detected '-march=native' or '-xHost' compiler flag. Force CPU_BASELINE=DETECT.") -+# endif() -+# set(CPU_BASELINE "DETECT" CACHE STRING "${HELP_CPU_BASELINE}") -+# set(CPU_BASELINE_DETECT ON) - endif() - - if(X86 OR X86_64) diff --git a/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch b/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch deleted file mode 100644 index acee67705..000000000 --- a/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/OpenCVFindLAPACK.cmake b/cmake/OpenCVFindLAPACK.cmake -index 342bebc..9ebd206 100644 ---- a/cmake/OpenCVFindLAPACK.cmake -+++ b/cmake/OpenCVFindLAPACK.cmake -@@ -136,10 +136,12 @@ if(WITH_LAPACK) - ocv_lapack_check() - endif() - if(NOT HAVE_LAPACK) -- if(LAPACKE_INCLUDE_DIR) -+ find_package(CBLAS) -+ if(LAPACKE_INCLUDE_DIR AND CBLAS_FOUND) - set(LAPACK_INCLUDE_DIR ${LAPACKE_INCLUDE_DIR}) - set(LAPACK_CBLAS_H "cblas.h") - set(LAPACK_LAPACKE_H "lapacke.h") -+ set(LAPACK_LIBRARIES ${LAPACK_LIBRARIES} ${CBLAS_LIBRARIES}) - set(LAPACK_IMPL "LAPACK/Generic") - ocv_lapack_check() - elseif(APPLE) diff --git a/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch b/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch deleted file mode 100644 index 3cc6328a2..000000000 --- a/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 5acf351e4b9d099d446f401df690d559ed5dfdad Mon Sep 17 00:00:00 2001 -From: Prasanth R -Date: Thu, 14 Jul 2022 13:34:54 +0530 -Subject: [PATCH] #21804 Add opencv_gapi as dep to samples/cpp - ---- - samples/cpp/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt -index c9c4440f22c7..f23b333ca93a 100644 ---- a/samples/cpp/CMakeLists.txt -+++ b/samples/cpp/CMakeLists.txt -@@ -15,6 +15,7 @@ set(OPENCV_CPP_SAMPLES_REQUIRED_DEPS - opencv_calib3d - opencv_stitching - opencv_dnn -+ opencv_gapi - ${OPENCV_MODULES_PUBLIC} - ${OpenCV_LIB_COMPONENTS}) - ocv_check_dependencies(${OPENCV_CPP_SAMPLES_REQUIRED_DEPS}) diff --git a/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch b/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch deleted file mode 100644 index 557576a87..000000000 --- a/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/opencv/opencv/issues/22418 -https://github.com/opencv/opencv/commit/496eed950f6d0e7fd92619d47e3cec8f06e96ace -https://bugs.gentoo.org/876748 - -From: Jochen Sprickerhof -Date: Mon, 8 Aug 2022 21:10:13 +0200 -Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT - ---- a/modules/videoio/src/ffmpeg_codecs.hpp -+++ b/modules/videoio/src/ffmpeg_codecs.hpp -@@ -60,6 +60,7 @@ extern "C" { - #include - #endif - -+#include - #include - - #ifdef __cplusplus - diff --git a/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch b/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch deleted file mode 100644 index 6bf04daf5..000000000 --- a/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch +++ /dev/null @@ -1,272 +0,0 @@ -https://github.com/opencv/opencv/pull/24203 - -From 689fa6f372975d58e9f50fd17a0abd105b1815f1 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Mon, 28 Aug 2023 04:20:58 +0100 -Subject: [PATCH] Fix compilation on arm64 with FP16 when disabled - -If building with -mcpu=native or any other setting which implies the current -CPU has FP16 but with intrinsics disabled, we mistakenly try to use it even -though convolution.hpp conditionally defines it correctly based on whether -we should *use it*. convolution.cpp on the other hand was mismatched and -trying to use it if the CPU supported it, even if not enabled in the build -system. - -Make the guards match. - -Bug: https://bugs.gentoo.org/913031 -Signed-off-by: Sam James ---- a/modules/dnn/src/layers/cpu_kernels/convolution.cpp -+++ b/modules/dnn/src/layers/cpu_kernels/convolution.cpp -@@ -118,7 +118,7 @@ Ptr initFastConv( - const size_t wstep = weightsMat.step1(); - - conv->useFP16 = false; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - // TODO: add FP16 support for Winograd. - if (_useFP16 && (conv->conv_type == CONV_TYPE_GENERIC || conv->conv_type == CONV_TYPE_DEPTHWISE_REMAIN)) - conv->useFP16 = true; -@@ -137,7 +137,7 @@ Ptr initFastConv( - int padded_ksize = ((ksize + VEC_ALIGN-1) / VEC_ALIGN) * VEC_ALIGN; - int nweights = C * padded_ksize; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (conv->useFP16) - { - conv->weightsBuf_FP16.resize(nweights + VEC_ALIGN); -@@ -190,7 +190,7 @@ Ptr initFastConv( - #endif - const int CONV_WINO_NATOMS_F32 = CONV_WINO_AREA / CONV_WINO_ATOM_F32; // for AVX2, it is 8, otherwise, it's 16. - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - // FP 16 - const int CONV_WINO_ATOM_F16 = CONV_WINO_ATOM_F32 * 2; - const int CONV_WINO_NATOMS_F16 = CONV_WINO_AREA / CONV_WINO_ATOM_F16; -@@ -208,7 +208,7 @@ Ptr initFastConv( - size_t nweights = ngroups*Kg_nblocks*Cg*CONV_WINO_KBLOCK*CONV_WINO_AREA; - - float* wptrWino = nullptr; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - float16_t* wptrWino_FP16 = nullptr; - if (conv->useFP16) - { -@@ -264,7 +264,7 @@ Ptr initFastConv( - } - - // repack the data. --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (conv->useFP16) - { - float16_t* wptr = wptrWino_FP16 + (g*Kg_nblocks + ki) * Cg *CONV_WINO_KBLOCK*CONV_WINO_AREA + -@@ -308,7 +308,7 @@ Ptr initFastConv( - - float* weightsBufPtr = nullptr; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - int numStripsMR_FP16 = (Kg + CONV_MR_FP16 - 1) / CONV_MR_FP16; - int Kg_aligned_FP16 = numStripsMR_FP16 * CONV_MR_FP16; - size_t nweights_FP16 = ngroups * Kg_aligned_FP16 * DkHkWkCg; -@@ -331,7 +331,7 @@ Ptr initFastConv( - } - - // Pack the weight. --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (conv->useFP16) - { - parallel_for_(Range(0, ngroups * numStripsMR_FP16), [&](const Range& r0){ -@@ -415,7 +415,7 @@ static inline void packData8(char*& inpbuf, float*& inptrIn, int& in_w, int& x0, - char * inpbufC = inpbuf + s0 * esz; - float* inptrInC = (float* )inptrIn; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - float16_t* inpbufC_FP16 = (float16_t *)inpbufC; - if (esz == sizeof(float16_t)) - { -@@ -521,7 +521,7 @@ static inline void packData2(char *& inpbuf, float*& inptrIn, int& in_w, int& x0 - char* inpbufC = inpbuf + s0 * esz; - float* inptrInC = inptrIn; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - float16_t* inpbufC_FP16 = (float16_t *)inpbufC; - if (esz == sizeof(float16_t)) - { -@@ -553,7 +553,7 @@ static inline void packData2(char *& inpbuf, float*& inptrIn, int& in_w, int& x0 - in_w += stride_w; - } - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - // Fast convert float 32 to float16 - static inline void _cvt32f16f( const float* src, float16_t* dst, int len) - { -@@ -623,7 +623,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - { - // Make special branch where memcpy() is called with a constant buffer size. - // Compilers will likely unroll this loop properly. --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inptr += inp_planesize, inpbuf += CONV_NR_esz) -@@ -636,7 +636,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inptr += inp_planesize, inpbuf += CONV_NR_esz) -@@ -700,7 +700,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - int w0 = std::max(0, (-in_w + dilation_w-1)/dilation_w); - int w1 = std::min(Wk, (Wi - in_w + dilation_w-1)/dilation_w); - const float* inptrInC = inptrIn; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - float16_t* inpbufC = (float16_t *)inpbuf + s0; -@@ -761,7 +761,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - int w1 = std::min(Wk, (Wi - in_w + dilation_w-1)/dilation_w); - - const float* inptrInC = inptrIn; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - float16_t* inpbufC = (float16_t *)inpbuf + s0; -@@ -834,7 +834,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - int w0 = std::max(0, (-in_w + dilation_w-1)/dilation_w); - int w1 = std::min(Wk, (Wi - in_w + dilation_w-1)/dilation_w); - const float* inptrInC = inptrIn; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - float16_t* inpbufC = (float16_t* )inpbuf + s0; -@@ -887,7 +887,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - for (; i < CONV_NR;) - { - float* inpbuf_ki = (float* )inpbuf + k * CONV_NR * Cg + i; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - float16_t * inpbuf_ki_FP16 = (float16_t *)inpbuf + k * CONV_NR * Cg + i; - #endif - -@@ -903,7 +903,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - { - if (stride_w == 1) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -934,7 +934,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else if (stride_w == 2) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -967,7 +967,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -1006,7 +1006,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - { - if (stride_w == 1) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -1029,7 +1029,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -1057,7 +1057,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR, inptr_ki += inp_planesize) -@@ -1073,7 +1073,7 @@ static inline void packInputData(char* inpbuf_task, float* inp, const int* ofsta - } - else - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - for (int c = 0; c < Cg; c++, inpbuf_ki_FP16 += CONV_NR) -@@ -1260,7 +1260,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr& co - int CONV_MR = CONV_MR_FP32; - int esz = sizeof(float ); - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - // works at FP 16. -@@ -1433,7 +1433,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr& co - } - - char *weights = nullptr; --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - CV_Assert(!conv->weightsBuf_FP16.empty()); -@@ -1474,7 +1474,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr& co - #if CV_NEON && CV_NEON_AARCH64 - if (conv->useNEON) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - opt_NEON::convBlockMR1_FP16(DkHkWkCg, weights, inptr, cptr, biasVal, fusedAdd, minval, maxval, ifMinMaxAct, outLen, CONV_NR); -@@ -1537,7 +1537,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr& co - #if CV_NEON - if (conv->useNEON) - { --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - opt_NEON::convBlock_FP16(c1 - c0, wptr, inptr, (char *)cptr_f16, ldc, c0 == 0, outLen, CONV_MR, CONV_NR); -@@ -1567,7 +1567,7 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr& co - float biasval = biasptr[k]; - int j = 0; - --#ifdef CONV_ARM_FP16 -+#if defined(CONV_ARM_FP16) && CV_FP16 - if (useFP16) - { - float32x4_t vbias = vdupq_n_f32(biasval); diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch b/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch deleted file mode 100644 index 395f0998a..000000000 --- a/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/modules/dnn/misc/tflite/schema_generated.h 2023-06-28 19:53:33.000000000 +0800 -+++ b/modules/dnn/misc/tflite/schema_generated.h 2023-08-24 15:17:19.594480034 +0800 -@@ -8,9 +8,9 @@ - - // Ensure the included flatbuffers.h is the same version as when this file was - // generated, otherwise it may not be compatible. --static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && -- FLATBUFFERS_VERSION_MINOR == 5 && -- FLATBUFFERS_VERSION_REVISION == 9, -+static_assert(FLATBUFFERS_VERSION_MAJOR == FLATBUFFERS_VERSION_MAJOR && -+ FLATBUFFERS_VERSION_MINOR == FLATBUFFERS_VERSION_MINOR && -+ FLATBUFFERS_VERSION_REVISION == FLATBUFFERS_VERSION_REVISION, - "Non-compatible flatbuffers version included"); - - namespace opencv_tflite { ---- a/cmake/OpenCVDetectFlatbuffers.cmake 2023-08-24 15:31:50.129947159 +0800 -+++ b/cmake/OpenCVDetectFlatbuffers.cmake 2023-08-24 15:36:15.176705845 +0800 -@@ -1,9 +1,9 @@ - if(WITH_FLATBUFFERS) - set(HAVE_FLATBUFFERS 1) -- set(flatbuffers_VERSION "23.5.9") -- ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt") -- ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1") -- set(CUSTOM_STATUS_flatbuffers " Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})") -+ #set(flatbuffers_VERSION "23.5.9") -+ #ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt") -+ #ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1") -+ #set(CUSTOM_STATUS_flatbuffers " Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})") - endif() - - if(WITH_FLATBUFFERS OR HAVE_FLATBUFFERS) diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch b/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch deleted file mode 100644 index 937e00e0c..000000000 --- a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/cmake/OpenCVFindProtobuf.cmake -+++ b/cmake/OpenCVFindProtobuf.cmake -@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF) - set(HAVE_PROTOBUF TRUE) - else() - unset(Protobuf_VERSION CACHE) -- find_package(Protobuf QUIET) -+ find_package(protobuf) - - # Backwards compatibility - # Define camel case versions of input variables -@@ -50,7 +50,7 @@ else() - endforeach() - # end of compatibility block - -- if(Protobuf_FOUND) -+ if(protobuf_FOUND) - if(TARGET protobuf::libprotobuf) - set(Protobuf_LIBRARIES "protobuf::libprotobuf") - else() diff --git a/media-libs/opencv/files/opencv-cuda.patch b/media-libs/opencv/files/opencv-cuda.patch deleted file mode 100644 index 0ebdd9f06..000000000 --- a/media-libs/opencv/files/opencv-cuda.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ab8cb6f8a9034da2a289b84685c6d959266029be Mon Sep 17 00:00:00 2001 -From: cudawarped <12133430+cudawarped@users.noreply.github.com> -Date: Tue, 1 Aug 2023 13:02:42 +0300 -Subject: [PATCH] cuda: fix for compatibility with CUDA Toolkit >= 12.2.0 - ---- - modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp | 2 +- - modules/dnn/src/cuda4dnn/primitives/region.hpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp -index f067dddaa701..91ff33f81718 100644 ---- a/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp -+++ b/modules/dnn/src/cuda4dnn/primitives/normalize_bbox.hpp -@@ -111,7 +111,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { - * or there might be several weights - * or we don't have to scale - */ -- if (weight != 1.0) -+ if (weight != static_cast(1.0f)) - { - kernels::scale1_with_bias1(stream, output, input, weight, 1.0); - } -diff --git a/modules/dnn/src/cuda4dnn/primitives/region.hpp b/modules/dnn/src/cuda4dnn/primitives/region.hpp -index d22d44214e7b..3af05155feea 100644 ---- a/modules/dnn/src/cuda4dnn/primitives/region.hpp -+++ b/modules/dnn/src/cuda4dnn/primitives/region.hpp -@@ -121,7 +121,7 @@ namespace cv { namespace dnn { namespace cuda4dnn { - new_coords - ); - -- if (nms_iou_threshold > 0) { -+ if (nms_iou_threshold > static_cast(0.0f)) { - auto output_mat = output_wrapper->getMutableHostMat(); - CV_Assert(output_mat.type() == CV_32F); - for (int i = 0; i < input.get_axis_size(0); i++) { diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml deleted file mode 100644 index 3dea3514d..000000000 --- a/media-libs/opencv/metadata.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - negril.nx+gentoo@gmail.com - Paul Zander - - - proxy-maint@gentoo.org - Proxy Maintainers - - - OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision. - Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition; - Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Understanding; Structure From Motion (SFM); and Mobile Robotics. - - - Install user contributed scripts from opencv_contrib (Experimental!) - Enable NVIDIA Cuda computations support (Experimental!) - Enable download during cmake configure - Enable usage of dev-cpp/eigen for computations - Enable features2d module - Enable support for sci-libs/gdal library - Enable x11-libs/gtk+:3 support - Build using Link Time Optimizations (LTO) - Enable compilation with opencvapps - Use Google's C++ argument parsing library - Use Google's C++ loggin library - Enables xfeatures2d and autodownload of samples in contrib - CVV module requires Qt5 - DNN module contrib requires tiny dnn - HDF module requires sci-libs/hdf5 - SFM module requires eigen, gflags, and glog - Enable Drawing UTF-8 strings with freetype/harfbuzz - Enable Ogre vision module support - Download dnn caffeemodel samples - Add support for OpenCL - Use Google's OCR Engine - Build and install programs for testing OpenCV (performance) - Build new 3D visualization module viz based on sci-libs/vtk - - - cpe:/a:opencv:opencv - opencv/opencv - opencv/opencv_contrib - opencvlibrary - - diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild b/media-libs/opencv/opencv-4.8.0-r1.ebuild deleted file mode 100644 index d4f5a4fc2..000000000 --- a/media-libs/opencv/opencv-4.8.0-r1.ebuild +++ /dev/null @@ -1,591 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# No 3.12 yet for bug #912987 -PYTHON_COMPAT=( python3_{9..12} ) -inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs - -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" -HOMEPAGE="https://opencv.org" -TINY_DNN_PV="1.0.0a3" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz ) - download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz ) - contrib? ( - https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz - contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz ) - contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) - )" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" # subslot = libopencv* soname version -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86" -IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine" - -# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications -ARM_CPU_FEATURES=( - cpu_flags_arm_neon:NEON - cpu_flags_arm_vfpv3:VFPV3 -) -PPC_CPU_FEATURES=( - cpu_flags_ppc_vsx:VSX - cpu_flags_ppc_vsx3:VSX3 -) -X86_CPU_FEATURES_RAW=( - avx:AVX - avx2:AVX2 - avx512f:AVX_512F - f16c:FP16 - fma3:FMA3 - popcnt:POPCNT - sse:SSE - sse2:SSE2 - sse3:SSE3 - ssse3:SSSE3 - sse4_1:SSE4_1 - sse4_2:SSE4_2 -) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${PPC_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}" - -# OpenGL needs gtk or Qt installed to activate, otherwise build system -# will silently disable it Wwithout the user knowing, which defeats the -# purpose of the opengl use flag. -# cuda needs contrib, bug #701712 -REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) - cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) - cuda? ( contrib - tesseract? ( opencl ) ) - dnnsamples? ( examples ) - gflags? ( contrib ) - glog? ( contrib ) - contribcvv? ( contrib qt5 ) - contribdnn? ( contrib ) - contribfreetype? ( contrib ) - contribhdf? ( contrib ) - contribovis? ( contrib ) - contribsfm? ( contrib eigen gflags glog ) - contribxfeatures2d? ( contrib download ) - examples? ( contribdnn ) - java? ( python ) - opengl? ( qt5 ) - python? ( ${PYTHON_REQUIRED_USE} ) - tesseract? ( contrib ) - ?? ( gtk3 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: -# openmp? ( !threads ) - -RDEPEND=" - app-arch/bzip2[${MULTILIB_USEDEP}] - dev-libs/protobuf:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - cuda? ( dev-util/nvidia-cuda-toolkit:0= ) - contribdnn? ( dev-libs/flatbuffers:= ) - contribhdf? ( sci-libs/hdf5:= ) - contribfreetype? ( - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/harfbuzz:=[${MULTILIB_USEDEP}] - ) - contribovis? ( dev-games/ogre:0/1.12 ) - ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) - gdal? ( sci-libs/gdal:= ) - gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] ) - glog? ( dev-cpp/glog:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) - gtk3? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - ) - ieee1394? ( - media-libs/libdc1394:=[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] - ) - java? ( >=virtual/jre-1.8:* ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) - lapack? ( - virtual/cblas - >=virtual/lapack-3.10 - ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - openexr? ( - dev-libs/imath:= - media-libs/openexr:= - ) - opengl? ( - virtual/opengl[${MULTILIB_USEDEP}] - virtual/glu[${MULTILIB_USEDEP}] - ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - ) - 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=,${MULTILIB_USEDEP}] ) - threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) - v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) - vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] ) - vtk? ( sci-libs/vtk[rendering] ) - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) - xine? ( media-libs/xine-lib )" -DEPEND="${RDEPEND} - eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 ) - java? ( >=virtual/jdk-1.8:* )" -BDEPEND="virtual/pkgconfig" - -MULTILIB_WRAPPED_HEADERS=( - # [opencv4] - /usr/include/opencv4/opencv2/cvconfig.h - /usr/include/opencv4/opencv2/opencv_modules.hpp - # [cudev] - /usr/include/opencv4/opencv2/cudaarithm.hpp - /usr/include/opencv4/opencv2/cudabgsegm.hpp - /usr/include/opencv4/opencv2/cudacodec.hpp - /usr/include/opencv4/opencv2/cudafeatures2d.hpp - /usr/include/opencv4/opencv2/cudafilters.hpp - /usr/include/opencv4/opencv2/cudaimgproc.hpp - /usr/include/opencv4/opencv2/cudalegacy.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp - /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp - /usr/include/opencv4/opencv2/cudaobjdetect.hpp - /usr/include/opencv4/opencv2/cudaoptflow.hpp - /usr/include/opencv4/opencv2/cudastereo.hpp - /usr/include/opencv4/opencv2/cudawarping.hpp - /usr/include/opencv4/opencv2/cudev/block/block.hpp - /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp - /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp - /usr/include/opencv4/opencv2/cudev/block/reduce.hpp - /usr/include/opencv4/opencv2/cudev/block/scan.hpp - /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp - /usr/include/opencv4/opencv2/cudev/common.hpp - /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp - /usr/include/opencv4/opencv2/cudev/expr/color.hpp - /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp - /usr/include/opencv4/opencv2/cudev/expr/expr.hpp - /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp - /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp - /usr/include/opencv4/opencv2/cudev/expr/warping.hpp - /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp - /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp - /usr/include/opencv4/opencv2/cudev/functional/functional.hpp - /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp - /usr/include/opencv4/opencv2/cudev/grid/copy.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp - /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp - /usr/include/opencv4/opencv2/cudev/grid/integral.hpp - /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp - /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp - /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp - /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp - /usr/include/opencv4/opencv2/cudev/grid/transform.hpp - /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp - /usr/include/opencv4/opencv2/cudev.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp - /usr/include/opencv4/opencv2/cudev/util/atomic.hpp - /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp - /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp - /usr/include/opencv4/opencv2/cudev/util/limits.hpp - /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp - /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp - /usr/include/opencv4/opencv2/cudev/util/tuple.hpp - /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp - /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp - /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp - /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp - /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp - /usr/include/opencv4/opencv2/cudev/warp/scan.hpp - /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp - /usr/include/opencv4/opencv2/cudev/warp/warp.hpp - # [contrib_cvv] - /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp - /usr/include/opencv4/opencv2/cvv/cvv.hpp - /usr/include/opencv4/opencv2/cvv/debug_mode.hpp - /usr/include/opencv4/opencv2/cvv/dmatch.hpp - /usr/include/opencv4/opencv2/cvv/filter.hpp - /usr/include/opencv4/opencv2/cvv/final_show.hpp - /usr/include/opencv4/opencv2/cvv.hpp - /usr/include/opencv4/opencv2/cvv/show_image.hpp - # [contrib_hdf] - /usr/include/opencv4/opencv2/hdf/hdf5.hpp - /usr/include/opencv4/opencv2/hdf.hpp - # [contrib_ovis] - /usr/include/opencv4/opencv2/ovis.hpp - # [contrib_sfm] - /usr/include/opencv4/opencv2/sfm.hpp - /usr/include/opencv4/opencv2/sfm/conditioning.hpp - /usr/include/opencv4/opencv2/sfm/fundamental.hpp - /usr/include/opencv4/opencv2/sfm/io.hpp - /usr/include/opencv4/opencv2/sfm/numeric.hpp - /usr/include/opencv4/opencv2/sfm/projection.hpp - /usr/include/opencv4/opencv2/sfm/reconstruct.hpp - /usr/include/opencv4/opencv2/sfm/robust.hpp - /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp - /usr/include/opencv4/opencv2/sfm/triangulation.hpp - # [vtk] - /usr/include/opencv4/opencv2/viz.hpp - /usr/include/opencv4/opencv2/viz/types.hpp - /usr/include/opencv4/opencv2/viz/viz3d.hpp - /usr/include/opencv4/opencv2/viz/vizcore.hpp - /usr/include/opencv4/opencv2/viz/widget_accessor.hpp - /usr/include/opencv4/opencv2/viz/widgets.hpp -) - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.0-disable-download.patch - "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch - "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch - "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch - "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch - "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch - "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch - "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - # https://bugs.gentoo.org/838274 - replace-flags -O3 -O2 - - cmake_src_prepare - - # remove bundled stuff - rm -r 3rdparty || die "Removing 3rd party components failed" - sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ - -i CMakeLists.txt cmake/*cmake || die - - if use dnnsamples; then - mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die - fi - - if use contrib; then - cd "${WORKDIR}/${PN}_contrib-${PV}" || die - if use contribxfeatures2d; then - mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die - fi - fi - - if use download; then - mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die - fi - - java-pkg-opt-2_src_prepare - - # this really belongs in src_prepare() too - 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 -} - -multilib_src_configure() { - # please dont sort here, order is the same as in CMakeLists.txt - GLOBALCMAKEARGS=( - # for protobuf - -DCMAKE_CXX_STANDARD=14 - - # Optional 3rd party components - # =================================================== - -DENABLE_DOWNLOAD=$(usex download) - -DWITH_QUIRC=OFF # Do not have dependencies - -DWITH_FLATBUFFERS=$(usex contribdnn) - -DWITH_1394=$(usex ieee1394) - # -DWITH_AVFOUNDATION=OFF # IOS - -DWITH_VTK=$(multilib_native_usex vtk) - -DWITH_EIGEN=$(usex eigen) - -DWITH_VFW=OFF # Video windows support - -DWITH_FFMPEG=$(usex ffmpeg) - -DWITH_GSTREAMER=$(usex gstreamer) - -DWITH_GSTREAMER_0_10=OFF # Don't want this - -DWITH_GTK=$(usex gtk3) - -DWITH_GTK_2_X=OFF # only want gtk3 nowadays - -DWITH_IPP=OFF - # Jasper was removed from tree because of security problems. - # Upstream were/are making progress. We use openjpeg instead. - # bug 734284 - -DWITH_JASPER=OFF - -DWITH_JPEG=$(usex jpeg) - -DWITH_OPENJPEG=$(usex jpeg2k) - -DWITH_WEBP=$(usex webp) - -DWITH_OPENEXR=$(multilib_native_usex openexr) - -DWITH_OPENGL=$(usex opengl) - -DWITH_OPENVX=OFF - -DWITH_OPENNI=OFF # Not packaged - -DWITH_OPENNI2=OFF # Not packaged - -DWITH_PNG=$(usex png) - -DWITH_GDCM=OFF - -DWITH_PVAPI=OFF - -DWITH_GIGEAPI=OFF - -DWITH_ARAVIS=OFF - -DWITH_QT=$(multilib_native_usex qt5 5 OFF) - -DWITH_WIN32UI=OFF # Windows only - # -DWITH_QUICKTIME=OFF - # -DWITH_QTKIT=OFF - -DWITH_TBB=$(usex threads) - -DWITH_OPENMP=$(usex openmp) - -DWITH_CSTRIPES=OFF - -DWITH_PTHREADS_PF=ON - -DWITH_TIFF=$(usex tiff) - -DWITH_UNICAP=OFF # Not packaged - -DWITH_V4L=$(usex v4l) - -DWITH_LIBV4L=$(usex v4l) - # -DWITH_DSHOW=ON # direct show supp - -DWITH_MSMF=OFF - -DWITH_XIMEA=OFF # Windows only - -DWITH_XINE=$(multilib_native_usex xine) - -DWITH_CLP=OFF - -DWITH_OPENCL=$(usex opencl) - -DWITH_OPENCL_SVM=OFF - -DWITH_OPENCLAMDFFT=$(usex opencl) - -DWITH_OPENCLAMDBLAS=$(usex opencl) - -DWITH_DIRECTX=OFF - -DWITH_INTELPERC=OFF - -DWITH_IPP_A=OFF - -DWITH_MATLAB=OFF - -DWITH_VA=$(usex vaapi) - -DWITH_VA_INTEL=$(usex vaapi) - -DWITH_GDAL=$(multilib_native_usex gdal) - -DWITH_GPHOTO2=$(usex gphoto2) - -DWITH_LAPACK=$(multilib_native_usex lapack) - -DWITH_ITT=OFF # 3dparty libs itt_notify - # =================================================== - # CUDA build components: nvidia-cuda-toolkit takes care of GCC version - # =================================================== - -DWITH_CUDA=$(multilib_native_usex cuda) - -DWITH_CUBLAS=$(multilib_native_usex cuda) - -DWITH_CUFFT=$(multilib_native_usex cuda) - -DWITH_NVCUVID=OFF - # -DWITH_NVCUVID=$(usex cuda) - -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "") - # =================================================== - # OpenCV build components - # =================================================== - -DBUILD_SHARED_LIBS=ON - -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag - -DBUILD_ANDROID_EXAMPLES=OFF - -DBUILD_opencv_apps=$(usex opencvapps ON OFF) - -DBUILD_DOCS=OFF # Doesn't install anyways. - -DBUILD_EXAMPLES=$(multilib_native_usex examples) - -DBUILD_PERF_TESTS=OFF - -DBUILD_TESTS=$(multilib_native_usex testprograms) - -DBUILD_WITH_DEBUG_INFO=$(usex debug) - # -DBUILD_WITH_STATIC_CRT=OFF - -DBUILD_WITH_DYNAMIC_IPP=OFF - -DBUILD_FAT_JAVA_LIB=OFF - # -DBUILD_ANDROID_SERVICE=OFF - -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda) - -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "") - # =================================================== - # OpenCV installation options - # =================================================== - -DINSTALL_CREATE_DISTRIB=OFF - -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples) - -DINSTALL_TESTS=$(multilib_native_usex testprograms) - -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples) - # -DINSTALL_ANDROID_EXAMPLES=OFF - -DINSTALL_TO_MANGLED_PATHS=OFF - -DOPENCV_GENERATE_PKGCONFIG=ON - # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX} - # to set its destination libdir - -DLIB_SUFFIX= - # =================================================== - # OpenCV build options - # =================================================== - -DENABLE_CCACHE=OFF - # bug 733796, but PCH is a risky game in CMake anyway - -DENABLE_PRECOMPILED_HEADERS=OFF - -DENABLE_SOLUTION_FOLDERS=OFF - -DENABLE_PROFILING=OFF - -DENABLE_COVERAGE=OFF - - -DHAVE_opencv_java=$(multilib_native_usex java YES NO) - -DENABLE_NOISY_WARNINGS=OFF - -DOPENCV_WARNINGS_ARE_ERRORS=OFF - -DENABLE_IMPL_COLLECTION=OFF - -DENABLE_INSTRUMENTATION=OFF - -DGENERATE_ABI_DESCRIPTOR=OFF - -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF - -DENABLE_LTO=$(usex lto) - # =================================================== - # things we want to be hard off or not yet figured out - # =================================================== - -DBUILD_PACKAGE=OFF - # =================================================== - # Not building protobuf but update files bug #631418 - # =================================================== - -DWITH_PROTOBUF=ON - -DBUILD_PROTOBUF=OFF - -DPROTOBUF_UPDATE_FILES=ON - -Dprotobuf_MODULE_COMPATIBLE=ON - # =================================================== - # things we want to be hard enabled not worth useflag - # =================================================== - -DCMAKE_SKIP_RPATH=ON - -DOPENCV_DOC_INSTALL_PATH= - -DBUILD_opencv_features2d=$(usex features2d ON OFF) - ) - - # ================================================== - # cpu flags, should solve 633900 - #=================================================== - local CPU_BASELINE="" - for i in "${CPU_FEATURES_MAP[@]}" ; do - if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163 - use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};" - fi - done - - GLOBALCMAKEARGS+=( - -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON - -DCPU_BASELINE=${CPU_BASELINE} - -DCPU_DISPATCH= - ) - - # =================================================== - # OpenCV Contrib Modules - # =================================================== - if use contrib; then - GLOBALCMAKEARGS+=( - -DBUILD_opencv_dnn=$(usex contribdnn ON OFF) - -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}" - -DBUILD_opencv_dnns_easily_fooled=OFF - -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF) - -DBUILD_opencv_cvv=$(usex contribcvv ON OFF) - -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF) - -DBUILD_opencv_sfm=$(usex contribsfm ON OFF) - -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF) - -DBUILD_opencv_ovis=$(usex contribovis ON OFF) - ) - - if multilib_is_native_abi; then - GLOBALCMAKEARGS+=( - -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract) - ) - else - GLOBALCMAKEARGS+=( - -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON - ) - fi - fi - - # workaround for bug 413429 - tc-export CC CXX - - local mycmakeargs=( - ${GLOBALCMAKEARGS[@]} - -DPYTHON_EXECUTABLE=OFF - -DINSTALL_PYTHON_EXAMPLES=OFF - -DBUILD_opencv_python2=OFF - -DBUILD_opencv_python3=OFF - ) - - cmake_src_configure - - # Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH} - # TODO patch ocv_download to copy files into destination dirs - if use contribdnn; then - mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die - cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die - fi - -} - -python_module_compile() { - local BUILD_DIR="${orig_BUILD_DIR}" - local mycmakeargs=( ${GLOBALCMAKEARGS[@]} ) - - # Set all python variables to load the correct Gentoo paths - mycmakeargs+=( - # python_setup alters PATH and sets this as wrapper - # to the correct interpreter we are building for - -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON} - -DINSTALL_PYTHON_EXAMPLES=$(usex examples) - ) - - # Regenerate cache file. Can't use rebuild_cache as it won't - # have the Gentoo specific options. - rm CMakeCache.txt || die "rm failed" - cmake_src_configure - cmake_src_compile - cmake_src_install - - # Remove compiled binary so new version compiles - # Avoid conflicts with new module builds as build system doesn't - # really support it. - rm -r modules/python3 || die "rm failed" - - python_optimize "${ED}"/$(python_get_sitedir) -} - -multilib_src_install() { - cmake_src_install - - # Build and install the python modules for all targets - if multilib_is_native_abi && use python; then - local orig_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl python_module_compile - fi -} diff --git a/media-libs/opencv/opencv-4.8.1.ebuild b/media-libs/opencv/opencv-4.8.1.ebuild deleted file mode 100644 index 5b88855cc..000000000 --- a/media-libs/opencv/opencv-4.8.1.ebuild +++ /dev/null @@ -1,614 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# No 3.12 yet for bug #912987 -PYTHON_COMPAT=( python3_{9..12} ) -inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 toolchain-funcs - -DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" -HOMEPAGE="https://opencv.org" -TINY_DNN_PV="1.0.0a3" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - dnnsamples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz ) - download? ( https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> ${PN}-4.4.0_extdep.tar.gz ) - contrib? ( - https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz - contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz ) - contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) - )" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" # subslot = libopencv* soname version -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 qt6 tesseract testprograms threads tiff vaapi v4l vtk webp xine" - -# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications -ARM_CPU_FEATURES=( - cpu_flags_arm_neon:NEON - cpu_flags_arm_vfpv3:VFPV3 -) -PPC_CPU_FEATURES=( - cpu_flags_ppc_vsx:VSX - cpu_flags_ppc_vsx3:VSX3 -) -X86_CPU_FEATURES_RAW=( - avx:AVX - avx2:AVX2 - avx512f:AVX_512F - f16c:FP16 - fma3:FMA3 - popcnt:POPCNT - sse:SSE - sse2:SSE2 - sse3:SSE3 - ssse3:SSSE3 - sse4_1:SSE4_1 - sse4_2:SSE4_2 -) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${PPC_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} ${CPU_FEATURES_MAP[@]%:*}" - -# OpenGL needs gtk or Qt installed to activate, otherwise build system -# will silently disable it Wwithout the user knowing, which defeats the -# purpose of the opengl use flag. -# cuda needs contrib, bug #701712 -REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_f16c ) - cpu_flags_x86_f16c? ( cpu_flags_x86_avx ) - cuda? ( contrib - tesseract? ( opencl ) ) - dnnsamples? ( examples ) - gflags? ( contrib ) - glog? ( contrib ) - contribcvv? ( contrib || ( qt5 qt6 ) ) - contribdnn? ( contrib ) - contribfreetype? ( contrib ) - contribhdf? ( contrib ) - contribovis? ( contrib ) - contribsfm? ( contrib eigen gflags glog ) - contribxfeatures2d? ( contrib download ) - examples? ( contribdnn ) - java? ( python ) - opengl? ( || ( qt5 qt6 ) ) - python? ( ${PYTHON_REQUIRED_USE} ) - tesseract? ( contrib ) - ?? ( gtk3 || ( qt5 qt6 ) )" - -# The following logic is intrinsic in the build system, but we do not enforce -# it on the useflags since this just blocks emerging pointlessly: -# openmp? ( !threads ) - -RDEPEND=" - app-arch/bzip2[${MULTILIB_USEDEP}] - dev-libs/protobuf:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - cuda? ( dev-util/nvidia-cuda-toolkit:0= ) - contribdnn? ( dev-libs/flatbuffers:= ) - contribhdf? ( sci-libs/hdf5:= ) - contribfreetype? ( - media-libs/freetype:2[${MULTILIB_USEDEP}] - media-libs/harfbuzz:=[${MULTILIB_USEDEP}] - ) - contribovis? ( dev-games/ogre:0/1.12 ) - ffmpeg? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) - gdal? ( sci-libs/gdal:= ) - gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] ) - glog? ( dev-cpp/glog:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gstreamer? ( - media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] - media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] - ) - gtk3? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - ) - ieee1394? ( - media-libs/libdc1394:=[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] - ) - java? ( >=virtual/jre-1.8:* ) - jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) - jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] ) - lapack? ( - virtual/cblas - >=virtual/lapack-3.10 - ) - opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) - openexr? ( - dev-libs/imath:= - media-libs/openexr:= - ) - opengl? ( - virtual/opengl[${MULTILIB_USEDEP}] - virtual/glu[${MULTILIB_USEDEP}] - ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - ) - qt5? ( - dev-qt/qtgui:5= - dev-qt/qtwidgets:5= - dev-qt/qttest:5= - dev-qt/qtconcurrent:5= - opengl? ( dev-qt/qtopengl:5= ) - ) - !qt5? ( - qt6? ( - dev-qt/qtbase:6=[gui,widgets,concurrent,opengl?] - ) - ) - tesseract? ( app-text/tesseract[opencl=,${MULTILIB_USEDEP}] ) - threads? ( dev-cpp/tbb:=[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:=[${MULTILIB_USEDEP}] ) - v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) - vaapi? ( media-libs/libva[${MULTILIB_USEDEP}] ) - vtk? ( sci-libs/vtk[rendering] ) - webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) - xine? ( media-libs/xine-lib )" -DEPEND="${RDEPEND} - eigen? ( >=dev-cpp/eigen-3.3.8-r1:3 ) - java? ( >=virtual/jdk-1.8:* )" -BDEPEND="virtual/pkgconfig" - -MULTILIB_WRAPPED_HEADERS=( - # [opencv4] - /usr/include/opencv4/opencv2/cvconfig.h - /usr/include/opencv4/opencv2/opencv_modules.hpp - # [cudev] - /usr/include/opencv4/opencv2/cudaarithm.hpp - /usr/include/opencv4/opencv2/cudabgsegm.hpp - /usr/include/opencv4/opencv2/cudacodec.hpp - /usr/include/opencv4/opencv2/cudafeatures2d.hpp - /usr/include/opencv4/opencv2/cudafilters.hpp - /usr/include/opencv4/opencv2/cudaimgproc.hpp - /usr/include/opencv4/opencv2/cudalegacy.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVHaarObjectDetection.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCV.hpp - /usr/include/opencv4/opencv2/cudalegacy/NCVPyramid.hpp - /usr/include/opencv4/opencv2/cudalegacy/NPP_staging.hpp - /usr/include/opencv4/opencv2/cudaobjdetect.hpp - /usr/include/opencv4/opencv2/cudaoptflow.hpp - /usr/include/opencv4/opencv2/cudastereo.hpp - /usr/include/opencv4/opencv2/cudawarping.hpp - /usr/include/opencv4/opencv2/cudev/block/block.hpp - /usr/include/opencv4/opencv2/cudev/block/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/block/detail/reduce_key_val.hpp - /usr/include/opencv4/opencv2/cudev/block/dynamic_smem.hpp - /usr/include/opencv4/opencv2/cudev/block/reduce.hpp - /usr/include/opencv4/opencv2/cudev/block/scan.hpp - /usr/include/opencv4/opencv2/cudev/block/vec_distance.hpp - /usr/include/opencv4/opencv2/cudev/common.hpp - /usr/include/opencv4/opencv2/cudev/expr/binary_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/binary_op.hpp - /usr/include/opencv4/opencv2/cudev/expr/color.hpp - /usr/include/opencv4/opencv2/cudev/expr/deriv.hpp - /usr/include/opencv4/opencv2/cudev/expr/expr.hpp - /usr/include/opencv4/opencv2/cudev/expr/per_element_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/reduction.hpp - /usr/include/opencv4/opencv2/cudev/expr/unary_func.hpp - /usr/include/opencv4/opencv2/cudev/expr/unary_op.hpp - /usr/include/opencv4/opencv2/cudev/expr/warping.hpp - /usr/include/opencv4/opencv2/cudev/functional/color_cvt.hpp - /usr/include/opencv4/opencv2/cudev/functional/detail/color_cvt.hpp - /usr/include/opencv4/opencv2/cudev/functional/functional.hpp - /usr/include/opencv4/opencv2/cudev/functional/tuple_adapter.hpp - /usr/include/opencv4/opencv2/cudev/grid/copy.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/copy.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/histogram.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/integral.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/minmaxloc.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_down.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/pyr_up.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_column.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/reduce_to_row.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/split_merge.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/transform.hpp - /usr/include/opencv4/opencv2/cudev/grid/detail/transpose.hpp - /usr/include/opencv4/opencv2/cudev/grid/histogram.hpp - /usr/include/opencv4/opencv2/cudev/grid/integral.hpp - /usr/include/opencv4/opencv2/cudev/grid/pyramids.hpp - /usr/include/opencv4/opencv2/cudev/grid/reduce.hpp - /usr/include/opencv4/opencv2/cudev/grid/reduce_to_vec.hpp - /usr/include/opencv4/opencv2/cudev/grid/split_merge.hpp - /usr/include/opencv4/opencv2/cudev/grid/transform.hpp - /usr/include/opencv4/opencv2/cudev/grid/transpose.hpp - /usr/include/opencv4/opencv2/cudev.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/constant.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/deriv.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/detail/gpumat.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/extrapolation.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/glob.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/gpumat.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/interpolation.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/lut.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/mask.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/remap.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/resize.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/texture.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/traits.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/transform.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/warping.hpp - /usr/include/opencv4/opencv2/cudev/ptr2d/zip.hpp - /usr/include/opencv4/opencv2/cudev/util/atomic.hpp - /usr/include/opencv4/opencv2/cudev/util/detail/tuple.hpp - /usr/include/opencv4/opencv2/cudev/util/detail/type_traits.hpp - /usr/include/opencv4/opencv2/cudev/util/limits.hpp - /usr/include/opencv4/opencv2/cudev/util/saturate_cast.hpp - /usr/include/opencv4/opencv2/cudev/util/simd_functions.hpp - /usr/include/opencv4/opencv2/cudev/util/tuple.hpp - /usr/include/opencv4/opencv2/cudev/util/type_traits.hpp - /usr/include/opencv4/opencv2/cudev/util/vec_math.hpp - /usr/include/opencv4/opencv2/cudev/util/vec_traits.hpp - /usr/include/opencv4/opencv2/cudev/warp/detail/reduce.hpp - /usr/include/opencv4/opencv2/cudev/warp/detail/reduce_key_val.hpp - /usr/include/opencv4/opencv2/cudev/warp/reduce.hpp - /usr/include/opencv4/opencv2/cudev/warp/scan.hpp - /usr/include/opencv4/opencv2/cudev/warp/shuffle.hpp - /usr/include/opencv4/opencv2/cudev/warp/warp.hpp - # [contrib_cvv] - /usr/include/opencv4/opencv2/cvv/call_meta_data.hpp - /usr/include/opencv4/opencv2/cvv/cvv.hpp - /usr/include/opencv4/opencv2/cvv/debug_mode.hpp - /usr/include/opencv4/opencv2/cvv/dmatch.hpp - /usr/include/opencv4/opencv2/cvv/filter.hpp - /usr/include/opencv4/opencv2/cvv/final_show.hpp - /usr/include/opencv4/opencv2/cvv.hpp - /usr/include/opencv4/opencv2/cvv/show_image.hpp - # [contrib_hdf] - /usr/include/opencv4/opencv2/hdf/hdf5.hpp - /usr/include/opencv4/opencv2/hdf.hpp - # [contrib_ovis] - /usr/include/opencv4/opencv2/ovis.hpp - # [contrib_sfm] - /usr/include/opencv4/opencv2/sfm.hpp - /usr/include/opencv4/opencv2/sfm/conditioning.hpp - /usr/include/opencv4/opencv2/sfm/fundamental.hpp - /usr/include/opencv4/opencv2/sfm/io.hpp - /usr/include/opencv4/opencv2/sfm/numeric.hpp - /usr/include/opencv4/opencv2/sfm/projection.hpp - /usr/include/opencv4/opencv2/sfm/reconstruct.hpp - /usr/include/opencv4/opencv2/sfm/robust.hpp - /usr/include/opencv4/opencv2/sfm/simple_pipeline.hpp - /usr/include/opencv4/opencv2/sfm/triangulation.hpp - # [vtk] - /usr/include/opencv4/opencv2/viz.hpp - /usr/include/opencv4/opencv2/viz/types.hpp - /usr/include/opencv4/opencv2/viz/viz3d.hpp - /usr/include/opencv4/opencv2/viz/vizcore.hpp - /usr/include/opencv4/opencv2/viz/widget_accessor.hpp - /usr/include/opencv4/opencv2/viz/widgets.hpp -) - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.0-disable-download.patch - "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch - "${FILESDIR}"/${PN}-4.1.2-opencl-license.patch - "${FILESDIR}"/${PN}-4.4.0-disable-native-cpuflag-detect.patch - "${FILESDIR}"/${PN}-4.5.0-link-with-cblas-for-lapack.patch - "${FILESDIR}"/${PN}-4.8.0-fix-protobuf.patch - "${FILESDIR}"/${PN}-4.8.0-fix-flatbuffer.patch - "${FILESDIR}"/${PN}-4.8.0-arm64-fp16.patch - "${FILESDIR}"/${PN}-cuda.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - # https://bugs.gentoo.org/838274 - replace-flags -O3 -O2 - - cmake_src_prepare - - # remove bundled stuff - rm -r 3rdparty || die "Removing 3rd party components failed" - sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ - -i CMakeLists.txt cmake/*cmake || die - - if use dnnsamples; then - mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die - fi - - if use contrib; then - cd "${WORKDIR}/${PN}_contrib-${PV}" || die - if use contribxfeatures2d; then - mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die - fi - fi - - if use download; then - mv "${WORKDIR}/${PN}-extdep-4.4.0" "${WORKDIR}/${P}/.cache/" || die - fi - - java-pkg-opt-2_src_prepare - - # this really belongs in src_prepare() too - 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 -} - -multilib_src_configure() { - # please dont sort here, order is the same as in CMakeLists.txt - GLOBALCMAKEARGS=( - # for protobuf - -DCMAKE_CXX_STANDARD=14 - - # Optional 3rd party components - # =================================================== - -DENABLE_DOWNLOAD=$(usex download) - -DWITH_QUIRC=OFF # Do not have dependencies - -DWITH_FLATBUFFERS=$(usex contribdnn) - -DWITH_1394=$(usex ieee1394) - # -DWITH_AVFOUNDATION=OFF # IOS - -DWITH_VTK=$(multilib_native_usex vtk) - -DWITH_EIGEN=$(usex eigen) - -DWITH_VFW=OFF # Video windows support - -DWITH_FFMPEG=$(usex ffmpeg) - -DWITH_GSTREAMER=$(usex gstreamer) - -DWITH_GSTREAMER_0_10=OFF # Don't want this - -DWITH_GTK=$(usex gtk3) - -DWITH_GTK_2_X=OFF # only want gtk3 nowadays - -DWITH_IPP=OFF - # Jasper was removed from tree because of security problems. - # Upstream were/are making progress. We use openjpeg instead. - # bug 734284 - -DWITH_JASPER=OFF - -DWITH_JPEG=$(usex jpeg) - -DWITH_OPENJPEG=$(usex jpeg2k) - -DWITH_WEBP=$(usex webp) - -DWITH_OPENEXR=$(multilib_native_usex openexr) - -DWITH_OPENGL=$(usex opengl) - -DWITH_OPENVX=OFF - -DWITH_OPENNI=OFF # Not packaged - -DWITH_OPENNI2=OFF # Not packaged - -DWITH_PNG=$(usex png) - -DWITH_GDCM=OFF - -DWITH_PVAPI=OFF - -DWITH_GIGEAPI=OFF - -DWITH_ARAVIS=OFF - -DWITH_WIN32UI=OFF # Windows only - # -DWITH_QUICKTIME=OFF - # -DWITH_QTKIT=OFF - -DWITH_TBB=$(usex threads) - -DWITH_OPENMP=$(usex openmp) - -DWITH_CSTRIPES=OFF - -DWITH_PTHREADS_PF=ON - -DWITH_TIFF=$(usex tiff) - -DWITH_UNICAP=OFF # Not packaged - -DWITH_V4L=$(usex v4l) - -DWITH_LIBV4L=$(usex v4l) - # -DWITH_DSHOW=ON # direct show supp - -DWITH_MSMF=OFF - -DWITH_XIMEA=OFF # Windows only - -DWITH_XINE=$(multilib_native_usex xine) - -DWITH_CLP=OFF - -DWITH_OPENCL=$(usex opencl) - -DWITH_OPENCL_SVM=OFF - -DWITH_OPENCLAMDFFT=$(usex opencl) - -DWITH_OPENCLAMDBLAS=$(usex opencl) - -DWITH_DIRECTX=OFF - -DWITH_INTELPERC=OFF - -DWITH_IPP_A=OFF - -DWITH_MATLAB=OFF - -DWITH_VA=$(usex vaapi) - -DWITH_VA_INTEL=$(usex vaapi) - -DWITH_GDAL=$(multilib_native_usex gdal) - -DWITH_GPHOTO2=$(usex gphoto2) - -DWITH_LAPACK=$(multilib_native_usex lapack) - -DWITH_ITT=OFF # 3dparty libs itt_notify - # =================================================== - # CUDA build components: nvidia-cuda-toolkit takes care of GCC version - # =================================================== - -DWITH_CUDA=$(multilib_native_usex cuda) - -DWITH_CUBLAS=$(multilib_native_usex cuda) - -DWITH_CUFFT=$(multilib_native_usex cuda) - -DWITH_NVCUVID=OFF - # -DWITH_NVCUVID=$(usex cuda) - -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "") - # =================================================== - # OpenCV build components - # =================================================== - -DBUILD_SHARED_LIBS=ON - -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag - -DBUILD_ANDROID_EXAMPLES=OFF - -DBUILD_opencv_apps=$(usex opencvapps ON OFF) - -DBUILD_DOCS=OFF # Doesn't install anyways. - -DBUILD_EXAMPLES=$(multilib_native_usex examples) - -DBUILD_PERF_TESTS=OFF - -DBUILD_TESTS=$(multilib_native_usex testprograms) - -DBUILD_WITH_DEBUG_INFO=$(usex debug) - # -DBUILD_WITH_STATIC_CRT=OFF - -DBUILD_WITH_DYNAMIC_IPP=OFF - -DBUILD_FAT_JAVA_LIB=OFF - # -DBUILD_ANDROID_SERVICE=OFF - -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda) - -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "") - # =================================================== - # OpenCV installation options - # =================================================== - -DINSTALL_CREATE_DISTRIB=OFF - -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples) - -DINSTALL_TESTS=$(multilib_native_usex testprograms) - -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples) - # -DINSTALL_ANDROID_EXAMPLES=OFF - -DINSTALL_TO_MANGLED_PATHS=OFF - -DOPENCV_GENERATE_PKGCONFIG=ON - # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX} - # to set its destination libdir - -DLIB_SUFFIX= - # =================================================== - # OpenCV build options - # =================================================== - -DENABLE_CCACHE=OFF - # bug 733796, but PCH is a risky game in CMake anyway - -DENABLE_PRECOMPILED_HEADERS=OFF - -DENABLE_SOLUTION_FOLDERS=OFF - -DENABLE_PROFILING=OFF - -DENABLE_COVERAGE=OFF - - -DHAVE_opencv_java=$(multilib_native_usex java YES NO) - -DENABLE_NOISY_WARNINGS=OFF - -DOPENCV_WARNINGS_ARE_ERRORS=OFF - -DENABLE_IMPL_COLLECTION=OFF - -DENABLE_INSTRUMENTATION=OFF - -DGENERATE_ABI_DESCRIPTOR=OFF - -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF - -DENABLE_LTO=$(usex lto) - # =================================================== - # things we want to be hard off or not yet figured out - # =================================================== - -DBUILD_PACKAGE=OFF - # =================================================== - # Not building protobuf but update files bug #631418 - # =================================================== - -DWITH_PROTOBUF=ON - -DBUILD_PROTOBUF=OFF - -DPROTOBUF_UPDATE_FILES=ON - -Dprotobuf_MODULE_COMPATIBLE=ON - # =================================================== - # things we want to be hard enabled not worth useflag - # =================================================== - -DCMAKE_SKIP_RPATH=ON - -DOPENCV_DOC_INSTALL_PATH= - -DBUILD_opencv_features2d=$(usex features2d ON OFF) - ) - - if use qt5; then - GLOBALCMAKEARGS+=( - -DWITH_QT=$(multilib_native_usex qt5 ON OFF) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON - ) - elif use qt6; then - GLOBALCMAKEARGS+=( - -DWITH_QT=$(multilib_native_usex qt6 ON OFF) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON - ) - else - GLOBALCMAKEARGS+=( - -DWITH_QT=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON - ) - fi - - # ================================================== - # cpu flags, should solve 633900 - #=================================================== - local CPU_BASELINE="" - for i in "${CPU_FEATURES_MAP[@]}" ; do - if [[ ${ABI} != x86 || ${i%:*} != "cpu_flags_x86_avx2" ]]; then # workaround for Bug 747163 - use ${i%:*} && CPU_BASELINE="${CPU_BASELINE}${i#*:};" - fi - done - - GLOBALCMAKEARGS+=( - -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON - -DCPU_BASELINE=${CPU_BASELINE} - -DCPU_DISPATCH= - ) - - # =================================================== - # OpenCV Contrib Modules - # =================================================== - if use contrib; then - GLOBALCMAKEARGS+=( - -DBUILD_opencv_dnn=$(usex contribdnn ON OFF) - -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}" - -DBUILD_opencv_dnns_easily_fooled=OFF - -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF) - -DBUILD_opencv_cvv=$(usex contribcvv ON OFF) - -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF) - -DBUILD_opencv_sfm=$(usex contribsfm ON OFF) - -DBUILD_opencv_freetype=$(usex contribfreetype ON OFF) - -DBUILD_opencv_ovis=$(usex contribovis ON OFF) - ) - - if multilib_is_native_abi; then - GLOBALCMAKEARGS+=( - -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract) - ) - else - GLOBALCMAKEARGS+=( - -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON - ) - fi - fi - - # workaround for bug 413429 - tc-export CC CXX - - local mycmakeargs=( - ${GLOBALCMAKEARGS[@]} - -DPYTHON_EXECUTABLE=OFF - -DINSTALL_PYTHON_EXAMPLES=OFF - -DBUILD_opencv_python2=OFF - -DBUILD_opencv_python3=OFF - ) - - cmake_src_configure - - # Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH} - # TODO patch ocv_download to copy files into destination dirs - if use contribdnn; then - mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die - cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die - fi - -} - -python_module_compile() { - local BUILD_DIR="${orig_BUILD_DIR}" - local mycmakeargs=( ${GLOBALCMAKEARGS[@]} ) - - # Set all python variables to load the correct Gentoo paths - mycmakeargs+=( - # python_setup alters PATH and sets this as wrapper - # to the correct interpreter we are building for - -DPYTHON_DEFAULT_EXECUTABLE=${EPYTHON} - -DINSTALL_PYTHON_EXAMPLES=$(usex examples) - ) - - # Regenerate cache file. Can't use rebuild_cache as it won't - # have the Gentoo specific options. - rm CMakeCache.txt || die "rm failed" - cmake_src_configure - cmake_src_compile - cmake_src_install - - # Remove compiled binary so new version compiles - # Avoid conflicts with new module builds as build system doesn't - # really support it. - rm -r modules/python3 || die "rm failed" - - python_optimize "${ED}"/$(python_get_sitedir) -} - -multilib_src_install() { - cmake_src_install - - # Build and install the python modules for all targets - if multilib_is_native_abi && use python; then - local orig_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl python_module_compile - fi -}