summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/alembic/Manifest1
-rw-r--r--media-gfx/alembic/alembic-1.7.12.ebuild90
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch60
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch72
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch29
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch27
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch29
-rw-r--r--media-gfx/alembic/metadata.xml5
8 files changed, 0 insertions, 313 deletions
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index e09960db3532..6b21cc8ad5b0 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,2 +1 @@
-DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
diff --git a/media-gfx/alembic/alembic-1.7.12.ebuild b/media-gfx/alembic/alembic-1.7.12.ebuild
deleted file mode 100644
index d67d4611da19..000000000000
--- a/media-gfx/alembic/alembic-1.7.12.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake multiprocessing
-
-DESCRIPTION="Open framework for storing and sharing scene data"
-HOMEPAGE="https://www.alembic.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+boost doc examples hdf5 prman test zlib"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- hdf5? ( zlib )
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=media-libs/openexr-2.3.0:=
- boost? ( >=dev-libs/boost-1.65.0:= )
- hdf5? ( >=sci-libs/hdf5-1.10.2:=[zlib(+)] )
- zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="doc? ( >=app-doc/doxygen-1.8.14-r1 )"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch"
- "${FILESDIR}/${PN}-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch"
- "${FILESDIR}/${PN}-1.7.11-0003-Fix-env-var-for-renderman.patch"
- "${FILESDIR}/${PN}-1.7.11-0004-Fix-a-compile-issue-with-const.patch"
- "${FILESDIR}/${PN}-1.7.11-0005-Fix-install-locations.patch"
- "${FILESDIR}/${PN}-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- if use doc; then
- doxygen -u Doxyfile || die "Failed to update Doxyfile"
- sed -i -e 's|DOT_NUM_THREADS[ \t]*= 0|DOT_NUM_THREADS = '$(makeopts_jobs)'|' Doxyfile || die "Failed to change dot threads"
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DALEMBIC_SHARED_LIBS=ON
- # The CMakeLists.txt file needs C++11 or C++-0x if none of them
- # is defined
- -DALEMBIC_LIB_USES_BOOST=$(usex boost)
- -DALEMBIC_LIB_USES_TR1=$(usex !boost)
- -DUSE_ARNOLD=OFF
- -DUSE_BINARIES=ON
- -DUSE_EXAMPLES=$(usex examples)
- -DUSE_HDF5=$(usex hdf5)
- -DUSE_MAYA=OFF
- -DUSE_PRMAN=$(usex prman)
- -DUSE_PYALEMBIC=OFF
- -DUSE_TESTS=$(usex test)
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- doxygen Doxyfile || die "Failed to build documentation"
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( doc/html/. )
- cmake_src_install
-}
-
-pkg_postinst() {
- if use prman; then
- einfo "If you're looking for an ebuild for renderman, you may want to"
- einfo "try the waebbl overlay: 'eselect repository enable waebbl'"
- einfo "followed by 'emerge renderman'"
- fi
-}
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch b/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
deleted file mode 100644
index d36e2503427f..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2060f95c43685895f36269667c30acf7499b81b6 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 13:19:57 +0200
-Subject: [PATCH 1/5] Fix to find boost with >=cmake-3.11
-
-Cmake version 3.11 and later has a new syntax introduced, when
-looking for boost libraries.
-This patches adds this syntax if an appropriate cmake version is used.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/AlembicBoost.cmake | 10 +++++++++-
- python/PyAlembic/CMakeLists.txt | 8 ++++----
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
-index 21b3515..db59157 100644
---- a/cmake/AlembicBoost.cmake
-+++ b/cmake/AlembicBoost.cmake
-@@ -79,7 +79,15 @@ IF (USE_PYALEMBIC AND APPLE)
- ENDIF()
-
- IF (USE_PYALEMBIC)
-- FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+ # cmake>=3.11 has a new syntax when searching for boost, which
-+ # needs to add the python version.
-+ # Hardcode the python version number, as PYTHON_VERSION_{MAJOR,MINOR}
-+ # are not yet know in the configuration phase.
-+ IF(CMAKE_MINOR_VERSION VERSION_GREATER 10)
-+ FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python27)
-+ ELSE()
-+ FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+ ENDIF()
- ELSE()
- FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options)
- ENDIF()
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index a3fdb31..af8dcb5 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -33,12 +33,12 @@
- ##
- ##-*****************************************************************************
-
--MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
-+MESSAGE(STATUS "Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
-
- # set core libs
--IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-- MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
-- SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
-+IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
-+ MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
-+ SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE})
-
- # lots of warnings coming from unused local typedefs inside boost python
- IF (NOT WINDOWS)
---
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch b/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
deleted file mode 100644
index c561e26a6656..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 60bbcde225f3c28a36d8643c451509d9deb09222 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 13:34:09 +0200
-Subject: [PATCH 2/5] Find IlmBase by setting a proper ILMBASE_ROOT value and
- by using pkg-config to determine the installed ilmbase version, instead of
- using the cmake STRINGS command.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/Modules/FindIlmBase.cmake | 18 +++++++++++++++++-
- cmake/Modules/FindPyIlmBase.cmake | 2 +-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
-index 679a02f..0fe2b1a 100644
---- a/cmake/Modules/FindIlmBase.cmake
-+++ b/cmake/Modules/FindIlmBase.cmake
-@@ -52,7 +52,7 @@ IF(NOT DEFINED ILMBASE_ROOT)
- SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
- ELSE()
- # TODO: set to default install path when shipping out
-- SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
-+ SET( ALEMBIC_ILMBASE_ROOT "/usr" )
- ENDIF()
- ELSE()
- IF ( ${WINDOWS} )
-@@ -87,6 +87,21 @@ SET(_ilmbase_SEARCH_DIRS
- /usr/freeware
- )
-
-+# use pkg-config to determine the correct version
-+include(FindPkgConfig)
-+IF(PKG_CONFIG_FOUND)
-+ PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
-+ IF(PC_ILMBASE_FOUND)
-+ SET(ILMBASE_VERSION ${PC_ILMBASE_VERSION})
-+ SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${PC_ILMBASE_INCLUDE_DIRS})
-+ STRING(REGEX MATCH "-lHalf" ALEMBIC_ILMBASE_HALF_LIB ${PC_ILMBASE_LDFLAGS})
-+ STRING(REGEX MATCH "-lIex" ALEMBIC_ILMBASE_IEX_LIB ${PC_ILMBASE_LDFLAGS})
-+ STRING(REGEX MATCH "-lIexMath" ALEMBIC_ILMBASE_IEXMATH_LIB ${PC_ILMBASE_LDFLAGS})
-+ STRING(REGEX MATCH "-lIlmThread" ALEMBIC_ILMBASE_ILMTHREAD_LIB ${PC_ILMBASE_LDFLAGS})
-+ String(REGEX MATCH "-lImath" ALEMBIC_ILMBASE_IMATH_LIB ${PC_ILMBASE_LDFLAGS})
-+ ENDIF()
-+ELSE(PKG_CONFIG_FOUND)
-+
- FIND_PATH(ILMBASE_INCLUDE_DIR
- NAMES
- IlmBaseConfig.h
-@@ -179,6 +194,7 @@ IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRE
- MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" )
- ENDIF()
-
-+ENDIF(PKG_CONFIG_FOUND)
-
- MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
- MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index d55f8d3..b5f3cb5 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -44,7 +44,7 @@ ELSE()
- SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND)
- ELSE()
- # TODO: set to default install path when shipping out
-- SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/")
-+ SET(ALEMBIC_PYILMBASE_ROOT "/usr")
- ENDIF()
- ELSE()
- IF (${WINDOWS})
---
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch b/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
deleted file mode 100644
index 9777bad13e8b..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3ca71af0e83fce89df0bfb472b28abe3c4e08c57 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 15:13:03 +0200
-Subject: [PATCH 3/5] Fix env var for renderman. This is called RMANTREE on
- linux.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/AlembicPRMan.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/AlembicPRMan.cmake b/cmake/AlembicPRMan.cmake
-index e02b237..fdbf26c 100644
---- a/cmake/AlembicPRMan.cmake
-+++ b/cmake/AlembicPRMan.cmake
-@@ -66,8 +66,8 @@ ELSE()
- ENDIF()
-
- # Prefer PRMAN_ROOT set from the environment over the CMakeCache'd variable
--IF(NOT $ENV{PRMAN_ROOT}x STREQUAL "x")
-- SET( ALEMBIC_PRMAN_ROOT $ENV{PRMAN_ROOT})
-+IF(NOT $ENV{RMANTREE}x STREQUAL "x")
-+ SET( ALEMBIC_PRMAN_ROOT $ENV{RMANTREE})
- ENDIF()
-
-
---
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch b/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
deleted file mode 100644
index 73e989ba6a6f..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d1895084e41970c8f91e9357fcb739ac29c47109 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 16:19:30 +0200
-Subject: [PATCH 4/5] WriteGeo.cpp: Fix a compile issue, where an invalid
- conversion from char* to const char* took place.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- prman/Procedural/WriteGeo.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/prman/Procedural/WriteGeo.cpp b/prman/Procedural/WriteGeo.cpp
-index 95b4867..5ad0b71 100644
---- a/prman/Procedural/WriteGeo.cpp
-+++ b/prman/Procedural/WriteGeo.cpp
-@@ -898,7 +898,7 @@ void ProcessCurves( ICurves &curves, ProcArgs &args )
- void WriteIdentifier( const ObjectHeader &ohead )
- {
- std::string name = ohead.getFullName();
-- char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
-+ const char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
-
- RiAttribute(const_cast<char*>( "identifier" ), const_cast<char*>( "name" ),
- nameArray, RI_NULL );
---
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch b/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
deleted file mode 100644
index 6bb8090344f1..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13b88370a862e16b417e9df6e40c2a9cba10852c Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 2 Aug 2019 21:31:03 +0200
-Subject: [PATCH] python/PyAlembic/Tests/CMakeLists.txt: fix variable
-
-The patch fixes a boost_python related variable which didn't had
-the version suffix for python.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- python/PyAlembic/Tests/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/PyAlembic/Tests/CMakeLists.txt b/python/PyAlembic/Tests/CMakeLists.txt
-index c32a018..ed9b23d 100644
---- a/python/PyAlembic/Tests/CMakeLists.txt
-+++ b/python/PyAlembic/Tests/CMakeLists.txt
-@@ -57,7 +57,7 @@ TARGET_LINK_LIBRARIES(PyAlembic_Test Alembic::Alembic ${ALEMBIC_PYILMBASE_LIBS})
-
- ADD_TEST(PyAlembic_Python_TEST PyAlembic_Test)
-
--GET_FILENAME_COMPONENT(BOOST_LIBRARY_DIR ${Boost_PYTHON_LIBRARY} PATH)
-+GET_FILENAME_COMPONENT(BOOST_LIBRARY_DIR ${Boost_PYTHON27_LIBRARY} PATH)
- GET_FILENAME_COMPONENT(ILMBASE_LIBRARY_DIR ${ALEMBIC_ILMBASE_IMATH_LIB} PATH)
-
- CONFIGURE_FILE(
---
-2.22.0
-
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 2ad53a2f4fa5..cbe5fd8cc576 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -14,12 +14,7 @@
developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
</longdescription>
<use>
- <flag name="boost">Use <pkg>dev-libs/boost</pkg> library</flag>
- <flag name="examples">Install alembic examples</flag>
<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
- <flag name="prman">
- Compile Alembic plugin for Renderman (experimental)
- </flag>
<flag name="test">Build and run the test-suite</flag>
<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
</use>