From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 68D3F138334 for ; Sun, 21 Apr 2019 18:24:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8738DE091B; Sun, 21 Apr 2019 18:24:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E7D8E091B for ; Sun, 21 Apr 2019 18:24:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1A32341D8E for ; Sun, 21 Apr 2019 18:24:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF8895C7 for ; Sun, 21 Apr 2019 18:24:16 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1555870900.3aaca40c1636ae63b4fbe4fa04108f22607ae261.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch media-libs/openimageio/openimageio-1.7.17.ebuild X-VCS-Directories: media-libs/openimageio/ media-libs/openimageio/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3aaca40c1636ae63b4fbe4fa04108f22607ae261 X-VCS-Branch: master Date: Sun, 21 Apr 2019 18:24:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8bec3f1c-b3bf-49ec-bb26-2e056ccbcb09 X-Archives-Hash: ba65a58fb1fc12dc39388f2de61d6871 commit: 3aaca40c1636ae63b4fbe4fa04108f22607ae261 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 21 17:18:12 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 18:21:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aaca40c media-libs/openimageio: Fix configure with openexr-2.3.0 Thanks-to: Alexander Miller gmx.de> Closes: https://bugs.gentoo.org/683126 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/openimageio-1.7.17-openexr-2.3.0.patch | 51 ++++++++++++++++++++++ media-libs/openimageio/openimageio-1.7.17.ebuild | 1 + 2 files changed, 52 insertions(+) diff --git a/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch b/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch new file mode 100644 index 00000000000..e4bd3562adc --- /dev/null +++ b/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch @@ -0,0 +1,51 @@ +Use PkgConfig to find OpenEXR. Otherwise, the code fails +when OpenEXR/OpenEXRConfig.h is a multilib wrapper. +Changes taken from openimageio-1.8.17. + +--- openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake ++++ openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake +@@ -27,6 +27,13 @@ + set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT}) + endif () + ++# Attempt to find OpenEXR with pkgconfig ++find_package(PkgConfig) ++if (PKG_CONFIG_FOUND) ++ pkg_check_modules(_ILMBASE QUIET IlmBase) ++ pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0) ++endif (PKG_CONFIG_FOUND) ++ + # List of likely places to find the headers -- note priority override of + # OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include. + # ILMBASE is needed in case ilmbase an openexr are installed in separate +@@ -35,6 +42,8 @@ + ${OPENEXR_CUSTOM_INCLUDE_DIR} + ${OPENEXR_HOME}/include + ${ILMBASE_HOME}/include ++ ${_ILMBASE_INCLUDEDIR} ++ ${_OPENEXR_INCLUDEDIR} + /usr/local/include + /usr/include + /usr/include/${CMAKE_LIBRARY_ARCHITECTURE} +@@ -53,7 +62,11 @@ + find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h) + + # Try to figure out version number +-if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h") ++if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "") ++ set (OPENEXR_VERSION "${_OPENEXR_VERSION}") ++ string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}") ++ string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}") ++elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h") + # Must be at least 2.0 + file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$") + string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP}) +@@ -90,6 +103,8 @@ + ${GENERIC_LIBRARY_PATHS} + ${OPENEXR_INCLUDE_PATH}/../lib + ${ILMBASE_INCLUDE_PATH}/../lib ++ ${_ILMBASE_LIBDIR} ++ ${_OPENEXR_LIBDIR} + /usr/local/lib + /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} + /usr/lib diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild index 0b3a2d7fe5f..2e5bb080fb5 100644 --- a/media-libs/openimageio/openimageio-1.7.17.ebuild +++ b/media-libs/openimageio/openimageio-1.7.17.ebuild @@ -61,6 +61,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch" "${FILESDIR}/${P}-make-python-and-boost-detection-more-generic.patch" + "${FILESDIR}/${P}-openexr-2.3.0.patch" # bug 683126 ) DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )