subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-libs\/opencv\/, media\-libs\/opencv\/files\/"

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/, media-libs/opencv/files/, profiles/arch/x86/, ...

2024-04-21 Thread Sam James

commit: cebb6e2fdce12a8c5f81f1b19bd494469ace2786
Author: Paul Zander  gmail  com>
AuthorDate: Fri Apr 12 13:08:34 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 21 12:49:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebb6e2f

media-libs/opencv: bugfixes

Closes: https://bugs.gentoo.org/929972
Closes: https://bugs.gentoo.org/928516
Closes: https://bugs.gentoo.org/928747
Closes: https://bugs.gentoo.org/927992
Closes: https://bugs.gentoo.org/927917
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36248
Signed-off-by: Sam James  gentoo.org>

 .../opencv/files/opencv-4.9.0-cuda-12.4.patch  | 70 ++
 media-libs/opencv/opencv-4.8.1-r1.ebuild   |  1 +
 media-libs/opencv/opencv-4.9.0.ebuild  |  5 +-
 profiles/arch/amd64/use.mask   |  4 ++
 profiles/arch/arm64/package.use.force  |  4 ++
 profiles/arch/arm64/package.use.mask   |  4 ++
 profiles/arch/base/use.mask|  4 ++
 profiles/arch/x86/use.mask |  4 ++
 8 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencv/files/opencv-4.9.0-cuda-12.4.patch 
b/media-libs/opencv/files/opencv-4.9.0-cuda-12.4.patch
new file mode 100644
index ..f3b5c7b36b50
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.9.0-cuda-12.4.patch
@@ -0,0 +1,70 @@
+From: 
https://gitlab.archlinux.org/archlinux/packaging/packages/opencv/-/blob/main/fix-nppi-bufsize-type.patch?ref_type=heads
+--- a/modules/cudaarithm/src/reductions.cpp2023-12-26 22:24:58.0 
+0100
 b/modules/cudaarithm/src/reductions.cpp2024-03-18 16:51:32.108049155 
+0100
+@@ -151,7 +151,7 @@
+ sz.width  = gsrc.cols;
+ sz.height = gsrc.rows;
+
+-int bufSize;
++size_t bufSize;
+ #if (CUDA_VERSION <= 4020)
+ nppSafeCall( nppiMeanStdDev8uC1RGetBufferHostSize(sz, &bufSize) );
+ #else
+@@ -227,7 +227,7 @@
+ sz.width  = gsrc.cols;
+ sz.height = gsrc.rows;
+
+-int bufSize;
++size_t bufSize;
+ #if (CUDA_VERSION <= 4020)
+ nppSafeCall( nppiMeanStdDev8uC1MRGetBufferHostSize(sz, &bufSize) );
+ #else
+--- a/modules/cudaimgproc/src/histogram.cpp2023-12-26 22:24:58.0 
+0100
 b/modules/cudaimgproc/src/histogram.cpp2024-03-18 17:51:37.005208948 
+0100
+@@ -281,8 +281,8 @@
+
+ namespace
+ {
+-typedef NppStatus (*get_buf_size_c1_t)(NppiSize oSizeROI, int nLevels, 
int* hpBufferSize);
+-typedef NppStatus (*get_buf_size_c4_t)(NppiSize oSizeROI, int nLevels[], 
int* hpBufferSize);
++typedef NppStatus (*get_buf_size_c1_t)(NppiSize oSizeROI, int nLevels, 
size_t* hpBufferSize);
++typedef NppStatus (*get_buf_size_c4_t)(NppiSize oSizeROI, int nLevels[], 
size_t* hpBufferSize);
+
+ template struct NppHistogramEvenFuncC1
+ {
+@@ -315,7 +315,7 @@
+ sz.width = src.cols;
+ sz.height = src.rows;
+
+-int buf_size;
++size_t buf_size;
+ get_buf_size(sz, levels, &buf_size);
+
+ BufferPool pool(stream);
+@@ -349,7 +349,7 @@
+
+ Npp32s* pHist[] = {hist[0].ptr(), hist[1].ptr(), 
hist[2].ptr(), hist[3].ptr()};
+
+-int buf_size;
++size_t buf_size;
+ get_buf_size(sz, levels, &buf_size);
+
+ BufferPool pool(stream);
+@@ -419,7 +419,7 @@
+ sz.width = src.cols;
+ sz.height = src.rows;
+
+-int buf_size;
++size_t buf_size;
+ get_buf_size(sz, levels.cols, &buf_size);
+
+ BufferPool pool(stream);
+@@ -460,7 +460,7 @@
+ sz.width = src.cols;
+ sz.height = src.rows;
+
+-int buf_size;
++size_t buf_size;
+ get_buf_size(sz, nLevels, &buf_size);
+
+ BufferPool pool(stream);

diff --git a/media-libs/opencv/opencv-4.8.1-r1.ebuild 
b/media-libs/opencv/opencv-4.8.1-r1.ebuild
index 0f6ed3e6a080..0756ee648856 100644
--- a/media-libs/opencv/opencv-4.8.1-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1-r1.ebuild
@@ -568,6 +568,7 @@ multilib_src_configure() {
 
if multilib_is_native_abi && use cuda; then
cuda_add_sandbox -w
+   sandbox_write "/proc/self/task"
 
if [[ -n "${CUDA_GENERATION}" ]]; then
mycmakeargs+=(

diff --git a/media-libs/opencv/opencv-4.9.0.ebuild 
b/media-libs/opencv/opencv-4.9.0.ebuild
index 5ad9e4eabaaa..9c1ac20be8c5 100644
--- a/media-libs/opencv/opencv-4.9.0.ebuild
+++ b/media-libs/opencv/opencv-4.9.0.ebuild
@@ -145,7 +145,7 @@ RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
dev-libs/protobuf:=[${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
-   cuda? (  (2024-04-14)
+# media-libs/quirc is keyworded on amd64
+-quirc
+
 # Paul Zander  (2024-03-28)
 # dev-libs/optix works on amd64
 -optix

diff --git a/profiles/arch/arm64/package.use.f

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

2024-02-04 Thread Andreas Sturmlechner

commit: 11f09619e0506c909af7274ed73d6906b31d1a99
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  4 11:39:43 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  4 13:15:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f09619

media-libs/opencv: drop 4.8.0-r3

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/opencv/Manifest |   6 -
 .../opencv/files/opencv-4.8.0-fix-flatbuffer.patch |  31 --
 media-libs/opencv/metadata.xml |   1 -
 media-libs/opencv/opencv-4.8.0-r3.ebuild   | 593 -
 4 files changed, 631 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 293a8806aa85..b425507a8c4c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,10 +1,5 @@
 DIST NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz 8771 
BLAKE2B 
f579960448bdaf57fbefd5e88002d8f6f4dbb828429b0f3a0112916c03039d4e4de65263eb8464a4d62924c1b77f0a61c2d93b7307657439bfbf7d59785f1533
 SHA512 
85dfdc52260f54f62c980508f4b6ab384e44200bd1c13761c4947f9a898c08f0faed2d734a85a4ba7a46f8788ed58ee89f12f61cee97881b69ba626bbd04f655
 DIST ade-0.1.2a.tar.gz 116737 BLAKE2B 
9ac2af2f21aab8cb5d599e0b653bb6126642588e508f55e5fbfe5ce9607267f25e5187fd31ed69349064551c06e15b2ba548319708ed5f70e7761470775cc6e0
 SHA512 
d3ed210ff25f4c05393b0039cb4a73a6ceb8b42ba3d776e0469da2362899d3f76564cc6a06965b7de91f38517e1cd4ff4b18c00185d2b1a0af5a34ecf0d9dd44
-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 opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz 397901 
BLAKE2B 
9adbe14ee3a2c90b890be694aa80d65b67e23a23f47ccabee4564e31eb9857d717b5a751df32004cfa5d6a53a9e1d8ea8d8943b705a0eaea5ca741169ef6
 SHA512 
8a92555aed2ac8752818586ab9762dd96ec128c5465cb87e402f15b15d16f7d371b3de045ef7295526e9ef99ec817766bb685a21d24dba29c650cf44e384a4e3
@@ -12,4 +7,3 @@ DIST 
opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz 63301261 BL
 DIST opencv_3rdparty-a8b69ccc738421293254aec5ddb38bd523503252.tar.gz 920403 
BLAKE2B 
5f834e8ccef9d88d0650f8ae5d215a2d07d0a356aaad4de1622068e0b2a7def88fccc84bc4397f0182732e836fcd6e363ae25a2cdeaa4d458a7d8ef9afc81da5
 SHA512 
5611b9db40477759213ab35320570c198f1f224f92ca801ca3accd1f7620faf3d44f306e44abefd10be118acee9b56da643ca82abaa7c4d2102fe92e5b298a6e
 DIST opencv_3rdparty-b2bfc75f6aea5b1f834ff0f0b865a7c18ff1459f.tar.gz 10036903 
BLAKE2B 
c13559569808db24105049e2081bc466c0e8b6dab58bcc69001e49ff82e03ec4701e25648b5e542b7df2c8e522abfbd82c9825e66c37d6a673847b41bf6effae
 SHA512 
3fc44f12802aa1dad0b12372d53242ae2134a2d74ca0b6d8e4639551623426106781a41d77ebfce79ac625a49aec26b0d7425e0d31f09bab6a15e3d43caef8bc
 DIST opencv_3rdparty-fccf7cd6a4b12079f73bbfb

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

2024-02-04 Thread Andreas Sturmlechner

commit: 5c080f8d73d1351815fa52e13155c6a12093693f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  4 10:39:56 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  4 12:44:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c080f8d

media-libs/opencv: Fix build with >=dev-libs/protobuf-22

Urgent fix since someone decided to bump dev-libs/protobuf-22.5 ...

Closes: https://bugs.gentoo.org/909087
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../opencv/files/opencv-4.8.1-protobuf-22.patch| 190 +
 media-libs/opencv/opencv-4.8.1-r1.ebuild   |   4 +-
 2 files changed, 193 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencv/files/opencv-4.8.1-protobuf-22.patch 
b/media-libs/opencv/files/opencv-4.8.1-protobuf-22.patch
new file mode 100644
index ..1e8a369777a5
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.8.1-protobuf-22.patch
@@ -0,0 +1,190 @@
+From 6f3dde396f6eed53afcd5cc882402e18ff7c1ca8 Mon Sep 17 00:00:00 2001
+From: Kumataro 
+Date: Sat, 7 Oct 2023 10:11:25 +0900
+Subject: [PATCH] 3rdparty: supporting protobuf v22 and later
+
+subsumes:
+
+- dnn: disable some tests for external protobuf
+- use GREATER instead of GREATER_EQUAL and remove new blank line at EOF
+- fix for BUILD_TESTS=OFF
+- Use Config mode in CMake.
+
+(cleaning up review noise)
+
+---
+ cmake/OpenCVFindProtobuf.cmake   | 35 +++-
+ modules/dnn/CMakeLists.txt   |  6 ++
+ modules/dnn/test/test_layers.cpp | 24 ++
+ 3 files changed, 56 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/OpenCVFindProtobuf.cmake b/cmake/OpenCVFindProtobuf.cmake
+index 8835347..5b1e175 100644
+--- a/cmake/OpenCVFindProtobuf.cmake
 b/cmake/OpenCVFindProtobuf.cmake
+@@ -30,8 +30,14 @@ if(BUILD_PROTOBUF)
+   set(Protobuf_LIBRARIES "libprotobuf")
+   set(HAVE_PROTOBUF TRUE)
+ else()
++  # we still need this for command PROTOBUF_GENERATE_CPP.
++  set(protobuf_MODULE_COMPATIBLE ON)
++
+   unset(Protobuf_VERSION CACHE)
+-  find_package(Protobuf QUIET)
++  find_package(Protobuf QUIET CONFIG)
++  if(NOT Protobuf_FOUND)
++find_package(Protobuf QUIET)
++  endif()
+ 
+   # Backwards compatibility
+   # Define camel case versions of input variables
+@@ -67,6 +73,20 @@ else()
+   endif()
+ endif()
+ 
++# See https://github.com/opencv/opencv/issues/24369
++# In Protocol Buffers v22.0 and later drops C++11 support and depends 
abseil-cpp.
++#   Details: https://protobuf.dev/news/2022-08-03/
++# And if std::text_view is in abseil-cpp requests C++17 and later.
++
++if(HAVE_PROTOBUF)
++  if(NOT (Protobuf_VERSION VERSION_LESS 22))
++if((CMAKE_CXX_STANDARD EQUAL 98) OR (CMAKE_CXX_STANDARD LESS 17))
++  message(STATUS "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is too old to 
support protobuf(${Protobuf_VERSION}) and/or abseil-cpp. Use C++17 or later. 
Turning HAVE_PROTOBUF off")
++  set(HAVE_PROTOBUF FALSE)
++endif()
++  endif()
++endif()
++
+ if(HAVE_PROTOBUF AND PROTOBUF_UPDATE_FILES AND NOT COMMAND 
PROTOBUF_GENERATE_CPP)
+   message(FATAL_ERROR "Can't configure protobuf dependency 
(BUILD_PROTOBUF=${BUILD_PROTOBUF} 
PROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES})")
+ endif()
+@@ -74,15 +94,20 @@ endif()
+ if(HAVE_PROTOBUF)
+   list(APPEND CUSTOM_STATUS protobuf)
+   if(NOT BUILD_PROTOBUF)
++unset( __location)
+ if(TARGET "${Protobuf_LIBRARIES}")
+   get_target_property(__location "${Protobuf_LIBRARIES}" 
IMPORTED_LOCATION_RELEASE)
+   if(NOT __location)
+ get_target_property(__location "${Protobuf_LIBRARIES}" 
IMPORTED_LOCATION)
+   endif()
+-elseif(Protobuf_LIBRARY)
+-  set(__location "${Protobuf_LIBRARY}")
+-else()
+-  set(__location "${Protobuf_LIBRARIES}")
++endif()
++
++if(NOT __location)
++  if(Protobuf_LIBRARY)
++set(__location "${Protobuf_LIBRARY}")
++  else()
++set(__location "${Protobuf_LIBRARIES}")
++  endif()
+ endif()
+   endif()
+   list(APPEND CUSTOM_STATUS_protobuf "Protobuf:"
+diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt
+index 804b78e..9fcc460 100644
+--- a/modules/dnn/CMakeLists.txt
 b/modules/dnn/CMakeLists.txt
+@@ -245,6 +245,12 @@ ocv_create_module(${libs} ${dnn_runtime_libs})
+ ocv_add_samples()
+ ocv_add_accuracy_tests(${dnn_runtime_libs})
+ 
++if(NOT BUILD_PROTOBUF)
++  if(TARGET opencv_test_dnn)
++ocv_target_compile_definitions(opencv_test_dnn PRIVATE 
"OPENCV_DNN_EXTERNAL_PROTOBUF=1")
++  endif()
++endif()
++
+ set(perf_path "${CMAKE_CURRENT_LIST_DIR}/perf")
+ file(GLOB_RECURSE perf_srcs "${perf_path}/*.cpp")
+ file(GLOB_RECURSE perf_hdrs "${perf_path}/*.hpp" "${perf_path}/*.h")
+diff --git a/modules/dnn/test/test_layers.cpp 
b/modules/dnn/test/test_layers.cpp
+index 763d94b..6cb6d54 100644
+--- a/modules/dnn/test/test_layers.cpp
 b/modules/dnn/test/test_layers.cpp
+@@ -756,11 +756,15 @@ TEST_F(Layer_RNN_Test, get_set_te

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

2024-01-10 Thread Sam James

commit: 0e9205edb9922309ecd568b7085fd59726c7d2ca
Author: Paul Zander  gmail  com>
AuthorDate: Fri Dec  8 14:58:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 10 12:32:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e9205ed

media-libs/opencv: add 4.8.1-r1

Closes: https://bugs.gentoo.org/702258
Closes: https://bugs.gentoo.org/830294
Closes: https://bugs.gentoo.org/883375
Closes: https://bugs.gentoo.org/913740
Closes: https://bugs.gentoo.org/914922
Closes: https://bugs.gentoo.org/917121
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/opencv/Manifest |   7 +
 .../files/opencv-4.8.1-ade-0.1.2a.tar.gz.patch |  18 +
 .../opencv-4.8.1-drop-python2-detection.patch  |  23 +
 ...ncv-4.8.1-eliminate-lto-compiler-warnings.patch |  36 ++
 .../opencv/files/opencv-4.8.1-libpng16.patch   |  58 ++
 .../opencv/files/opencv-4.8.1-opencv_test.patch|  18 +
 .../files/opencv-4.8.1-python3_12-support.patch|  25 +
 .../opencv-4.8.1-use-system-flatbuffers.patch  |  36 ++
 .../files/opencv-4.8.1-use-system-opencl.patch |  25 +
 ...rib-4.8.1-NVIDIAOpticalFlowSDK-2.0.tar.gz.patch |  20 +
 .../opencv/files/opencv_contrib-4.8.1-rgbd.patch   |  15 +
 media-libs/opencv/metadata.xml |  34 +-
 media-libs/opencv/opencv-4.8.1-r1.ebuild   | 644 +
 13 files changed, 945 insertions(+), 14 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4c83059fb2d5..293a8806aa85 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,5 @@
+DIST NVIDIAOpticalFlowSDK-edb50da3cf849840d680249aa6dbef248ebce2ca.tar.gz 8771 
BLAKE2B 
f579960448bdaf57fbefd5e88002d8f6f4dbb828429b0f3a0112916c03039d4e4de65263eb8464a4d62924c1b77f0a61c2d93b7307657439bfbf7d59785f1533
 SHA512 
85dfdc52260f54f62c980508f4b6ab384e44200bd1c13761c4947f9a898c08f0faed2d734a85a4ba7a46f8788ed58ee89f12f61cee97881b69ba626bbd04f655
+DIST ade-0.1.2a.tar.gz 116737 BLAKE2B 
9ac2af2f21aab8cb5d599e0b653bb6126642588e508f55e5fbfe5ce9607267f25e5187fd31ed69349064551c06e15b2ba548319708ed5f70e7761470775cc6e0
 SHA512 
d3ed210ff25f4c05393b0039cb4a73a6ceb8b42ba3d776e0469da2362899d3f76564cc6a06965b7de91f38517e1cd4ff4b18c00185d2b1a0af5a34ecf0d9dd44
 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
@@ -5,4 +7,9 @@ DIST opencv-4.8.0.tar.gz 91992565 BLAKE2B 
eede5479acdcef7dfb49d260b696ed14e85a27
 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 opencv_3rdparty-34e4206aef44d50e6bbcd0ab06354b52e7466d26.tar.gz 397901 
BLAKE2B 
9adbe14ee3a2c90b890be694aa80d65b67e23a23f47ccabee4564e31eb9857d717b5a751df32004cfa5d6a53a9e1d8ea8d8943b705a0eaea5ca741169ef6
 SHA512 
8a92555aed2ac8752818586ab9762dd96ec128c5465cb87e402f15b15d16f7d371b3de045ef7295526e9ef99ec817766bb685a21d24dba29c650cf44e384a4e3
+DIST opencv_3rdparty-8afa57abc8229d611c4937165d20e2a2d9fc5a12.tar.gz 63301261 
BLAKE2B 
923dc944edfda4c292d42207290bee414bfe21998f6ffe341ea3b38b6f2f581f3a243653e2c1fd3fa86084068ad6e7acd5ca73ab43094aa15f124d379833a5d8
 SHA512 
68cce870da0846cbd12a093ec7896b510e34590

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

2023-11-22 Thread Sam James

commit: 8912df505fed8b242f01d5ee8d78b23c7a72fd86
Author: Paul Zander  gmail  com>
AuthorDate: Tue Nov 21 15:05:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 22 11:39:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8912df50

media-libs/opencv: 4.8.x fix for compatibility with CUDA Toolkit >= 12.2.0

Closes: https://bugs.gentoo.org/915775
Closes: https://bugs.gentoo.org/917675
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33928
Signed-off-by: Sam James  gentoo.org>

 .../files/opencv-4.8.0-fix-cuda-12.2.0.patch   | 40 ++
 media-libs/opencv/opencv-4.8.0-r1.ebuild   |  1 +
 media-libs/opencv/opencv-4.8.0.ebuild  |  1 +
 media-libs/opencv/opencv-4.8.1.ebuild  |  1 +
 4 files changed, 43 insertions(+)

diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch 
b/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch
new file mode 100644
index ..fd7d12af2644
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.8.0-fix-cuda-12.2.0.patch
@@ -0,0 +1,40 @@
+https://github.com/opencv/opencv/pull/24104
+https://github.com/opencv/opencv/commit/5466fd2606ca6df57bbe43f064d2ae73fe4329eb
+https://bugs.gentoo.org/915775
+
+From ab8cb6f8a9034da2a289b84685c6d959266029be Mon Sep 17 00:00:00 2001
+From: cudawarped <12133430+cudawar...@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/opencv-4.8.0-r1.ebuild 
b/media-libs/opencv/opencv-4.8.0-r1.ebuild
index 2910615c0b36..ad47071aba4d 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -295,6 +295,7 @@ PATCHES=(
"${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}-4.8.0-fix-cuda-12.2.0.patch
 )
 
 pkg_pretend() {

diff --git a/media-libs/opencv/opencv-4.8.0.ebuild 
b/media-libs/opencv/opencv-4.8.0.ebuild
index 772cd8408d98..82322d2d67fb 100644
--- a/media-libs/opencv/opencv-4.8.0.ebuild
+++ b/media-libs/opencv/opencv-4.8.0.ebuild
@@ -290,6 +290,7 @@ PATCHES=(
"${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-cuda-12.2.0.patch
 )
 
 pkg_pretend() {

diff --git a/media-libs/opencv/opencv-4.8.1.ebuild 
b/media-libs/opencv/opencv-4.8.1.ebuild
index 0bfc5cab4674..3f219f22a627 100644
--- a/media-libs/opencv/opencv-4.8.1.ebuild
+++ b/media-libs/opencv/opencv-4.8.1.ebuild
@@ -300,6 +300,7 @@ PATCHES=(
"${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}-4.8.0-fix-cuda-12.2.0.patch
 )
 
 pkg_pretend() {

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

2023-08-27 Thread Sam James

commit: 4e6bb1138e0e8009b6e66b479e417d4d7c066fda
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 28 03:44:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 28 04:03:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6bb113

media-libs/opencv: fix build on (some) arm64

See patch for details.

Closes: https://bugs.gentoo.org/913031
Signed-off-by: Sam James  gentoo.org>

 .../opencv/files/opencv-4.8.0-arm64-fp16.patch | 272 +
 media-libs/opencv/opencv-4.8.0-r1.ebuild   |   1 +
 2 files changed, 273 insertions(+)

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
new file mode 100644
index ..84e36f88e6f7
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch
@@ -0,0 +1,272 @@
+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 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 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 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 CV_FP16
+ float16_t* wptrWino_FP16 = nullptr;
+ if (conv->useFP16)
+ {
+@@ -264,7 +264,7 @@ Ptr initFastConv(
+ }
+ 
+ // repack the data.
+-#ifdef CONV_ARM_FP16
++#if 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 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 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 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 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 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
+ {
+

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

2022-09-14 Thread Andreas Sturmlechner

commit: 118a0104ca9c4a75c1caf1b2c9eff1e7f9d7b02d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 14 08:34:27 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 09:18:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118a0104

media-libs/opencv: Fix IUSE=examples

Closes: https://bugs.gentoo.org/830163
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/opencv-4.6.0-fix-build-examples.patch | 21 +
 media-libs/opencv/opencv-4.6.0-r2.ebuild|  1 +
 2 files changed, 22 insertions(+)

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
new file mode 100644
index ..3cc6328a2323
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch
@@ -0,0 +1,21 @@
+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/opencv-4.6.0-r2.ebuild 
b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index 49f04357d294..8cca419b41eb 100644
--- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -290,6 +290,7 @@ PATCHES=(
"${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}"/${P}-fix-build-examples.patch # bug 830163, pending 
upstream PR #22245
 )
 
 pkg_pretend() {

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

2022-04-18 Thread Matt Turner

commit: db31e728d75e3ea0f74c259846c1786856c4a5e4
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 19 05:49:33 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 19 05:49:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db31e728

media-libs/opencv: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 media-libs/opencv/Manifest |   4 -
 .../opencv/files/opencv-4.5.2-lapack-3.10.patch| 123 -
 media-libs/opencv/opencv-4.5.2-r3.ebuild   | 573 
 media-libs/opencv/opencv-4.5.2-r5.ebuild   | 574 
 media-libs/opencv/opencv-4.5.4.ebuild  | 585 -
 media-libs/opencv/opencv-4.5.5.ebuild  | 583 
 6 files changed, 2442 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4d32599e1140..cf43ea8cfd9e 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,10 +1,6 @@
 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.5.2.tar.gz 88925795 BLAKE2B 
625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3
 SHA512 
07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
-DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B 
d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879
 SHA512 
72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
-DIST opencv-4.5.4.tar.gz 89724634 BLAKE2B 
76ce5ab8182c87e5f9e18faf62f2ee0eb629e4997877c59aa0f6ac334c27d737cf5205f4b85f64cabfdd587a57096fa3241ae6e48cebbd963ec8ad3ebe07ad35
 SHA512 
39a7af95bc30d427c6df5e5d481469ab1ceea7878a93ae5c119991333e877a88d0a644e17dc6bd316e64b2840e48411a97f1b2397a8000719c5cec32751fa954
-DIST opencv-4.5.4_contrib.tar.gz 61054226 BLAKE2B 
c553bfc6fd1b5fd17f562b27248ddd4bd946089cd8cce346f152b47d4a8a22faa35ceb9bd501c31901189b884d782fbfec1dc041d69e1b8cc0ac0d5d079e610e
 SHA512 
a48d4b5d764170814d9027fdf50f61bb4a24f0b5a547dded79d06b948f86443f14734efc7bbb708b3870781cafc6bc9e3092d35dac34a81da2bf1740d5f93ff9
 DIST opencv-4.5.5.tar.gz 89879893 BLAKE2B 
6f2ce34b33132ad544d661417f730e17aedfbe17a22048ad0b8d287970626756c51309410d0fb5bf487af773ff4415d36b6768158ebc3cb963b37bb888ee4ba6
 SHA512 
4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02
 DIST opencv-4.5.5_contrib.tar.gz 60563220 BLAKE2B 
4a020824688e379f1d127fb834b0008b3cbf78acea4847cb4994e9e0b6ddfeec3f06867967b8546725cf050c1fd0df042a18caff80463ad101cf14dc66daea9a
 SHA512 
8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 
1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63
 SHA512 
4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44

diff --git a/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch 
b/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch
deleted file mode 100644
index 31e2fc60d121..
--- a/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-https://bugs.gentoo.org/800539
-
 a/modules/core/src/hal_internal.cpp
-+++ b/modules/core/src/hal_internal.cpp
-@@ -163,9 +163,9 @@
- if(n == 1 && b_step == sizeof(fptype))
- {
- if(typeid(fptype) == typeid(float))
--sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, 
&lapackStatus);
-+LAPACK_sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, 
&lapackStatus);
- else if(typeid(fptype) == typeid(double))
--

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

2021-05-31 Thread Michał Górny

commit: a4e93c7f16e365035d6c40dec0d1db9ff050caaa
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May 31 20:48:17 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May 31 20:53:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e93c7f

media-libs/opencv: Remove old

Signed-off-by: Michał Górny  gentoo.org>

 media-libs/opencv/Manifest |   2 -
 media-libs/opencv/files/opencv-3.0.0-gles.patch|  14 -
 .../files/opencv-4.1.2-pkg-config-file.patch   |  11 -
 media-libs/opencv/opencv-4.1.2-r3.ebuild   | 498 -
 4 files changed, 525 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 20748a1ff12..d09b3e97e0c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,7 +1,5 @@
 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.1.2.tar.gz 87468598 BLAKE2B 
9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c
 SHA512 
d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
-DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B 
c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb5590fe44dab7545e4cc308
 SHA512 
1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
 DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 
89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d
 SHA512 
7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
 DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B 
bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3
 SHA512 
c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f
 DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 
4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52
 SHA512 
b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17

diff --git a/media-libs/opencv/files/opencv-3.0.0-gles.patch 
b/media-libs/opencv/files/opencv-3.0.0-gles.patch
deleted file mode 100644
index a2629d928e8..000
--- a/media-libs/opencv/files/opencv-3.0.0-gles.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: opencv-2.4.11/modules/highgui/src/window_QT.cpp
-===
 opencv-2.4.11.orig/modules/highgui/src/window_QT.cpp
-+++ opencv-2.4.11/modules/highgui/src/window_QT.cpp
-@@ -3118,7 +3118,9 @@ void OpenGlViewPort::updateGl()
- 
- void OpenGlViewPort::initializeGL()
- {
-+#ifdef GL_PERSPECTIVE_CORRECTION_HINT
- glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-+#endif
- }
- 
- void OpenGlViewPort::resizeGL(int w, int h)

diff --git a/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch 
b/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch
deleted file mode 100644
index 496216186af..000
--- a/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/cmake/templates/opencv-XXX.pc.in 2019-12-04 21:28:09.686525699 +0100
-+++ b/cmake/templates/opencv-XXX.pc.in 2019-12-04 21:29:21.319265154 +0100
-@@ -3,7 +3,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir_old=@includedir@/opencv
-+includedir_old=@includedir@/opencv2
- includedir_new=@includedir@
- 
- Name: OpenCV

diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild 
b/media-libs/opencv/opencv-4.1.2-r3.ebuild
deleted file mode 100644
index de4bb53e8da..000
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sampl

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

2020-11-02 Thread Sam James

commit: c92eaa6a7d93400503334e9c65df2b8e400ab90f
Author: Ross Charles Campbell  gmail  com>
AuthorDate: Sun Oct 18 14:59:46 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  3 07:18:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c92eaa6a

media-libs/opencv: various fixes

 - Explicitly depends on virtual/lapacke to prevent its cmake build scripts from
implicitly disabling lapack support when it can't find lapacke.h.

 - Link with cblas when sci-libs/lapack is supplimented as the default lapack
implementation.

 - examples USE requires contribdnn USE to be enabled to prevent build failure.

Closes: https://bugs.gentoo.org/700176
Closes: https://bugs.gentoo.org/749681
Closes: https://bugs.gentoo.org/717812
Closes: https://bugs.gentoo.org/701790
Closes: https://bugs.gentoo.org/704518
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Ross Charles Campbell  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17964
Signed-off-by: Sam James  gentoo.org>

 .../opencv-4.5.0-link-with-cblas-for-lapack.patch  | 18 ++
 media-libs/opencv/opencv-4.5.0.ebuild  |  8 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..acee677052d
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.5.0-link-with-cblas-for-lapack.patch
@@ -0,0 +1,18 @@
+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/opencv-4.5.0.ebuild 
b/media-libs/opencv/opencv-4.5.0.ebuild
index 54bb9292356..21f4784aa91 100644
--- a/media-libs/opencv/opencv-4.5.0.ebuild
+++ b/media-libs/opencv/opencv-4.5.0.ebuild
@@ -70,6 +70,7 @@ REQUIRED_USE="
contribovis? ( contrib )
contribsfm? ( contrib eigen gflags glog )
contribxfeatures2d? ( contrib download )
+   examples? ( contribdnn )
java? ( python )
opengl? ( qt5 )
python? ( ${PYTHON_REQUIRED_USE} )
@@ -111,7 +112,11 @@ RDEPEND="
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
-   lapack? ( virtual/lapack )
+   lapack? (
+   virtual/cblas
+   virtual/lapack
+   virtual/lapacke
+   )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
opengl? (
@@ -274,6 +279,7 @@ PATCHES=(
"${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
 )
 
 pkg_pretend() {

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

2020-06-25 Thread Andreas Sturmlechner

commit: e00c8edae30e54a80c29fabf1ecac66462a5edde
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 25 07:56:35 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 25 17:07:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00c8eda

media-libs/opencv: Drop vulnerable 3.4.1-r7

Bug: https://bugs.gentoo.org/711284
Bug: https://bugs.gentoo.org/729504
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/opencv/Manifest |   3 -
 ...opencv-3.3.0-remove-tiny-dnn-autodownload.patch |  27 --
 .../files/opencv-3.4.1-compilation-C-mode.patch|  56 ---
 .../files/opencv-3.4.1-fix-build-with-va.patch |  26 --
 .../opencv/files/opencv-3.4.1-fix-on-x86.patch |  27 --
 media-libs/opencv/files/opencv-3.4.1-popcnt.patch  |  30 --
 .../opencv-3.4.1-python-lib-suffix-hack.patch  |  13 -
 .../opencv/files/opencv-3.4.1-python37.patch   |  12 -
 .../files/opencv-3.4.1-remove-git-autodetect.patch |  42 --
 media-libs/opencv/opencv-3.4.1-r7.ebuild   | 501 -
 10 files changed, 737 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 079529c915c..3f4b2dfa9bb 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,8 +1,5 @@
 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-3.4.1.tar.gz 87051748 BLAKE2B 
87c83ab9b3d7fb048263f047aa5d6e95b153e1a28f3e34cc885eff7eb080a2258cfa1aa494cd56b32f1098ab158c17c23fc8464fcbe70642a3a1842f2fd1b4ac
 SHA512 
e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b
-DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 
63d9d5cb088371754eb132607789c8f1d4820f3e0e486593d6f64ee8f918ea4362152f050baec16f17904c03a6cdc0abc6e5fb2510308dcbabebe97b29285fbc
 SHA512 
431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1
 DIST opencv-4.1.2.tar.gz 87468598 BLAKE2B 
9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c
 SHA512 
d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
 DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B 
c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb5590fe44dab7545e4cc308
 SHA512 
1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
-DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 
85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562
 SHA512 
5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 
1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63
 SHA512 
4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44

diff --git 
a/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch 
b/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
deleted file mode 100644
index 6929a4c2ce4..000
--- a/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -purN a/modules/dnn_modern/CMakeLists.txt 
b/modules/dnn_modern/CMakeLists.txt
 a/modules/dnn_modern/CMakeLists.txt2017-07-31 15:58:38.0 
+0100
-+++ b/modules/dnn_modern/CMakeLists.txt2018-01-15 17:15:15.202454388 
+
-@@ -15,23 +15,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CU
- # MODULE REQUIREMENTS
- # 
- 
--set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn")
--set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3")
--ocv_download(FILENAME "v1.0.0a3.tar.gz"
--   HASH "adb1c512e09ca2c7a6faef36f9c53e59"
--   URL
-- "${OPENCV_TINY_DNN_URL}"
--

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

2019-12-06 Thread Amy Liffey

commit: 93efdf78e5dea766ec0fb02840a59698a88b905b
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Dec  6 20:35:45 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Dec  6 20:37:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93efdf78

media-libs/opencv: fix pkg-config file generation

Closes: https://bugs.gentoo.org/701662
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amy Liffey  gentoo.org>

 .../files/opencv-4.1.2-pkg-config-file.patch   |  11 +
 media-libs/opencv/opencv-4.1.2-r2.ebuild   | 497 +
 2 files changed, 508 insertions(+)

diff --git a/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch 
b/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch
new file mode 100644
index 000..496216186af
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch
@@ -0,0 +1,11 @@
+--- a/cmake/templates/opencv-XXX.pc.in 2019-12-04 21:28:09.686525699 +0100
 b/cmake/templates/opencv-XXX.pc.in 2019-12-04 21:29:21.319265154 +0100
+@@ -3,7 +3,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+-includedir_old=@includedir@/opencv
++includedir_old=@includedir@/opencv2
+ includedir_new=@includedir@
+ 
+ Name: OpenCV

diff --git a/media-libs/opencv/opencv-4.1.2-r2.ebuild 
b/media-libs/opencv/opencv-4.1.2-r2.ebuild
new file mode 100644
index 000..5f9efaf9134
--- /dev/null
+++ b/media-libs/opencv/opencv-4.1.2-r2.ebuild
@@ -0,0 +1,497 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
+
+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
 )
+   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="BSD"
+SLOT="0/4.1.2" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d 
cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 
cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt 
cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnnsamples 
-download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer 
gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp opencvapps 
pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+# 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.
+REQUIRED_USE="
+   cuda? ( tesseract? ( opencl ) )
+   dnnsamples? ( examples )
+   gflags? ( contrib )
+   glog? ( contrib )
+   contribcvv? ( contrib qt5 )
+   contribdnn? ( contrib )
+   contribhdf? ( contrib )
+   contribsfm? ( contrib eigen gflags glog )
+   contribxfeatures2d? ( contrib download )
+   java? ( python )
+   opengl? ( || ( gtk qt5 ) )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   tesseract? ( contrib )"
+
+# 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? ( !qt5 )
+#  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= )
+   contribhdf? ( sci-libs/hdf5:= )
+   ffmpeg? (
+   libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
+   !libav? ( 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}]
+   )
+   gtk? (
+   dev-libs/glib:2[${MULTILIB_USEDEP}]
+   x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+   opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
+   )
+   ieee1394? (
+   media-libs/libdc1394[${MULTILIB_USEDEP}]
+

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

2019-03-31 Thread Amy Liffey

commit: 42ffb447e4f3a045a9613c9c8b85f55b9dfbab7e
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Mar 31 14:47:51 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Mar 31 18:52:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ffb447

media-libs/opencv: fix build on x86

- Add upstream patch found by kensington to fix build on x86

Closes: https://bugs.gentoo.org/682104
Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 .../opencv/files/opencv-3.4.1-fix-on-x86.patch | 27 ++
 media-libs/opencv/opencv-3.4.1-r5.ebuild   |  1 +
 2 files changed, 28 insertions(+)

diff --git a/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch 
b/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch
new file mode 100644
index 000..f36d643cf73
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-fix-on-x86.patch
@@ -0,0 +1,27 @@
+From 7dc162cb4252ccf461f1c63650abde3c8807b79c Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin 
+Date: Mon, 9 Apr 2018 18:25:51 +0300
+Subject: [PATCH] core: fix mm_pause() for non-SSE i386 builds
+
+replaced to safe binary compatible 'rep; nop' asm instruction
+---
+ modules/core/src/parallel_impl.cpp | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules/core/src/parallel_impl.cpp 
b/modules/core/src/parallel_impl.cpp
+index 78d9eb63694..bc64fce7a81 100644
+--- a/modules/core/src/parallel_impl.cpp
 b/modules/core/src/parallel_impl.cpp
+@@ -49,7 +49,11 @@ DECLARE_CV_YIELD
+ DECLARE_CV_PAUSE
+ #endif
+ #ifndef CV_PAUSE
+-#if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
++# if defined __GNUC__ && (defined __i386__ || defined __x86_64__)
++#   if !defined(__SSE__)
++  static inline void cv_non_sse_mm_pause() { __asm__ __volatile__ ("rep; 
nop"); }
++# define _mm_pause cv_non_sse_mm_pause
++#   endif
+ #   define CV_PAUSE(v) do { for (int __delay = (v); __delay > 0; --__delay) { 
_mm_pause(); } } while (0)
+ # elif defined __GNUC__ && defined __aarch64__
+ #   define CV_PAUSE(v) do { for (int __delay = (v); __delay > 0; --__delay) { 
asm volatile("yield" ::: "memory"); } } while (0)

diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild 
b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index 092e2a0d7eb..cb9bc604ea9 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -234,6 +234,7 @@ PATCHES=(
"${FILESDIR}/${P}-remove-git-autodetect.patch"
"${FILESDIR}/${P}-fix-build-with-va.patch" # bug 
https://bugs.gentoo.org/656576
"${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900
+   "${FILESDIR}/${P}-fix-on-x86.patch" # https://bugs.gentoo.org/682104
 )
 
 pkg_pretend() {

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

2019-01-24 Thread Amy Liffey

commit: feeb7a004035ddf5a3c45b19399165cff76c6f82
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Jan 24 08:54:25 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Jan 24 09:24:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feeb7a00

media-libs/opencv: fix popcnt detection

Closes: https://bugs.gentoo.org/633900
Submitted-by:  Branko Grubic  gmail.com>
Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 media-libs/opencv/files/opencv-3.4.1-popcnt.patch | 30 +++
 media-libs/opencv/opencv-3.4.1-r5.ebuild  |  1 +
 2 files changed, 31 insertions(+)

diff --git a/media-libs/opencv/files/opencv-3.4.1-popcnt.patch 
b/media-libs/opencv/files/opencv-3.4.1-popcnt.patch
new file mode 100644
index 000..51a6d554a25
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-popcnt.patch
@@ -0,0 +1,30 @@
+From a2d6fc7ac040c6ef94a36515f9ea24428f8f1ecc Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin 
+Date: Tue, 24 Apr 2018 12:40:25 +0300
+Subject: [PATCH] cmake: fix popcnt detection
+
+via GCC/Clang __POPCNT__ define
+---
+ cmake/checks/cpu_popcnt.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/checks/cpu_popcnt.cpp b/cmake/checks/cpu_popcnt.cpp
+index 16e5575108b..44c7deda053 100644
+--- a/cmake/checks/cpu_popcnt.cpp
 b/cmake/checks/cpu_popcnt.cpp
+@@ -4,12 +4,14 @@
+ #define CV_POPCNT_U64 _mm_popcnt_u64
+ #  endif
+ #  define CV_POPCNT_U32 _mm_popcnt_u32
+-#else
++#elif defined(__POPCNT__)
+ #  include 
+ #  if defined(__x86_64__)
+ #define CV_POPCNT_U64 __builtin_popcountll
+ #  endif
+ #  define CV_POPCNT_U32 __builtin_popcount
++#else
++#  error "__POPCNT__ is not defined by compiler"
+ #endif
+ 
+ int main()

diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild 
b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index 45086698e73..c8bf140695b 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -233,6 +233,7 @@ PATCHES=(
"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
"${FILESDIR}/${P}-remove-git-autodetect.patch"
"${FILESDIR}/${P}-fix-build-with-va.patch" # bug 
https://bugs.gentoo.org/656576
+   "${FILESDIR}/${P}-popcnt.patch" # https://bugs.gentoo.org/633900
 )
 
 pkg_pretend() {

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

2019-01-17 Thread Amy Liffey

commit: 510d7eb712901d372fba19bccc96e9d23855bae4
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Jan 17 08:59:50 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Jan 17 18:12:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510d7eb7

media-libs/opencv: add missing build dep

Closes: https://bugs.gentoo.org/656576
Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../files/opencv-3.4.1-fix-build-with-va.patch | 26 ++
 media-libs/opencv/opencv-3.4.1-r5.ebuild   |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch 
b/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch
new file mode 100644
index 000..813eb7e4ae6
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch
@@ -0,0 +1,26 @@
+From 20f5fa8e3e880bc8b2e5156e9f25f7fb756ed8e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= 
+Date: Wed, 28 Feb 2018 19:21:31 +
+Subject: [PATCH] Fix build with VA
+
+This commit readd ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES}
+that was missed in commit 2200e13c7193e0fe9db4b9f7c4bee3a7ef043909
+
+diff --git a/samples/va_intel/CMakeLists.txt 
b/samples/va_intel/CMakeLists.txt
+-ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} 
${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
++  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} 
${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
+---
+ samples/va_intel/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt
+index af51dd32061..04f2ea5fd40 100644
+--- a/samples/va_intel/CMakeLists.txt
 b/samples/va_intel/CMakeLists.txt
+@@ -17,5 +17,5 @@ 
ocv_include_modules_recurse(${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
+ file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+ foreach(sample_filename ${all_samples})
+   ocv_define_sample(tgt ${sample_filename} va_intel)
+-  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} 
${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
++  ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} 
${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
+ endforeach()

diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild 
b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index 4b41ad5b750..45086698e73 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -105,7 +105,8 @@ DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
contrib_dnn? ( dev-libs/cereal )
eigen? ( dev-cpp/eigen:3 )
-   java?  ( >=virtual/jdk-1.6 )"
+   java?  ( >=virtual/jdk-1.6 )
+   vaapi?  ( x11-libs/libva )"
 
 MULTILIB_WRAPPED_HEADERS=(
/usr/include/opencv2/cvconfig.h
@@ -231,6 +232,7 @@ PATCHES=(
"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
"${FILESDIR}/${P}-remove-git-autodetect.patch"
+   "${FILESDIR}/${P}-fix-build-with-va.patch" # bug 
https://bugs.gentoo.org/656576
 )
 
 pkg_pretend() {

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

2017-09-19 Thread Amy Liffey

commit: 742fba96406dc63f2f3696674dbc303258d9a76d
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Sep 19 13:55:28 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Sep 19 13:55:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742fba96

media-libs/opencv: remove too big patch

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-libs/opencv/Manifest |   1 +
 .../opencv/files/opencv-3.3.0-imgcodecs-gcc.patch  | 902 -
 ...{opencv-3.3.0.ebuild => opencv-3.3.0-r1.ebuild} |   3 +-
 3 files changed, 3 insertions(+), 903 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 1f375ff71d5..feb1a990ef8 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,4 @@
+DIST imgcodecs-opencv-3.3.0.tar.gz 7724 SHA256 
5d1ef31142ed42e06b2bb71134da7e5fae5e94e70896aae26ac2dc0baa74a161 SHA512 
9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
 WHIRLPOOL 
fbf18817a3f6e82d2ce1ecad237b223244328208fe9926033133c2126e785a1ad3fbf06b69113a94996d624e73003564ea9ce2314ffbdecfb0ea3fd67308084d
 DIST opencv-2.4.13.tar.gz 91669572 SHA256 
94ebcca61c30034d5fb16feab8ec12c8a868f5162d20a9f0396f0f5f6d8bbbff SHA512 
efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
 WHIRLPOOL 
9fdbf2e47edeb8c177cb03ed5dc129475dd704c022975bc875d444a6e6c3df630f1151e738cf07fbe48343d0eb87723091131063fe776c63a386c46c0153f1d5
 DIST opencv-2.4.13.zip 94319943 SHA256 
fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 
b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b
 WHIRLPOOL 
86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455
 DIST opencv-3.1.0.tar.gz 76135587 SHA256 
f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 
57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f
 WHIRLPOOL 
b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4

diff --git a/media-libs/opencv/files/opencv-3.3.0-imgcodecs-gcc.patch 
b/media-libs/opencv/files/opencv-3.3.0-imgcodecs-gcc.patch
deleted file mode 100644
index d4ec2feb0b2..000
--- a/media-libs/opencv/files/opencv-3.3.0-imgcodecs-gcc.patch
+++ /dev/null
@@ -1,902 +0,0 @@
-From 0d854db361106dfcb055231fd0112c5b85ef2287 Mon Sep 17 00:00:00 2001
-From: Alexander Alekhin 
-Date: Tue, 15 Aug 2017 21:45:05 +
-Subject: [PATCH 1/3] build: workaround GCC 7.1.1 compilation issue with
- sanitize flags
-
-Version: gcc (GCC) 7.1.1 20170622 (Red Hat 7.1.1-3)
-Flags: -fsanitize=address,undefined

- modules/ts/src/cuda_test.cpp | 56 ++--
- 1 file changed, 33 insertions(+), 23 deletions(-)
-
-diff --git a/modules/ts/src/cuda_test.cpp b/modules/ts/src/cuda_test.cpp
-index a48e0a08719..eb4cee13622 100644
 a/modules/ts/src/cuda_test.cpp
-+++ b/modules/ts/src/cuda_test.cpp
-@@ -322,16 +322,20 @@ namespace cvtest
- 
- if (m1.size() != m2.size())
- {
--return AssertionFailure() << "Matrices \"" << expr1 << "\" and 
\"" << expr2 << "\" have different sizes : \""
--  << expr1 << "\" [" << 
PrintToString(m1.size()) << "] vs \""
--  << expr2 << "\" [" << 
PrintToString(m2.size()) << "]";
-+std::stringstream msg;
-+msg << "Matrices \"" << expr1 << "\" and \"" << expr2 << "\" have 
different sizes : \""
-+<< expr1 << "\" [" << PrintToString(m1.size()) << "] vs \""
-+<< expr2 << "\" [" << PrintToString(m2.size()) << "]";
-+return AssertionFailure() << msg.str();
- }
- 
- if (m1.type() != m2.type())
- {
--return AssertionFailure() << "Matrices \"" << expr1 << "\" and 
\"" << expr2 << "\" have different types : \""
--  << expr1 << "\" [" << 
PrintToString(MatType(m1.type())) << "] vs \""
--  << expr2 << "\" [" << 
PrintToString(MatType(m2.type())) << "]";
-+std::stringstream msg;
-+msg << "Matrices \"" << expr1 << "\" and \"" << expr2 << "\" have 
different types : \""
-+<< expr1 << "\" [" << PrintToString(MatType(m1.type())) << "] 
vs \""
-+<< expr2 << "\" [" << PrintToString(MatType(m2.type())) << 
"]";
-+ return AssertionFailure() << msg.str();
- }
- 
- Mat diff;
-@@ -343,12 +347,14 @@ namespace cvtest
- 
- if (maxVal > eps)
- {
--return AssertionFailure() << "The max diff

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

2017-09-19 Thread Amy Liffey

commit: bf987cafbb90f2c798f98539141121d20ddfd796
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Sep 19 07:46:54 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Sep 19 07:52:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf987caf

media-libs/opencv: version bump 3.3.0 bug #629534

- Patch for CVEs bug #627958
- Add required use for bug #621986
- Version bump fixes bug #627954

Closes: https://bugs.gentoo.org/629534

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-libs/opencv/Manifest |   2 +
 .../files/opencv-3.3.0-contrib-xfeatures2d.patch   |  19 +
 .../opencv/files/opencv-3.3.0-imgcodecs-gcc.patch  | 902 +
 media-libs/opencv/opencv-3.3.0.ebuild  | 354 
 4 files changed, 1277 insertions(+)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index a529669fefa..1f375ff71d5 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -4,4 +4,6 @@ DIST opencv-3.1.0.tar.gz 76135587 SHA256 
f00b3c4f42acda07d89031a2ebb5ebe390764a1
 DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 
478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 
d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a
 WHIRLPOOL 
18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353
 DIST opencv-3.2.0.tar.gz 78861546 SHA256 
b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 SHA512 
a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d
 WHIRLPOOL 
092c0c1195d80f89e0e2fd030a93eb80e7b83ce155fdcd9fa071248be20127a684922c83de73be9bf321d934e14b0b4e60cc78ab272ab9d39d6707da37db30d3
 DIST opencv-3.2.0_contrib.tar.gz 54765210 SHA256 
1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe SHA512 
eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
 WHIRLPOOL 
eb8f916c19474a58f4c2785e50dc261a31f684a917011473b94a19d26e4e9845c042f77196c000dd97543699b745360114cdd31cad549379b6394e9d727c72a8
+DIST opencv-3.3.0.tar.gz 81238534 SHA256 
8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6 SHA512 
13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
 WHIRLPOOL 
211496e559fa3a78b662329a5e21613fdc39b616155584311f82f3d7c733676bcb58d8e04ffda2d73658933240e16122212413fa1c2e6dfe764439c9460d7c41
+DIST opencv-3.3.0_contrib.tar.gz 54848519 SHA256 
e94acf39cd4854c3ef905e06516e5f74f26dddfa6477af89558fb40a57aeb444 SHA512 
ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
 WHIRLPOOL 
b186f673e276c4b8c4c5253fd17181f0e1b7bd4a0e0c74f15ab55ea5f2ee54a72fc295247c7bfcbfbedba1fc01b4c5e2a53a2a4eff79ab0480977a6eefc90c58
 DIST vgg_boostdesc-3.2.0.tar.gz 1867770 SHA256 
6da9c2465e2b36330fa5d5c45320a0667da5cb4eafd66a5b1f45feb2af047a27 SHA512 
4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 WHIRLPOOL 
5c78e43c95d40d103ac741248deb130bcb49a5b7e2cd012135572630b525b6f15a7f89948170c76545d97eb3815a000a2a1236ad24de2205eeb8938ee8eb0c12

diff --git a/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch 
b/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch
new file mode 100644
index 000..26e4ac767c3
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch
@@ -0,0 +1,19 @@
+--- a/modules/xfeatures2d/CMakeLists.txt   2017-09-16 14:28:38.44000 
+0200
 b/modules/xfeatures2d/CMakeLists.txt   2017-09-16 14:27:21.35000 
+0200
+@@ -2,11 +2,11 @@
+ 
+ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d 
opencv_calib3d OPTIONAL opencv_shape opencv_cudaarithm WRAP python java)
+ 
++#include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake)
++#include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake)
++#set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d")
++#download_boost_descriptors("${DOWNLOAD_DIR}" boost_status)
++#download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status)
+-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake)
+-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake)
+-set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d")
+-download_boost_descriptors("${DOWNLOAD_DIR}" boost_status)
+-download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status)
+ if(NOT boost_status OR NOT vgg_status)
+   ocv_module_disable(xfeatures2d)
+ endif()

diff --git a/media-libs/opencv/files/opencv-3.3.0-imgcodecs-gcc.patch 
b/media-libs/opencv/files/opencv-3.3.0-imgcodecs-gcc.patch
new file mode 100644
index 000..d4ec2fe

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

2017-09-01 Thread Amy Liffey

commit: a900af241376ab156509ae9a3832dfeb332d95b7
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Sep  1 11:34:13 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Sep  1 11:37:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a900af24

media-libs/opencv: 2.4.13 add imgcodecs patch bug #627958

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../opencv-2.4.13-imgcodecs-refactoring.patch  | 580 +
 ...cv-2.4.13-r1.ebuild => opencv-2.4.13-r2.ebuild} |   2 +-
 2 files changed, 581 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencv/files/opencv-2.4.13-imgcodecs-refactoring.patch 
b/media-libs/opencv/files/opencv-2.4.13-imgcodecs-refactoring.patch
new file mode 100644
index 000..d1bea36580f
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.13-imgcodecs-refactoring.patch
@@ -0,0 +1,580 @@
+From 72d29259ca741950527c8cca7fb649030c01f658 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin 
+Date: Tue, 15 Aug 2017 22:04:55 +
+Subject: [PATCH] imgcodecs: refactoring, improve code quality
+
+---
+ modules/core/include/opencv2/core/core.hpp   |   3 +
+ modules/core/include/opencv2/core/operations.hpp |   3 +
+ modules/highgui/src/bitstrm.cpp  |   2 +
+ modules/highgui/src/bitstrm.hpp  |  19 ++--
+ modules/highgui/src/grfmt_bmp.cpp|  13 ++-
+ modules/highgui/src/grfmt_pxm.cpp| 119 +-
+ modules/highgui/src/loadsave.cpp | 120 +++
+ 7 files changed, 207 insertions(+), 72 deletions(-)
+
+diff --git a/modules/core/include/opencv2/core/core.hpp 
b/modules/core/include/opencv2/core/core.hpp
+index 6bb295f5c73..86f4eb182b2 100644
+--- a/modules/core/include/opencv2/core/core.hpp
 b/modules/core/include/opencv2/core/core.hpp
+@@ -3248,6 +3248,9 @@ template class AutoBuffer
+ //! returns read-only pointer to the real buffer, stack-allocated or 
head-allocated
+ operator const _Tp* () const;
+ 
++//! returns number of allocated elements
++size_t getSize() const;
++
+ protected:
+ //! pointer to the real buffer, can point to buf if the buffer is small 
enough
+ _Tp* ptr;
+diff --git a/modules/core/include/opencv2/core/operations.hpp 
b/modules/core/include/opencv2/core/operations.hpp
+index 1b7484aded2..37fd3d97c7a 100644
+--- a/modules/core/include/opencv2/core/operations.hpp
 b/modules/core/include/opencv2/core/operations.hpp
+@@ -2581,6 +2581,9 @@ template inline 
AutoBuffer<_Tp, fixed_size>::op
+ template inline AutoBuffer<_Tp, 
fixed_size>::operator const _Tp* () const
+ { return ptr; }
+ 
++template inline size_t AutoBuffer<_Tp, 
fixed_size>::getSize() const
++{ return size; }
++
+ 
+ /// Ptr 

+ 
+diff --git a/modules/highgui/src/bitstrm.cpp b/modules/highgui/src/bitstrm.cpp
+index dd8bec87cca..67792a27f28 100644
+--- a/modules/highgui/src/bitstrm.cpp
 b/modules/highgui/src/bitstrm.cpp
+@@ -208,6 +208,8 @@ int  RLByteStream::getByte()
+ current = m_current;
+ }
+ 
++CV_Assert(current < m_end);
++
+ val = *((uchar*)current);
+ m_current = current + 1;
+ return val;
+diff --git a/modules/highgui/src/bitstrm.hpp b/modules/highgui/src/bitstrm.hpp
+index 57956beb539..b22987bc911 100644
+--- a/modules/highgui/src/bitstrm.hpp
 b/modules/highgui/src/bitstrm.hpp
+@@ -48,13 +48,20 @@
+ namespace cv
+ {
+ 
+-enum
+-{
+-RBS_THROW_EOS=-123,  //  exception code
+-RBS_THROW_FORB=-124,  //  exception code
+-RBS_HUFF_FORB=2047,  // forrbidden huffman code "value"
+-RBS_BAD_HEADER=-125 // invalid header
++#define DECLARE_RBS_EXCEPTION(name) \
++class RBS_ ## name ## _Exception : public cv::Exception \
++{ \
++public: \
++RBS_ ## name ## _Exception(int code_, const String& err_, const String& 
func_, const String& file_, int line_) : \
++cv::Exception(code_, err_, func_, file_, line_) \
++{} \
+ };
++DECLARE_RBS_EXCEPTION(THROW_EOS)
++#define RBS_THROW_EOS RBS_THROW_EOS_Exception(CV_StsError, "Unexpected end of 
input stream", CV_Func, __FILE__, __LINE__)
++DECLARE_RBS_EXCEPTION(THROW_FORB)
++#define RBS_THROW_FORB RBS_THROW_FORB_Exception(CV_StsError, "Forrbidden 
huffman code", CV_Func, __FILE__, __LINE__)
++DECLARE_RBS_EXCEPTION(BAD_HEADER)
++#define RBS_BAD_HEADER RBS_BAD_HEADER_Exception(CV_StsError, "Invalid 
header", CV_Func, __FILE__, __LINE__)
+ 
+ typedef unsigned long ulong;
+ 
+diff --git a/modules/highgui/src/grfmt_bmp.cpp 
b/modules/highgui/src/grfmt_bmp.cpp
+index c8f8218cd3b..026b317467d 100644
+--- a/modules/highgui/src/grfmt_bmp.cpp
 b/modules/highgui/src/grfmt_bmp.cpp
+@@ -115,8 +115,9 @@ bool  BmpDecoder::readHeader()
+ 
+ if( m_bpp <= 8 )
+ {
+-memset( m_palette, 0, sizeof(m_palette));
+-m_strm.getBytes( m_palette, (clrused == 0? 1< 2 ) // absolute mode
+

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

2017-06-06 Thread Amy Liffey

commit: 4f5b990bd068f98184e7ecfabf461a33275569c5
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Jun  6 14:42:31 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Jun  6 14:42:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f5b990b

media-libs/opencv: disable pch for gcc-6.0 bug #617654

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-libs/opencv/Manifest |   1 +
 .../opencv/files/opencv-2.4.13-gcc-6.0.patch   |  23 ++
 media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch |  11 +
 media-libs/opencv/opencv-2.4.13-r1.ebuild  | 240 +++
 media-libs/opencv/opencv-3.2.0-r1.ebuild   | 330 +
 5 files changed, 605 insertions(+)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 040a0468305..a529669fefa 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,4 @@
+DIST opencv-2.4.13.tar.gz 91669572 SHA256 
94ebcca61c30034d5fb16feab8ec12c8a868f5162d20a9f0396f0f5f6d8bbbff SHA512 
efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
 WHIRLPOOL 
9fdbf2e47edeb8c177cb03ed5dc129475dd704c022975bc875d444a6e6c3df630f1151e738cf07fbe48343d0eb87723091131063fe776c63a386c46c0153f1d5
 DIST opencv-2.4.13.zip 94319943 SHA256 
fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 
b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b
 WHIRLPOOL 
86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455
 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

diff --git a/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch 
b/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch
new file mode 100644
index 000..b0a5084752c
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch
@@ -0,0 +1,23 @@
+From fb598bb76a0431aa3a880ecfa45054c996a070fb Mon Sep 17 00:00:00 2001
+From: Maksim Shabunin 
+Date: Fri, 13 May 2016 13:28:09 +0300
+Subject: [PATCH] Disabled PCH support for gcc >= 6.0.0
+
+Command line generation routine uses "-isystem" to include headers outside of 
"/modules" folder, but GCC 6 does not work when passed "-isystem 
/usr/include" option.
+---
+ cmake/OpenCVPCHSupport.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/OpenCVPCHSupport.cmake b/cmake/OpenCVPCHSupport.cmake
+index 13619daf27e..e6585cae020 100644
+--- a/cmake/OpenCVPCHSupport.cmake
 b/cmake/OpenCVPCHSupport.cmake
+@@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+ ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+ OUTPUT_VARIABLE gcc_compiler_version)
+ #MESSAGE("GCC Version: ${gcc_compiler_version}")
+-IF(gcc_compiler_version VERSION_GREATER "4.2.-1")
++IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version 
VERSION_LESS "6.0.0")
+ SET(PCHSupport_FOUND TRUE)
+ ENDIF()
+ 

diff --git a/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch 
b/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch
new file mode 100644
index 000..457d3595e49
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch
@@ -0,0 +1,11 @@
+--- a/cmake/OpenCVPCHSupport.cmake 2017-06-06 15:05:09.180022719 +0200
 b/cmake/OpenCVPCHSupport.cmake 2017-06-06 15:05:50.775022684 +0200
+@@ -14,7 +14,7 @@
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+ 
+-IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2.0")
++IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version 
VERSION_LESS "6.0.0")
+ SET(PCHSupport_FOUND TRUE)
+ ENDIF()
+ 

diff --git a/media-libs/opencv/opencv-2.4.13-r1.ebuild 
b/media-libs/opencv/opencv-2.4.13-r1.ebuild
new file mode 100644
index 000..b57b2652493
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.13-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A c

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

2017-04-16 Thread Amy Liffey

commit: 07d392554c7c60474bba42bd03cf978572e62976
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Apr 16 14:11:02 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Apr 16 14:15:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d39255

media-libs/opencv: version bump 3.2.0 bug #604982

Package-Manager: portage-2.3.3

 media-libs/opencv/Manifest |   3 +
 ...cv-3.2.0-contrib_xfeatures2d-autodownload.patch |  10 +
 media-libs/opencv/files/opencv-3.2.0-vtk.patch |  11 +
 media-libs/opencv/metadata.xml |   5 +-
 media-libs/opencv/opencv-3.2.0.ebuild  | 329 +
 5 files changed, 356 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4b12e50eae0..040a0468305 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,6 @@
 DIST opencv-2.4.13.zip 94319943 SHA256 
fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 
b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b
 WHIRLPOOL 
86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455
 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
+DIST opencv-3.2.0.tar.gz 78861546 SHA256 
b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 SHA512 
a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d
 WHIRLPOOL 
092c0c1195d80f89e0e2fd030a93eb80e7b83ce155fdcd9fa071248be20127a684922c83de73be9bf321d934e14b0b4e60cc78ab272ab9d39d6707da37db30d3
+DIST opencv-3.2.0_contrib.tar.gz 54765210 SHA256 
1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe SHA512 
eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
 WHIRLPOOL 
eb8f916c19474a58f4c2785e50dc261a31f684a917011473b94a19d26e4e9845c042f77196c000dd97543699b745360114cdd31cad549379b6394e9d727c72a8
+DIST vgg_boostdesc-3.2.0.tar.gz 1867770 SHA256 
6da9c2465e2b36330fa5d5c45320a0667da5cb4eafd66a5b1f45feb2af047a27 SHA512 
4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 WHIRLPOOL 
5c78e43c95d40d103ac741248deb130bcb49a5b7e2cd012135572630b525b6f15a7f89948170c76545d97eb3815a000a2a1236ad24de2205eeb8938ee8eb0c12

diff --git 
a/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch 
b/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch
new file mode 100644
index 000..f03c57d425c
--- /dev/null
+++ 
b/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch
@@ -0,0 +1,10 @@
+--- a/modules/xfeatures2d/CMakeLists.txt   2017-02-28 13:10:56.47000 
+0100
 b/modules/xfeatures2d/CMakeLists.txt   2017-02-28 13:11:03.97000 
+0100
+@@ -1,5 +1,5 @@
+ set(the_description "Contributed/Experimental Algorithms for Salient 2D 
Features Detection")
+ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d 
opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml
+   OPTIONAL opencv_cudaarithm WRAP python java)
+-include(cmake/download_vgg.cmake)
+-include(cmake/download_boostdesc.cmake)
++#include(cmake/download_vgg.cmake)
++#include(cmake/download_boostdesc.cmake)

diff --git a/media-libs/opencv/files/opencv-3.2.0-vtk.patch 
b/media-libs/opencv/files/opencv-3.2.0-vtk.patch
new file mode 100644
index 000..1e3daec8aa3
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.2.0-vtk.patch
@@ -0,0 +1,11 @@
+--- a/cmake/OpenCVDetectVTK.cmake  2017-03-20 10:43:28.401962910 +0100
 b/cmake/OpenCVDetectVTK.cmake  2017-03-20 10:43:09.127963906 +0100
+@@ -8,7 +8,7 @@
+   IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a 
var.
+   find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} 
vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture 
vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE)
+   ELSE(VTK_RENDERING_BACKEN

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

2016-11-07 Thread Amy Winston

commit: 7701033807a21a0c5c52780efa1a1b059e3e9b95
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Mon Nov  7 12:47:07 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Tue Nov  8 06:51:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77010338

media-libs/opencv: revision bump to 3.1.0-r6

* Update SRC_URI to the new URLs
* Switch to downloading the tar.gz instead zip file
* Add git hash to end of contrib download to allow revision bumps
* Updated revision of contrib modules to fix various errors
* Remove Qt 4 support to follow the new Gentoo standard
* Use new OpenMP test logic
* Added patch to build against CUDA v8.
  Patch based on one submitted by Sven Eden
  Gentoo-bug: 598674
  Gentoo-bug: 597754
* Added Tesseract use flag and fixed building against it.
  Gentoo-bug: 572836
  Gentoo-bug: 584428
* Added use flag for the SFM module because of dependencies
  on several Google libraries
  Gentoo-bug: 597166
* Added use flag for the HDF module because of a dependency
  on media-libs/hdaf5
  Gentoo-bug: 596212
* Added use flag for the CVV module because it will silently
  fail if Qt 5 is not installed.
* Added patch to fix the finding of certain libraries
  Gentoo-Bug: 584478

Signed-off by: Jonathan Scruggs (j.scruggs  gmail.com)

 media-libs/opencv/Manifest |   2 +
 .../files/opencv-3.1.0-find-libraries-fix.patch|  48 
 .../opencv-3.1.0-remove-graphcut-for-cuda-8.patch  |  23 ++
 media-libs/opencv/metadata.xml |   6 +
 media-libs/opencv/opencv-3.1.0-r6.ebuild   | 296 +
 5 files changed, 375 insertions(+)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 82a9d48..624ef49 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,5 +1,7 @@
 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.tar.gz 76135587 SHA256 
f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 
57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f
 WHIRLPOOL 
b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4
 DIST opencv-3.1.0.zip 79186131 SHA256 
1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 
b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a
 WHIRLPOOL 
3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
+DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 
478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 
d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a
 WHIRLPOOL 
18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353
 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

diff --git a/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch 
b/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch
new file mode 100644
index ..52f4db6
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch
@@ -0,0 +1,48 @@
+diff -purN a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
+--- a/cmake/OpenCVFindLibsGrfmt.cmake  2015-12-18 15:02:16.0 +

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

2016-11-07 Thread Amy Winston

commit: a6629e1c0dbbbc67db09b096ca7a2c54eae73dc1
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Mon Nov  7 17:43:43 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Tue Nov  8 06:52:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6629e1c

media-libs/opencv: Remove old ebuilds and patches Some ebuilds don't work, so 
there's no point in keeping them.

Since OpenCV 3.0.0 is no longer in the tree, the following can
be closed:
Gentoo-bug: 566080
Gentoo-bug: 557328

Signed-off by: Jonathan Scruggs (j.scruggs  gmail.com)

 media-libs/opencv/Manifest |   4 -
 .../files/opencv-2.4.11-git-autodetect.patch   |  57 ---
 .../opencv/files/opencv-3.0.0-git-autodetect.patch |  41 ---
 .../files/opencv-3.1.0-fix-hal-headers.patch   |  91 -
 .../files/opencv-3.1.0-fix-ocl-declaration.patch   | 214 ---
 .../files/opencv-3.1.0-invalid-string-usage.patch  |  75 
 .../files/opencv-contrib-find-hdf5-fix.patch   | 392 -
 media-libs/opencv/opencv-2.4.12.ebuild | 217 
 media-libs/opencv/opencv-3.0.0.ebuild  | 221 
 media-libs/opencv/opencv-3.1.0-r4.ebuild   | 268 --
 media-libs/opencv/opencv-3.1.0-r5.ebuild   | 300 
 11 files changed, 1880 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 624ef49..9838733 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,7 +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.tar.gz 76135587 SHA256 
f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 
57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f
 WHIRLPOOL 
b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4
-DIST opencv-3.1.0.zip 79186131 SHA256 
1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 
b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a
 WHIRLPOOL 
3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
 DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 
478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 
d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a
 WHIRLPOOL 
18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353
-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

diff --git a/media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch 
b/media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch
deleted file mode 100644
index 12a5ca0..
--- a/media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
 opencv-2.4.11/work/opencv-2.4.11/CMakeLists.txt.old2016-04-07 
14:20:23.874972922 +0200
-+++ opencv-2.4.11/work/opencv-2.4.11/CMakeLists.txt2016-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 varia

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

2016-06-09 Thread Amy Winston

commit: dbd568dda672d12c7bf7b6a3b4522e3631af1bb3
Author: Amy Winston  gentoo  org>
AuthorDate: Thu Jun  9 18:23:58 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Jun  9 18:25:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd568dd

media-libs/opencv: eapi=6 bump

- Fix cuda bug #577410
- Add qt5 support
- Remove doc useflag bug #556198

Package-Manager: portage-2.2.28

 .../files/opencv-2.4.12-git-autodetect.patch   |   4 +-
 media-libs/opencv/opencv-2.4.12-r1.ebuild  | 241 +
 2 files changed, 243 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch 
b/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
index e981c37..8d6fcaf 100644
--- a/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
+++ b/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
@@ -1,5 +1,5 @@
 opencv-2.4.12/work/opencv-2.4.12/CMakeLists.txt.old2016-04-07 
14:44:17.461912634 +0200
-+++ opencv-2.4.12/work/opencv-2.4.12/CMakeLists.txt2016-04-07 
14:45:10.674910396 +0200
+--- a/CMakeLists.txt   2016-04-07 14:44:17.461912634 +0200
 b/CMakeLists.txt   2016-04-07 14:45:10.674910396 +0200
 @@ -388,32 +388,32 @@
  # 
  

diff --git a/media-libs/opencv/opencv-2.4.12-r1.ebuild 
b/media-libs/opencv/opencv-2.4.12-r1.ebuild
new file mode 100644
index 000..16b48f7
--- /dev/null
+++ b/media-libs/opencv/opencv-2.4.12-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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.org";
+
+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 +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
+   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 )
+"
+
+PATCHES=(
+   "${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"
+   )
+
+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 || die
+
+   java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+   if use openmp; then
+   tc-has-openmp || die "Please switch to

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

2016-05-15 Thread Amy Winston

commit: d110a79b0ff04ac125b2b1339606fe2e8dbcae7f
Author: Amy Winston  gentoo  org>
AuthorDate: Sun May 15 13:48:35 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Sun May 15 13:51:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d110a79b

media-libs/opencv: remove old 2.4.9 and 2.4.10

Package-Manager: portage-2.2.26

 media-libs/opencv/Manifest |   2 -
 .../files/opencv-2.4.10-git-autodetect.patch   |  57 --
 .../opencv/files/opencv-2.4.10-pic-x86.patch   |  49 --
 media-libs/opencv/files/opencv-2.4.9-cuda.patch|  89 ---
 .../opencv/files/opencv-2.4.9-git-autodetect.patch |  59 --
 media-libs/opencv/files/opencv-2.4.9-libav10.patch | 748 -
 media-libs/opencv/opencv-2.4.10.ebuild | 219 --
 media-libs/opencv/opencv-2.4.9.ebuild  | 220 --
 8 files changed, 1443 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 800ac58..485d82b 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,7 +1,5 @@
-DIST opencv-2.4.10.zip 91692581 SHA256 
1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 SHA512 
545345f2984bda9ec5e5f0947077c5f40028ea018cbb21362f33615e5a02d5ed19a51c77a9b183086534e6496509dd008f9d7d40c2efc46bf2a942c710b4424c
 WHIRLPOOL 
3231c1f6b766b39a44b10354532037f5f9f856bd1533c205cc39a1a3758aa53dd4d15595127fd6d1c1d2b6b7bdafe64521ca833c036a5075de4b298218d4bf0c
 DIST opencv-2.4.11.zip 91671436 SHA256 
af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea SHA512 
748f6b939200a7ad2c2ae2531bf9bf38b82a576530f10691c13a0ad52568a7eb8b9d312e946ba8e78f592ef05ae389ecb982544f0c00cb83a2d87ae4b4da61b0
 WHIRLPOOL 
1c621b835fb144997ecbabddaa1b9a0cd0653e27c5a4f2abc43f3c6152a0b98eb0941d59263be33f69a6f3bccdffa484455c2ddaa747ed4a2bd2cd3192956d29
 DIST opencv-2.4.12.zip 93261101 SHA256 
2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 
3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05
 WHIRLPOOL 
86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
-DIST opencv-2.4.9.zip 91684751 SHA256 
803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 
8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62
 WHIRLPOOL 
5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
 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

diff --git a/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch 
b/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch
deleted file mode 100644
index 9349864..000
--- a/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
 opencv-2.4.10/work/opencv-2.4.10/CMakeLists.txt.old2016-04-07 
14:17:10.524981054 +0200
-+++ opencv-2.4.10/work/opencv-2.4.10/CMakeLists.txt2016-04-07 
14:13:38.726989961 +0200
-@@ -375,32 +375,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_advance

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

2016-03-02 Thread Amy Winston

commit: 5dfc738e3025c2559923c8bb72d7c4399aaec89b
Author: Amy Winston  gentoo  org>
AuthorDate: Wed Mar  2 12:10:06 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Wed Mar  2 12:10:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfc738e

media-libs/opencv: revert drop old 3.1.0-r1 and patches

This reverts commit 48656e3b700cf6d771db428bc6dde322753839d3.

 .../files/opencv-3.1.0-fix-hal-headers.patch   |  91 
 .../files/opencv-3.1.0-fix-ocl-declaration.patch   | 214 +
 .../files/opencv-3.1.0-invalid-string-usage.patch  |  75 ++
 media-libs/opencv/opencv-3.1.0-r1.ebuild   | 252 +
 4 files changed, 632 insertions(+)

diff --git a/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch 
b/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch
new file mode 100644
index 000..dd77571
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch
@@ -0,0 +1,91 @@
+From f529a1df2b17bcada1179ddcaf1352e3a5ba97b8 Mon Sep 17 00:00:00 2001
+From: Maksim Shabunin 
+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 
+ #include 
++#include 
+ 
+ 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(y);
+ uchar* mask_row = mask.ptr(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 
+ 
+ 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 {
+ 

diff --git a/media-libs/opencv/files/opencv-3.1.0-fix-ocl-declaration.patch 
b/media-libs/opencv/files/opencv-3.1.0-fix-ocl-declaration.patch
new file mode 100644
index 000..e9a190c
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-fix-ocl-declaration.patch
@@ -0,0 +1,214 @@
+From ac8dd366e4a1877e0af16961a4094496bed955f7 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin 
+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_cont

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

2016-01-23 Thread Amy Winston

commit: f753262e119064afbaf11b171be9c33aff217557
Author: Amy Winston  gentoo  org>
AuthorDate: Sat Jan 23 17:48:16 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Sat Jan 23 17:51:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f753262e

media-libs/opencv: 3.1.0 version bump bug #571496

Package-Manager: portage-2.2.24

 media-libs/opencv/Manifest |   1 +
 .../files/opencv-3.1.0-cmake-no-opengl.patch   |  22 ++
 .../files/opencv-3.1.0-fix-hal-headers.patch   |  91 
 .../files/opencv-3.1.0-fix-ocl-declaration.patch   | 214 +
 .../files/opencv-3.1.0-invalid-string-usage.patch  |  75 ++
 media-libs/opencv/metadata.xml |   2 +
 media-libs/opencv/opencv-3.1.0.ebuild  | 252 +
 7 files changed, 657 insertions(+)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 57bffd8..86ee2a5 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -2,4 +2,5 @@ DIST opencv-2.4.10.zip 91692581 SHA256 
1bf4cb87283797fd91669d4f90b622a677a903c20
 DIST opencv-2.4.11.zip 91671436 SHA256 
af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea SHA512 
748f6b939200a7ad2c2ae2531bf9bf38b82a576530f10691c13a0ad52568a7eb8b9d312e946ba8e78f592ef05ae389ecb982544f0c00cb83a2d87ae4b4da61b0
 WHIRLPOOL 
1c621b835fb144997ecbabddaa1b9a0cd0653e27c5a4f2abc43f3c6152a0b98eb0941d59263be33f69a6f3bccdffa484455c2ddaa747ed4a2bd2cd3192956d29
 DIST opencv-2.4.9.zip 91684751 SHA256 
803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 
8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62
 WHIRLPOOL 
5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
 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_contrib.zip 76144299 SHA256 
ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 
9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf
 WHIRLPOOL 
411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843

diff --git a/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch 
b/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch
new file mode 100644
index 000..d6d70d71
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch
@@ -0,0 +1,22 @@
+From cdb9c60dcb65e04e7c0bd6bef9b86841191c785a Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin 
+Date: Thu, 31 Dec 2015 02:24:54 +0300
+Subject: [PATCH] gpu samples: fix REMOVE_ITEM error
+
+---
+ samples/gpu/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
+index 6085cac..852a8c2 100644
+--- a/samples/gpu/CMakeLists.txt
 b/samples/gpu/CMakeLists.txt
+@@ -97,7 +97,7 @@ endif()
+ if(INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh 
*.dsp *.cmd )
+   if(NOT WITH_OPENGL)
+-list(REMOVE_ITEM all_samples "opengl.cpp")
++list(REMOVE_ITEM install_list "opengl.cpp")
+   endif(NOT WITH_OPENGL)
+   install(FILES ${install_list}
+   DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu

diff --git a/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch 
b/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch
new file mode 100644
index 000..dd77571
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch
@@ -0,0 +1,91 @@
+From f529a1df2b17bcada1179ddcaf1352e3a5ba97b8 Mon Sep 17 00:00:00 2001
+From: Maksim Shabunin 
+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 
+ #include

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/, media-libs/opencv/files/, profiles/arch/x86/, ...

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

26 matches

Site Navigation

Mail list logo

Footer information