Attachment #204544 for bug #237847

Lines 24-34 Link Here

(-)graphics/digikam/Makefile (-2 / +4 lines)
24	liblcms2.so:graphics/lcms2 \	24	liblcms2.so:graphics/lcms2 \
25	liblensfun.so:graphics/lensfun \	25	liblensfun.so:graphics/lensfun \
26	liblqr-1.so:graphics/liblqr-1 \	26	liblqr-1.so:graphics/liblqr-1 \
27	libopencv_video.so:graphics/opencv \
28	libopencv_core.so:graphics/opencv-core \
29	libpgf.so:graphics/libpgf \	27	libpgf.so:graphics/libpgf \
30	libpng.so:graphics/png \	28	libpng.so:graphics/png \
31	libtiff.so:graphics/tiff	29	libtiff.so:graphics/tiff
		30	BUILD_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_video.so:graphics/opencv \
		31	${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core
		32	RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_video.so:graphics/opencv \
		33	${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core
32		34
33	USES= bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl jpeg \	35	USES= bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl jpeg \
34	kde:5 pkgconfig qt:5 shebangfix tar:xz	36	kde:5 pkgconfig qt:5 shebangfix tar:xz

Lines 12-21 Link Here

(-)graphics/nomacs/Makefile (-2 / +4 lines)
12		12
13	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \	13	LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
14	libsysinfo.so:devel/libsysinfo \	14	libsysinfo.so:devel/libsysinfo \
15	libopencv_highgui.so:graphics/opencv \
16	libopencv_core.so:graphics/opencv-core \
17	liblcms2.so:graphics/lcms2 \	15	liblcms2.so:graphics/lcms2 \
18	libtbb.so:devel/tbb	16	libtbb.so:devel/tbb
		17	BUILD_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \
		18	${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core
		19	RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \
		20	${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core
19		21
20	USES= cmake desktop-file-utils dos2unix pkgconfig qt:5 tar:bzip2	22	USES= cmake desktop-file-utils dos2unix pkgconfig qt:5 tar:bzip2
21	USE_QT= concurrent core gui network printsupport svg widgets \	23	USE_QT= concurrent core gui network printsupport svg widgets \

Lines 61-69 Link Here

(-)graphics/openimageio/Makefile (-3 / +6 lines)
61	OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio	61	OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio
62		62
63	OPENCV_CMAKE_BOOL= USE_OPENCV	63	OPENCV_CMAKE_BOOL= USE_OPENCV
64	OPENCV_LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \	64	OPENCV_CMAKE_ARGS= -DLOCALBASE:PATH=${LOCALBASE}
65	libopencv_core.so:graphics/opencv-core \	65	OPENCV_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15
66	libopenjpeg.so:graphics/openjpeg15	66	OPENCV_BUILD_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \
		67	${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv
		68	OPENCV_RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \
		69	${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv
67		70
68	OPENJPEG_CMAKE_BOOL= USE_OPENJPEG	71	OPENJPEG_CMAKE_BOOL= USE_OPENJPEG
69	OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg	72	OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg




--- 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 ()




--- src/libOpenImageIO/imagebufalgo_opencv.cpp.orig	2019-05-19 18:47:12 UTC
+++ src/libOpenImageIO/imagebufalgo_opencv.cpp
@@ -37,6 +37,7 @@
 #include <opencv2/core/core_c.h>
 #include <opencv2/highgui/highgui_c.h>
 #include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/videoio/videoio_c.h>
 #endif
 
 #include <iostream>
@@ -49,7 +50,6 @@
 #include <OpenImageIO/dassert.h>
 #include <OpenImageIO/thread.h>
 #include <OpenImageIO/sysutil.h>
-
 
 
 OIIO_NAMESPACE_BEGIN




LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE
LICENSE_FILE_MIT=	${WRKSRC}/LICENSE

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 pkgconfig
DOS2UNIX_GLOB=	*.cpp *.hpp
CMAKE_ARGS=	-DOPENCV_PREFIX:PATH="${LOCALBASE}" \
		-DOpenCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libOpenCL.so"




--- 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()
 

-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_PKG_LIBRARY_DIRS})
 
 if(HAVE_OPENCV)
   add_definitions(-DHAVE_OPENCV)

Lines 23-32 Link Here

(-)graphics/yafaray/Makefile (-2 / +4 lines)
23	libfreetype.so:print/freetype2 \	23	libfreetype.so:print/freetype2 \
24	libHalf.so:graphics/ilmbase \	24	libHalf.so:graphics/ilmbase \
25	libIlmImf.so:graphics/openexr \	25	libIlmImf.so:graphics/openexr \
26	libopencv_photo.so:graphics/opencv \
27	libopencv_core.so:graphics/opencv-core \
28	libpng16.so:graphics/png \	26	libpng16.so:graphics/png \
29	libtiff.so:graphics/tiff	27	libtiff.so:graphics/tiff
		28	BUILD_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \
		29	${LOCALBASE}/lib/opencv4/libopencv_photo.so:graphics/opencv
		30	RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_core.so:graphics/opencv-core \
		31	${LOCALBASE}/lib/opencv4/libopencv_photo.so:graphics/opencv
30		32
31	USES= cmake gnome jpeg	33	USES= cmake gnome jpeg
32	USE_GITHUB= yes	34	USE_GITHUB= yes

Return to bug 237847

Line 0 Link Here

(-)graphics/openimageio/files/patch-src_cmake_modules_FindOpenCV.cmake (+38 lines)
	1	--- src/cmake/modules/FindOpenCV.cmake.orig 2018-12-01 16:42:08 UTC
	2	+++ src/cmake/modules/FindOpenCV.cmake
	3	@@ -16,13 +16,16 @@ IF(PKG_CONFIG_FOUND AND NOT LIBRAW_PATH)
	4	SET(LibRaw_r_DEFINITIONS ${PC_LIBRAW_R_CFLAGS_OTHER})
	5	ENDIF()
	6
	7	-find_path (OpenCV_INCLUDE_DIR opencv/cv.h
	8	+find_path (OpenCV_INCLUDE_DIR opencv2/core/core_c.h
	9	+ HINTS
	10	+ "${LOCALBASE}/include"
	11	"${PROJECT_SOURCE_DIR}/include"
	12	"${OpenCV_DIR}/include"
	13	"$ENV{OpenCV_DIR}/include"
	14	/usr/local/include
	15	/opt/local/include
	16	/usr/local/opt/opencv3/include
	17	+ PATH_SUFFIXES opencv4
	18	)
	19	if (OpenCV_INCLUDE_DIR AND EXISTS "${OpenCV_INCLUDE_DIR}/opencv2/core/version.hpp")
	20	file (STRINGS "${OpenCV_INCLUDE_DIR}/opencv2/core/version.hpp" TMP REGEX "^#define CV_VERSION_EPOCH .*$")
	21	@@ -48,6 +51,7 @@ set (libdirs "${PROJECT_SOURCE_DIR}/lib"
	22	/usr/local/lib
	23	/opt/local/lib
	24	/usr/local/opt/opencv3/lib
	25	+ "${LOCALBASE}/lib/"
	26	)
	27
	28
	29	@@ -60,7 +64,8 @@ endif ()
	30	foreach (component ${opencv_components})
	31	find_library (${component}_lib
	32	NAMES ${component}
	33	- PATHS ${libdirs} )
	34	+ PATHS ${libdirs}
	35	+ PATH_SUFFIXES opencv4 )
	36	if (${component}_lib)
	37	set (OpenCV_LIBS ${OpenCV_LIBS} ${${component}_lib})
	38	endif ()

Line 0 Link Here

(-)graphics/openimageio/files/patch-src_libOpenImageIO_imagebufalgo__opencv.cpp (+18 lines)
	1	--- src/libOpenImageIO/imagebufalgo_opencv.cpp.orig 2019-05-19 18:47:12 UTC
	2	+++ src/libOpenImageIO/imagebufalgo_opencv.cpp
	3	@@ -37,6 +37,7 @@
	4	#include <opencv2/core/core_c.h>
	5	#include <opencv2/highgui/highgui_c.h>
	6	#include <opencv2/imgproc/imgproc_c.h>
	7	+#include <opencv2/videoio/videoio_c.h>
	8	#endif
	9
	10	#include <iostream>
	11	@@ -49,7 +50,6 @@
	12	#include <OpenImageIO/dassert.h>
	13	#include <OpenImageIO/thread.h>
	14	#include <OpenImageIO/sysutil.h>
	15	-
	16
	17
	18	OIIO_NAMESPACE_BEGIN

Lines 14-27 Link Here

(-)graphics/waifu2x-converter-cpp/Makefile (-4 / +6 lines)
14	LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE	14	LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE
15	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE	15	LICENSE_FILE_MIT= ${WRKSRC}/LICENSE
16		16
17	BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl	17	BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl \
18	LIB_DEPENDS= libopencv_highgui.so:graphics/opencv \	18	${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \
19	libopencv_imgproc.so:graphics/opencv-core	19	${LOCALBASE}/lib/opencv4/libopencv_imgproc.so:graphics/opencv-core
		20	RUN_DEPENDS= ${LOCALBASE}/lib/opencv4/libopencv_highgui.so:graphics/opencv \
		21	${LOCALBASE}/lib/opencv4/libopencv_imgproc.so:graphics/opencv-core
20		22
21	USE_GITHUB= yes	23	USE_GITHUB= yes
22	GH_ACCOUNT= tanakamura	24	GH_ACCOUNT= tanakamura
23		25
24	USES= cmake compiler:c++11-lib dos2unix	26	USES= cmake compiler:c++11-lib dos2unix pkgconfig
25	DOS2UNIX_GLOB= .cpp .hpp	27	DOS2UNIX_GLOB= .cpp .hpp
26	CMAKE_ARGS= -DOPENCV_PREFIX:PATH="${LOCALBASE}" \	28	CMAKE_ARGS= -DOPENCV_PREFIX:PATH="${LOCALBASE}" \
27	-DOpenCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libOpenCL.so"	29	-DOpenCL_LIBRARY:FILEPATH="${LOCALBASE}/lib/libOpenCL.so"

Lines 1-6 Link Here

(-)graphics/waifu2x-converter-cpp/files/patch-CMakeLists.txt (-4 / +16 lines)
1	--- CMakeLists.txt.orig 2018-05-02 21:05:51.508265000 +0000	1	--- CMakeLists.txt.orig 2016-01-30 17:04:48 UTC
2	+++ CMakeLists.txt 2018-05-02 21:05:54.408309000 +0000	2	+++ CMakeLists.txt
3	@@ -22,7 +22,7 @@ else()	3	@@ -5,7 +5,7 @@ add_executable(conv conv.c)
		4	find_package(PkgConfig)
		5	include(CheckIncludeFileCXX)
		6
		7	-pkg_check_modules(OPENCV_PKG opencv)
		8	+pkg_check_modules(OPENCV_PKG opencv4)
		9
		10	string(TIMESTAMP TS)
		11	add_definitions(-DBUILD_TS="${TS}")
		12	@@ -22,9 +22,9 @@ else()
4	link_directories(${OPENCV_PREFIX}/lib)	13	link_directories(${OPENCV_PREFIX}/lib)
5	endif()	14	endif()
6		15
Lines 7-11 Link Here
7	-check_include_file_cxx("opencv2/opencv.hpp" HAVE_OPENCV)	16	-check_include_file_cxx("opencv2/opencv.hpp" HAVE_OPENCV)
8	+check_include_file_cxx("opencv2/videoio.hpp" HAVE_OPENCV)	17	+check_include_file_cxx("opencv2/videoio.hpp" HAVE_OPENCV)
9	find_library(IMGCODECS_LIBRARY NAMES opencv_imgcodecs opencv_highgui	18	find_library(IMGCODECS_LIBRARY NAMES opencv_imgcodecs opencv_highgui
10	HINTS ${OPENCV_PKG_INCLUDE_DIRS} ${OPENCV_PREFIX}/lib)	19	- HINTS ${OPENCV_PKG_INCLUDE_DIRS} ${OPENCV_PREFIX}/lib)
		20	+ HINTS ${OPENCV_PKG_INCLUDE_DIRS} ${OPENCV_PKG_LIBRARY_DIRS})
11		21
		22	if(HAVE_OPENCV)
		23	add_definitions(-DHAVE_OPENCV)