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

2024-01-10 Thread Sam James 
commit: 75eee21436198227c02ae33e67d718c626cc2646
Author: Paul Zander  gmail  com>
AuthorDate: Fri Jan  5 21:20:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 10 12:41:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75eee214

media-libs/opencv: 4.8.0-r1 drop broken protobuf patch

This might be the cause for runtime failures.
Bug: https://bugs.gentoo.org/916189

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

 .../opencv/files/opencv-4.8.0-fix-protobuf.patch | 20 
 ...opencv-4.8.0-r1.ebuild => opencv-4.8.0-r2.ebuild} |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch 
b/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch
deleted file mode 100644
index 937e00e0c024..
--- a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/cmake/OpenCVFindProtobuf.cmake
-+++ b/cmake/OpenCVFindProtobuf.cmake
-@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF)
-   set(HAVE_PROTOBUF TRUE)
- else()
-   unset(Protobuf_VERSION CACHE)
--  find_package(Protobuf QUIET)
-+  find_package(protobuf)
- 
-   # Backwards compatibility
-   # Define camel case versions of input variables
-@@ -50,7 +50,7 @@ else()
-   endforeach()
-   # end of compatibility block
- 
--  if(Protobuf_FOUND)
-+  if(protobuf_FOUND)
- if(TARGET protobuf::libprotobuf)
-   set(Protobuf_LIBRARIES "protobuf::libprotobuf")
- else()

diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild 
b/media-libs/opencv/opencv-4.8.0-r2.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-4.8.0-r1.ebuild
rename to media-libs/opencv/opencv-4.8.0-r2.ebuild
index e5f917168501..2671f7fab885 100644
--- a/media-libs/opencv/opencv-4.8.0-r1.ebuild
+++ b/media-libs/opencv/opencv-4.8.0-r2.ebuild
@@ -87,7 +87,7 @@ REQUIRED_USE="
 
 RDEPEND="
app-arch/bzip2[${MULTILIB_USEDEP}]
-   dev-libs/protobuf:=[${MULTILIB_USEDEP}]
+

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

2024-01-03 Thread Andreas Sturmlechner 
commit: ea50a5c540e7e8730230b9a54521173c4ea0d521
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan  3 20:58:50 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  3 21:28:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea50a5c5

media-libs/opencv: Cleanup vulnerable <4.8.0 and overshadowed 4.8.0

Bug: https://bugs.gentoo.org/906106
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/opencv/Manifest |   4 -
 .../files/opencv-4.6.0-fix-build-examples.patch|  21 -
 .../opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch   |  19 -
 media-libs/opencv/opencv-4.6.0-r4.ebuild   | 582 
 media-libs/opencv/opencv-4.7.0-r1.ebuild   | 584 
 media-libs/opencv/opencv-4.7.0.ebuild  | 581 
 media-libs/opencv/opencv-4.8.0.ebuild  | 585 -
 7 files changed, 2376 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index eb95310084f5..4c83059fb2d5 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.6.0.tar.gz 90208971 BLAKE2B 
f01a907eb4a54fc0795293f1a28bbf3af5a3d237293293f6ef5275646207d48b3d634b2d91e7011407176405b60c7e4383076e520ceb56f92b09c36e97333148
 SHA512 
93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46
-DIST opencv-4.6.0_contrib.tar.gz 59667769 BLAKE2B 
26b454436d943d7955194fd21ad29efc417d5c873fa19a6a200beb319cd75c6ec5766734c478fcd55745a7c200ffdaa92e7b1821f13810bb9d181d263f8fc6da
 SHA512 
2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d
-DIST opencv-4.7.0.tar.gz 91027497 BLAKE2B 
c76ae37a79e48f818b83383f35b4fe518d959e4e34651dc16346438eeba31cbfd5c970c27e30cad359c8ad91435e9bdb61cad147f08e671d4c844cb8c5b525f9
 SHA512 
f799e1eb4ef1eb81212319cf908d0a64d2d5179c8da86b919b06e96a6870a9f3ed33251223a841b71711349018ea6782c174179fa59958a1573e22d11cc9347d
-DIST opencv-4.7.0_contrib.tar.gz 59421940 BLAKE2B 
d427743c45d7430f3a6dd5712ad46bb7c2b9e88a48a3e924fb32c6a10cdb1f4205941453cc3e1340f02cd53ba5a13061f0da9a7e413072a6bd4a6529507b0939
 SHA512 
f0d878180655de4255cb72cf358a5949dfcf53a386e74f9a743902ac1bae12b2e812a1fc4ecc56a6afdc6adbffec867883a3245ce0b527614cc76e3710e23230
 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

diff --git a/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch 
b/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch
deleted file mode 100644
index 3cc6328a2323..
--- a/media-libs/opencv/files/opencv-4.6.0-fix-build-examples.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 5acf351e4b9d099d446f401df690d559ed5dfdad Mon Sep 17 00:00:00 2001
-From: Prasanth R 
-Date: Thu, 14 Jul 2022 13:34:54 +0530
-Subject: [PATCH] #21804 Add opencv_gapi as dep to samples/cpp
-

- samples/cpp/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/samples/cpp/CMakeLists.txt

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

2023-08-28 Thread Sam James 
commit: f86f0e650d2bc739837a28cd32bc4c255cca258a
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 28 06:43:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 28 06:43:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f86f0e65

media-libs/opencv: fix amd64 build (oops)

Bug: https://bugs.gentoo.org/913031
Closes: https://bugs.gentoo.org/913131
Fixes: 4e6bb1138e0e8009b6e66b479e417d4d7c066fda
Signed-off-by: Sam James  gentoo.org>

 .../opencv/files/opencv-4.8.0-arm64-fp16.patch | 56 +++---
 1 file changed, 28 insertions(+), 28 deletions(-)

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
index 84e36f88e6f7..6bf04daf58ae 100644
--- a/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch
+++ b/media-libs/opencv/files/opencv-4.8.0-arm64-fp16.patch
@@ -23,7 +23,7 @@ Signed-off-by: Sam James 
  
  conv->useFP16 = false;
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  // TODO: add FP16 support for Winograd.
  if (_useFP16 && (conv->conv_type == CONV_TYPE_GENERIC || conv->conv_type 
== CONV_TYPE_DEPTHWISE_REMAIN))
  conv->useFP16 = true;
@@ -32,7 +32,7 @@ Signed-off-by: Sam James 
  int nweights = C * padded_ksize;
  
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  if (conv->useFP16)
  {
  conv->weightsBuf_FP16.resize(nweights + VEC_ALIGN);
@@ -41,7 +41,7 @@ Signed-off-by: Sam James 
  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
++#if defined(CONV_ARM_FP16) && CV_FP16
  // FP 16
  const int CONV_WINO_ATOM_F16 = CONV_WINO_ATOM_F32 * 2;
  const int CONV_WINO_NATOMS_F16 = CONV_WINO_AREA / CONV_WINO_ATOM_F16;
@@ -50,7 +50,7 @@ Signed-off-by: Sam James 
  
  float* wptrWino = nullptr;
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  float16_t* wptrWino_FP16 = nullptr;
  if (conv->useFP16)
  {
@@ -59,7 +59,7 @@ Signed-off-by: Sam James 
  
  // repack the data.
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  if (conv->useFP16)
  {
  float16_t* wptr = wptrWino_FP16 + (g*Kg_nblocks + ki) * 
Cg *CONV_WINO_KBLOCK*CONV_WINO_AREA +
@@ -68,7 +68,7 @@ Signed-off-by: Sam James 
  float* weightsBufPtr = nullptr;
  
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  int numStripsMR_FP16 = (Kg + CONV_MR_FP16 - 1) / CONV_MR_FP16;
  int Kg_aligned_FP16 = numStripsMR_FP16 * CONV_MR_FP16;
  size_t nweights_FP16 = ngroups * Kg_aligned_FP16 * DkHkWkCg;
@@ -77,7 +77,7 @@ Signed-off-by: Sam James 
  
  // Pack the weight.
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  if (conv->useFP16)
  {
  parallel_for_(Range(0, ngroups * numStripsMR_FP16), [&](const 
Range& r0){
@@ -86,7 +86,7 @@ Signed-off-by: Sam James 
  float* inptrInC = (float* )inptrIn;
  
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  float16_t* inpbufC_FP16 = (float16_t *)inpbufC;
  if (esz == sizeof(float16_t))
  {
@@ -95,7 +95,7 @@ Signed-off-by: Sam James 
  float* inptrInC = inptrIn;
  
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  float16_t* inpbufC_FP16 = (float16_t *)inpbufC;
  if (esz == sizeof(float16_t))
  {
@@ -104,7 +104,7 @@ Signed-off-by: Sam James 
  }
  
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  // Fast convert float 32 to float16
  static inline void _cvt32f16f( const float* src, float16_t* dst, int len)
  {
@@ -113,7 +113,7 @@ Signed-off-by: Sam James 
  // Make special branch where memcpy() is called with a 
constant buffer size.
  // Compilers will likely unroll this loop properly.
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  if (useFP16)
  {
  for (int c = 0; c < Cg; c++, inptr += inp_planesize, 
inpbuf += CONV_NR_esz)
@@ -122,7 +122,7 @@ Signed-off-by: Sam James 
  else
  {
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16
  if (useFP16)
  {
  for (int c = 0; c < Cg; c++, inptr += inp_planesize, 
inpbuf += CONV_NR_esz)
@@ -131,7 +131,7 @@ Signed-off-by: Sam James 
  int w1 = std::min(Wk, (Wi - in_w + 
dilation_w-1)/dilation_w);
  const float* inptrInC = inptrIn;
 -#ifdef CONV_ARM_FP16
-+#if CV_FP16
++#if defined(CONV_ARM_FP16) && CV_FP16

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

2023-08-24 Thread Sam James 
commit: 83451b512b473dd0484daaa6c7eff4a4f26c15b9
Author: Huang Rui  gmail  com>
AuthorDate: Thu Aug 24 08:01:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 24 22:35:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83451b51

media-libs/opencv: fix build problem with contribdnn

- support tflite import with contribdnn
- add dev-libs/flatbuffers RDEPEND and fix build problem
- fix protobuf 23.3 build problem with contribdnn

Closes: https://bugs.gentoo.org/912788
Signed-off-by: Huang Rui  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32429
Signed-off-by: Sam James  gentoo.org>

 .../opencv/files/opencv-4.8.0-fix-flatbuffer.patch |  31 ++
 .../opencv/files/opencv-4.8.0-fix-protobuf.patch   |  20 +
 media-libs/opencv/opencv-4.8.0-r1.ebuild   | 588 +
 3 files changed, 639 insertions(+)

diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch 
b/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch
new file mode 100644
index ..395f0998a3b9
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch
@@ -0,0 +1,31 @@
+--- a/modules/dnn/misc/tflite/schema_generated.h   2023-06-28 
19:53:33.0 +0800
 b/modules/dnn/misc/tflite/schema_generated.h   2023-08-24 
15:17:19.594480034 +0800
+@@ -8,9 +8,9 @@
+ 
+ // Ensure the included flatbuffers.h is the same version as when this file was
+ // generated, otherwise it may not be compatible.
+-static_assert(FLATBUFFERS_VERSION_MAJOR == 23 &&
+-  FLATBUFFERS_VERSION_MINOR == 5 &&
+-  FLATBUFFERS_VERSION_REVISION == 9,
++static_assert(FLATBUFFERS_VERSION_MAJOR == FLATBUFFERS_VERSION_MAJOR &&
++  FLATBUFFERS_VERSION_MINOR == FLATBUFFERS_VERSION_MINOR &&
++  FLATBUFFERS_VERSION_REVISION == FLATBUFFERS_VERSION_REVISION,
+  "Non-compatible flatbuffers version included");
+ 
+ namespace opencv_tflite {
+--- a/cmake/OpenCVDetectFlatbuffers.cmake  2023-08-24 15:31:50.129947159 
+0800
 b/cmake/OpenCVDetectFlatbuffers.cmake  2023-08-24 15:36:15.176705845 
+0800
+@@ -1,9 +1,9 @@
+ if(WITH_FLATBUFFERS)
+   set(HAVE_FLATBUFFERS 1)
+-  set(flatbuffers_VERSION "23.5.9")
+-  ocv_install_3rdparty_licenses(flatbuffers 
"${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt")
+-  ocv_add_external_target(flatbuffers 
"${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1")
+-  set(CUSTOM_STATUS_flatbuffers "Flatbuffers:" "builtin/3rdparty 
(${flatbuffers_VERSION})")
++  #set(flatbuffers_VERSION "23.5.9")
++  #ocv_install_3rdparty_licenses(flatbuffers 
"${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt")
++  #ocv_add_external_target(flatbuffers 
"${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1")
++  #set(CUSTOM_STATUS_flatbuffers "Flatbuffers:" "builtin/3rdparty 
(${flatbuffers_VERSION})")
+ endif()
+ 
+ if(WITH_FLATBUFFERS OR HAVE_FLATBUFFERS)

diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch 
b/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch
new file mode 100644
index ..937e00e0c024
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch
@@ -0,0 +1,20 @@
+--- a/cmake/OpenCVFindProtobuf.cmake
 b/cmake/OpenCVFindProtobuf.cmake
+@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF)
+   set(HAVE_PROTOBUF TRUE)
+ else()
+   unset(Protobuf_VERSION CACHE)
+-  find_package(Protobuf QUIET)
++  find_package(protobuf)
+ 
+   # Backwards compatibility
+   # Define camel case versions of input variables
+@@ -50,7 +50,7 @@ else()
+   endforeach()
+   # end of compatibility block
+ 
+-  if(Protobuf_FOUND)
++  if(protobuf_FOUND)
+ if(TARGET protobuf::libprotobuf)
+   set(Protobuf_LIBRARIES "protobuf::libprotobuf")
+ else()

diff --git a/media-libs/opencv/opencv-4.8.0-r1.ebuild 
b/media-libs/opencv/opencv-4.8.0-r1.ebuild
new file mode 100644
index ..e4cc0a689fed
--- /dev/null
+++ b/media-libs/opencv/opencv-4.8.0-r1.ebuild
@@ -0,0 +1,588 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 cmake-multilib python-r1 
toolchain-funcs
+
+DESCRIPTION="A collection of algorithms and sample code for various computer 
vision problems"
+HOMEPAGE="https://opencv.org;
+TINY_DNN_PV="1.0.0a3"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+   dnnsamples? ( 
https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz
 )
+   download? ( 
https://github.com/rossbridger/opencv-extdep/archive/4.4.0.tar.gz -> 
${PN}-4.4.0_extdep.tar.gz )
+   contrib? (
+   https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> 
${P}_contrib.tar.gz
+   contribdnn? ( 
https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
+

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

2022-10-14 Thread Sam James 
commit: 2df30a8bd2f70b44639ed94b5ff8b1680944dae1
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 15 00:44:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 15 00:44:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df30a8b

media-libs/opencv: fix build with ffmpeg 5

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

 .../opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch  | 19 +++
 media-libs/opencv/opencv-4.6.0-r2.ebuild  |  1 +
 2 files changed, 20 insertions(+)

diff --git a/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch 
b/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch
new file mode 100644
index ..557576a8747a
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.6.0-fix-ffmpeg-5.patch
@@ -0,0 +1,19 @@
+https://github.com/opencv/opencv/issues/22418
+https://github.com/opencv/opencv/commit/496eed950f6d0e7fd92619d47e3cec8f06e96ace
+https://bugs.gentoo.org/876748
+
+From: Jochen Sprickerhof 
+Date: Mon, 8 Aug 2022 21:10:13 +0200
+Subject: [PATCH] Add missing header for LIBAVCODEC_VERSION_INT
+
+--- a/modules/videoio/src/ffmpeg_codecs.hpp
 b/modules/videoio/src/ffmpeg_codecs.hpp
+@@ -60,6 +60,7 @@ extern "C" {
+ #include 
+ #endif
+ 
++#include 
+ #include 
+ 
+ #ifdef __cplusplus
+

diff --git a/media-libs/opencv/opencv-4.6.0-r2.ebuild 
b/media-libs/opencv/opencv-4.6.0-r2.ebuild
index a02ff7760364..4f475dc6f45e 100644
--- a/media-libs/opencv/opencv-4.6.0-r2.ebuild
+++ b/media-libs/opencv/opencv-4.6.0-r2.ebuild
@@ -291,6 +291,7 @@ PATCHES=(
"${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
+   "${FILESDIR}"/${P}-fix-ffmpeg-5.patch
 )
 
 pkg_pretend() {

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

2021-12-02 Thread Sam James 
commit: c6f83216c443b41bcb26be6e8f139005310ce42b
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec  3 00:46:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec  3 00:53:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f83216

media-libs/opencv: add lapack patch

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

 .../opencv/files/opencv-4.5.2-lapack-3.10.patch| 123 +
 media-libs/opencv/opencv-4.5.2-r5.ebuild   |   3 +-
 media-libs/opencv/opencv-4.5.4.ebuild  |   3 +-
 3 files changed, 127 insertions(+), 2 deletions(-)

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
new file mode 100644
index ..31e2fc60d121
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.5.2-lapack-3.10.patch
@@ -0,0 +1,123 @@
+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, , , (float*)a, , (float*)b, , 
);
++LAPACK_sposv_(L, , , (float*)a, , (float*)b, , 
);
+ else if(typeid(fptype) == typeid(double))
+-dposv_(L, , , (double*)a, , (double*)b, , 
);
++LAPACK_dposv_(L, , , (double*)a, , (double*)b, , 
);
+ }
+ else
+ {
+@@ -174,9 +174,9 @@
+ transpose(b, ldb, tmpB, m, m, n);
+ 
+ if(typeid(fptype) == typeid(float))
+-sposv_(L, , , (float*)a, , (float*)tmpB, , 
);
++LAPACK_sposv_(L, , , (float*)a, , (float*)tmpB, , 
);
+ else if(typeid(fptype) == typeid(double))
+-dposv_(L, , , (double*)a, , (double*)tmpB, , 
);
++LAPACK_dposv_(L, , , (double*)a, , (double*)tmpB, , 
);
+ 
+ transpose(tmpB, m, b, ldb, n, m);
+ delete[] tmpB;
+@@ -185,9 +185,9 @@
+ else
+ {
+ if(typeid(fptype) == typeid(float))
+-spotrf_(L, , (float*)a, , );
++LAPACK_spotrf_(L, , (float*)a, , );
+ else if(typeid(fptype) == typeid(double))
+-dpotrf_(L, , (double*)a, , );
++LAPACK_dpotrf_(L, , (double*)a, , );
+ }
+ 
+ if(lapackStatus == 0) *info = true;
+@@ -227,17 +227,17 @@
+ }
+ 
+ if(typeid(fptype) == typeid(float))
+-sgesdd_(mode, , , (float*)a, , (float*)w, (float*)u, , 
(float*)vt, , (float*), , iworkBuf, info);
++LAPACK_sgesdd_(mode, , , (float*)a, , (float*)w, (float*)u, 
, (float*)vt, , (float*), , iworkBuf, info);
+ else if(typeid(fptype) == typeid(double))
+-dgesdd_(mode, , , (double*)a, , (double*)w, (double*)u, , 
(double*)vt, , (double*), , iworkBuf, info);
++LAPACK_dgesdd_(mode, , , (double*)a, , (double*)w, 
(double*)u, , (double*)vt, , (double*), , iworkBuf, info);
+ 
+ lwork = (int)round(work1); //optimal buffer size
+ fptype* buffer = new fptype[lwork + 1];
+ 
+ if(typeid(fptype) == typeid(float))
+-sgesdd_(mode, , , (float*)a, , (float*)w, (float*)u, , 
(float*)vt, , (float*)buffer, , iworkBuf, info);
++LAPACK_sgesdd_(mode, , , (float*)a, , (float*)w, (float*)u, 
, (float*)vt, , (float*)buffer, , iworkBuf, info);
+ else if(typeid(fptype) == typeid(double))
+-dgesdd_(mode, , , (double*)a, , (double*)w, (double*)u, , 
(double*)vt, , (double*)buffer, , iworkBuf, info);
++LAPACK_dgesdd_(mode, , , (double*)a, , (double*)w, 
(double*)u, , (double*)vt, , (double*)buffer, , iworkBuf, info);
+ 
+ if(!(flags & CV_HAL_SVD_NO_UV))
+ transpose_square_inplace(vt, ldv, n);
+@@ -288,18 +288,18 @@
+ if (k == 1 && b_step == sizeof(fptype))
+ {
+ if (typeid(fptype) == typeid(float))
+-sgels_(mode, , , , (float*)tmpA, , (float*)b, 
, (float*), , info);
++LAPACK_sgels_(mode, , , , (float*)tmpA, , 
(float*)b, , (float*), , info);
+ else if (typeid(fptype) == typeid(double))
+-dgels_(mode, , , , (double*)tmpA, , (double*)b, 
, (double*), , info);
++LAPACK_dgels_(mode, , , , (double*)tmpA, , 
(double*)b, , (double*), , info);
+ 
+ lwork = cvRound(work1); //optimal buffer size
+ std::vector workBufMemHolder(lwork + 1);
+ fptype* buffer = ();
+ 
+ if (typeid(fptype) == typeid(float))
+-sgels_(mode, , , , (float*)tmpA, , (float*)b, 
, (float*)buffer, , info);
++LAPACK_sgels_(mode, , , , (float*)tmpA, , 
(float*)b, , (float*)buffer, , info);
+ else if (typeid(fptype) == typeid(double))
+-dgels_(mode, , , , (double*)tmpA, , (double*)b, 
, (double*)buffer, , info);
++LAPACK_dgels_(mode, , , , (double*)tmpA, , 
(double*)b, ,

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

2020-06-25 Thread Andreas Sturmlechner 
commit: b9d85c6578126c3592dbae8a8fc6ff6b27995e34
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 25 07:53:25 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 25 17:07:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d85c65

media-libs/opencv: Drop vulnerable 2.4.13-r4

Bug: https://bugs.gentoo.org/647802
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 |   1 -
 .../opencv/files/opencv-2.3.1a-libav-0.7.patch |  10 -
 .../opencv/files/opencv-2.4.13-gcc-6.0.patch   |  23 -
 .../opencv-2.4.13-imgcodecs-refactoring.patch  | 580 -
 media-libs/opencv/files/opencv-2.4.2-cflags.patch  |  21 -
 media-libs/opencv/files/opencv-2.4.3-gcc47.patch   |  22 -
 .../opencv/files/opencv-2.4.8-javamagic.patch  |  32 --
 .../files/opencv-2.4.9-cuda-pkg-config.patch   |  12 -
 media-libs/opencv/opencv-2.4.13-r4.ebuild  | 230 
 9 files changed, 931 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index f7ec8ef1be8..079529c915c 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,4 +1,3 @@
-DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 
7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9
 SHA512 
efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
 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

diff --git a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch 
b/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
deleted file mode 100644
index 59090703d14..000
--- a/media-libs/opencv/files/opencv-2.3.1a-libav-0.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 OpenCV-2.3.1.orig/modules/highgui/src/cap_ffmpeg_impl.hpp  2011-11-14 
05:33:37.0 +0100
-+++ OpenCV-2.3.1/modules/highgui/src/cap_ffmpeg_impl.hpp   2011-11-14 
05:33:18.0 +0100
-@@ -104,6 +104,7 @@
- #endif
- #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
-   #include 
-+  #include 
- #endif
- #if defined(HAVE_LIBSWSCALE_SWSCALE_H)
-   #include 

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
deleted file mode 100644
index b0a5084752c..000
--- a/media-libs/opencv/files/opencv-2.4.13-gcc-6.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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-2.4.13-imgcodecs-refactoring.patch 
b/media-libs/opencv/files/opencv-2.4.13-imgcodecs-refactoring.patch
deleted file mode 100644
index d1bea36580f..000
--- a/media-libs/opencv/files/opencv-2.4.13-imgcodecs-refactoring.patch
+++ /dev/null
@@ -1,580 +0,0 @@
-From 72d29259ca741950527c8cca7fb649030c01f658 Mon Sep 17 00:00:00 2001
-From: Alexander Alekhin 
-Date: Tue, 15 Aug

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

2019-12-07 Thread Amy Liffey 
commit: 432d7ed8116713d109521ea4f5ec0a9e2310feb6
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat Dec  7 19:38:29 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Dec  7 19:38:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=432d7ed8

media-libs/opencv: dont try to install LICENSE.txt

Submitted-by: Helmut Jarausch  igpm.rwth-aachen.de>
Closes: https://bugs.gentoo.org/701448
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Amy Liffey  gentoo.org>

 media-libs/opencv/files/opencv-4.1.2-opencl-license.patch | 10 ++
 media-libs/opencv/opencv-4.1.2-r2.ebuild  |  1 +
 2 files changed, 11 insertions(+)

diff --git a/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch 
b/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch
new file mode 100644
index 000..f69a88db0a4
--- /dev/null
+++ b/media-libs/opencv/files/opencv-4.1.2-opencl-license.patch
@@ -0,0 +1,10 @@
+--- a/cmake/OpenCVDetectOpenCL.cmake.ORIG  2019-11-29 11:29:00.642852106 
+0100
 b/cmake/OpenCVDetectOpenCL.cmake   2019-11-29 11:37:57.088822546 +0100
+@@ -5,7 +5,6 @@
+ else()
+   set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library")
+   set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" 
CACHE PATH "OpenCL include directory")
+-  ocv_install_3rdparty_licenses(opencl-headers 
"${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
+ endif()
+ mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
+ 

diff --git a/media-libs/opencv/opencv-4.1.2-r2.ebuild 
b/media-libs/opencv/opencv-4.1.2-r2.ebuild
index 5f9efaf9134..c97e2fcb3f4 100644
--- a/media-libs/opencv/opencv-4.1.2-r2.ebuild
+++ b/media-libs/opencv/opencv-4.1.2-r2.ebuild
@@ -235,6 +235,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.4.0-disable-download.patch"
"${FILESDIR}/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch"
"${FILESDIR}/${P}-pkg-config-file.patch"
+   "${FILESDIR}/${P}-opencl-license.patch"
 )
 
 pkg_pretend() {

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

2019-08-10 Thread Alexey Shvetsov 
commit: f94b3d13ae8e6a49cea026ee62d70f2b07f9d2d7
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Sat Aug 10 20:13:38 2019 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sat Aug 10 20:14:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94b3d13

media-libs/opencv: Fix py3.7 build

Follwoup to ac064acc48d43d7bfbf12c0985c5b0667454600b

Closes: https://bugs.gentoo.org/691480
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Alexey Shvetsov  gentoo.org>

 media-libs/opencv/files/opencv-3.4.1-python37.patch | 12 
 media-libs/opencv/opencv-3.4.1-r6.ebuild|  1 +
 2 files changed, 13 insertions(+)

diff --git a/media-libs/opencv/files/opencv-3.4.1-python37.patch 
b/media-libs/opencv/files/opencv-3.4.1-python37.patch
new file mode 100644
index 000..94d307b748c
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-python37.patch
@@ -0,0 +1,12 @@
+diff -urN a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
+--- a/modules/python/src2/cv2.cpp  2018-02-23 11:38:33.0 +0300
 b/modules/python/src2/cv2.cpp  2019-08-10 22:28:03.337071791 +0300
+@@ -886,7 +886,7 @@
+ (void)name;
+ if(!obj || obj == Py_None)
+ return true;
+-char* str = PyString_AsString(obj);
++const char* str = PyString_AsString(obj);
+ if(!str)
+ return false;
+ value = String(str);

diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild 
b/media-libs/opencv/opencv-3.4.1-r6.ebuild
index 2fdf2cd1f98..1f5783f9621 100644
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r6.ebuild
@@ -236,6 +236,7 @@ PATCHES=(
"${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
+   "${FILESDIR}/${P}-python37.patch" # https://bugs.gentoo.org/691480
 )
 
 pkg_pretend() {

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

2019-01-16 Thread Amy Liffey 
commit: 488d9073c92dd15c8b67506993c90c595d039bee
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Jan 16 19:30:15 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Jan 16 19:42:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488d9073

media-libs/opencv: remove old versions 3.2.0, 3.3.0, 3.4.1-r2

Closes: https://bugs.gentoo.org/630438
Closes: https://bugs.gentoo.org/637080
Closes: https://bugs.gentoo.org/657076
Closes: https://bugs.gentoo.org/636030
Closes: https://bugs.gentoo.org/661674
Closes: https://bugs.gentoo.org/658568
Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 media-libs/opencv/Manifest |   5 -
 .../files/opencv-3.1.0-find-libraries-fix.patch|  48 --
 .../opencv/files/opencv-3.1.0-java-magic.patch |  47 --
 ...cv-3.2.0-contrib_xfeatures2d-autodownload.patch |  10 -
 .../opencv/files/opencv-3.2.0-cpu-mno-sse2.patch   |  11 -
 .../opencv-3.2.0-fix_ussage_cpu_instructions.patch |  64 ---
 media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch |  11 -
 media-libs/opencv/files/opencv-3.2.0-vtk.patch |  11 -
 .../files/opencv-3.3.0-contrib-xfeatures2d.patch   |  19 -
 .../opencv/files/opencv-3.3.0-cuda9-cmake.patch|  87 
 .../files/opencv-3.3.0-cuda9-compute20.patch   |  21 -
 .../opencv/files/opencv-3.3.0-cuda9-saturate.patch |  41 --
 media-libs/opencv/opencv-3.2.0-r4.ebuild   | 369 ---
 media-libs/opencv/opencv-3.3.0-r6.ebuild   | 465 ---
 media-libs/opencv/opencv-3.4.1-r2.ebuild   | 497 -
 15 files changed, 1706 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 9b52583151c..4cfab222a0a 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,9 +1,4 @@
-DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 
0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130
 SHA512 
9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 
7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9
 SHA512 
efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
-DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 
6d44263792b9cd2d009c7eeaddc2ef87acb01482cc9d36f2fe7717f981ff85a4e5007e4018d3ae15f383f6c3b1a0e009049f319bde0bce98575f04ccd6062cd8
 SHA512 
a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d
-DIST opencv-3.2.0_contrib.tar.gz 54765210 BLAKE2B 
6c5bcb1c18da937751f234cc1edaae58416ab9ab5a3407a2ab2c22f4e174ffeb800396d34fe489f424b288fbd608e106cd5f5b458a06a509cea5f7d8e23a67a7
 SHA512 
eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
-DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 
9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34
 SHA512 
13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
-DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 
53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b
 SHA512 
ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
 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

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
deleted file mode 100644
index 52f4db6b311..000
--- a/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch
+++

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

2019-01-14 Thread Amy Liffey 
commit: 9e7938189272bae00cd3da81d868cfe85748d08d
Author: Amy Liffey  gentoo  org>
AuthorDate: Mon Jan 14 22:15:53 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Jan 14 22:20:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e793818

media-libs/opencv: patch to remove git autodetect

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

 .../files/opencv-3.4.1-remove-git-autodetect.patch | 42 ++
 media-libs/opencv/opencv-3.4.1-r5.ebuild   |  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch 
b/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch
new file mode 100644
index 000..94b221ab9a8
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch
@@ -0,0 +1,42 @@
+--- a/CMakeLists.txt   2019-01-10 19:29:06.831367707 +0100
 b/CMakeLists.txt   2019-01-10 19:30:11.125364384 +0100
+@@ -522,23 +522,23 @@
+ # 
+ #  Autodetect if we are in a GIT repository
+ # 
+-find_host_package(Git QUIET)
++# find_host_package(Git QUIET)
+ 
+-if(NOT DEFINED OPENCV_VCSVERSION AND GIT_FOUND)
+-  execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always 
--dirty --match "[0-9].[0-9].[0-9]*"
+-WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
+-OUTPUT_VARIABLE OPENCV_VCSVERSION
+-RESULT_VARIABLE GIT_RESULT
+-ERROR_QUIET
+-OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  if(NOT GIT_RESULT EQUAL 0)
+-set(OPENCV_VCSVERSION "unknown")
+-  endif()
+-elseif(NOT DEFINED OPENCV_VCSVERSION)
+-  # We don't have git:
+-  set(OPENCV_VCSVERSION "unknown")
+-endif()
++# if(NOT DEFINED OPENCV_VCSVERSION AND GIT_FOUND)
++#  execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always 
--dirty --match "[0-9].[0-9].[0-9]*"
++#WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
++#OUTPUT_VARIABLE OPENCV_VCSVERSION
++#RESULT_VARIABLE GIT_RESULT
++#ERROR_QUIET
++#OUTPUT_STRIP_TRAILING_WHITESPACE
++#  )
++#  if(NOT GIT_RESULT EQUAL 0)
++#set(OPENCV_VCSVERSION "unknown")
++#  endif()
++# elseif(NOT DEFINED OPENCV_VCSVERSION)
++#  # We don't have git:
++# set(OPENCV_VCSVERSION "unknown")
++#endif()
+ 
+ 
+ # 

diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild 
b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index b03f24a8491..569397d8555 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -230,6 +230,7 @@ PATCHES=(
"${FILESDIR}/${P}-compilation-C-mode.patch" # 
https://bugs.gentoo.org/656530
"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
+   "${FILESDIR}/${P}-remove-git-autodetect.patch"
 )
 
 pkg_pretend() {

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

2018-05-31 Thread Amy Liffey 
commit: fbadf5fc3cdc26df32995e2e1cad1ed47f40efad
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu May 31 17:15:58 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu May 31 17:24:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbadf5fc

media-libs/opencv: workaround C compilation mode

- Add nvcc flags to fix compilation with cuda
- Fix issue with C compilation mode for vlc
- Fix python installation path

Closes: https://bugs.gentoo.org/656530
Closes: https://bugs.gentoo.org/656580
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/opencv-3.4.1-compilation-C-mode.patch| 56 ++
 .../opencv-3.4.1-cuda-add-relaxed-constexpr.patch  | 14 ++
 .../opencv-3.4.1-python-lib-suffix-hack.patch  | 13 +
 ...encv-3.4.1-r1.ebuild => opencv-3.4.1-r2.ebuild} |  6 ++-
 4 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch 
b/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch
new file mode 100644
index 000..c94f206ed4f
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-compilation-C-mode.patch
@@ -0,0 +1,56 @@
+From 549b5df22520b60b91dd77096434d79425b31ac2 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin 
+Date: Mon, 28 May 2018 18:07:23 +0300
+Subject: [PATCH] build: workaround issues with C compilation mode
+
+- cvdef.h + cvRound (double only)
+- highgui_c.h
+---
+ modules/core/include/opencv2/core/cvdef.h   | 8 +++-
+ modules/highgui/include/opencv2/highgui/highgui_c.h | 2 ++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/modules/core/include/opencv2/core/cvdef.h 
b/modules/core/include/opencv2/core/cvdef.h
+index a87ced09d78..4ab72b34cc1 100644
+--- a/modules/core/include/opencv2/core/cvdef.h
 b/modules/core/include/opencv2/core/cvdef.h
+@@ -480,7 +480,7 @@ Cv64suf;
+ // Integer types portatibility
+ #ifdef OPENCV_STDINT_HEADER
+ #include OPENCV_STDINT_HEADER
+-#else
++#elif defined(__cplusplus)
+ #if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */
+ namespace cv {
+ typedef signed char int8_t;
+@@ -517,9 +517,15 @@ typedef ::int64_t int64_t;
+ typedef ::uint64_t uint64_t;
+ }
+ #endif
++#else // pure C
++#include 
+ #endif
+ 
+ 
+ //! @}
+ 
++#ifndef __cplusplus
++#include "opencv2/core/fast_math.hpp" // define cvRound(double)
++#endif
++
+ #endif // OPENCV_CORE_CVDEF_H
+diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h 
b/modules/highgui/include/opencv2/highgui/highgui_c.h
+index 1eb414a76ca..35413139c79 100644
+--- a/modules/highgui/include/opencv2/highgui/highgui_c.h
 b/modules/highgui/include/opencv2/highgui/highgui_c.h
+@@ -135,8 +135,10 @@ CVAPI(int) cvNamedWindow( const char* name, int flags 
CV_DEFAULT(CV_WINDOW_AUTOS
+ CVAPI(void) cvSetWindowProperty(const char* name, int prop_id, double 
prop_value);
+ CVAPI(double) cvGetWindowProperty(const char* name, int prop_id);
+ 
++#ifdef __cplusplus  // FIXIT remove in OpenCV 4.0
+ /* Get window image rectangle coordinates, width and height */
+ CVAPI(cv::Rect)cvGetWindowImageRect(const char* name);
++#endif
+ 
+ /* display image within window (highgui windows remember their content) */
+ CVAPI(void) cvShowImage( const char* name, const CvArr* image );

diff --git 
a/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch 
b/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch
new file mode 100644
index 000..11ca6aa861e
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-cuda-add-relaxed-constexpr.patch
@@ -0,0 +1,14 @@
+diff -Naur a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake
+--- a/cmake/FindCUDA.cmake 2018-05-26 12:57:45.698858052 +0100
 b/cmake/FindCUDA.cmake 2018-05-26 16:49:01.196390803 +0100
+@@ -447,8 +447,8 @@
+ # Parse HOST_COMPILATION mode.
+ option(CUDA_HOST_COMPILATION_CPP "Generated file extension" ON)
+ 
+-# Extra user settable flags
+-set(CUDA_NVCC_FLAGS "" CACHE STRING "Semi-colon delimit multiple arguments.")
++ #Extra user settable flags
++set(CUDA_NVCC_FLAGS "--expt-relaxed-constexpr;" CACHE STRING "Semi-colon 
delimit multiple arguments.")
+ 
+ if(CMAKE_GENERATOR MATCHES "Visual Studio")
+   set(_CUDA_MSVC_HOST_COMPILER 
"$(VCInstallDir)Tools/MSVC/$(VCToolsVersion)/bin/Host$(Platform)/$(PlatformTarget)")

diff --git a/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch 
b/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch
new file mode 100644
index 000..248e5034a21
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-python-lib-suffix-hack.patch
@@ -0,0 +1,13 @@
+--- a/cmake/OpenCVDetectPython.cmake   2018-05-31 09:14:42.998873104 +0200
 b/cmake/OpenCVDetectPython.cmake   2018-05-31 09:26:08.444914001 +0200
+@@ -140,8 +140,8 @@
+ else() #debian based assumed, install to the dist-packages.
+   set(_packages_path "python${_version_major_minor}/dist-packages")
+ endif()
+-

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

2018-05-25 Thread Amy Liffey 
commit: 002d99b2bfde3f4dfc53c79087b6367ee2cf704d
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri May 25 19:35:49 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri May 25 19:35:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002d99b2

media-libs/opencv: remove unused patches

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/opencv-3.1.0-cmake-no-opengl.patch   | 22 
 .../opencv/files/opencv-3.1.0-git-autodetect.patch | 42 --
 .../opencv-3.1.0-remove-graphcut-for-cuda-8.patch  | 23 
 3 files changed, 87 deletions(-)

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
deleted file mode 100644
index d6d70d717d3..000
--- a/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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-git-autodetect.patch 
b/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch
deleted file mode 100644
index f4bf0da2cc9..000
--- a/media-libs/opencv/files/opencv-3.1.0-git-autodetect.patch
+++ /dev/null
@@ -1,42 +0,0 @@
 a/CMakeLists.txt   2016-04-07 14:34:35.090937125 +0200
-+++ b/CMakeLists.txt   2016-04-07 14:35:18.492935300 +0200
-@@ -444,23 +444,23 @@
- # 
- #  Autodetect if we are in a GIT repository
- # 
--find_host_package(Git QUIET)
-+#find_host_package(Git QUIET)
- 
--if(GIT_FOUND)
--  execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always 
--dirty --match "[0-9].[0-9].[0-9]*"
--WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
--OUTPUT_VARIABLE OPENCV_VCSVERSION
--RESULT_VARIABLE GIT_RESULT
--ERROR_QUIET
--OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  if(NOT GIT_RESULT EQUAL 0)
--set(OPENCV_VCSVERSION "unknown")
--  endif()
--else()
--  # We don't have git:
--  set(OPENCV_VCSVERSION "unknown")
--endif()
-+#if(GIT_FOUND)
-+#  execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always 
--dirty --match "[0-9].[0-9].[0-9]*"
-+#WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-+#OUTPUT_VARIABLE OPENCV_VCSVERSION
-+#RESULT_VARIABLE GIT_RESULT
-+#ERROR_QUIET
-+#OUTPUT_STRIP_TRAILING_WHITESPACE
-+#  )
-+#  if(NOT GIT_RESULT EQUAL 0)
-+#set(OPENCV_VCSVERSION "unknown")
-+#  endif()
-+#else()
-+#  # We don't have git:
-+#  set(OPENCV_VCSVERSION "unknown")
-+#endif()
- 
- 
- # 

diff --git 
a/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch 
b/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch
deleted file mode 100644
index 64761a263a1..000
--- a/media-libs/opencv/files/opencv-3.1.0-remove-graphcut-for-cuda-8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 10896129b39655e19e4e7c529153cb5c2191a1db Mon Sep 17 00:00:00 2001
-From: Vladislav Vinogradov 
-Date: Fri, 6 May 2016 11:37:32 +0300
-Subject: [PATCH] GraphCut deprecated in CUDA 7.5 and removed in 8.0
-

- modules/cudalegacy/src/graphcuts.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules/cudalegacy/src/graphcuts.cpp 
b/modules/cudalegacy/src/graphcuts.cpp
-index eb08c3c..1a1eb85 100644
 a/modules/cudalegacy/src/graphcuts.cpp
-+++ b/modules/cudalegacy/src/graphcuts.cpp
-@@ -42,7 +42,8 @@
- 
- #include "precomp.hpp"
- 
--#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER)
-+// GraphCut has been removed in NPP 8.0
-+#if !defined (HAVE_CUDA) || defined (CUDA_DISABLER) || (CUDART_VERSION >= 
8000)
- 
- void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, 
GpuMat&, Stream&) { throw_no_cuda(); }
- void cv::cuda::graphcut(GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, 
GpuMat&, GpuMat&, GpuMat&, GpuMat&, GpuMat&, Stream&) { throw_no_cuda(); }

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

2018-05-25 Thread Amy Liffey 
commit: f3c8fe50642f04ec8434ee96f153689cedb8ec5c
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri May 25 19:23:46 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri May 25 19:26:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c8fe50

media-libs/opencv: version bump 3.4.1

Closes: https://bugs.gentoo.org/642800
Closes: https://bugs.gentoo.org/633900
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-libs/opencv/Manifest |   4 +
 .../files/opencv-3.4.0-disable-download.patch  |  29 ++
 media-libs/opencv/metadata.xml |   1 +
 media-libs/opencv/opencv-3.4.1.ebuild  | 495 +
 4 files changed, 529 insertions(+)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b193d22127a..26353736e85 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -6,5 +6,9 @@ DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 
6d44263792b9cd2d009c7eeaddc2ef87acb014
 DIST opencv-3.2.0_contrib.tar.gz 54765210 BLAKE2B 
6c5bcb1c18da937751f234cc1edaae58416ab9ab5a3407a2ab2c22f4e174ffeb800396d34fe489f424b288fbd608e106cd5f5b458a06a509cea5f7d8e23a67a7
 SHA512 
eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
 DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 
9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34
 SHA512 
13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
 DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 
53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b
 SHA512 
ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
+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 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.4.0-disable-download.patch 
b/media-libs/opencv/files/opencv-3.4.0-disable-download.patch
new file mode 100644
index 000..245ad3b3d02
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.0-disable-download.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt   2018-05-13 20:47:11.635871328 +0200
 b/CMakeLists.txt   2018-05-13 20:47:49.289872617 +0200
+@@ -187,6 +187,7 @@
+ # 
+ 
+ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable non-free algorithms" OFF)
++OCV_OPTION(ENABLE_DOWNLOAD "Enable download during configure" ON)
+ 
+ # 3rd party libs
+ OCV_OPTION(BUILD_ZLIB   "Build zlib from source" 
WIN32 OR APPLE)
+
+--- a/cmake/OpenCVDownload.cmake   2018-05-13 21:22:14.966943336 +0200
 b/cmake/OpenCVDownload.cmake   2018-05-13 21:23:15.959945424 +0200
+@@ -32,6 +32,7 @@
+ 
+ 
+ function(ocv_download)
++ if(ENABLE_DOWNLOAD)
+   cmake_parse_arguments(DL "UNPACK;RELATIVE_URL" 
"FILENAME;HASH;DESTINATION_DIR;ID;STATUS" "URL" ${ARGN})

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

2018-02-05 Thread Amy Liffey 
commit: 40e8ca0d2be44a4aaa1947e945c38630f7cc9119
Author: Amy Liffey  gentoo  org>
AuthorDate: Mon Feb  5 17:44:07 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Mon Feb  5 17:49:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e8ca0d

media-libs/opencv: add missing patch

Closes: https://bugs.gentoo.org/646582
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 ...opencv-3.3.0-remove-tiny-dnn-autodownload.patch | 27 ++
 1 file changed, 27 insertions(+)

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
new file mode 100644
index 000..6929a4c2ce4
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.3.0-remove-tiny-dnn-autodownload.patch
@@ -0,0 +1,27 @@
+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}"
+- "$ENV{OPENCV_TINY_DNN_URL}"
+- "https://github.com/tiny-dnn/tiny-dnn/archive/;
+-   DESTINATION_DIR "${TINY_DNN_CPP_PATH}"
+-   STATUS TINY_DNN_DOWNLOAD_SUCCESS
+-   ID "tiny-dnn"
+-   UNPACK RELATIVE_URL)
+-
+-if(NOT TINY_DNN_DOWNLOAD_SUCCESS)
+-  message(STATUS "Failed to download tiny-dnn sources")
+-endif()
+-
+ find_package(TinyDNN QUIET)
+ 
+ include(CheckCXXCompilerFlag)

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

2018-01-21 Thread Amy Liffey 
commit: b311829f28929c5dd15402b395365ccffb85ecd1
Author: Amy Liffey  gentoo  org>
AuthorDate: Sun Jan 21 08:35:52 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sun Jan 21 08:36:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b311829f

media-libs/opencv: fix cuda9 and autodownload

- Fix cuda 9 compatibility
Submitted-by: Todd Walter  rogers.com>

- Remove autodownload tiny_dnn from contrib
Submitted-by: Jonathan Scruggs  gmail.com>

- Add PYTHON_COMPAT 3_6

Closes: https://bugs.gentoo.org/637078
Closes: https://bugs.gentoo.org/633844
Closes: https://bugs.gentoo.org/632116
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-libs/opencv/Manifest |   1 +
 .../opencv/files/opencv-3.3.0-cuda9-cmake.patch|  87 
 .../files/opencv-3.3.0-cuda9-compute20.patch   |  21 +
 .../opencv/files/opencv-3.3.0-cuda9-saturate.patch |  41 ++
 media-libs/opencv/metadata.xml |   1 +
 media-libs/opencv/opencv-3.3.0-r5.ebuild   | 466 +
 6 files changed, 617 insertions(+)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 84e8300ba03..b193d22127a 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -6,4 +6,5 @@ DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 
6d44263792b9cd2d009c7eeaddc2ef87acb014
 DIST opencv-3.2.0_contrib.tar.gz 54765210 BLAKE2B 
6c5bcb1c18da937751f234cc1edaae58416ab9ab5a3407a2ab2c22f4e174ffeb800396d34fe489f424b288fbd608e106cd5f5b458a06a509cea5f7d8e23a67a7
 SHA512 
eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
 DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 
9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34
 SHA512 
13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
 DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 
53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b
 SHA512 
ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
+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-cuda9-cmake.patch 
b/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch
new file mode 100644
index 000..270c599d708
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch
@@ -0,0 +1,87 @@
+diff --git a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake
+index 678b450ab..c2a58bd00 100644
+--- a/cmake/FindCUDA.cmake
 b/cmake/FindCUDA.cmake
+@@ -283,7 +283,38 @@
+ #   CUDA_nppc_LIBRARY -- NVIDIA Performance Primitives lib (core).
+ #Only available for CUDA version 5.5+.
+ #   CUDA_nppi_LIBRARY -- NVIDIA Performance Primitives lib (image 
processing).
+-#Only available for CUDA version 5.5+.
++#Only available for CUDA version 5.5+ and was 
split up
++#in CUDA version 8.0+ and doesn't exist in 
combined
++#form in CUDA version 9.0+.
++#   CUDA_nppial_LIBRARY   -- NVIDIA Performance Primatives library 
(arithmetic and
++#logical operation functions). Only available for 
CUDA
++#version 8.0+.
++#   CUDA_nppicc_LIBRARY   -- NVIDIA Performance Primatives library (color 
conversion
++#and sampling functions). Only available for CUDA 
version
++#8.0+.
++#   CUDA_nppicom_LIBRARY  -- NVIDIA Performance Primatives library (JPEG 
compression
++#and decompression functions). Only available for 
CUDA
++#version 8.0+.
++#   CUDA_nppidei_LIBRARY  -- NVIDIA Performance Primatives library (data 
exchange and
++#initialization functions). Only available for 
CUDA
++#version 8.0+.
++#   CUDA_nppif_LIBRARY-- NVIDIA Performance Primatives library (filtering 
and
++#computer vision functions). Only available for 
CUDA
++#version

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

2017-09-05 Thread Amy Liffey 
commit: b3b568163f74a14e7967589456a7ddf7b8e2d639
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Sep  5 16:29:22 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Sep  5 18:15:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3b56816

media-libs/opencv: remove unused patches

 .../files/opencv-2.4.12-git-autodetect.patch   |  57 
 .../files/opencv-3.1.0-gentooify-python.patch  | 101 -
 2 files changed, 158 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
deleted file mode 100644
index 8d6fcaf681f..000
--- a/media-libs/opencv/files/opencv-2.4.12-git-autodetect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
 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 @@
- # 
- 
- # don't use FindGit because it requires CMake 2.8.2
--set(git_names git eg) # eg = easy git
-+#set(git_names git eg) # eg = easy git
- # Prefer .cmd variants on Windows unless running in a Makefile in the MSYS 
shell
--if(CMAKE_HOST_WIN32)
--  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
--set(git_names git.cmd git eg.cmd eg)
--  endif()
--endif()
-+#if(CMAKE_HOST_WIN32)
-+#  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
-+#set(git_names git.cmd git eg.cmd eg)
-+#  endif()
-+#endif()
- 
--find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd 
Git/bin DOC "git command line client")
--mark_as_advanced(GIT_EXECUTABLE)
-+#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd 
Git/bin DOC "git command line client")
-+#mark_as_advanced(GIT_EXECUTABLE)
- 
--if(GIT_EXECUTABLE)
--  execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty 
--match "2.[0-9].[0-9]*"
--WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
--OUTPUT_VARIABLE OPENCV_VCSVERSION
--RESULT_VARIABLE GIT_RESULT
--ERROR_QUIET
--OUTPUT_STRIP_TRAILING_WHITESPACE
--  )
--  if(NOT GIT_RESULT EQUAL 0)
--set(OPENCV_VCSVERSION "unknown")
--  endif()
--else()
-+#if(GIT_EXECUTABLE)
-+#  execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty 
--match "2.[0-9].[0-9]*"
-+#WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
-+#OUTPUT_VARIABLE OPENCV_VCSVERSION
-+#RESULT_VARIABLE GIT_RESULT
-+#ERROR_QUIET
-+#OUTPUT_STRIP_TRAILING_WHITESPACE
-+#  )
-+#  if(NOT GIT_RESULT EQUAL 0)
-+#set(OPENCV_VCSVERSION "unknown")
-+#  endif()
-+#else()
-   # We don't have git:
--  set(OPENCV_VCSVERSION "unknown")
--endif()
-+#  set(OPENCV_VCSVERSION "unknown")
-+#endif()
- 
- 
- # 

diff --git a/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch 
b/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch
deleted file mode 100644
index 7bb01b455f0..000
--- a/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -purN a/cmake/OpenCVDetectGentooPython.cmake 
b/cmake/OpenCVDetectGentooPython.cmake
 a/cmake/OpenCVDetectGentooPython.cmake 1970-01-01 01:00:00.0 
+0100
-+++ b/cmake/OpenCVDetectGentooPython.cmake 2016-06-09 10:21:09.236148446 
+0100
-@@ -0,0 +1,77 @@
-+# Find specified Python version
-+# Arguments:
-+#   found (variable): Set if interpreter found
-+#   executable (variable): Output of executable found
-+#   version_string (variable): Output of found version
-+#   version_major (variable): Output of found major version
-+#   version_minor (variable): Output of found minor version
-+#   libs_found (variable): Set if libs found
-+#   libs_version_string (variable): Output of found libs version
-+#   libraries (variable): Output of found Python libraries
-+#   library (variable): Output of found Python library
-+#   debug_libraries (variable): Output of found Python debug libraries
-+#   debug_library (variable): Output of found Python debug library
-+#   include_path (variable): Output of found Python include path
-+#   include_dir (variable): Output of found Python include dir
-+#   include_dir2 (variable): Output of found Python include dir2
-+#   packages_path (variable): Output of found Python packages path
-+#   numpy_include_dirs (variable): Output of found Python Numpy include dirs
-+function(find_python found executable version_string version_major 
version_minor
-+ libs_found libs_version_string libraries library debug_libraries
-+ debug_library include_path include_dir include_dir2 packages_path
-+ numpy_include_dirs)
-+
-+  set(${found} "TRUE" PARENT_SCOPE)
-+  set(${executable} "${GENTOO_PYTHON_EXECUTABLE}" CACHE FILEPATH "Path to 
Python interpretor")
-+  set(${version_string} "${GENTOO_PYTHON_MAJOR}.${GENTOO_PYTHON_MINOR}" 
PARENT_SCOPE)
-+

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

2017-07-27 Thread Amy Liffey 
commit: 0bf608a00f6466cb09e7d55b9e2579f0ca0b07c6
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Jul 27 18:50:07 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Jul 27 18:53:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf608a0

media-libs/opencv: fix mno-sse2

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch | 11 +++
 media-libs/opencv/opencv-3.2.0-r2.ebuild|  1 +
 2 files changed, 12 insertions(+)

diff --git a/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch 
b/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch
new file mode 100644
index 000..a73456411f2
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch
@@ -0,0 +1,11 @@
+--- a/cmake/OpenCVCompilerOptions.cmake2017-07-22 13:26:51.178960091 
+0200
 b/cmake/OpenCVCompilerOptions.cmake2017-07-22 13:27:47.238961469 
+0200
+@@ -176,8 +176,6 @@
+   endif()
+   if(ENABLE_SSE2)
+ add_extra_compiler_option(-msse2)
+-  elseif(X86 OR X86_64)
+-add_extra_compiler_option(-mno-sse2)
+   endif()
+   if(ARM)
+ add_extra_compiler_option("-mfp16-format=ieee")

diff --git a/media-libs/opencv/opencv-3.2.0-r2.ebuild 
b/media-libs/opencv/opencv-3.2.0-r2.ebuild
index e8fe383042f..6793803ee3b 100644
--- a/media-libs/opencv/opencv-3.2.0-r2.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r2.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
"${FILESDIR}/${P}-vtk.patch"
"${FILESDIR}/${P}-gcc-6.0.patch"
"${FILESDIR}/${PN}-3.2.0-fix_ussage_cpu_instructions.patch"
+   "${FILESDIR}/${P}-cpu-mno-sse2.patch"
 )
 
 pkg_pretend() {

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

2017-07-27 Thread Amy Liffey 
commit: e62eff34b2ebd90b7b23812d793456df4dba22fc
Author: Yurii Moskalenko  gmail  com>
AuthorDate: Mon Jul  3 01:21:32 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Jul 27 18:36:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62eff34

media-libs/opencv: Fix usage CPU instructions

 .../opencv-3.2.0-fix_ussage_cpu_instructions.patch | 64 ++
 ...encv-3.2.0-r1.ebuild => opencv-3.2.0-r2.ebuild} |  1 +
 2 files changed, 65 insertions(+)

diff --git 
a/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch 
b/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch
new file mode 100644
index 000..7b88216f329
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch
@@ -0,0 +1,64 @@
+--- a/cmake/OpenCVCompilerOptions.cmake
 b/cmake/OpenCVCompilerOptions.cmake
+@@ -164,8 +164,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   # Other optimizations
+   if(ENABLE_OMIT_FRAME_POINTER)
+ add_extra_compiler_option(-fomit-frame-pointer)
+-  else()
+-add_extra_compiler_option(-fno-omit-frame-pointer)
+   endif()
+   if(ENABLE_FAST_MATH)
+ add_extra_compiler_option(-ffast-math)
+@@ -195,8 +193,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   if(NOT MINGW)
+ if(ENABLE_AVX)
+   add_extra_compiler_option(-mavx)
+-elseif(X86 OR X86_64)
+-  add_extra_compiler_option(-mno-avx)
+ endif()
+ if(ENABLE_AVX2)
+   add_extra_compiler_option(-mavx2)
+@@ -210,26 +206,18 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ if(NOT OPENCV_EXTRA_CXX_FLAGS MATCHES "-mavx")
+   if(ENABLE_SSE3)
+ add_extra_compiler_option(-msse3)
+-  elseif(X86 OR X86_64)
+-add_extra_compiler_option(-mno-sse3)
+   endif()
+ 
+   if(ENABLE_SSSE3)
+ add_extra_compiler_option(-mssse3)
+-  elseif(X86 OR X86_64)
+-add_extra_compiler_option(-mno-ssse3)
+   endif()
+ 
+   if(ENABLE_SSE41)
+ add_extra_compiler_option(-msse4.1)
+-  elseif(X86 OR X86_64)
+-add_extra_compiler_option(-mno-sse4.1)
+   endif()
+ 
+   if(ENABLE_SSE42)
+ add_extra_compiler_option(-msse4.2)
+-  elseif(X86 OR X86_64)
+-add_extra_compiler_option(-mno-sse4.2)
+   endif()
+ 
+   if(ENABLE_POPCNT)
+@@ -238,16 +226,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ endif()
+   endif(NOT MINGW)
+ 
+-  if(X86 OR X86_64)
+-if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4)
+-  if(OPENCV_EXTRA_CXX_FLAGS MATCHES "-m(sse2|avx)")
+-add_extra_compiler_option(-mfpmath=sse)# !! important - be on the 
same wave with x64 compilers
+-  else()
+-add_extra_compiler_option(-mfpmath=387)
+-  endif()
+-endif()
+-  endif()
+-
+   # Profiling?
+   if(ENABLE_PROFILING)
+ add_extra_compiler_option("-pg -g"

diff --git a/media-libs/opencv/opencv-3.2.0-r1.ebuild 
b/media-libs/opencv/opencv-3.2.0-r2.ebuild
similarity index 99%
rename from media-libs/opencv/opencv-3.2.0-r1.ebuild
rename to media-libs/opencv/opencv-3.2.0-r2.ebuild
index fc5c7aeb029..e8fe383042f 100644
--- a/media-libs/opencv/opencv-3.2.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.2.0-r2.ebuild
@@ -97,6 +97,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
"${FILESDIR}/${P}-vtk.patch"
"${FILESDIR}/${P}-gcc-6.0.patch"
+   "${FILESDIR}/${PN}-3.2.0-fix_ussage_cpu_instructions.patch"
 )
 
 pkg_pretend() {

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

2016-09-27 Thread Amy Winston 
commit: 366480ac81d84673ffbbfcfff277a91d6c6041df
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Thu Sep 22 17:08:23 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Tue Sep 27 14:22:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=366480ac

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

- Feature: added in support for installing the Python module for each
  implementation selected
  Gentoo-Bug: 593504

- Bug fix: under certain conditions the HDF5 library isn't found
  Gentoo-Bug: 588850

- Bug fix: OpenGL needs Qt or Gtk+ otherwise it's disabled

- Misc: cleaned up usex expressions
added qtwidgets depend
moved openmp detection to pkg_pretend as per Gentoo style guidelines

Signed off by Jonathan Scruggs (j.scruggs  gmail.com, irc: Dracwyrm)

 .../files/opencv-contrib-find-hdf5-fix.patch   | 392 +
 media-libs/opencv/opencv-3.1.0-r5.ebuild   | 300 
 2 files changed, 692 insertions(+)

diff --git a/media-libs/opencv/files/opencv-contrib-find-hdf5-fix.patch 
b/media-libs/opencv/files/opencv-contrib-find-hdf5-fix.patch
new file mode 100644
index ..af86cf98
--- /dev/null
+++ b/media-libs/opencv/files/opencv-contrib-find-hdf5-fix.patch
@@ -0,0 +1,392 @@
+diff -purN a/modules/hdf/cmake/FindHDF5.cmake 
b/modules/hdf/cmake/FindHDF5.cmake
+--- a/modules/hdf/cmake/FindHDF5.cmake 1970-01-01 01:00:00.0 +0100
 b/modules/hdf/cmake/FindHDF5.cmake 2015-09-16 17:53:05.0 +0100
+@@ -0,0 +1,379 @@
++#.rst:
++# FindHDF5
++# 
++#
++# Find HDF5, a library for reading and writing self describing array data.
++#
++#
++#
++# This module invokes the HDF5 wrapper compiler that should be installed
++# alongside HDF5.  Depending upon the HDF5 Configuration, the wrapper
++# compiler is called either h5cc or h5pcc.  If this succeeds, the module
++# will then call the compiler with the -show argument to see what flags
++# are used when compiling an HDF5 client application.
++#
++# The module will optionally accept the COMPONENTS argument.  If no
++# COMPONENTS are specified, then the find module will default to finding
++# only the HDF5 C library.  If one or more COMPONENTS are specified, the
++# module will attempt to find the language bindings for the specified
++# components.  The only valid components are C, CXX, Fortran, HL, and
++# Fortran_HL.  If the COMPONENTS argument is not given, the module will
++# attempt to find only the C bindings.
++#
++# On UNIX systems, this module will read the variable
++# HDF5_USE_STATIC_LIBRARIES to determine whether or not to prefer a
++# static link to a dynamic link for HDF5 and all of it's dependencies.
++# To use this feature, make sure that the HDF5_USE_STATIC_LIBRARIES
++# variable is set before the call to find_package.
++#
++# To provide the module with a hint about where to find your HDF5
++# installation, you can set the environment variable HDF5_ROOT.  The
++# Find module will then look in this path when searching for HDF5
++# executables, paths, and libraries.
++#
++# In addition to finding the includes and libraries required to compile
++# an HDF5 client application, this module also makes an effort to find
++# tools that come with the HDF5 distribution that may be useful for
++# regression testing.
++#
++# This module will define the following variables:
++#
++# ::
++#
++#   HDF5_INCLUDE_DIRS - Location of the hdf5 includes
++#   HDF5_INCLUDE_DIR - Location of the hdf5 includes (deprecated)
++#   HDF5_DEFINITIONS - Required compiler definitions for HDF5
++#   HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings.
++#   HDF5_CXX_LIBRARIES - Required libraries for the HDF5 C++ bindings
++#   HDF5_Fortran_LIBRARIES - Required libraries for the HDF5 Fortran bindings
++#   HDF5_HL_LIBRARIES - Required libraries for the HDF5 high level API
++#   HDF5_Fortran_HL_LIBRARIES - Required libraries for the high level Fortran
++#   bindings.
++#   HDF5_LIBRARIES - Required libraries for all requested bindings
++#   HDF5_FOUND - true if HDF5 was found on the system
++#   HDF5_VERSION - HDF5 version in format Major.Minor.Release
++#   HDF5_LIBRARY_DIRS - the full set of library directories
++#   HDF5_IS_PARALLEL - Whether or not HDF5 was found with parallel IO support
++#   HDF5_C_COMPILER_EXECUTABLE - the path to the HDF5 C wrapper compiler
++#   HDF5_CXX_COMPILER_EXECUTABLE - the path to the HDF5 C++ wrapper compiler
++#   HDF5_Fortran_COMPILER_EXECUTABLE - the path to the HDF5 Fortran wrapper 
compiler
++#   HDF5_DIFF_EXECUTABLE - the path to the HDF5 dataset comparison tool
++
++#=
++# Copyright 2015 Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
++# Copyright 2009 Kitware, Inc.
++#
++# Distributed under the OSI-approved BSD License (the "License");
++# see accompanying file Copyright.txt for details.
++#
++# This software is

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

2016-06-09 Thread Amy Winston 
commit: cf149b0c51363346080559b66a540c956cfd05aa
Author: dracwyrm  gmail  com>
AuthorDate: Thu Jun  9 12:52:00 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Jun  9 13:52:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf149b0c

media-libs/opencv: change to EAPI 6 and fix python installation

-Add patch to install the correct bindings based on single_python_target
-Fix Cuda in ebuild
-Remove unused CMake options
-Modified patch to be -p1 format
-Tiny fixes and rewrites for EAPI 6 specs

 .../files/opencv-3.1.0-gentooify-python.patch  | 101 
 .../opencv/files/opencv-3.1.0-git-autodetect.patch |   4 +-
 .../opencv/files/opencv-3.1.0-java-magic.patch |  47 
 media-libs/opencv/opencv-3.1.0-r4.ebuild   | 269 +
 4 files changed, 419 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch 
b/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch
new file mode 100644
index 000..7bb01b4
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-gentooify-python.patch
@@ -0,0 +1,101 @@
+diff -purN a/cmake/OpenCVDetectGentooPython.cmake 
b/cmake/OpenCVDetectGentooPython.cmake
+--- a/cmake/OpenCVDetectGentooPython.cmake 1970-01-01 01:00:00.0 
+0100
 b/cmake/OpenCVDetectGentooPython.cmake 2016-06-09 10:21:09.236148446 
+0100
+@@ -0,0 +1,77 @@
++# Find specified Python version
++# Arguments:
++#   found (variable): Set if interpreter found
++#   executable (variable): Output of executable found
++#   version_string (variable): Output of found version
++#   version_major (variable): Output of found major version
++#   version_minor (variable): Output of found minor version
++#   libs_found (variable): Set if libs found
++#   libs_version_string (variable): Output of found libs version
++#   libraries (variable): Output of found Python libraries
++#   library (variable): Output of found Python library
++#   debug_libraries (variable): Output of found Python debug libraries
++#   debug_library (variable): Output of found Python debug library
++#   include_path (variable): Output of found Python include path
++#   include_dir (variable): Output of found Python include dir
++#   include_dir2 (variable): Output of found Python include dir2
++#   packages_path (variable): Output of found Python packages path
++#   numpy_include_dirs (variable): Output of found Python Numpy include dirs
++function(find_python found executable version_string version_major 
version_minor
++ libs_found libs_version_string libraries library debug_libraries
++ debug_library include_path include_dir include_dir2 packages_path
++ numpy_include_dirs)
++
++  set(${found} "TRUE" PARENT_SCOPE)
++  set(${executable} "${GENTOO_PYTHON_EXECUTABLE}" CACHE FILEPATH "Path to 
Python interpretor")
++  set(${version_string} "${GENTOO_PYTHON_MAJOR}.${GENTOO_PYTHON_MINOR}" 
PARENT_SCOPE)
++  set(${version_major} "${GENTOO_PYTHON_MAJOR}" PARENT_SCOPE)
++  set(${version_minor} "${GENTOO_PYTHON_MINOR}" PARENT_SCOPE)
++  set(${libs_found} "TRUE" PARENT_SCOPE)
++  set(${libs_version_string} "${version_string}" PARENT_SCOPE)
++  set(${libraries} "${GENTOO_PYTHON_LIBRARIES}" PARENT_SCOPE)
++  set(${library} "${GENTOO_PYTHON_LIBRARIES}" CACHE FILEPATH "Path to Python 
library")
++  set(${debug_libraries} "${GENTOO_PYTHON_DEBUG_LIBRARIES}" PARENT_SCOPE)
++  set(${debug_library} "${GENTOO_PYTHON_DEBUG_LIBRARIES}" CACHE FILEPATH 
"Path to Python debug")
++  set(${include_path} "${GENTOO_PYTHON_INCLUDE_PATH}" PARENT_SCOPE)
++  set(${include_dir} "${GENTOO_PYTHON_INCLUDE_PATH}" CACHE PATH "Python 
include dir")
++  set(${include_dir2} "${GENTOO_PYTHON_INCLUDE_PATH}" CACHE PATH "Python 
include dir 2")
++  set(${packages_path} "${GENTOO_PYTHON_PACKAGES_PATH}" CACHE PATH "Where to 
install the python packages.")
++  set(${numpy_include_dirs} 
"${GENTOO_PYTHON_PACKAGES_PATH}/numpy/core/include/" CACHE PATH "Path to numpy 
headers")
++endfunction(find_python)
++
++# In order to use existing CMake files, this needs to be here to switch 
between
++# Python 2 and 3. It's messy and could be in the ebuild to declare this,
++# but then the ebuild would be a mile long and unreadable. This makes then
++# messy stuff hidden out of the way.
++set(PYTHON2INTERP_FOUND "FALSE")
++set(PYTHON3INTERP_FOUND "FALSE")
++
++if(WITH_PYTHON)
++  if(GENTOO_PYTHON_MAJOR EQUAL 2)
++find_python(PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING
++  PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND
++  PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY
++  PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH
++  PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH
++  PYTHON2_NUMPY_INCLUDE_DIRS)
++  endif()
++
++  if(GENTOO_PYTHON_MAJOR EQUAL 3)
++find_python(PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING
++

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

2016-04-07 Thread Amy Winston 
commit: 6cd559c43465c20af06254031d6b6bef023be901
Author: Amy Winston  gentoo  org>
AuthorDate: Thu Apr  7 17:34:44 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Apr  7 17:36:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd559c4

media-libs/opencv: disable git autodetect bug #558556

Package-Manager: portage-2.2.26

 .../files/opencv-2.4.10-git-autodetect.patch   | 57 +
 .../files/opencv-2.4.11-git-autodetect.patch   | 57 +
 .../files/opencv-2.4.12-git-autodetect.patch   | 57 +
 .../opencv/files/opencv-2.4.9-git-autodetect.patch | 59 ++
 .../opencv/files/opencv-3.0.0-git-autodetect.patch | 41 +++
 .../opencv/files/opencv-3.1.0-git-autodetect.patch | 42 +++
 media-libs/opencv/opencv-2.4.10.ebuild |  3 +-
 media-libs/opencv/opencv-2.4.11.ebuild |  3 +-
 media-libs/opencv/opencv-2.4.12.ebuild |  3 +-
 media-libs/opencv/opencv-2.4.9.ebuild  |  3 +-
 media-libs/opencv/opencv-3.0.0.ebuild  |  3 +-
 media-libs/opencv/opencv-3.1.0-r1.ebuild   |  3 +-
 media-libs/opencv/opencv-3.1.0-r2.ebuild   |  3 +-
 13 files changed, 327 insertions(+), 7 deletions(-)

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
new file mode 100644
index 000..9349864
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.10-git-autodetect.patch
@@ -0,0 +1,57 @@
+--- 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_advanced(GIT_EXECUTABLE)
++#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd 
Git/bin DOC "git command line client")
++#mark_as_advanced(GIT_EXECUTABLE)
+ 
+-if(GIT_EXECUTABLE)
+-  execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty 
--match "2.[0-9].[0-9]*"
+-WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
+-OUTPUT_VARIABLE OPENCV_VCSVERSION
+-RESULT_VARIABLE GIT_RESULT
+-ERROR_QUIET
+-OUTPUT_STRIP_TRAILING_WHITESPACE
+-  )
+-  if(NOT GIT_RESULT EQUAL 0)
+-set(OPENCV_VCSVERSION "unknown")
+-  endif()
+-else()
++#if(GIT_EXECUTABLE)
++#  execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty 
--match "2.[0-9].[0-9]*"
++#WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
++#OUTPUT_VARIABLE OPENCV_VCSVERSION
++#RESULT_VARIABLE GIT_RESULT
++#ERROR_QUIET
++#OUTPUT_STRIP_TRAILING_WHITESPACE
++#  )
++#  if(NOT GIT_RESULT EQUAL 0)
++#set(OPENCV_VCSVERSION "unknown")
++#  endif()
++#else()
+   # We don't have git:
+-  set(OPENCV_VCSVERSION "unknown")
+-endif()
++#  set(OPENCV_VCSVERSION "unknown")
++#endif()
+ 
+ 
+ # 

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
new file mode 100644
index 000..12a5ca0
--- /dev/null
+++ b/media-libs/opencv/files/opencv-2.4.11-git-autodetect.patch
@@ -0,0 +1,57 @@
+--- 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 variants on Windows unless running in a Makefile in the MSYS 
shell
+-if(CMAKE_HOST_WIN32)
+-  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
+-set(git_names git.cmd git eg.cmd eg)
+-  endif()
+-endif()
++#if(CMAKE_HOST_WIN32)
++#  if(NOT CMAKE_GENERATOR MATCHES "MSYS")
++#set(git_names git.cmd git eg.cmd eg)
++#  endif()
++#endif()
+ 
+-find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd 
Git/bin DOC "git command line client")
+-mark_as_advanced(GIT_EXECUTABLE)
++#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd

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

2016-02-25 Thread Amy Winston 
commit: 48656e3b700cf6d771db428bc6dde322753839d3
Author: Amy Winston  gentoo  org>
AuthorDate: Thu Feb 25 13:32:22 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Feb 25 13:32:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48656e3b

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

Package-Manager: portage-2.2.26

 .../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 deletions(-)

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
deleted file mode 100644
index dd77571..000
--- a/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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
deleted file mode 100644
index e9a190c..000
--- a/media-libs/opencv/files/opencv-3.1.0-fix-ocl-declaration.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-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