<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ee6b12c6a9085423201c3942f157b12243511952">https://github.com/macports/macports-ports/commit/ee6b12c6a9085423201c3942f157b12243511952</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ee6b12c opencv: update version 3.1.0->3.2.0
</span>ee6b12c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ee6b12c6a9085423201c3942f157b12243511952
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 16 09:50:23 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> opencv: update version 3.1.0->3.2.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Update dependencies because library names change.
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/48067
</span>---
aqua/nomacs/Portfile | 2 +-
gis/orfeotoolbox/Portfile | 2 +-
graphics/objectmarker/Portfile | 2 +-
graphics/opencv/Portfile | 47 ++--
graphics/opencv/files/patch-32bit_accelerate.diff | 165 ++++++++++++++
graphics/opencv/files/patch-install_name.diff | 40 ----
graphics/opencv/files/patch-opencl-PR6052.diff | 245 ---------------------
.../opencv/files/patch-use-avfound-no-qtkit.diff | 39 ----
kde/digikam/Portfile | 2 +-
math/caffe/Portfile | 2 +-
science/gerbil/Portfile | 1 +
science/gmic/Portfile | 1 +
x11/auto-multiple-choice/Portfile | 2 +-
13 files changed, 205 insertions(+), 345 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/nomacs/Portfile b/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ac4627..a6ad768 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cmake 1.0
</span>
name nomacs
version 3.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license GPL-3+
maintainers pvanek openmaintainer
description nomacs image viewer application bundle
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/orfeotoolbox/Portfile b/gis/orfeotoolbox/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c526b6a..69b1ecc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/orfeotoolbox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/orfeotoolbox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup conflicts_build 1.0
</span>
name orfeotoolbox
version 4.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories gis graphics
platforms darwin
license CeCILL
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/objectmarker/Portfile b/graphics/objectmarker/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5bbd1b9..5e2b0ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/objectmarker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/objectmarker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name objectmarker
version 20070501
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories graphics
license none
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/Portfile b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a34a53..ae8ae42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
name opencv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> categories graphics science
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,11 @@ distfiles ${distname}.zip:opencv
</span> use_zip yes
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d7a811c67cfb16243470822150760252d5770165 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 09da1443a5ef3de036b11bf0d1f384da36d459d9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d2000ced54662e509adde1d781bf78526cc50fb4498d97a022d6f673c7bd175c \
</span> ${version}.zip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 91266cae464ab0f9c00f0f764ba9025a6765d83a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5082b5df7179ff71f4681747c482169f0d5d5b77605816cfe5b93c588021fbb4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0973c57ea36f38a64cc95eced43b3cf52dc15b58 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8f1937984d0130b38975346f0c18199c443706f75ab81b3dfda46c4550b4508b
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ depends_lib-append port:zlib \
</span> port:openexr \
path:lib/libavcodec.dylib:ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-install_name.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span> patch-modules_python_CMakeLists.txt.diff \
patch-modules_java_CMakeLists.txt.diff \
patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,15 +141,34 @@ configure.args-append \
</span> -DENABLE_PRECOMPILED_HEADERS=ON \
-DENABLE_SSSE3=ON
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_AVFOUNDATION=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-use-avfound-no-qtkit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> configure.args-append \
-DZLIB_LIBRARY=${prefix}/lib/libz.dylib \
-DBZIP2_LIBRARIES=${prefix}/lib/libbz2.dylib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not opportunistically find other LAPACK implementations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see cmake/OpenCVFindLAPACK.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_INCLUDE_DIR=Accelerate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LIBRARIES="-framework Accelerate" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_CBLAS_H=cblas.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LAPACKE_H=lapacke.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_IMPL=Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${build_arch} eq "i386" || ${build_arch} eq "ppc" || [variant_isset universal] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #The Accelerate ABI requires 32-bit signed integers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #In clapack.h, __CLPK_integer is a typedef for either
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # int (64-bit) or long int (32-bit).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #opencv only uses ints.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #Casting between pointers is never recommended, but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # int and long int should have the same representations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on 32-bit systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-32bit_accelerate.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { !${configureccache} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_CCACHE=NO
</span> }
set opencv_linker_libs ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,7 +216,6 @@ variant eigen description {Enable eigen support.} {
</span> }
variant opencl description {Enable OpenCL support.} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-opencl-PR6052.diff
</span> pre-configure {
if {${os.platform} eq "darwin" && ${os.major} < 11} {
ui_error "The OpenCL variant only works with OS X 10.7 Lion or later."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -307,7 +325,6 @@ variant tbb description {Use Intel TBB.} {
</span> -DWITH_TBB=ON
configure.args-append -DHAVE_TBB=ON \
-DTBB_INCLUDE_DIRS=${prefix}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend opencv_linker_libs "-ltbb" "-ltbbmalloc"
</span> }
variant vtk description {Include VTK support.} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-32bit_accelerate.diff b/graphics/opencv/files/patch-32bit_accelerate.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b452514
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-32bit_accelerate.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,165 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/core/src/hal_internal.cpp.orig 2017-01-15 13:05:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/core/src/hal_internal.cpp 2017-01-15 13:06:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,9 +108,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(n == 1 && b_step == sizeof(fptype))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgesv_(&m, &n, (float*)a, &lda, piv, (float*)b, &m, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (float*)b, (__CLPK_integer*)&m, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgesv_(&m, &n, (double*)a, &lda, piv, (double*)b, &m, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (double*)b, (__CLPK_integer*)&m, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,9 +120,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transpose(b, ldb, tmpB, m, m, n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgesv_(&m, &n, (float*)a, &lda, piv, (float*)tmpB, &m, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (float*)tmpB, (__CLPK_integer*)&m, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgesv_(&m, &n, (double*)a, &lda, piv, (double*)tmpB, &m, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (double*)tmpB, (__CLPK_integer*)&m, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transpose(tmpB, m, b, ldb, n, m);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete[] tmpB;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,9 +131,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgetrf_(&m, &m, (float*)a, &lda, piv, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgetrf_((__CLPK_integer*)&m, (__CLPK_integer*)&m, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgetrf_(&m, &m, (double*)a, &lda, piv, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgetrf_((__CLPK_integer*)&m, (__CLPK_integer*)&m, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(*info == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,9 +161,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(n == 1 && b_step == sizeof(fptype))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sposv_(L, &m, &n, (float*)a, &lda, (float*)b, &m, &lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sposv_(L, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (float*)b, (__CLPK_integer*)&m, (__CLPK_integer*)&lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dposv_(L, &m, &n, (double*)a, &lda, (double*)b, &m, &lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dposv_(L, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (double*)b, (__CLPK_integer*)&m, (__CLPK_integer*)&lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,9 +172,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transpose(b, ldb, tmpB, m, m, n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sposv_(L, &m, &n, (float*)a, &lda, (float*)tmpB, &m, &lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sposv_(L, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (float*)tmpB, (__CLPK_integer*)&m, (__CLPK_integer*)&lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dposv_(L, &m, &n, (double*)a, &lda, (double*)tmpB, &m, &lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dposv_(L, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (double*)tmpB, (__CLPK_integer*)&m, (__CLPK_integer*)&lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transpose(tmpB, m, b, ldb, n, m);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete[] tmpB;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,9 +183,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spotrf_(L, &m, (float*)a, &lda, &lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spotrf_(L, (__CLPK_integer*)&m, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)&lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dpotrf_(L, &m, (double*)a, &lda, &lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dpotrf_(L, (__CLPK_integer*)&m, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)&lapackStatus);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(lapackStatus == 0) *info = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -225,17 +225,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (float*)w, (float*)u, (__CLPK_integer*)&ldu, (float*)vt, (__CLPK_integer*)&ldv, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (double*)w, (double*)u, (__CLPK_integer*)&ldu, (double*)vt, (__CLPK_integer*)&ldv, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lwork = (int)round(work1); //optimal buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fptype* buffer = new fptype[lwork + 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (float*)w, (float*)u, (__CLPK_integer*)&ldu, (float*)vt, (__CLPK_integer*)&ldv, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if(typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (double*)w, (double*)u, (__CLPK_integer*)&ldu, (double*)vt, (__CLPK_integer*)&ldv, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!(flags & CV_HAL_SVD_NO_UV))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transpose_square_inplace(vt, ldv, n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -286,18 +286,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (k == 1 && b_step == sizeof(fptype))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)b, (__CLPK_integer*)&m, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)b, (__CLPK_integer*)&m, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lwork = (int)round(work1); //optimal buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<fptype> workBufMemHolder(lwork + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fptype* buffer = &workBufMemHolder.front();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)b, (__CLPK_integer*)&m, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)b, (__CLPK_integer*)&m, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -307,18 +307,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transpose(b, ldb, tmpB, m, m, k);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)tmpB, (__CLPK_integer*)&m, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)tmpB, (__CLPK_integer*)&m, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lwork = (int)round(work1); //optimal buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<fptype> workBufMemHolder(lwork + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fptype* buffer = &workBufMemHolder.front();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)tmpB, (__CLPK_integer*)&m, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)tmpB, (__CLPK_integer*)&m, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ transpose(tmpB, m, b, ldb, k, m);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -326,18 +326,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgeqrf_(&m, &n, (float*)tmpA, &ldtmpA, (float*)dst, (float*)&work1, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)dst, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgeqrf_(&m, &n, (double*)tmpA, &ldtmpA, (double*)dst, (double*)&work1, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)dst, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lwork = (int)round(work1); //optimal buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<fptype> workBufMemHolder(lwork + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fptype* buffer = &workBufMemHolder.front();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (typeid(fptype) == typeid(float))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sgeqrf_(&m, &n, (float*)tmpA, &ldtmpA, (float*)dst, (float*)buffer, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)dst, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (typeid(fptype) == typeid(double))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dgeqrf_(&m, &n, (double*)tmpA, &ldtmpA, (double*)dst, (double*)buffer, &lwork, info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)dst, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m == n)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-install_name.diff b/graphics/opencv/files/patch-install_name.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 03e6042..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-install_name.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- apps/annotation/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ apps/annotation/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,6 @@ set_target_properties(${the_target} PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INSTALL_NAME_DIR lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUT_NAME "opencv_annotation")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_SOLUTION_FOLDERS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- apps/createsamples/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ apps/createsamples/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,6 @@ set_target_properties(${the_target} PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INSTALL_NAME_DIR lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUT_NAME "opencv_createsamples")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_SOLUTION_FOLDERS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- apps/traincascade/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ apps/traincascade/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,6 @@ set_target_properties(${the_target} PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INSTALL_NAME_DIR lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUT_NAME "opencv_traincascade")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ENABLE_SOLUTION_FOLDERS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/OpenCVModule.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/OpenCVModule.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -754,7 +754,6 @@ macro(_ocv_create_module)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ARCHIVE_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBRARY_OUTPUT_DIRECTORY ${LIBRARY_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INSTALL_NAME_DIR lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For dynamic link numbering convenions
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-opencl-PR6052.diff b/graphics/opencv/files/patch-opencl-PR6052.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3186890..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-opencl-PR6052.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,245 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/checks/opencl.cpp b/cmake/checks/opencl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 95a36f3..b71b92f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/checks/opencl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/checks/opencl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,8 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <OpenCL/cl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// custom OpenCL headers are located in "CL" subfolder (3rdparty/include/...)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CL/cl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef CL_VERSION_1_2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f824ce9..801709e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -95,11 +95,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define clUnloadPlatformCompiler clUnloadPlatformCompiler_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define clWaitForEvents clWaitForEvents_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <OpenCL/cl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CL/cl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // generated by parser_cl.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef clBuildProgram
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 64a7fed..1ad4a6a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +41,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef clGetGLTextureInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define clGetGLTextureInfo clGetGLTextureInfo_pfn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // generated by parser_cl.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern CL_RUNTIME_EXPORT cl_mem (CL_API_CALL*clCreateFromGLBuffer)(cl_context, cl_mem_flags, cl_GLuint, int*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern CL_RUNTIME_EXPORT cl_mem (CL_API_CALL*clCreateFromGLRenderbuffer)(cl_context, cl_mem_flags, cl_GLuint, cl_int*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,3 +54,5 @@ extern CL_RUNTIME_EXPORT cl_int (CL_API_CALL*clEnqueueReleaseGLObjects)(cl_comma
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern CL_RUNTIME_EXPORT cl_int (CL_API_CALL*clGetGLContextInfoKHR)(const cl_context_properties*, cl_gl_context_info, size_t, void*, size_t*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern CL_RUNTIME_EXPORT cl_int (CL_API_CALL*clGetGLObjectInfo)(cl_mem, cl_gl_object_type*, cl_GLuint*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern CL_RUNTIME_EXPORT cl_int (CL_API_CALL*clGetGLTextureInfo)(cl_mem, cl_gl_texture_info, size_t, void*, size_t*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp b/modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 105867f..8338ac6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/include/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,6 +5,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #error "Invalid usage"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // generated by parser_cl.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef clCreateFromGLBuffer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define clCreateFromGLBuffer clCreateFromGLBuffer_fn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,3 +38,5 @@ inline cl_int clGetGLObjectInfo(cl_mem p0, cl_gl_object_type* p1, cl_GLuint* p2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef clGetGLTextureInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define clGetGLTextureInfo clGetGLTextureInfo_fn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline cl_int clGetGLTextureInfo(cl_mem p0, cl_gl_texture_info p1, size_t p2, void* p3, size_t* p4) { return clGetGLTextureInfo_pfn(p0, p1, p2, p3, p4); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opencl/runtime/autogenerated/opencl_gl_impl.hpp b/modules/core/src/opencl/runtime/autogenerated/opencl_gl_impl.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6d97180..5b37133 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/opencl/runtime/autogenerated/opencl_gl_impl.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/opencl/runtime/autogenerated/opencl_gl_impl.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,6 +139,8 @@ struct opencl_gl_fn14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } // anonymous namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // generated by parser_cl.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cl_mem (CL_API_CALL*clCreateFromGLBuffer)(cl_context, cl_mem_flags, cl_GLuint, int*) =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opencl_gl_fn4<OPENCL_GL_FN_clCreateFromGLBuffer, cl_mem, cl_context, cl_mem_flags, cl_GLuint, int*>::switch_fn;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,3 +198,5 @@ static const struct DynamicFnEntry* opencl_gl_fn_list[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // number of enabled functions: 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opencl/runtime/generator/common.py b/modules/core/src/opencl/runtime/generator/common.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 80c5452..5f81e8e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/opencl/runtime/generator/common.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/opencl/runtime/generator/common.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -254,6 +254,6 @@ def ProcessTemplate(inputFile, ctx, noteLine='//\n// AUTOGENERATED, DO NOT EDIT\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert line[-1] == '@'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name = line[1:-1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert ctx.has_key(name), name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- line = ctx[name]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- print line,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ line = ctx[name] + ('\n' if len(ctx[name]) > 0 and ctx[name][-1] != '\n' else '')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.stdout.write(line)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opencl/runtime/generator/generate.sh b/modules/core/src/opencl/runtime/generator/generate.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-old mode 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-new mode 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in b/modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4196622..b6c8f05 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/opencl/runtime/generator/template/opencl_core.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,11 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_REMAP_ORIGIN@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <OpenCL/cl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CL/cl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_REMAP_DYNAMIC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opencl/runtime/generator/template/opencl_gl.hpp.in b/modules/core/src/opencl/runtime/generator/template/opencl_gl.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4bed423..13a33c7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/opencl/runtime/generator/template/opencl_gl.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/opencl/runtime/generator/template/opencl_gl.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,4 +8,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_REMAP_DYNAMIC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_FN_DECLARATIONS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opencl/runtime/generator/template/opencl_gl_impl.hpp.in b/modules/core/src/opencl/runtime/generator/template/opencl_gl_impl.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1458601..cba1278 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/opencl/runtime/generator/template/opencl_gl_impl.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/opencl/runtime/generator/template/opencl_gl_impl.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,8 +4,12 @@ namespace {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_FN_SWITCH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } // anonymous namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_FN_ENTRY_DEFINITIONS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_FN_ENTRY_LIST@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_NUMBER_OF_ENABLED_FUNCTIONS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opencl/runtime/generator/template/opencl_gl_wrappers.hpp.in b/modules/core/src/opencl/runtime/generator/template/opencl_gl_wrappers.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0aeefb4..fc03179 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/opencl/runtime/generator/template/opencl_gl_wrappers.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/opencl/runtime/generator/template/opencl_gl_wrappers.hpp.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,4 +2,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #error "Invalid usage"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @CL_FN_INLINE_WRAPPERS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opencl/runtime/opencl_core.cpp b/modules/core/src/opencl/runtime/opencl_core.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0ab3381..405a593 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/opencl/runtime/opencl_core.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/opencl/runtime/opencl_core.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -286,6 +286,8 @@ static void* opencl_check_fn(int ID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "opencv2/core/opencl/runtime/opencl_gl.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void* opencl_gl_check_fn(int ID);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "autogenerated/opencl_gl_impl.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,6 +308,8 @@ static void* opencl_gl_check_fn(int ID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return func;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif // cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // HAVE_OPENGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/core/src/opengl.cpp b/modules/core/src/opengl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3bbc0f8..f3d106f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/opengl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/opengl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1580,6 +1580,11 @@ void cv::ogl::render(const ogl::Arrays& arr, InputArray indices, int mode, Scala
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_OPENCL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "opencv2/core/opencl/runtime/opencl_gl.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef cl_khr_gl_sharing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define HAVE_OPENCL_OPENGL_SHARING
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define NO_OPENCL_SHARING_ERROR CV_ErrorNoReturn(cv::Error::StsBadFunc, "OpenCV was build without OpenCL/OpenGL sharing support")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else // HAVE_OPENCL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define NO_OPENCL_SUPPORT_ERROR CV_ErrorNoReturn(cv::Error::StsBadFunc, "OpenCV was build without OpenCL support")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif // HAVE_OPENCL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1602,6 +1607,8 @@ Context& initializeContextFromGL()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENGL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif !defined(HAVE_OPENCL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENCL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif !defined(HAVE_OPENCL_OPENGL_SHARING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_OPENCL_SHARING_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cl_uint numPlatforms;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cl_int status = clGetPlatformIDs(0, NULL, &numPlatforms);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1701,6 +1708,8 @@ void convertToGLTexture2D(InputArray src, Texture2D& texture)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENGL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif !defined(HAVE_OPENCL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENCL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif !defined(HAVE_OPENCL_OPENGL_SHARING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_OPENCL_SHARING_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Size srcSize = src.size();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CV_Assert(srcSize.width == (int)texture.cols() && srcSize.height == (int)texture.rows());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1753,6 +1762,8 @@ void convertFromGLTexture2D(const Texture2D& texture, OutputArray dst)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENGL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif !defined(HAVE_OPENCL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENCL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif !defined(HAVE_OPENCL_OPENGL_SHARING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_OPENCL_SHARING_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // check texture format
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int dtype = CV_8UC4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1812,6 +1823,8 @@ UMat mapGLBuffer(const Buffer& buffer, int accessFlags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENGL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif !defined(HAVE_OPENCL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENCL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif !defined(HAVE_OPENCL_OPENGL_SHARING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_OPENCL_SHARING_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace cv::ocl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Context& ctx = Context::getDefault();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1862,6 +1875,8 @@ void unmapGLBuffer(UMat& u)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENGL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif !defined(HAVE_OPENCL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_OPENCL_SUPPORT_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif !defined(HAVE_OPENCL_OPENGL_SHARING)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NO_OPENCL_SHARING_ERROR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace cv::ocl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cl_command_queue clQueue = (cl_command_queue)Queue::getDefault().ptr();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-use-avfound-no-qtkit.diff b/graphics/opencv/files/patch-use-avfound-no-qtkit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d8f6908..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-use-avfound-no-qtkit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3ee50ff..357a700 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,7 +162,7 @@ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Optional 3rd party components
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ===================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCV_OPTION(WITH_1394 "Include IEEE1394 support" ON IF (NOT ANDROID AND NOT IOS AND NOT WINRT) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OCV_OPTION(WITH_AVFOUNDATION "Use AVFoundation for Video I/O" ON IF IOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OCV_OPTION(WITH_AVFOUNDATION "Use AVFoundation for Video I/O" ON IF (APPLE OR IOS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCV_OPTION(WITH_CARBON "Use Carbon for UI instead of Cocoa" OFF IF APPLE )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCV_OPTION(WITH_VTK "Include VTK library support (and build opencv_viz module eiher)" ON IF (NOT ANDROID AND NOT IOS AND NOT WINRT AND NOT CMAKE_CROSSCOMPILING) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCV_OPTION(WITH_CUDA "Include NVidia Cuda Runtime support" ON IF (NOT IOS AND NOT WINRT) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git cmake/OpenCVFindLibsVideo.cmake cmake/OpenCVFindLibsVideo.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2e09cf2..978d9de 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/OpenCVFindLibsVideo.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/OpenCVFindLibsVideo.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -316,7 +316,7 @@ if (NOT IOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_QUICKTIME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(HAVE_QUICKTIME YES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(APPLE AND CMAKE_COMPILER_IS_CLANGCXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(HAVE_QTKIT YES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(HAVE_QTKIT NO)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git modules/videoio/CMakeLists.txt modules/videoio/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b5da8d0..e4ca82b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/videoio/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/videoio/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -167,7 +167,7 @@ endif(HAVE_GIGE_API)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(HAVE_AVFOUNDATION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_avfoundation.mm)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND VIDEOIO_LIBRARIES "-framework AVFoundation" "-framework QuartzCore")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(APPEND VIDEOIO_LIBRARIES "-framework AVFoundation" "-framework QuartzCore" "-framework CoreMedia" "-framework CoreFoundation" "-framework AppKit")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(HAVE_QUICKTIME)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/digikam/Portfile b/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf104a3..57a867d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name digikam
version 4.9.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories kde kde4
license GPL-2+
maintainers hyper-world.de:jan openmaintainer \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/Portfile b/math/caffe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc84c93..b28abd9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span>
github.setup BVLC caffe 6d92d8fcfe0eea9495ffbc326256ec5b70c3eed1
version 20150717
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories math science
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerbil/Portfile b/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6095f60..c53ff6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup cmake 1.0
</span>
name gerbil
version 1.0b
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 5004777d0efb900968f5ca2e4f0545ccc67ac0f3 \
sha256 710fc8d7864d5385949a51d9dbd2259f4835449ec7de5b6200ad3d104cd9684f
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/Portfile b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 12a373a..ba24927 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name gmic
version 1.7.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license CeCILL
categories science
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/auto-multiple-choice/Portfile b/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3ab137..b0fb219 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup perl5 1.0
</span> perl5.branches 5.24
name auto-multiple-choice
version 1.2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> categories x11 tex education
platforms darwin
license GPL-2+
</pre><pre style='margin:0'>
</pre>