diff options
| author | markd <markd@pkgsrc.org> | 2019-12-29 10:15:04 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2019-12-29 10:15:04 +0000 |
| commit | 8daf2e9d3892bcc59e3b3276a96f652672764bd8 (patch) | |
| tree | dcfe9607abd3e41617c2f9bbf1a9099e716b87db /graphics/openimageio | |
| parent | b8f644888534912d6d4cd3e3246caf2ce2fdcbd9 (diff) | |
| download | pkgsrc-8daf2e9d3892bcc59e3b3276a96f652672764bd8.tar.gz | |
openimageio: use ffmpeg4. find the correct openexr libraries.
Diffstat (limited to 'graphics/openimageio')
| -rw-r--r-- | graphics/openimageio/Makefile | 5 | ||||
| -rw-r--r-- | graphics/openimageio/distinfo | 3 | ||||
| -rw-r--r-- | graphics/openimageio/patches/patch-src_cmake_modules_FindOpenEXR.cmake | 24 |
3 files changed, 29 insertions, 3 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 4fc67d8d757..5e324244707 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.57 2019/08/22 12:23:21 ryoon Exp $ +# $NetBSD: Makefile,v 1.58 2019/12/29 10:15:04 markd Exp $ OIIOVER= 1.8.15 DISTNAME= oiio-Release-${OIIOVER} PKGNAME= ${DISTNAME:S/oiio-Release/openimageio/} -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= graphics MASTER_SITES= -https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz @@ -44,6 +44,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/giflib/buildlink3.mk" +.include "../../multimedia/ffmpeg4/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../mk/compiler.mk" diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index 11cbe006204..a523c57290c 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.19 2018/10/25 07:07:35 leot Exp $ +$NetBSD: distinfo,v 1.20 2019/12/29 10:15:04 markd Exp $ SHA1 (oiio-Release-1.8.15.tar.gz) = 3c8139af5c68d63a6fecd3096c0b78e34698c57b RMD160 (oiio-Release-1.8.15.tar.gz) = b434b141e44e8ce2b4433e286b795654e3f850e4 SHA512 (oiio-Release-1.8.15.tar.gz) = e022e5c7e300d3dd952bcf3476e1b676a8931f67ba6b3959b26c75b9709907ac1c1b99de651f5876045f9a333e325a161b0d5159cb5bf385eb4f9f90a04707c7 Size (oiio-Release-1.8.15.tar.gz) = 27828632 bytes SHA1 (patch-src_cmake_install.cmake) = 8db6fbf92878d237dc08a761481febef45cb9f05 +SHA1 (patch-src_cmake_modules_FindOpenEXR.cmake) = c8ff004f262b2d47d4f00dace858a3dad8bd3833 SHA1 (patch-src_include_OpenImageIO_strutil.h) = 881d5df34c8aa7641f018d64cd8b080534813db2 SHA1 (patch-src_libutil_sysutil.cpp) = 78b8b4d7a5f4d963bdea0cc1739ee5b899898c3c diff --git a/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenEXR.cmake b/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenEXR.cmake new file mode 100644 index 00000000000..990d7b9287f --- /dev/null +++ b/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenEXR.cmake @@ -0,0 +1,24 @@ +$NetBSD: patch-src_cmake_modules_FindOpenEXR.cmake,v 1.1 2019/12/29 10:15:04 markd Exp $ + +pkgsrc doesn't install OpenEXR with version embedded in name, so don't +look for them as might pick up some non pkgsrc version. + +--- src/cmake/modules/FindOpenEXR.cmake.orig 2018-10-01 21:26:14.000000000 +0000 ++++ src/cmake/modules/FindOpenEXR.cmake +@@ -128,11 +128,11 @@ set (_openexr_components IlmThread IlmIm + foreach (COMPONENT ${_openexr_components}) + string (TOUPPER ${COMPONENT} UPPERCOMPONENT) + # First try with the version embedded +- set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_CUSTOM_LIB_SUFFIX}) +- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME} +- PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH) +- # Again, with no directory restrictions +- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}) ++# set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}${OPENEXR_CUSTOM_LIB_SUFFIX}) ++# find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME} ++# PATHS ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH) ++# # Again, with no directory restrictions ++# find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}) + # Try again without the version + set (FULL_COMPONENT_NAME ${OPENEXR_CUSTOM_LIB_PREFIX}${COMPONENT}${OPENEXR_CUSTOM_LIB_SUFFIX}) + find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME} |