pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/graphics

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Feb 13 09:23:46 UTC 2020

Modified Files:
        pkgsrc/graphics/opencv: Makefile Makefile.common PLIST buildlink3.mk
            distinfo options.mk
        pkgsrc/graphics/opencv-contrib-face: distinfo
        pkgsrc/graphics/opencv/patches:
            patch-cmake_OpenCVDetectCXXCompiler.cmake

Log Message:
opencv: updated to 3.4.9

version:3.4.9
OpenCV 3.4.9 has been released. Bug fixes, optimizations and other enhancements are propagated into OpenCV 4.2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/opencv/Makefile.common
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/opencv/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/opencv/buildlink3.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/opencv/options.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/opencv-contrib-face/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.87 pkgsrc/graphics/opencv/Makefile:1.88
--- pkgsrc/graphics/opencv/Makefile:1.87        Sun Dec 29 10:00:08 2019
+++ pkgsrc/graphics/opencv/Makefile     Thu Feb 13 09:23:46 2020
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.87 2019/12/29 10:00:08 markd Exp $
+# $NetBSD: Makefile,v 1.88 2020/02/13 09:23:46 adam Exp $
 
 .include "Makefile.common"
 
 DISTNAME=      opencv-${OPENCV_VERSION}
-PKGREVISION=   1
 
 MAINTAINER=    anthony.mallet%laas.fr@localhost
 COMMENT=       Library for computer vision problems
@@ -23,7 +22,8 @@ CHECK_WRKREF_SKIP=    ${PREFIX}/lib/libopen
 
 .include "options.mk"
 
-TEST_TARGET=           test
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/build/lib
+TEST_TARGET=   test
 
 post-install:
        ${RM} -r ${DESTDIR}${PREFIX}/share/licenses
@@ -32,6 +32,7 @@ post-install:
 
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/opencv/Makefile.common
diff -u pkgsrc/graphics/opencv/Makefile.common:1.3 pkgsrc/graphics/opencv/Makefile.common:1.4
--- pkgsrc/graphics/opencv/Makefile.common:1.3  Mon Dec 16 08:24:39 2019
+++ pkgsrc/graphics/opencv/Makefile.common      Thu Feb 13 09:23:46 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.3 2019/12/16 08:24:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2020/02/13 09:23:46 adam Exp $
 # used by graphics/opencv/Makefile
 # used by graphics/opencv-contrib-face/Makefile
 
-OPENCV_VERSION=        3.4.8
+OPENCV_VERSION=        3.4.9
 
 CATEGORIES=    graphics devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=opencv/}

Index: pkgsrc/graphics/opencv/PLIST
diff -u pkgsrc/graphics/opencv/PLIST:1.22 pkgsrc/graphics/opencv/PLIST:1.23
--- pkgsrc/graphics/opencv/PLIST:1.22   Sat Dec 21 22:50:00 2019
+++ pkgsrc/graphics/opencv/PLIST        Thu Feb 13 09:23:46 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2019/12/21 22:50:00 markd Exp $
+@comment $NetBSD: PLIST,v 1.23 2020/02/13 09:23:46 adam Exp $
 bin/opencv_annotation
 bin/opencv_createsamples
 bin/opencv_interactive-calibration
@@ -86,6 +86,7 @@ include/opencv2/core/hal/intrin_sse_em.h
 include/opencv2/core/hal/intrin_vsx.hpp
 include/opencv2/core/hal/intrin_wasm.hpp
 include/opencv2/core/hal/msa_macros.h
+include/opencv2/core/hal/simd_utils.impl.hpp
 include/opencv2/core/ippasync.hpp
 include/opencv2/core/mat.hpp
 include/opencv2/core/mat.inl.hpp
@@ -128,8 +129,10 @@ include/opencv2/core/utility.hpp
 include/opencv2/core/utils/allocator_stats.hpp
 include/opencv2/core/utils/allocator_stats.impl.hpp
 include/opencv2/core/utils/filesystem.hpp
+include/opencv2/core/utils/instrumentation.hpp
 include/opencv2/core/utils/logger.defines.hpp
 include/opencv2/core/utils/logger.hpp
+include/opencv2/core/utils/tls.hpp
 include/opencv2/core/utils/trace.hpp
 include/opencv2/core/va_intel.hpp
 include/opencv2/core/version.hpp

Index: pkgsrc/graphics/opencv/buildlink3.mk
diff -u pkgsrc/graphics/opencv/buildlink3.mk:1.4 pkgsrc/graphics/opencv/buildlink3.mk:1.5
--- pkgsrc/graphics/opencv/buildlink3.mk:1.4    Tue Jul 16 15:39:35 2019
+++ pkgsrc/graphics/opencv/buildlink3.mk        Thu Feb 13 09:23:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2019/07/16 15:39:35 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/02/13 09:23:46 adam Exp $
 
 BUILDLINK_TREE+=       opencv
 
@@ -8,12 +8,9 @@ OPENCV_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.opencv+= opencv>=3.0.0
 BUILDLINK_PKGSRCDIR.opencv?=   ../../graphics/opencv
 
-.include "../../mk/pkg-build-options.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.opencv:Mjasper)
-.  include "../../graphics/jasper/buildlink3.mk"
-.endif
+.include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.44 pkgsrc/graphics/opencv/distinfo:1.45
--- pkgsrc/graphics/opencv/distinfo:1.44        Sun Dec 29 10:00:08 2019
+++ pkgsrc/graphics/opencv/distinfo     Thu Feb 13 09:23:46 2020
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.44 2019/12/29 10:00:08 markd Exp $
+$NetBSD: distinfo,v 1.45 2020/02/13 09:23:46 adam Exp $
 
-SHA1 (opencv-3.4.8.tar.gz) = ae032936ddbfecca7fbe6cd307d942604f26d403
-RMD160 (opencv-3.4.8.tar.gz) = 40652271f410d9d48904a7df428465296f71d874
-SHA512 (opencv-3.4.8.tar.gz) = 6c2dfa88e9a93747397f80e6a3dd7eed126bc14efe6c0ec5b064d10bc49f24fc6fb187029f3ac6f5d9f5c16465b96ba55e5d5cacc3584dce69e10567df423ccb
-Size (opencv-3.4.8.tar.gz) = 87343996 bytes
+SHA1 (opencv-3.4.9.tar.gz) = bcd0fafc9f1a240d92af9007c9f8098da601d7a5
+RMD160 (opencv-3.4.9.tar.gz) = 2ab36f669a70c876e739736e6b9daacabc5933fe
+SHA512 (opencv-3.4.9.tar.gz) = f445970ca39794fc5fbcaed8b506c6b332cbce911ed8487f490bca9a565c8ed3071816261a1803a8f4b43f58d66ca5eaab30be478c4b7ee973a6b6fc2b370869
+Size (opencv-3.4.9.tar.gz) = 87342965 bytes
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
 SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
 SHA1 (patch-CMakeLists.txt) = 029368ab14163640d1651f572810eb8eb0c043d9
-SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
+SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
 SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471

Index: pkgsrc/graphics/opencv/options.mk
diff -u pkgsrc/graphics/opencv/options.mk:1.9 pkgsrc/graphics/opencv/options.mk:1.10
--- pkgsrc/graphics/opencv/options.mk:1.9       Sun Dec 29 10:00:08 2019
+++ pkgsrc/graphics/opencv/options.mk   Thu Feb 13 09:23:46 2020
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.9 2019/12/29 10:00:08 markd Exp $
+# $NetBSD: options.mk,v 1.10 2020/02/13 09:23:46 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opencv
-PKG_SUPPORTED_OPTIONS= ffmpeg jasper
+PKG_SUPPORTED_OPTIONS= ffmpeg
 
 .include "../../mk/bsd.options.mk"
 
@@ -14,14 +14,5 @@ CMAKE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/
 CMAKE_ARGS+=   -DWITH_FFMPEG=OFF
 .endif
 
-.if !empty(PKG_OPTIONS:Mjasper)
-CMAKE_ARGS+=   -DWITH_JASPER=ON
-# jasper uses SIZE_MAX and friends in its headers.
-CXXFLAGS+=     -D__STDC_LIMIT_MACROS
-.include "../../graphics/jasper/buildlink3.mk"
-.else
-CMAKE_ARGS+=   -DWITH_JASPER=OFF
-.endif
-
 # FIXME: should be option.mk'ed instead
 CMAKE_ARGS+=   -DBUILD_DOCS=OFF

Index: pkgsrc/graphics/opencv-contrib-face/distinfo
diff -u pkgsrc/graphics/opencv-contrib-face/distinfo:1.13 pkgsrc/graphics/opencv-contrib-face/distinfo:1.14
--- pkgsrc/graphics/opencv-contrib-face/distinfo:1.13   Tue Dec 31 10:15:50 2019
+++ pkgsrc/graphics/opencv-contrib-face/distinfo        Thu Feb 13 09:23:46 2020
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.13 2019/12/31 10:15:50 mef Exp $
+$NetBSD: distinfo,v 1.14 2020/02/13 09:23:46 adam Exp $
 
-SHA1 (opencv-3.4.8.tar.gz) = ae032936ddbfecca7fbe6cd307d942604f26d403
-RMD160 (opencv-3.4.8.tar.gz) = 40652271f410d9d48904a7df428465296f71d874
-SHA512 (opencv-3.4.8.tar.gz) = 6c2dfa88e9a93747397f80e6a3dd7eed126bc14efe6c0ec5b064d10bc49f24fc6fb187029f3ac6f5d9f5c16465b96ba55e5d5cacc3584dce69e10567df423ccb
-Size (opencv-3.4.8.tar.gz) = 87343996 bytes
-SHA1 (opencv_contrib-3.4.8.tar.gz) = 4bbae66b0e75077a1a4d2e9b887aa78cb7ba386f
-RMD160 (opencv_contrib-3.4.8.tar.gz) = 9e4c29c1e4df283288ea91ad5630822e5f60ca70
-SHA512 (opencv_contrib-3.4.8.tar.gz) = dcb8fbbe87f46739540989b49167c8663963656a935fb4e42785d00f2d95b85288aae6f4024c27322fb0589c9700cf99cadcaa710228c335097b2d5914f7c7fb
-Size (opencv_contrib-3.4.8.tar.gz) = 57305269 bytes
+SHA1 (opencv-3.4.9.tar.gz) = bcd0fafc9f1a240d92af9007c9f8098da601d7a5
+RMD160 (opencv-3.4.9.tar.gz) = 2ab36f669a70c876e739736e6b9daacabc5933fe
+SHA512 (opencv-3.4.9.tar.gz) = f445970ca39794fc5fbcaed8b506c6b332cbce911ed8487f490bca9a565c8ed3071816261a1803a8f4b43f58d66ca5eaab30be478c4b7ee973a6b6fc2b370869
+Size (opencv-3.4.9.tar.gz) = 87342965 bytes
+SHA1 (opencv_contrib-3.4.9.tar.gz) = ff8529d40acc5619ee046bbdcbebc7cc06eca5a7
+RMD160 (opencv_contrib-3.4.9.tar.gz) = db0189ee28092423ca79104ead9388d27c986ec0
+SHA512 (opencv_contrib-3.4.9.tar.gz) = 3a15425b1dd920c1050463426ef0c4a02db17487414b5e82c3f1222f01f5850df49cbf39fd56ede055d4882c30663b068260e7cb3138fa6cf12d66804c7b9e48
+Size (opencv_contrib-3.4.9.tar.gz) = 56142721 bytes
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
 SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
 SHA1 (patch-CMakeLists.txt) = 029368ab14163640d1651f572810eb8eb0c043d9
-SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
+SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = ac7deccedcc5071d3785c7827a06419713ba0529
 SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa
 SHA1 (patch-modules_core_src_downhill__simplex.cpp) = 1ad7c2fa126d15050b87785e8eec20dbe796b471

Index: pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake
diff -u pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake:1.1 pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake:1.2
--- pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake:1.1        Thu Oct  8 17:45:59 2015
+++ pkgsrc/graphics/opencv/patches/patch-cmake_OpenCVDetectCXXCompiler.cmake    Thu Feb 13 09:23:46 2020
@@ -1,17 +1,17 @@
-$NetBSD: patch-cmake_OpenCVDetectCXXCompiler.cmake,v 1.1 2015/10/08 17:45:59 fhajny Exp $
+$NetBSD: patch-cmake_OpenCVDetectCXXCompiler.cmake,v 1.2 2020/02/13 09:23:46 adam Exp $
 
 Rely on pkgsrc to set architeture, see CONFIGURE_ENV.
 
---- cmake/OpenCVDetectCXXCompiler.cmake.orig   2015-06-03 17:21:34.000000000 +0000
+--- cmake/OpenCVDetectCXXCompiler.cmake.orig   2019-12-19 15:16:47.000000000 +0000
 +++ cmake/OpenCVDetectCXXCompiler.cmake
-@@ -103,6 +103,10 @@ if(MSVC64 OR MINGW64)
-   set(X86_64 1)
- elseif(MINGW OR (MSVC AND NOT CMAKE_CROSSCOMPILING))
-   set(X86 1)
+@@ -84,6 +84,10 @@ endif()
+ message(STATUS "Detected processor: ${CMAKE_SYSTEM_PROCESSOR}")
+ if(OPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION)
+   # custom setup: required variables are passed through cache / CMake's command-line
 +elseif("$ENV{MACHINE_ARCH}" MATCHES "x86_64")
 +  set(X86_64 1)
 +elseif("$ENV{MACHINE_ARCH}" MATCHES "i386")
 +  set(X86 1)
  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*")
    set(X86_64 1)
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*")
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*")
Home | Main Index | Thread Index | Old Index