Index: graphics/digikam/Makefile =================================================================== --- graphics/digikam/Makefile (revision 500577) +++ graphics/digikam/Makefile (working copy) @@ -24,11 +24,13 @@ liblcms2.so:graphics/lcms2 \ liblensfun.so:graphics/lensfun \ liblqr-1.so:graphics/liblqr-1 \ - libopencv_video.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ libpgf.so:graphics/libpgf \ libpng.so:graphics/png \ libtiff.so:graphics/tiff +BUILD_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_video.so:graphics/opencv \ + ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core +RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_video.so:graphics/opencv \ + ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core USES= bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl jpeg \ kde:5 pkgconfig qt:5 shebangfix tar:xz Index: graphics/nomacs/Makefile =================================================================== --- graphics/nomacs/Makefile (revision 500577) +++ graphics/nomacs/Makefile (working copy) @@ -12,10 +12,12 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libsysinfo.so:devel/libsysinfo \ - libopencv_highgui.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ liblcms2.so:graphics/lcms2 \ libtbb.so:devel/tbb +BUILD_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \ + ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core +RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \ + ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core USES= cmake desktop-file-utils dos2unix pkgconfig qt:5 tar:bzip2 USE_QT= concurrent core gui network printsupport svg widgets \ Index: graphics/openimageio/Makefile =================================================================== --- graphics/openimageio/Makefile (revision 500577) +++ graphics/openimageio/Makefile (working copy) @@ -61,9 +61,12 @@ OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio OPENCV_CMAKE_BOOL= USE_OPENCV -OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ - libopenjpeg.so:graphics/openjpeg15 +OPENCV_CMAKE_ARGS= -DLOCALBASE:PATH=${LOCALBASE} +OPENCV_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 +OPENCV_BUILD_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \ + ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv +OPENCV_RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \ + ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv OPENJPEG_CMAKE_BOOL= USE_OPENJPEG OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg Index: graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake =================================================================== --- graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake (nonexistent) +++ graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake (working copy) @@ -0,0 +1,38 @@ +--- src/cmake/modules/FindOpenCV.cmake.orig 2018-12-01 16:42:08 UTC ++++ src/cmake/modules/FindOpenCV.cmake +@@ -16,13 +16,16 @@ IF(PKG_CONFIG_FOUND AND NOT LIBRAW_PATH) + SET(LibRaw_r_DEFINITIONS ${PC_LIBRAW_R_CFLAGS_OTHER}) + ENDIF() + +-find_path (OpenCV_INCLUDE_DIR opencv/cv.h ++find_path (OpenCV_INCLUDE_DIR opencv2/core/core_c.h ++ HINTS ++ "${LOCALBASE}/include" + "${PROJECT_SOURCE_DIR}/include" + "${OpenCV_DIR}/include" + "$ENV{OpenCV_DIR}/include" + /usr/local/include + /opt/local/include + /usr/local/opt/opencv3/include ++ PATH_SUFFIXES opencv4 + ) + if (OpenCV_INCLUDE_DIR AND EXISTS "${OpenCV_INCLUDE_DIR}/opencv2/core/version.hpp") + file (STRINGS "${OpenCV_INCLUDE_DIR}/opencv2/core/version.hpp" TMP REGEX "^#define CV_VERSION_EPOCH .*$") +@@ -48,6 +51,7 @@ set (libdirs "${PROJECT_SOURCE_DIR}/lib" + /usr/local/lib + /opt/local/lib + /usr/local/opt/opencv3/lib ++ "${LOCALBASE}/lib/" + ) + + +@@ -60,7 +64,8 @@ endif () + foreach (component ${opencv_components}) + find_library (${component}_lib + NAMES ${component} +- PATHS ${libdirs} ) ++ PATHS ${libdirs} ++ PATH_SUFFIXES opencv4 ) + if (${component}_lib) + set (OpenCV_LIBS ${OpenCV_LIBS} ${${component}_lib}) + endif () Property changes on: graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/openimageio/files/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp =================================================================== --- graphics/openimageio/files/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp (nonexistent) +++ graphics/openimageio/files/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp (working copy) @@ -0,0 +1,18 @@ +--- src/libOpenImageIO/imagebufalgo_opencv.cpp.orig 2019-05-19 18:47:12 UTC ++++ src/libOpenImageIO/imagebufalgo_opencv.cpp +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #endif + + #include +@@ -49,7 +50,6 @@ + #include + #include + #include +- + + + OIIO_NAMESPACE_BEGIN Property changes on: graphics/openimageio/files/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: graphics/waifu2x-converter-cpp/Makefile =================================================================== --- graphics/waifu2x-converter-cpp/Makefile (revision 500577) +++ graphics/waifu2x-converter-cpp/Makefile (working copy) @@ -14,14 +14,16 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl -LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \ - libopencv_imgproc.so:graphics/opencv-core +BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl \ + ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \ + ${LOCALBASE}/lib/opencv4/libopencv_imgproc.so:graphics/opencv-core +RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \ + ${LOCALBASE}/lib/opencv4/libopencv_imgproc.so:graphics/opencv-core USE_GITHUB= yes GH_ACCOUNT= tanakamura -USES= cmake compiler:c++11-lib dos2unix +USES= cmake compiler:c++11-lib dos2unix pkgconfig DOS2UNIX_GLOB= *.cpp *.hpp CMAKE_ARGS= -DOPENCV_PREFIX:PATH="${LOCALBASE}" \ -DOpenCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libOpenCL.so" Index: graphics/waifu2x-converter-cpp/files/patch-CMakeLists.txt =================================================================== --- graphics/waifu2x-converter-cpp/files/patch-CMakeLists.txt (revision 500577) +++ graphics/waifu2x-converter-cpp/files/patch-CMakeLists.txt (working copy) @@ -1,6 +1,15 @@ ---- CMakeLists.txt.orig 2018-05-02 21:05:51.508265000 +0000 -+++ CMakeLists.txt 2018-05-02 21:05:54.408309000 +0000 -@@ -22,7 +22,7 @@ else() +--- CMakeLists.txt.orig 2016-01-30 17:04:48 UTC ++++ CMakeLists.txt +@@ -5,7 +5,7 @@ add_executable(conv conv.c) + find_package(PkgConfig) + include(CheckIncludeFileCXX) + +-pkg_check_modules(OPENCV_PKG opencv) ++pkg_check_modules(OPENCV_PKG opencv4) + + string(TIMESTAMP TS) + add_definitions(-DBUILD_TS="${TS}") +@@ -22,9 +22,9 @@ else() link_directories(${OPENCV_PREFIX}/lib) endif() @@ -7,5 +16,8 @@ -check_include_file_cxx("opencv2/opencv.hpp" HAVE_OPENCV) +check_include_file_cxx("opencv2/videoio.hpp" HAVE_OPENCV) find_library(IMGCODECS_LIBRARY NAMES opencv_imgcodecs opencv_highgui - HINTS ${OPENCV_PKG_INCLUDE_DIRS} ${OPENCV_PREFIX}/lib) +- HINTS ${OPENCV_PKG_INCLUDE_DIRS} ${OPENCV_PREFIX}/lib) ++ HINTS ${OPENCV_PKG_INCLUDE_DIRS} ${OPENCV_PKG_LIBRARY_DIRS}) + if(HAVE_OPENCV) + add_definitions(-DHAVE_OPENCV) Index: graphics/yafaray/Makefile =================================================================== --- graphics/yafaray/Makefile (revision 500577) +++ graphics/yafaray/Makefile (working copy) @@ -23,10 +23,12 @@ libfreetype.so:print/freetype2 \ libHalf.so:graphics/ilmbase \ libIlmImf.so:graphics/openexr \ - libopencv_photo.so:graphics/opencv \ - libopencv_core.so:graphics/opencv-core \ libpng16.so:graphics/png \ libtiff.so:graphics/tiff +BUILD_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \ + ${LOCALBASE}/lib/opencv4/libopencv_photo.so:graphics/opencv +RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \ + ${LOCALBASE}/lib/opencv4/libopencv_photo.so:graphics/opencv USES= cmake gnome jpeg USE_GITHUB= yes