From owner-dev-commits-ports-main@freebsd.org Tue May 18 13:10:37 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76EDD64CB66; Tue, 18 May 2021 13:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FkxFT2zdfz3q8q; Tue, 18 May 2021 13:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45C571FD38; Tue, 18 May 2021 13:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14IDAbZx025947; Tue, 18 May 2021 13:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14IDAbKR025946; Tue, 18 May 2021 13:10:37 GMT (envelope-from git) Date: Tue, 18 May 2021 13:10:37 GMT Message-Id: <202105181310.14IDAbKR025946@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 0bd52ecbc95f - main - graphics/opencolorio: fix build for graphics/opencolorio-tools MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bd52ecbc95ffd3885ad56cf0ea603dc4ca974e4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 13:10:37 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bd52ecbc95ffd3885ad56cf0ea603dc4ca974e4 commit 0bd52ecbc95ffd3885ad56cf0ea603dc4ca974e4 Author: Dmitry Marakasov AuthorDate: 2021-05-17 21:48:32 +0000 Commit: Dmitry Marakasov 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