diff options
| author | dbj <dbj@pkgsrc.org> | 2016-02-17 04:49:47 +0000 |
|---|---|---|
| committer | dbj <dbj@pkgsrc.org> | 2016-02-17 04:49:47 +0000 |
| commit | 43699ea6a2d4eef6ce368cac8f7fcee7ee618869 (patch) | |
| tree | 7726b49b71e16e291539b58e6d6c2c138fc9a339 /graphics | |
| parent | d445db3ad7976bc2ab16e37496f6cc780e2ac715 (diff) | |
| download | pkgsrc-43699ea6a2d4eef6ce368cac8f7fcee7ee618869.tar.gz | |
fix linking of openCV libraries.
fixes build on Darwin
Diffstat (limited to 'graphics')
3 files changed, 38 insertions, 1 deletions
diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index 83d65156b88..f8e8291099f 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,13 +1,15 @@ -$NetBSD: distinfo,v 1.13 2015/12/15 09:29:04 markd Exp $ +$NetBSD: distinfo,v 1.14 2016/02/17 04:49:47 dbj Exp $ SHA1 (oiio-Release-1.5.16.tar.gz) = 9e067be3bd191841faaa39352fee66a22352db19 RMD160 (oiio-Release-1.5.16.tar.gz) = b4d17be7e2d074b2e5a936834c5540242f7603e7 SHA512 (oiio-Release-1.5.16.tar.gz) = 8ecf2b42875b05aa72a227e56f8c247560d8e53505d51812449afa57db39e7c8425c1fdfa87a08b22c0592a24e457fba4b98ad91642168e45d99753ca4cf7b8e Size (oiio-Release-1.5.16.tar.gz) = 23136543 bytes SHA1 (patch-CMakeLists.txt) = cce7fabfd51526847ea964fa7fd5ca3e8a6b08e7 +SHA1 (patch-src_cmake_externalpackages.cmake) = ba2ab35ab10ae1e3d8a44244f3ffd50e18bfb7b0 SHA1 (patch-src_cmake_modules_FindOpenJpeg.cmake) = 5c68708dc0c987c27719e63ab634bcdcde4d7bee SHA1 (patch-src_cmake_oiio__macros.cmake) = 37962a7256e1e82b6ffa1b16bfc771ea3812fae3 SHA1 (patch-src_cmake_platform.cmake) = b7c8f459499563f6aeb0de270087d1993db67af3 +SHA1 (patch-src_libOpenImageIO_CMakeLists.txt) = 3b6fce87f06d0a7c52559877aacdfcc8ab24b6d8 SHA1 (patch-src_libutil_sysutil.cpp) = 6a4418cd4557d036fd94b747a7630bdce0abd4be SHA1 (patch-src_make_detectplatform.mk) = d62c332ad559cca3a5f135bc8cdd69cc89a6c196 SHA1 (patch-src_ptex.imageio_ptex_PtexPlatform.h) = 9fad164cda52e35d42128a55d63057dae8ddac35 diff --git a/graphics/openimageio/patches/patch-src_cmake_externalpackages.cmake b/graphics/openimageio/patches/patch-src_cmake_externalpackages.cmake new file mode 100644 index 00000000000..3043eeccdd3 --- /dev/null +++ b/graphics/openimageio/patches/patch-src_cmake_externalpackages.cmake @@ -0,0 +1,22 @@ +$NetBSD: patch-src_cmake_externalpackages.cmake,v 1.1 2016/02/17 04:49:47 dbj Exp $ + +--- src/cmake/externalpackages.cmake.orig 2015-06-11 17:25:58.000000000 +0000 ++++ src/cmake/externalpackages.cmake +@@ -467,7 +467,16 @@ if (USE_OPENCV) + /usr/local/lib + /opt/local/lib + ) +- set (OpenCV_LIBS "${OpenCV_LIBS} ${OpenCV_LIBS_highgui}") ++ set (OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_LIBS_highgui}) ++ find_library (OpenCV_LIBS_videoio ++ NAMES opencv_videoio ++ PATHS "${THIRD_PARTY_TOOLS_HOME}/lib/" ++ "${PROJECT_SOURCE_DIR}/lib" ++ "${OpenCV_HOME}/lib" ++ /usr/local/lib ++ /opt/local/lib ++ ) ++ set (OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_LIBS_videoio}) + if (OpenCV_INCLUDE_DIR AND OpenCV_LIBS) + set (OpenCV_FOUND TRUE) + add_definitions ("-DUSE_OPENCV") diff --git a/graphics/openimageio/patches/patch-src_libOpenImageIO_CMakeLists.txt b/graphics/openimageio/patches/patch-src_libOpenImageIO_CMakeLists.txt new file mode 100644 index 00000000000..71bda3da2b6 --- /dev/null +++ b/graphics/openimageio/patches/patch-src_libOpenImageIO_CMakeLists.txt @@ -0,0 +1,13 @@ +$NetBSD: patch-src_libOpenImageIO_CMakeLists.txt,v 1.1 2016/02/17 04:49:47 dbj Exp $ + +--- src/libOpenImageIO/CMakeLists.txt.orig 2015-06-11 17:25:58.000000000 +0000 ++++ src/libOpenImageIO/CMakeLists.txt +@@ -231,7 +231,7 @@ endif () + # Include OpenCV if using it + if (OpenCV_FOUND) + include_directories (${OpenCV_INCLUDE_DIR}) +- target_link_libraries (OpenImageIO opencv_core opencv_highgui) ++ target_link_libraries (OpenImageIO ${OpenCV_LIBS}) + endif () + + # Include OpenSSL if using it |