CVS commit: pkgsrc/graphics/opencv

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Dec 29 10:00:08 UTC 2019

Modified Files:
        pkgsrc/graphics/opencv: Makefile distinfo options.mk
        pkgsrc/graphics/opencv/patches: patch-CMakeLists.txt

Log Message:
opencv: switch to ffmpeg4.  Don't pick up stray packages.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/opencv/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/opencv/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt

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.86 pkgsrc/graphics/opencv/Makefile:1.87
--- pkgsrc/graphics/opencv/Makefile:1.86        Mon Dec 16 08:24:39 2019
+++ pkgsrc/graphics/opencv/Makefile     Sun Dec 29 10:00:08 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.86 2019/12/16 08:24:39 adam Exp $
+# $NetBSD: Makefile,v 1.87 2019/12/29 10:00:08 markd Exp $
 
 .include "Makefile.common"
 
 DISTNAME=      opencv-${OPENCV_VERSION}
+PKGREVISION=   1
 
 MAINTAINER=    anthony.mallet%laas.fr@localhost
 COMMENT=       Library for computer vision problems

Index: pkgsrc/graphics/opencv/distinfo
diff -u pkgsrc/graphics/opencv/distinfo:1.43 pkgsrc/graphics/opencv/distinfo:1.44
--- pkgsrc/graphics/opencv/distinfo:1.43        Mon Dec 16 08:24:39 2019
+++ pkgsrc/graphics/opencv/distinfo     Sun Dec 29 10:00:08 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2019/12/16 08:24:39 adam Exp $
+$NetBSD: distinfo,v 1.44 2019/12/29 10:00:08 markd Exp $
 
 SHA1 (opencv-3.4.8.tar.gz) = ae032936ddbfecca7fbe6cd307d942604f26d403
 RMD160 (opencv-3.4.8.tar.gz) = 40652271f410d9d48904a7df428465296f71d874
@@ -6,7 +6,7 @@ SHA512 (opencv-3.4.8.tar.gz) = 6c2dfa88e
 Size (opencv-3.4.8.tar.gz) = 87343996 bytes
 SHA1 (patch-3rdparty_ippicv_ippicv.cmake) = 14ce5de382084793ace32f43c6dfaf01f7ffb390
 SHA1 (patch-3rdparty_protobuf_src_google_protobuf_message__lite.cc) = f1b77384ea8110d2bf3a30ff3fe9f2fa39608caf
-SHA1 (patch-CMakeLists.txt) = 43fac541d6445186e335cb74c95d9e1c05749edd
+SHA1 (patch-CMakeLists.txt) = 029368ab14163640d1651f572810eb8eb0c043d9
 SHA1 (patch-cmake_OpenCVDetectCXXCompiler.cmake) = 221b0551d0f29d7e79afe3da8a33b1b3a4f7bf20
 SHA1 (patch-cmake_OpenCVDetectPython.cmake) = 4f3bfe574edf083ebc7e78d347355c58461b2c6b
 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = 75444e65677be99af8167f9060419d7970a7adaa

Index: pkgsrc/graphics/opencv/options.mk
diff -u pkgsrc/graphics/opencv/options.mk:1.8 pkgsrc/graphics/opencv/options.mk:1.9
--- pkgsrc/graphics/opencv/options.mk:1.8       Tue Jul 16 15:36:02 2019
+++ pkgsrc/graphics/opencv/options.mk   Sun Dec 29 10:00:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2019/07/16 15:36:02 nia Exp $
+# $NetBSD: options.mk,v 1.9 2019/12/29 10:00:08 markd Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opencv
 PKG_SUPPORTED_OPTIONS= ffmpeg jasper
@@ -7,9 +7,9 @@ PKG_SUPPORTED_OPTIONS=  ffmpeg jasper
 
 .if !empty(PKG_OPTIONS:Mffmpeg)
 CMAKE_ARGS+=   -DWITH_FFMPEG=ON
-CMAKE_ARGS+=   -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg2
-CMAKE_ARGS+=   -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg2
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+CMAKE_ARGS+=   -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg4
+CMAKE_ARGS+=   -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg4
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .else
 CMAKE_ARGS+=   -DWITH_FFMPEG=OFF
 .endif

Index: pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.8 pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.9
--- pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt:1.8     Mon Dec 16 08:24:39 2019
+++ pkgsrc/graphics/opencv/patches/patch-CMakeLists.txt Sun Dec 29 10:00:08 2019
@@ -1,10 +1,47 @@
-$NetBSD: patch-CMakeLists.txt,v 1.8 2019/12/16 08:24:39 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.9 2019/12/29 10:00:08 markd Exp $
 
+Don't add to CMAKE_LIBRARY_PATH, may cause other versions of packages
+to be found in preference to pkgsrc ones.
 Do not build third party libraries on Darwin.
 
 --- CMakeLists.txt.orig        2019-10-09 11:42:29.000000000 +0000
 +++ CMakeLists.txt
-@@ -201,13 +201,13 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable
+@@ -151,34 +151,6 @@ OCV_OPTION(ENABLE_CXX11 "Enable C++11 co
+ include(cmake/OpenCVDetectCXXCompiler.cmake)
+ ocv_cmake_hook(POST_DETECT_COMPILER)
+ 
+-# Add these standard paths to the search paths for FIND_LIBRARY
+-# to find libraries from these locations first
+-if(UNIX AND NOT ANDROID)
+-  if(X86_64 OR CMAKE_SIZEOF_VOID_P EQUAL 8)
+-    if(EXISTS /lib64)
+-      list(APPEND CMAKE_LIBRARY_PATH /lib64)
+-    else()
+-      list(APPEND CMAKE_LIBRARY_PATH /lib)
+-    endif()
+-    if(EXISTS /usr/lib64)
+-      list(APPEND CMAKE_LIBRARY_PATH /usr/lib64)
+-    else()
+-      list(APPEND CMAKE_LIBRARY_PATH /usr/lib)
+-    endif()
+-  elseif(X86 OR CMAKE_SIZEOF_VOID_P EQUAL 4)
+-    if(EXISTS /lib32)
+-      list(APPEND CMAKE_LIBRARY_PATH /lib32)
+-    else()
+-      list(APPEND CMAKE_LIBRARY_PATH /lib)
+-    endif()
+-    if(EXISTS /usr/lib32)
+-      list(APPEND CMAKE_LIBRARY_PATH /usr/lib32)
+-    else()
+-      list(APPEND CMAKE_LIBRARY_PATH /usr/lib)
+-    endif()
+-  endif()
+-endif()
+-
+ # Add these standard paths to the search paths for FIND_PATH
+ # to find include files from these locations first
+ if(MINGW)
+@@ -201,13 +173,13 @@ OCV_OPTION(OPENCV_ENABLE_NONFREE "Enable
  
  # 3rd party libs
  OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD   "Force using 3rdparty code from source" OFF)