summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Waibel <waebbl-gentoo@posteo.net>2021-10-30 13:39:46 +0200
committerSam James <sam@gentoo.org>2021-10-31 02:22:14 +0000
commita0269435cbd4abb653db80470b2094e2ca560c8a (patch)
tree1b1cb31afbdb62b0ecf2e9830225100a7a62640f /media-gfx
parentmedia-gfx/openvdb: add note about possible future NanoVDB (diff)
downloadgentoo-a0269435cbd4abb653db80470b2094e2ca560c8a.tar.gz
gentoo-a0269435cbd4abb653db80470b2094e2ca560c8a.tar.bz2
gentoo-a0269435cbd4abb653db80470b2094e2ca560c8a.zip
media-gfx/alembic: build against ilmbase and openexr:0
Closes: https://bugs.gentoo.org/820746 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> Closes: https://github.com/gentoo/gentoo/pull/22762 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/alembic/alembic-1.8.3.ebuild5
-rw-r--r--media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch90
2 files changed, 94 insertions, 1 deletions
diff --git a/media-gfx/alembic/alembic-1.8.3.ebuild b/media-gfx/alembic/alembic-1.8.3.ebuild
index c46c467c35e5..5cf7be6360aa 100644
--- a/media-gfx/alembic/alembic-1.8.3.ebuild
+++ b/media-gfx/alembic/alembic-1.8.3.ebuild
@@ -35,7 +35,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.0-0001-set-correct-libdir.patch
+ "${FILESDIR}"/${P}-0001-find-py-ilmbase-in-config-mode.patch
+)
DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
diff --git a/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch b/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch
new file mode 100644
index 000000000000..bc7ac9f507a8
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch
@@ -0,0 +1,90 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 30 Oct 2021 11:56:04 +0200
+Subject: [PATCH] find (py)ilmbase in config mode
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+
+diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake
+index 9f52ca6..f076e14 100644
+--- a/cmake/AlembicIlmBase.cmake
++++ b/cmake/AlembicIlmBase.cmake
+@@ -43,23 +43,27 @@ IF (Imath_FOUND)
+ ELSE()
+ MESSAGE(STATUS "Could not find Imath looking for IlmBase instead.")
+ # What we really want to do is look for libs Imath and half
+- FIND_PACKAGE(IlmBase)
++ FIND_PACKAGE(IlmBase CONFIG REQUIRED)
+ SET(ALEMBIC_USING_IMATH_3 OFF)
++ SET(ILMBASE_FOUND True)
++ GET_TARGET_PROPERTY(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY IlmBase::IlmBaseConfig INTERFACE_INCLUDE_DIRECTORIES)
++ SET(ALEMBIC_ILMBASE_HALF_LIB IlmBase::Half)
++ SET(ALEMBIC_ILMBASE_IEX_LIB IlmBase::Iex)
++ SET(ALEMBIC_ILMBASE_IEXMATH_LIB IlmBase::IexMath)
++ SET(ALEMBIC_ILMBASE_ILMTHREAD_LIB IlmBase::IlmThread)
++ SET(ALEMBIC_ILMBASE_IMATH_LIB IlmBase::Imath)
++ SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_HALF_LIB} ${ALEMBIC_ILMBASE_IEX_LIB} ${ALEMBIC_ILMBASE_IEXMATH_LIB}
++ ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} ${ALEMBIC_ILMBASE_IMATH_LIB})
+
+ IF (ILMBASE_FOUND)
+ SET(ALEMBIC_ILMBASE_FOUND 1 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise")
+-
+- SET(ALEMBIC_ILMBASE_LIBS
+- ${ALEMBIC_ILMBASE_IMATH_LIB}
+- ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}
+- ${ALEMBIC_ILMBASE_IEX_LIB}
+- ${ALEMBIC_ILMBASE_HALF_LIB}
+- )
+-
+- if (${ALEMBIC_ILMBASE_IEXMATH_LIB})
+- SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_LIBS} ${ALEMBIC_ILMBASE_IEXMATH_LIB})
+- endif (${ALEMBIC_ILMBASE_IEXMATH_LIB})
+-
++ MESSAGE(STATUS "Found package IlmBase")
++ MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
++ MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
++ MESSAGE( STATUS "IEX LIB: ${ALEMBIC_ILMBASE_IEX_LIB}" )
++ MESSAGE( STATUS "IEXMATH LIB: ${ALEMBIC_ILMBASE_IEXMATH_LIB}" )
++ MESSAGE( STATUS "ILMTHREAD LIB: ${ALEMBIC_ILMBASE_ILMTHREAD_LIB}" )
++ MESSAGE( STATUS "IMATH LIB: ${ALEMBIC_ILMBASE_IMATH_LIB}" )
+ ELSE()
+ SET(ALEMBIC_ILMBASE_FOUND 0 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise")
+ ENDIF()
+diff --git a/cmake/AlembicPyIlmBase.cmake b/cmake/AlembicPyIlmBase.cmake
+index 249e084..3cc6253 100644
+--- a/cmake/AlembicPyIlmBase.cmake
++++ b/cmake/AlembicPyIlmBase.cmake
+@@ -43,20 +43,19 @@ IF (Imath_FOUND)
+ SET(ALEMBIC_PYILMBASE_PYIMATH_LIB Imath::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR})
+ MESSAGE(STATUS "Found package Imath using: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}")
+ ELSE()
+- FIND_PACKAGE(PyIlmBase)
++ MESSAGE(STATUS "Could not find Imath looking for PyIlmBase instead.")
++ FIND_PACKAGE(PyIlmBase CONFIG REQUIRED)
++ SET(PYILMBASE_FOUND True)
+ IF (PYILMBASE_FOUND)
+ SET(ALEMBIC_PYILMBASE_FOUND 1 CACHE STRING "Set to 1 if PyIlmBase is found, 0 otherwise")
+-
+- SET(ALEMBIC_PYILMBASE_LIBS
+- ${ALEMBIC_PYILMBASE_PYIMATH_LIB}
+- )
+-
+- GET_FILENAME_COMPONENT(ALEMBIC_PYILMBASE_LIB_DIRECTORY
+- ${ALEMBIC_PYILMBASE_PYIMATH_LIB}
+- PATH
+- )
+-
++ SET(ALEMBIC_PYILMBASE_PYIMATH_LIB PyIlmBase::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR})
++ MESSAGE(STATUS "Found package PyIlmBase using: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}")
++ GET_TARGET_PROPERTY(ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY PyIlmBase::PyImath_Python${PYTHON_VERSION_MAJOR}_${PYTHON_VERSION_MINOR} INTERFACE_INCLUDE_DIRECTORIES)
++ SET(ALEMBIC_PYIMATH_MODULE_DIRECTORY "/usr/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages")
++ MESSAGE(STATUS "PYILMBASE INCLUDE PATH: ${ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY}")
++ MESSAGE(STATUS "PYIMATH LIB: ${ALEMBIC_PYILMBASE_PYIMATH_LIB}")
++ MESSAGE(STATUS "PYIMATH MODULE: ${ALEMBIC_PYIMATH_MODULE_DIRECTORY}")
+ ELSE()
+ SET(ALEMBIC_PYILMBASE_FOUND 0 CACHE STRING "Set to 1 if PyIlmBase is found, 0 otherwise")
+ ENDIF()
+-ENDIF()
+\ No newline at end of file
++ENDIF()
+--
+2.33.1