Date: Tue, 18 May 2021 13:10:37 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0bd52ecbc95f - main - graphics/opencolorio: fix build for graphics/opencolorio-tools Message-ID: <202105181310.14IDAbKR025946@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bd52ecbc95ffd3885ad56cf0ea603dc4ca974e4 commit 0bd52ecbc95ffd3885ad56cf0ea603dc4ca974e4 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2021-05-17 21:48:32 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2021-05-18 13:06:43 +0000 graphics/opencolorio: fix build for graphics/opencolorio-tools Patch out broken and unneeded OpenEXR/half.h detection. Approved by: portmgr blanket --- .../files/patch-share_cmake_OCIOMacros.cmake | 32 ++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake b/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake index 5bd99e152c9f..9edaa87e95ed 100644 --- a/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake +++ b/graphics/opencolorio/files/patch-share_cmake_OCIOMacros.cmake @@ -1,6 +1,34 @@ ---- share/cmake/OCIOMacros.cmake.orig 2015-08-29 00:58:36 UTC +--- share/cmake/OCIOMacros.cmake.orig 2019-03-28 05:12:57 UTC +++ share/cmake/OCIOMacros.cmake -@@ -168,7 +168,7 @@ MACRO(OCIOFindPython) +@@ -96,27 +96,6 @@ MACRO(OCIOFindOpenImageIO) + set(OIIO_FOUND TRUE) + message(STATUS "Found OIIO library ${OIIO_LIBRARIES}") + message(STATUS "Found OIIO includes ${OIIO_INCLUDES}") +- +- # Unfortunately, OIIO hides a dependency to Ilmbase includes +- +- if(ILMBASE_PATH) +- message(STATUS "Ilmbase path explicitly specified: ${ILMBASE_PATH}") +- endif() +- +- FIND_PATH( ILMBASE_INCLUDES OpenEXR/half.h +- ${ILMBASE_PATH}/include/ +- /usr/include +- /usr/local/include +- /sw/include +- /opt/local/include +- DOC "The directory where OpenEXR/half.h resides") +- +- if(ILMBASE_INCLUDES) +- message(STATUS "Found Ilmbase includes ${ILMBASE_INCLUDES}") +- else() +- set(OIIO_FOUND FALSE) +- message(STATUS "Ilmbase not found. Specify ILMBASE_PATH to locate it") +- endif() + else() + set(OIIO_FOUND FALSE) + message(STATUS "OIIO not found. Specify OIIO_PATH to locate it") +@@ -222,7 +201,7 @@ MACRO(OCIOFindPython) file(TO_CMAKE_PATH "${PYTHON_LIBRARY_DIRS_RAW}" PYTHON_LIBRARY_DIRS) FIND_LIBRARY(PYTHON_LIBRARY
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105181310.14IDAbKR025946>