CVS commit: pkgsrc/graphics/openimageio

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Dec 29 10:15:04 UTC 2019

Modified Files:
        pkgsrc/graphics/openimageio: Makefile distinfo
Added Files:
        pkgsrc/graphics/openimageio/patches:
            patch-src_cmake_modules_FindOpenEXR.cmake

Log Message:
openimageio: use ffmpeg4. find the correct openexr libraries.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/graphics/openimageio/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/graphics/openimageio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenEXR.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/openimageio/Makefile
diff -u pkgsrc/graphics/openimageio/Makefile:1.57 pkgsrc/graphics/openimageio/Makefile:1.58
--- pkgsrc/graphics/openimageio/Makefile:1.57   Thu Aug 22 12:23:21 2019
+++ pkgsrc/graphics/openimageio/Makefile        Sun Dec 29 10:15:04 2019
@@ -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"

Index: pkgsrc/graphics/openimageio/distinfo
diff -u pkgsrc/graphics/openimageio/distinfo:1.19 pkgsrc/graphics/openimageio/distinfo:1.20
--- pkgsrc/graphics/openimageio/distinfo:1.19   Thu Oct 25 07:07:35 2018
+++ pkgsrc/graphics/openimageio/distinfo        Sun Dec 29 10:15:04 2019
@@ -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

Added files:

Index: pkgsrc/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenEXR.cmake
diff -u /dev/null pkgsrc/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenEXR.cmake:1.1
--- /dev/null   Sun Dec 29 10:15:04 2019
+++ pkgsrc/graphics/openimageio/patches/patch-src_cmake_modules_FindOpenEXR.cmake       Sun Dec 29 10:15:04 2019
@@ -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}