public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/
@ 2017-12-16 12:59 Patrice Clement
  0 siblings, 0 replies; 8+ messages in thread
From: Patrice Clement @ 2017-12-16 12:59 UTC (permalink / raw
  To: gentoo-commits

commit:     146cec1dd3c1b1aaa56d945f049d4fc935010ed9
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Tue Nov 14 20:43:10 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 12:59:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146cec1d

media-gfx/alembic: new package.

Alembic is an open framework for storing and sharing scene data.

Closes: https://bugs.gentoo.org/634966
Closes: https://github.com/gentoo/gentoo/pull/6083
Package-Manager: Portage-2.3.14, Repoman-2.3.5

 media-gfx/alembic/Manifest                         |   1 +
 media-gfx/alembic/alembic-1.7.4.ebuild             | 100 ++++++++++++++++
 .../alembic/files/alembic-CMakeLists-fix_lib.patch | 132 +++++++++++++++++++++
 .../files/alembic-FindIlmBase-pkgconfig.patch      |  28 +++++
 .../alembic/files/alembic-fix-importerror.patch    |  17 +++
 media-gfx/alembic/metadata.xml                     |  27 +++++
 6 files changed, 305 insertions(+)

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
new file mode 100644
index 00000000000..84e5a72ffb7
--- /dev/null
+++ b/media-gfx/alembic/Manifest
@@ -0,0 +1 @@
+DIST alembic-1.7.4.tar.gz 805503 BLAKE2B b8a8b986d0323dbe3748e1dde5436d66e08620a28852c3331ee612d43a414e381a1cdbbb63200b8f146ce94ebb0e3d0ae6f70f33575bd9ff25e9121f2cd73d1a SHA512 8e752d6d85bea3b6a53582d35a589fc40824456098d950974effe0a6a0e359fec1e056af1ea1379f7e23b7ffed2c05c7f5269fa4b64757631b7d57fb60ee98b0

diff --git a/media-gfx/alembic/alembic-1.7.4.ebuild b/media-gfx/alembic/alembic-1.7.4.ebuild
new file mode 100644
index 00000000000..1c14f809024
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.7.4.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 cmake-utils
+
+DESCRIPTION="Alembic is an open framework for storing and sharing scene data"
+HOMEPAGE="http://alembic.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+boost doc hdf5 pyalembic test +zlib"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	hdf5? ( zlib )
+	pyalembic? ( boost )"
+
+DEPEND="
+	${PYTHON_DEP}
+	>=dev-util/cmake-3.7.2
+	boost? ( >=dev-libs/boost-1.62.0-r1 )
+	doc? ( >=app-doc/doxygen-1.8.13-r1 )
+	pyalembic? ( >=dev-python/pyilmbase-2.2.0 )"
+
+RDEPEND="
+	${PYTHON_DEP}
+	>=media-libs/openexr-2.2.0-r2
+	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
+	zlib? ( >=sys-libs/zlib-1.2.11-r1 )"
+
+DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
+	"${FILESDIR}/${PN}-CMakeLists-fix_lib.patch"
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+# Static linking, the use of tr1 and support for prman might be added
+# in the future.
+src_configure() {
+	# I don't have a license for arnold renderer or maya so I disable them
+	# as default.
+	# Also I'm currently not using renderman, so I disable the prman flag
+	# by default too.
+	local mycmakeargs=(
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=OFF
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		-DUSE_PYALEMBIC=$(usex pyalembic)
+		-DUSE_STATIC_BOOST=OFF	# I won't use static libraries
+		-DUSE_STATIC_HDF5=OFF
+		-DUSE_TESTS=$(usex test)
+		-DALEMBIC_ILMBASE_LINK_STATIC=OFF # I don't want to link statically against ilmbase
+		-DALEMBIC_SHARED_LIBS=ON # For now let's ignore building static libraries
+		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
+		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen -u Doxyfile
+		doxygen Doxyfile
+	fi
+}
+
+src_test() {
+	if use test; then
+		cmake-utils_src_test
+	fi
+}
+
+src_install() {
+	DESTDIR="${D}" cmake-utils_src_install
+	if use doc; then
+		dodoc -r "doc/html"
+	fi
+
+	# move the cmake files from lib->lib64
+	mv "${D}/usr/lib/cmake" "${D}/usr/lib64/cmake" || die
+	rm -rv "${D}/usr/lib" || die
+}

diff --git a/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch b/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch
new file mode 100644
index 00000000000..c653927ecbe
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch
@@ -0,0 +1,132 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d84f002..a35b662 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -79,12 +79,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
+ 
+ # Set static/dynamic build options
+ SET(LIB_TYPE STATIC)
+-SET(RUNTIME_INSTALL_DIR lib)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(ARCHIVE_INSTALL_DIR lib)
++SET(RUNTIME_INSTALL_DIR lib64)
++SET(LIBRARY_INSTALL_DIR lib64)
++SET(ARCHIVE_INSTALL_DIR lib64)
+ IF (ALEMBIC_SHARED_LIBS)
+     SET(LIB_TYPE SHARED)
+-    SET(ARCHIVE_INSTALL_DIR lib)
++    SET(ARCHIVE_INSTALL_DIR lib64)
+     IF (WIN32)
+         ADD_DEFINITIONS(-DALEMBIC_DLL)
+     ENDIF()
+diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
+index 3725ed7..edea767 100644
+--- a/bin/AbcConvert/CMakeLists.txt
++++ b/bin/AbcConvert/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic)
+ 
+ set_target_properties(abcconvert PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
+ 
+ INSTALL(TARGETS abcconvert DESTINATION bin)
+diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
+index e2fd355..2234650 100644
+--- a/bin/AbcDiff/CMakeLists.txt
++++ b/bin/AbcDiff/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic)
+ 
+ set_target_properties(abcdiff PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
+ 
+ INSTALL(TARGETS abcdiff DESTINATION bin)
+diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
+index 396226e..116c122 100644
+--- a/bin/AbcEcho/CMakeLists.txt
++++ b/bin/AbcEcho/CMakeLists.txt
+@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic)
+ 
+ set_target_properties(abcecho abcechobounds PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
+ 
+ INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
+diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
+index 1dbeb9d..7b721d0 100644
+--- a/bin/AbcLs/CMakeLists.txt
++++ b/bin/AbcLs/CMakeLists.txt
+@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic)
+ 
+ set_target_properties(abcls PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
+ 
+ INSTALL(TARGETS abcls DESTINATION bin)
+diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
+index 3106bf2..0c8a205 100644
+--- a/bin/AbcStitcher/CMakeLists.txt
++++ b/bin/AbcStitcher/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic)
+ 
+ set_target_properties(abcstitcher PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
+ 
+ INSTALL(TARGETS abcstitcher DESTINATION bin)
+diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
+index 3c41004..de7c7fc 100644
+--- a/bin/AbcTree/CMakeLists.txt
++++ b/bin/AbcTree/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic)
+ 
+ set_target_properties(abctree PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
+ 
+ INSTALL(TARGETS abctree DESTINATION bin)
+diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
+index 3e16518..b07cb7d 100644
+--- a/lib/Alembic/CMakeLists.txt
++++ b/lib/Alembic/CMakeLists.txt
+@@ -86,9 +86,9 @@ ENDIF()
+ 
+ INSTALL(TARGETS Alembic
+         EXPORT AlembicTargets
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib
+-        RUNTIME DESTINATION lib)
++        LIBRARY DESTINATION lib64
++        ARCHIVE DESTINATION lib64
++        RUNTIME DESTINATION lib64)
+ 
+ #-******************************************************************************
+ # PACKAGE EXPORTS
+diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
+index 06daf30..254ca2b 100644
+--- a/python/PyAlembic/CMakeLists.txt
++++ b/python/PyAlembic/CMakeLists.txt
+@@ -128,7 +128,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
+     )
+ 
+     INSTALL (TARGETS alembic
+-        DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++        DESTINATION lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
+     )
+ 
+     IF (USE_TESTS)
+@@ -137,7 +137,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
+ 
+     set_target_properties(alembic PROPERTIES
+         INSTALL_RPATH_USE_LINK_PATH TRUE
+-        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
+ ELSE()
+     MESSAGE(FATAL_ERROR "Unable to find Python libs")
+ ENDIF()

diff --git a/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch b/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch
new file mode 100644
index 00000000000..b291e839e8c
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch
@@ -0,0 +1,28 @@
+diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
+index dac8659..e7beb59 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} )
+@@ -97,6 +97,14 @@ FIND_PATH(ILMBASE_INCLUDE_DIR
+     include/OpenEXR
+ )
+ 
++FIND_PACKAGE(PkgConfig)
++IF (PKG_CONFIG_FOUND)
++	PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
++	IF (PC_ILMBASE_FOUND)
++		SET(_ilmbase_libs_ver_init ${PC_ILMBASE_VERSION})
++	ENDIF()
++ENDIF()
++
+ # If the headers were found, get the version from config file, if not already set.
+ IF(ILMBASE_INCLUDE_DIR)
+   SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${ILMBASE_INCLUDE_DIR})

diff --git a/media-gfx/alembic/files/alembic-fix-importerror.patch b/media-gfx/alembic/files/alembic-fix-importerror.patch
new file mode 100644
index 00000000000..8a86f08c733
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-fix-importerror.patch
@@ -0,0 +1,17 @@
+diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
+index 254ca2b..c8c915a 100644
+--- a/python/PyAlembic/CMakeLists.txt
++++ b/python/PyAlembic/CMakeLists.txt
+@@ -45,6 +45,12 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
+         ADD_DEFINITIONS(-Wno-unused-local-typedefs)
+     ENDIF()
+ 
++	# fix for ImportError: dynamic module does not define init function (initalembic)
++	# see: https://github.com/alembic/alembic/issues/142
++	IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
++		SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
++	ENDIF()
++
+     SET(CPP_FILES
+         PyAbcCoreLayer.cpp
+         PyAbcGeomTypes.cpp

diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
new file mode 100644
index 00000000000..3d75399517f
--- /dev/null
+++ b/media-gfx/alembic/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+	Alembic is an open computer graphics interchange framework, 
+	developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
+</longdescription>
+<use>
+	<flag name="boost">Use <pkg>dev-libs/boost</pkg> library</flag>
+	<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
+	<flag name="pyalembic">Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)</flag>
+	<flag name="test">Build and run the test-suite</flag>
+	<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
+</use>
+<upstream>
+	<bugs-to>https://github.com/alembic/alembic/issues</bugs-to>
+	<remote-id type="github">https://github.com/alembic/alembic</remote-id>
+</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/
@ 2018-10-03 16:13 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2018-10-03 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     162768ac2cb3e927725d077a815b2f8de34f6ae4
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Fri Sep 28 14:37:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct  3 15:57:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162768ac

media-gfx/alembic: bump to version 1.7.9

add experimental support for arnold, maya and renderman plugins
fix import error in python

Bug: https://bugs.gentoo.org/667230
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/10003
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/alembic/Manifest                         |   1 +
 media-gfx/alembic/alembic-1.7.9.ebuild             | 107 ++++++++++++
 .../files/alembic-1.7.9-CMakeLists-fix_lib.patch   | 189 +++++++++++++++++++++
 ...lembic-1.7.9-find-pyilmbase-python-module.patch |  13 ++
 .../files/alembic-1.7.9-fix-python-import.patch    |  30 ++++
 media-gfx/alembic/files/alembic-1.7.9-prman.patch  |  26 +++
 media-gfx/alembic/metadata.xml                     |  18 +-
 7 files changed, 383 insertions(+), 1 deletion(-)

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 84e5a72ffb7..9e761d9c16c 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.7.4.tar.gz 805503 BLAKE2B b8a8b986d0323dbe3748e1dde5436d66e08620a28852c3331ee612d43a414e381a1cdbbb63200b8f146ce94ebb0e3d0ae6f70f33575bd9ff25e9121f2cd73d1a SHA512 8e752d6d85bea3b6a53582d35a589fc40824456098d950974effe0a6a0e359fec1e056af1ea1379f7e23b7ffed2c05c7f5269fa4b64757631b7d57fb60ee98b0
+DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2

diff --git a/media-gfx/alembic/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
new file mode 100644
index 00000000000..638b12a639b
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.7.9.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+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"
+# TODO: ~x86 currently depends on new =dev-python/pyilmbase-2.3.0 which has
+# ~x86 keyword. As soon as it's updated in the tree, the keyword can be
+# added here.
+KEYWORDS="~amd64"
+IUSE="arnold +boost doc examples hdf5 maya prman python test zlib"
+
+# pyalembic python bindings need boost
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	hdf5? ( zlib )
+	python? ( boost )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=media-libs/openexr-2.2.0-r2:=
+	boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_USEDEP}] )
+	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
+	python? ( >=dev-python/pyilmbase-2.2.0[${PYTHON_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
+"
+DEPEND="
+	${RDEPEND}
+	>=dev-util/cmake-3.9.6
+	doc? ( >=app-doc/doxygen-1.8.13-r1 )
+"
+
+DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
+	"${FILESDIR}/${P}-CMakeLists-fix_lib.patch"
+	"${FILESDIR}/${P}-prman.patch"
+	"${FILESDIR}/${P}-fix-python-import.patch"
+	"${FILESDIR}/${P}-find-pyilmbase-python-module.patch"
+)
+
+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=$(usex arnold)
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=$(usex maya)
+		-DUSE_PRMAN=$(usex prman)
+		-DUSE_PYALEMBIC=$(usex python)
+		-DUSE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	if use arnold; then
+		einfo "NOTE: The arnold plugin is highly experimental and hasn't been"
+		einfo "tested, due to missing license. If you have trouble compiling"
+		einfo "or running it, please file a bug report for the package at"
+		einfo "Gentoo's bugzilla."
+	fi
+	if use maya; then
+		einfo "NOTE: The maya plugin is highly experimental and hasn't been"
+		einfo "tested, due to missing license. If you have trouble compiling"
+		einfo "or running it, please file a bug report for the package at"
+		einfo "Gentoo's bugzilla."
+	fi
+	if use prman; then
+		einfo "NOTE: The renderman plugin is still experimental and has not"
+		einfo "been tested much. If you have trouble running it, please file"
+		einfo "a bug report for the package at Gentoo's bugzilla."
+		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.9-CMakeLists-fix_lib.patch b/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
new file mode 100644
index 00000000000..06ebf60b0d6
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
@@ -0,0 +1,189 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 298f4be..18b3ff5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,12 +80,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
+ 
+ # Set static/dynamic build options
+ SET(LIB_TYPE STATIC)
+-SET(RUNTIME_INSTALL_DIR lib)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(ARCHIVE_INSTALL_DIR lib)
++SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
++SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
++SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+ IF (ALEMBIC_SHARED_LIBS)
+     SET(LIB_TYPE SHARED)
+-    SET(ARCHIVE_INSTALL_DIR lib)
++    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+     IF (WIN32)
+         ADD_DEFINITIONS(-DALEMBIC_DLL)
+     ENDIF()
+diff --git a/arnold/Procedural/CMakeLists.txt b/arnold/Procedural/CMakeLists.txt
+index 69e00da..47ccf66 100644
+--- a/arnold/Procedural/CMakeLists.txt
++++ b/arnold/Procedural/CMakeLists.txt
+@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES( AlembicArnoldProcedural Alembic::Alembic)
+ 
+ set_target_properties(AlembicArnoldProcedural PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL ( TARGETS
+   AlembicArnoldProcedural
+diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
+index 451409c..c882971 100644
+--- a/bin/AbcConvert/CMakeLists.txt
++++ b/bin/AbcConvert/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic::Alembic)
+ 
+ set_target_properties(abcconvert PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcconvert DESTINATION bin)
+diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
+index 511864a..bed92b2 100644
+--- a/bin/AbcDiff/CMakeLists.txt
++++ b/bin/AbcDiff/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic::Alembic)
+ 
+ set_target_properties(abcdiff PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcdiff DESTINATION bin)
+diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
+index be5f5c1..eca449a 100644
+--- a/bin/AbcEcho/CMakeLists.txt
++++ b/bin/AbcEcho/CMakeLists.txt
+@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic::Alembic)
+ 
+ set_target_properties(abcecho abcechobounds PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
+diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
+index 815f84f..92f83c4 100644
+--- a/bin/AbcLs/CMakeLists.txt
++++ b/bin/AbcLs/CMakeLists.txt
+@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic::Alembic)
+ 
+ set_target_properties(abcls PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcls DESTINATION bin)
+diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
+index a963420..a84e00b 100644
+--- a/bin/AbcStitcher/CMakeLists.txt
++++ b/bin/AbcStitcher/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic::Alembic)
+ 
+ set_target_properties(abcstitcher PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abcstitcher DESTINATION bin)
+diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
+index b4f65f1..74225ac 100644
+--- a/bin/AbcTree/CMakeLists.txt
++++ b/bin/AbcTree/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic::Alembic)
+ 
+ set_target_properties(abctree PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS abctree DESTINATION bin)
+diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
+index fb3def8..d5bbcec 100644
+--- a/lib/Alembic/CMakeLists.txt
++++ b/lib/Alembic/CMakeLists.txt
+@@ -84,7 +84,7 @@ IF ( ${ALEMBIC_LIB_USES_TR1} AND CMAKE_COMPILER_IS_GNUCXX AND
+     TARGET_LINK_LIBRARIES( Alembic atomic )
+ ENDIF()
+ 
+-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
++SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
+ INSTALL(TARGETS Alembic
+         EXPORT AlembicTargets
+         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
+@@ -117,7 +117,7 @@ EXPORT(TARGETS
+     Alembic::
+     )
+ 
+-SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
++SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
+     "Where to install the Alembic's cmake files")
+ 
+ INSTALL(FILES
+diff --git a/maya/AbcExport/CMakeLists.txt b/maya/AbcExport/CMakeLists.txt
+index 50d2fd2..f8bc850 100644
+--- a/maya/AbcExport/CMakeLists.txt
++++ b/maya/AbcExport/CMakeLists.txt
+@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(AbcExport
+ 
+ set_target_properties(AbcExport PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS AbcExport
+         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
+diff --git a/maya/AbcImport/CMakeLists.txt b/maya/AbcImport/CMakeLists.txt
+index 6826183..e71e612 100644
+--- a/maya/AbcImport/CMakeLists.txt
++++ b/maya/AbcImport/CMakeLists.txt
+@@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(AbcImport
+ 
+ set_target_properties(AbcImport PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS AbcImport
+         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
+diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
+index 6b46e91..3635bcc 100644
+--- a/prman/Procedural/CMakeLists.txt
++++ b/prman/Procedural/CMakeLists.txt
+@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES(AlembicRiProcedural Alembic::Alembic)
+ 
+ set_target_properties(AlembicRiProcedural PROPERTIES
+     INSTALL_RPATH_USE_LINK_PATH TRUE
+-    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ 
+ INSTALL(TARGETS
+     AlembicRiProcedural
+diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
+index 91c45c4..c87eec6 100644
+--- a/python/PyAlembic/CMakeLists.txt
++++ b/python/PyAlembic/CMakeLists.txt
+@@ -128,7 +128,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
+     )
+ 
+     SET( ALEMBIC_PYTHON_INSTALL_DIR
+-        lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++        lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
+         CACHE PATH
+         "Alembic's python bindings install directory"
+     )
+@@ -143,7 +143,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
+ 
+     set_target_properties(alembic PROPERTIES
+         INSTALL_RPATH_USE_LINK_PATH TRUE
+-        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ ELSE()
+     MESSAGE(FATAL_ERROR "Unable to find Python libs")
+ ENDIF()

diff --git a/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch b/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
new file mode 100644
index 00000000000..4acdc5d7d88
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
+index 5cb9108..c3f80a2 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})

diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
new file mode 100644
index 00000000000..ca8bedef57a
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
@@ -0,0 +1,30 @@
+diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
+index c677549..5cb9108 100644
+--- a/cmake/Modules/FindPyIlmBase.cmake
++++ b/cmake/Modules/FindPyIlmBase.cmake
+@@ -60,11 +60,11 @@ ELSE()
+ 
+     SET(LIBRARY_PATHS
+         ${ALEMBIC_PYILMBASE_ROOT}/lib
+-        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY}
++#        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY} # this is defined nowhere
+         ~/Library/Frameworks
+         /Library/Frameworks
+-        /usr/local/lib
+-        /usr/lib
++        /usr/local/lib${LIB_SUFFIX}
++        /usr/lib${LIB_SUFFIX}
+         /sw/lib
+         /opt/local/lib
+         /opt/csw/lib
+@@ -118,8 +118,8 @@ ELSE()
+     FIND_PATH(ALEMBIC_PYIMATH_MODULE_DIRECTORY imathmodule.so
+         PATHS
+         ${LIBRARY_PATHS}
+-        /usr/local/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
+-        ${ALEMBIC_PYILMBASE_ROOT}/lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++        /usr/local/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++        ${ALEMBIC_PYILMBASE_ROOT}/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
+         DOC "The imathmodule.so module directory"
+     )
+ 

diff --git a/media-gfx/alembic/files/alembic-1.7.9-prman.patch b/media-gfx/alembic/files/alembic-1.7.9-prman.patch
new file mode 100644
index 00000000000..cfd299c79bb
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.9-prman.patch
@@ -0,0 +1,26 @@
+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()
+ 
+ 
+diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
+index 6b46e91..0cb2aa6 100644
+--- a/prman/Procedural/CMakeLists.txt
++++ b/prman/Procedural/CMakeLists.txt
+@@ -65,5 +65,5 @@ set_target_properties(AlembicRiProcedural PROPERTIES
+ INSTALL(TARGETS
+     AlembicRiProcedural
+     DESTINATION
+-    prman/procedurals
++    $ENV{RMANTREE}/lib/plugins
+ )

diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 3d75399517f..30e01e315c7 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -14,9 +14,25 @@
 	developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
 </longdescription>
 <use>
+	<flag name="arnold">
+		Add support for arnold renderer (experimental)
+	</flag>
 	<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="pyalembic">Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)</flag>
+	<flag name="maya">
+		Compile Alembic plugin for Maya (experimental)
+	</flag>
+	<flag name="prman">
+		Compile Alembic plugin for Renderman (experimental)
+	</flag>
+	<flag name="pyalembic">
+		<!-- renamed to python in 1.7.9 -->
+		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
+	</flag>
+	<flag name="python">
+		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
+	</flag>
 	<flag name="test">Build and run the test-suite</flag>
 	<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
 </use>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/
@ 2019-06-12 10:03 Andreas Sturmlechner
  0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2019-06-12 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     1ecda4f6fe77c57f8fbedd6abde2fea46a8933e0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 10:01:36 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 10:03:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ecda4f6

media-gfx/alembic: Drop 1.7.4

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/alembic/Manifest                         |   1 -
 media-gfx/alembic/alembic-1.7.4.ebuild             | 101 ----------------
 .../alembic/files/alembic-CMakeLists-fix_lib.patch | 132 ---------------------
 .../alembic/files/alembic-fix-importerror.patch    |  17 ---
 media-gfx/alembic/metadata.xml                     |   4 -
 5 files changed, 255 deletions(-)

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 9e761d9c16c..86ce90b5899 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,2 +1 @@
-DIST alembic-1.7.4.tar.gz 805503 BLAKE2B b8a8b986d0323dbe3748e1dde5436d66e08620a28852c3331ee612d43a414e381a1cdbbb63200b8f146ce94ebb0e3d0ae6f70f33575bd9ff25e9121f2cd73d1a SHA512 8e752d6d85bea3b6a53582d35a589fc40824456098d950974effe0a6a0e359fec1e056af1ea1379f7e23b7ffed2c05c7f5269fa4b64757631b7d57fb60ee98b0
 DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2

diff --git a/media-gfx/alembic/alembic-1.7.4.ebuild b/media-gfx/alembic/alembic-1.7.4.ebuild
deleted file mode 100644
index 542642f08d7..00000000000
--- a/media-gfx/alembic/alembic-1.7.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 cmake-utils
-
-DESCRIPTION="Alembic is an 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"
-IUSE="+boost doc hdf5 pyalembic test +zlib"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-	pyalembic? ( boost )"
-
-DEPEND="
-	${PYTHON_DEP}
-	>=dev-util/cmake-3.7.2
-	boost? ( >=dev-libs/boost-1.62.0-r1 )
-	doc? ( >=app-doc/doxygen-1.8.13-r1 )
-	pyalembic? ( >=dev-python/pyilmbase-2.2.0 )"
-
-RDEPEND="
-	${PYTHON_DEP}
-	>=media-libs/openexr-2.2.0-r2
-	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )"
-
-DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
-	"${FILESDIR}/${PN}-CMakeLists-fix_lib.patch"
-	"${FILESDIR}/${PN}-fix-importerror.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-# Static linking, the use of tr1 and support for prman might be added
-# in the future.
-src_configure() {
-	# I don't have a license for arnold renderer or maya so I disable them
-	# as default.
-	# Also I'm currently not using renderman, so I disable the prman flag
-	# by default too.
-	local mycmakeargs=(
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=OFF
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		-DUSE_PYALEMBIC=$(usex pyalembic)
-		-DUSE_STATIC_BOOST=OFF	# I won't use static libraries
-		-DUSE_STATIC_HDF5=OFF
-		-DUSE_TESTS=$(usex test)
-		-DALEMBIC_ILMBASE_LINK_STATIC=OFF # I don't want to link statically against ilmbase
-		-DALEMBIC_SHARED_LIBS=ON # For now let's ignore building static libraries
-		-DALEMBIC_LIB_USES_BOOST=$(usex boost)
-		-DALEMBIC_LIB_USES_TR1=$(usex !boost)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen -u Doxyfile
-		doxygen Doxyfile
-	fi
-}
-
-src_test() {
-	if use test; then
-		cmake-utils_src_test
-	fi
-}
-
-src_install() {
-	DESTDIR="${D}" cmake-utils_src_install
-	if use doc; then
-		dodoc -r "doc/html"
-	fi
-
-	# move the cmake files from lib->lib64
-	mv "${D}/usr/lib/cmake" "${D}/usr/lib64/cmake" || die
-	rm -rv "${D}/usr/lib" || die
-}

diff --git a/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch b/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch
deleted file mode 100644
index c653927ecbe..00000000000
--- a/media-gfx/alembic/files/alembic-CMakeLists-fix_lib.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d84f002..a35b662 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -79,12 +79,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
- 
- # Set static/dynamic build options
- SET(LIB_TYPE STATIC)
--SET(RUNTIME_INSTALL_DIR lib)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(ARCHIVE_INSTALL_DIR lib)
-+SET(RUNTIME_INSTALL_DIR lib64)
-+SET(LIBRARY_INSTALL_DIR lib64)
-+SET(ARCHIVE_INSTALL_DIR lib64)
- IF (ALEMBIC_SHARED_LIBS)
-     SET(LIB_TYPE SHARED)
--    SET(ARCHIVE_INSTALL_DIR lib)
-+    SET(ARCHIVE_INSTALL_DIR lib64)
-     IF (WIN32)
-         ADD_DEFINITIONS(-DALEMBIC_DLL)
-     ENDIF()
-diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
-index 3725ed7..edea767 100644
---- a/bin/AbcConvert/CMakeLists.txt
-+++ b/bin/AbcConvert/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic)
- 
- set_target_properties(abcconvert PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcconvert DESTINATION bin)
-diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
-index e2fd355..2234650 100644
---- a/bin/AbcDiff/CMakeLists.txt
-+++ b/bin/AbcDiff/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic)
- 
- set_target_properties(abcdiff PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcdiff DESTINATION bin)
-diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
-index 396226e..116c122 100644
---- a/bin/AbcEcho/CMakeLists.txt
-+++ b/bin/AbcEcho/CMakeLists.txt
-@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic)
- 
- set_target_properties(abcecho abcechobounds PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
-diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
-index 1dbeb9d..7b721d0 100644
---- a/bin/AbcLs/CMakeLists.txt
-+++ b/bin/AbcLs/CMakeLists.txt
-@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic)
- 
- set_target_properties(abcls PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcls DESTINATION bin)
-diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
-index 3106bf2..0c8a205 100644
---- a/bin/AbcStitcher/CMakeLists.txt
-+++ b/bin/AbcStitcher/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic)
- 
- set_target_properties(abcstitcher PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abcstitcher DESTINATION bin)
-diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
-index 3c41004..de7c7fc 100644
---- a/bin/AbcTree/CMakeLists.txt
-+++ b/bin/AbcTree/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic)
- 
- set_target_properties(abctree PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- 
- INSTALL(TARGETS abctree DESTINATION bin)
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index 3e16518..b07cb7d 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -86,9 +86,9 @@ ENDIF()
- 
- INSTALL(TARGETS Alembic
-         EXPORT AlembicTargets
--        LIBRARY DESTINATION lib
--        ARCHIVE DESTINATION lib
--        RUNTIME DESTINATION lib)
-+        LIBRARY DESTINATION lib64
-+        ARCHIVE DESTINATION lib64
-+        RUNTIME DESTINATION lib64)
- 
- #-******************************************************************************
- # PACKAGE EXPORTS
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 06daf30..254ca2b 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -128,7 +128,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-     )
- 
-     INSTALL (TARGETS alembic
--        DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        DESTINATION lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-     )
- 
-     IF (USE_TESTS)
-@@ -137,7 +137,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
- 
-     set_target_properties(alembic PROPERTIES
-         INSTALL_RPATH_USE_LINK_PATH TRUE
--        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64)
- ELSE()
-     MESSAGE(FATAL_ERROR "Unable to find Python libs")
- ENDIF()

diff --git a/media-gfx/alembic/files/alembic-fix-importerror.patch b/media-gfx/alembic/files/alembic-fix-importerror.patch
deleted file mode 100644
index 8a86f08c733..00000000000
--- a/media-gfx/alembic/files/alembic-fix-importerror.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 254ca2b..c8c915a 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -45,6 +45,12 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-         ADD_DEFINITIONS(-Wno-unused-local-typedefs)
-     ENDIF()
- 
-+	# fix for ImportError: dynamic module does not define init function (initalembic)
-+	# see: https://github.com/alembic/alembic/issues/142
-+	IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-+		SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default")
-+	ENDIF()
-+
-     SET(CPP_FILES
-         PyAbcCoreLayer.cpp
-         PyAbcGeomTypes.cpp

diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index 30e01e315c7..4166d46b5bc 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -26,10 +26,6 @@
 	<flag name="prman">
 		Compile Alembic plugin for Renderman (experimental)
 	</flag>
-	<flag name="pyalembic">
-		<!-- renamed to python in 1.7.9 -->
-		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
-	</flag>
 	<flag name="python">
 		Build pyalembic python bindings (needs <pkg>dev-python/pyilmbase</pkg>)
 	</flag>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/
@ 2020-06-08 16:47 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2020-06-08 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     2b711e0a5d119bb56416cbccb910e5a301b1561b
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat May 16 09:04:51 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 16:46:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b711e0a

media-gfx/alembic: drop old

Drop obsolete 1.7.9.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15821
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/alembic/Manifest                         |   1 -
 media-gfx/alembic/alembic-1.7.9.ebuild             | 109 ------------
 .../files/alembic-1.7.9-CMakeLists-fix_lib.patch   | 189 ---------------------
 ...1.7.9-find-boost-python-for-cmake-ge-3.11.patch |  20 ---
 ...lembic-1.7.9-find-pyilmbase-python-module.patch |  13 --
 .../alembic-1.7.9-fix-boost-python-naming.patch    |  17 --
 .../files/alembic-1.7.9-fix-python-import.patch    |  30 ----
 media-gfx/alembic/files/alembic-1.7.9-prman.patch  |  26 ---
 .../files/alembic-FindIlmBase-pkgconfig.patch      |  28 ---
 9 files changed, 433 deletions(-)

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 21dfd588300..c647c113758 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,3 +1,2 @@
 DIST alembic-1.7.11.tar.gz 826833 BLAKE2B ea2ee92cefcc92d3658b8c71351ec0f72bd1fb5d5b6c771ceebe81b1db61a280420f480cd3612f44bc134cccb388954be89baba9dc6e5973e102bc55d65cd974 SHA512 94b9c218a2fe6e2e24205aff4a2f6bab784851c2aa15592fb60ea91f0e8038b0c0656a118f3a5cba0d3de8917dd90b74d0e2d1c4ac034b9ee3f5d0741d9f6b70
 DIST alembic-1.7.12.tar.gz 827983 BLAKE2B 7d508fdbfd92f213936635666a221fdad30f242a37ef8ff54a6272854565ebb890ffd11d8fe010f1558c0872fcb23080413d76380772ebf5db52033bdf0d9c85 SHA512 e05e0b24056c17f01784ced1f9606a269974de195f1aca8a6fce2123314e7ee609f70df77ac7fe18dc7f0c04fb883d38cc7de9b963caacf9586aaa24d4ac6210
-DIST alembic-1.7.9.tar.gz 813379 BLAKE2B 599edeb5ad805656755b3e150fba56182d1d60673951b0c1702b3e3e82d9499ec4fcb938303103c27f84458f61ab8de4b872eaa322380ae7713e3b4cd3831af7 SHA512 8025c20525ffbd5bdc9dd5a33ad8238e49f063d244ab9d112e7d1ddb7ee7cf9b36ceb74cb45d658ce22d3033552c89bddf6b818cf466ea46aa1a70a41fdeddb2

diff --git a/media-gfx/alembic/alembic-1.7.9.ebuild b/media-gfx/alembic/alembic-1.7.9.ebuild
deleted file mode 100644
index c04e8c9b6f6..00000000000
--- a/media-gfx/alembic/alembic-1.7.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
-
-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="arnold +boost doc examples hdf5 maya prman python test zlib"
-RESTRICT="!test? ( test )"
-
-# pyalembic python bindings need boost
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	hdf5? ( zlib )
-	python? ( boost )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=media-libs/openexr-2.2.0-r2:=
-	hdf5? ( >=sci-libs/hdf5-1.8.18[zlib(+)] )
-	python? ( >=dev-python/pyilmbase-2.2.0[${PYTHON_SINGLE_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.11-r1 )
-	$(python_gen_cond_dep '
-		boost? ( >=dev-libs/boost-1.65.0:=[python,${PYTHON_MULTI_USEDEP}] )
-	')
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-util/cmake-3.9.6
-	doc? ( >=app-doc/doxygen-1.8.13-r1 )
-"
-
-DOCS=( "ACKNOWLEDGEMENTS.txt" "FEEDBACK.txt" "NEWS.txt" "README.txt" )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-FindIlmBase-pkgconfig.patch"
-	"${FILESDIR}/${P}-CMakeLists-fix_lib.patch"
-	"${FILESDIR}/${P}-prman.patch"
-	"${FILESDIR}/${P}-fix-python-import.patch"
-	"${FILESDIR}/${P}-find-pyilmbase-python-module.patch"
-	"${FILESDIR}/${P}-find-boost-python-for-cmake-ge-3.11.patch"
-	"${FILESDIR}/${P}-fix-boost-python-naming.patch"
-)
-
-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=$(usex arnold)
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=$(usex maya)
-		-DUSE_PRMAN=$(usex prman)
-		-DUSE_PYALEMBIC=$(usex python)
-		-DUSE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		doxygen -u Doxyfile || die
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use arnold; then
-		einfo "NOTE: The arnold plugin is highly experimental and hasn't been"
-		einfo "tested, due to missing license. If you have trouble compiling"
-		einfo "or running it, please file a bug report for the package at"
-		einfo "Gentoo's bugzilla."
-	fi
-	if use maya; then
-		einfo "NOTE: The maya plugin is highly experimental and hasn't been"
-		einfo "tested, due to missing license. If you have trouble compiling"
-		einfo "or running it, please file a bug report for the package at"
-		einfo "Gentoo's bugzilla."
-	fi
-	if use prman; then
-		einfo "NOTE: The renderman plugin is still experimental and has not"
-		einfo "been tested much. If you have trouble running it, please file"
-		einfo "a bug report for the package at Gentoo's bugzilla."
-		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.9-CMakeLists-fix_lib.patch b/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
deleted file mode 100644
index 06ebf60b0d6..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-CMakeLists-fix_lib.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 298f4be..18b3ff5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,12 +80,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
- 
- # Set static/dynamic build options
- SET(LIB_TYPE STATIC)
--SET(RUNTIME_INSTALL_DIR lib)
--SET(LIBRARY_INSTALL_DIR lib)
--SET(ARCHIVE_INSTALL_DIR lib)
-+SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
-+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
- IF (ALEMBIC_SHARED_LIBS)
-     SET(LIB_TYPE SHARED)
--    SET(ARCHIVE_INSTALL_DIR lib)
-+    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
-     IF (WIN32)
-         ADD_DEFINITIONS(-DALEMBIC_DLL)
-     ENDIF()
-diff --git a/arnold/Procedural/CMakeLists.txt b/arnold/Procedural/CMakeLists.txt
-index 69e00da..47ccf66 100644
---- a/arnold/Procedural/CMakeLists.txt
-+++ b/arnold/Procedural/CMakeLists.txt
-@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES( AlembicArnoldProcedural Alembic::Alembic)
- 
- set_target_properties(AlembicArnoldProcedural PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL ( TARGETS
-   AlembicArnoldProcedural
-diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
-index 451409c..c882971 100644
---- a/bin/AbcConvert/CMakeLists.txt
-+++ b/bin/AbcConvert/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic::Alembic)
- 
- set_target_properties(abcconvert PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcconvert DESTINATION bin)
-diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
-index 511864a..bed92b2 100644
---- a/bin/AbcDiff/CMakeLists.txt
-+++ b/bin/AbcDiff/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic::Alembic)
- 
- set_target_properties(abcdiff PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcdiff DESTINATION bin)
-diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
-index be5f5c1..eca449a 100644
---- a/bin/AbcEcho/CMakeLists.txt
-+++ b/bin/AbcEcho/CMakeLists.txt
-@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic::Alembic)
- 
- set_target_properties(abcecho abcechobounds PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
-diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
-index 815f84f..92f83c4 100644
---- a/bin/AbcLs/CMakeLists.txt
-+++ b/bin/AbcLs/CMakeLists.txt
-@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic::Alembic)
- 
- set_target_properties(abcls PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcls DESTINATION bin)
-diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
-index a963420..a84e00b 100644
---- a/bin/AbcStitcher/CMakeLists.txt
-+++ b/bin/AbcStitcher/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic::Alembic)
- 
- set_target_properties(abcstitcher PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abcstitcher DESTINATION bin)
-diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
-index b4f65f1..74225ac 100644
---- a/bin/AbcTree/CMakeLists.txt
-+++ b/bin/AbcTree/CMakeLists.txt
-@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic::Alembic)
- 
- set_target_properties(abctree PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS abctree DESTINATION bin)
-diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
-index fb3def8..d5bbcec 100644
---- a/lib/Alembic/CMakeLists.txt
-+++ b/lib/Alembic/CMakeLists.txt
-@@ -84,7 +84,7 @@ IF ( ${ALEMBIC_LIB_USES_TR1} AND CMAKE_COMPILER_IS_GNUCXX AND
-     TARGET_LINK_LIBRARIES( Alembic atomic )
- ENDIF()
- 
--SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
-+SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
- INSTALL(TARGETS Alembic
-         EXPORT AlembicTargets
-         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
-@@ -117,7 +117,7 @@ EXPORT(TARGETS
-     Alembic::
-     )
- 
--SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
-+SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
-     "Where to install the Alembic's cmake files")
- 
- INSTALL(FILES
-diff --git a/maya/AbcExport/CMakeLists.txt b/maya/AbcExport/CMakeLists.txt
-index 50d2fd2..f8bc850 100644
---- a/maya/AbcExport/CMakeLists.txt
-+++ b/maya/AbcExport/CMakeLists.txt
-@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(AbcExport
- 
- set_target_properties(AbcExport PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS AbcExport
-         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
-diff --git a/maya/AbcImport/CMakeLists.txt b/maya/AbcImport/CMakeLists.txt
-index 6826183..e71e612 100644
---- a/maya/AbcImport/CMakeLists.txt
-+++ b/maya/AbcImport/CMakeLists.txt
-@@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(AbcImport
- 
- set_target_properties(AbcImport PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS AbcImport
-         DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
-diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
-index 6b46e91..3635bcc 100644
---- a/prman/Procedural/CMakeLists.txt
-+++ b/prman/Procedural/CMakeLists.txt
-@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES(AlembicRiProcedural Alembic::Alembic)
- 
- set_target_properties(AlembicRiProcedural PROPERTIES
-     INSTALL_RPATH_USE_LINK_PATH TRUE
--    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+    INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- 
- INSTALL(TARGETS
-     AlembicRiProcedural
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 91c45c4..c87eec6 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -128,7 +128,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-     )
- 
-     SET( ALEMBIC_PYTHON_INSTALL_DIR
--        lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-         CACHE PATH
-         "Alembic's python bindings install directory"
-     )
-@@ -143,7 +143,7 @@ IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
- 
-     set_target_properties(alembic PROPERTIES
-         INSTALL_RPATH_USE_LINK_PATH TRUE
--        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-+        INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- ELSE()
-     MESSAGE(FATAL_ERROR "Unable to find Python libs")
- ENDIF()

diff --git a/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch b/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
deleted file mode 100644
index d8abfce72f5..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-find-boost-python-for-cmake-ge-3.11.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
-index 21b3515..ba6f396 100644
---- a/cmake/AlembicBoost.cmake
-+++ b/cmake/AlembicBoost.cmake
-@@ -79,7 +79,14 @@ IF (USE_PYALEMBIC AND APPLE)
- ENDIF()
- 
- IF (USE_PYALEMBIC)
--    FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    # At least cmake-3.11 has introduced a new syntax while looking for
-+    # boost python libraries. It might apply to version 10 too, but I
-+    # couldn't check due to cmake-3.10 compile error.
-+    IF (CMAKE_MINOR_VERSION VERSION_GREATER 10)
-+        FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python2.7)
-+    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/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch b/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
deleted file mode 100644
index 4acdc5d7d88..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-find-pyilmbase-python-module.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index 5cb9108..c3f80a2 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})

diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
deleted file mode 100644
index c14d7ad960c..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-fix-boost-python-naming.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index 5a75e63..492be6a 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -33,10 +33,10 @@
- ##
- ##-*****************************************************************************
- 
--MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
-+MESSAGE(STATUS "Boost_PYTHON2.7_LIBRARY_RELEASE: ${Boost_PYTHON2.7_LIBRARY_RELEASE}")
- 
- # set core libs
--IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
-+IF (Boost_PYTHON2.7_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
-     MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
-     SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
- 

diff --git a/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch b/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
deleted file mode 100644
index ca8bedef57a..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-fix-python-import.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index c677549..5cb9108 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -60,11 +60,11 @@ ELSE()
- 
-     SET(LIBRARY_PATHS
-         ${ALEMBIC_PYILMBASE_ROOT}/lib
--        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY}
-+#        ${ALEMBIC_PYILMBASE_MODULE_DIRECTORY} # this is defined nowhere
-         ~/Library/Frameworks
-         /Library/Frameworks
--        /usr/local/lib
--        /usr/lib
-+        /usr/local/lib${LIB_SUFFIX}
-+        /usr/lib${LIB_SUFFIX}
-         /sw/lib
-         /opt/local/lib
-         /opt/csw/lib
-@@ -118,8 +118,8 @@ ELSE()
-     FIND_PATH(ALEMBIC_PYIMATH_MODULE_DIRECTORY imathmodule.so
-         PATHS
-         ${LIBRARY_PATHS}
--        /usr/local/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
--        ${ALEMBIC_PYILMBASE_ROOT}/lib64/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        /usr/local/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-+        ${ALEMBIC_PYILMBASE_ROOT}/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-         DOC "The imathmodule.so module directory"
-     )
- 

diff --git a/media-gfx/alembic/files/alembic-1.7.9-prman.patch b/media-gfx/alembic/files/alembic-1.7.9-prman.patch
deleted file mode 100644
index cfd299c79bb..00000000000
--- a/media-gfx/alembic/files/alembic-1.7.9-prman.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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()
- 
- 
-diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
-index 6b46e91..0cb2aa6 100644
---- a/prman/Procedural/CMakeLists.txt
-+++ b/prman/Procedural/CMakeLists.txt
-@@ -65,5 +65,5 @@ set_target_properties(AlembicRiProcedural PROPERTIES
- INSTALL(TARGETS
-     AlembicRiProcedural
-     DESTINATION
--    prman/procedurals
-+    $ENV{RMANTREE}/lib/plugins
- )

diff --git a/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch b/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch
deleted file mode 100644
index b291e839e8c..00000000000
--- a/media-gfx/alembic/files/alembic-FindIlmBase-pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
-index dac8659..e7beb59 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} )
-@@ -97,6 +97,14 @@ FIND_PATH(ILMBASE_INCLUDE_DIR
-     include/OpenEXR
- )
- 
-+FIND_PACKAGE(PkgConfig)
-+IF (PKG_CONFIG_FOUND)
-+	PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
-+	IF (PC_ILMBASE_FOUND)
-+		SET(_ilmbase_libs_ver_init ${PC_ILMBASE_VERSION})
-+	ENDIF()
-+ENDIF()
-+
- # If the headers were found, get the version from config file, if not already set.
- IF(ILMBASE_INCLUDE_DIR)
-   SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${ILMBASE_INCLUDE_DIR})


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/
@ 2021-02-12 16:20 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-02-12 16:20 UTC (permalink / raw
  To: gentoo-commits

commit:     4b26fced0d93ce48dfa466d3f8f25e339478dbf7
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Mon Feb  1 20:49:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 16:20:31 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b26fced

media-gfx/alembic: drop 1.7.12

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19299
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/alembic/Manifest                         |  1 -
 media-gfx/alembic/alembic-1.7.12.ebuild            | 90 ----------------------
 ...11-0001-Fix-to-find-boost-with-cmake-3.11.patch | 60 ---------------
 ...se-by-setting-a-proper-ILMBASE_ROOT-value.patch | 72 -----------------
 ...bic-1.7.11-0003-Fix-env-var-for-renderman.patch | 29 -------
 ....7.11-0004-Fix-a-compile-issue-with-const.patch | 27 -------
 ...Alembic-Tests-CMakeLists.txt-fix-variable.patch | 29 -------
 media-gfx/alembic/metadata.xml                     |  5 --
 8 files changed, 313 deletions(-)

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index e09960db353..6b21cc8ad5b 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 d67d4611da1..00000000000
--- 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 d36e2503427..00000000000
--- 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 c561e26a665..00000000000
--- 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 9777bad13e8..00000000000
--- 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 73e989ba6a6..00000000000
--- 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 6bb8090344f..00000000000
--- 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 2ad53a2f4fa..cbe5fd8cc57 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>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/
@ 2021-05-04 22:02 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-05-04 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     47b69a1658ffcb36fcc019efd112d0fa3a948b3a
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Apr 23 16:07:03 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  4 22:01:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47b69a16

media-gfx/alembic: bump to 1.8.0

Closes: https://bugs.gentoo.org/783843
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20515
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/alembic/Manifest                         |  1 +
 media-gfx/alembic/alembic-1.8.0.ebuild             | 52 ++++++++++++++++++++
 .../alembic-1.8.0-0001-set-correct-libdir.patch    | 57 ++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 6b21cc8ad5b..99b7d902ae5 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
+DIST alembic-1.8.0.tar.gz 860886 BLAKE2B eccb1c74e90094a9b473ecb66260714a519110c20b18248c4fc5ecff5edf2b424b303764f80ee76333e588e85a92499d75a8104b972ccd142cc26532fd89df30 SHA512 23fc881863741f7fd081342f5c53c1ec3d00ab300ba8cd10e4a659ee820a9ed1244cf7cf2fd40482f6be32b9d7df44128363246e942bd03c802f3a2a81533b57

diff --git a/media-gfx/alembic/alembic-1.8.0.ebuild b/media-gfx/alembic/alembic-1.8.0.ebuild
new file mode 100644
index 00000000000..dedaae796d0
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.8.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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"
+# arm{,64} either pyilmbase needs to be keyworded or imath merged and keyworded
+# to re-add python / pyalembic support
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples hdf5 test"
+RESTRICT="!test? ( test )"
+
+# TODO: once imath has been merge, switch to use imath instead
+# of ilmbase
+RDEPEND="
+	>=media-libs/ilmbase-2.5.5:=
+	hdf5? (
+		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
+		>=sys-libs/zlib-1.2.11-r1
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
+
+PATCHES=( "${FILESDIR}/${P}-0001-set-correct-libdir.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_BUILD_LIBS=ON
+		-DALEMBIC_SHARED_LIBS=ON
+		-DDOCS_PATH=OFF	# currently does nothing but require doxygen
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		# TODO: needs imath merged and keyworded for arm{,64}
+		-DUSE_PYALEMBIC=OFF
+		-DUSE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}

diff --git a/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch b/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch
new file mode 100644
index 00000000000..3216e38d238
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.8.0-0001-set-correct-libdir.patch
@@ -0,0 +1,57 @@
+From 9e877b10c05e9482ef00bda99033508cc64211fd Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 23 Apr 2021 15:20:15 +0200
+Subject: [PATCH] set correct libdir
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt             | 8 ++++----
+ lib/Alembic/CMakeLists.txt | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69fff1e..97d1e2d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,12 +73,12 @@ option(DOCS_PATH
+ 
+ # Set static/dynamic build options
+ SET(LIB_TYPE STATIC)
+-SET(RUNTIME_INSTALL_DIR lib)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(ARCHIVE_INSTALL_DIR lib)
++SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
++SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
++SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+ IF (ALEMBIC_SHARED_LIBS)
+     SET(LIB_TYPE SHARED)
+-    SET(ARCHIVE_INSTALL_DIR lib)
++    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+     IF (WIN32)
+         ADD_DEFINITIONS(-DALEMBIC_DLL)
+     ENDIF()
+diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
+index 20acfed..9859bbe 100644
+--- a/lib/Alembic/CMakeLists.txt
++++ b/lib/Alembic/CMakeLists.txt
+@@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES(Alembic
+     ${ZLIB_LIBRARY}
+   )
+ 
+-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
++SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
+ INSTALL(TARGETS Alembic
+         EXPORT AlembicTargets
+         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
+@@ -91,7 +91,7 @@ INSTALL(TARGETS Alembic
+ 
+ set(alembic_targets_file "${PROJECT_NAME}Targets.cmake")
+ 
+-SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
++SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
+         "Where to install the Alembic's cmake files")
+ 
+ INCLUDE(CMakePackageConfigHelpers)
+-- 
+2.31.1
+


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/
@ 2023-01-13 12:03 Arthur Zamarin
  0 siblings, 0 replies; 8+ messages in thread
From: Arthur Zamarin @ 2023-01-13 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     216fa11e5c4e228b36e073048757a38b25c1b7bb
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Jan 13 11:00:01 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:03:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216fa11e

media-gfx/alembic: drop 1.8.3-r2

Bug #830932 becomes obsolete, hence the closing.

Closes: https://bugs.gentoo.org/830932
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29089
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-gfx/alembic/Manifest                         |  1 -
 media-gfx/alembic/alembic-1.8.3-r2.ebuild          | 65 ----------------
 ...1.8.3-0001-find-py-ilmbase-in-config-mode.patch | 90 ----------------------
 3 files changed, 156 deletions(-)

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 0e6d302f6ce2..945025e06f5b 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,2 +1 @@
-DIST alembic-1.8.3.tar.gz 862221 BLAKE2B 81639b0968dbcaac0096eac83385b7d6b1dc27b4b1652ede8cf6b6cf3aa3eea3c6f5e53f033708b61f79d99ebfaa766a9cac3345a043d6cc0ba6d6c29dcb9ed0 SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036
 DIST alembic-1.8.4.tar.gz 867788 BLAKE2B b7bc5ebcaebc5905a9a2e45be21170a72923fd6af6d9f97b81bdc7e8b80bb037ed3f667ea15a5b96194b33687010fda455e4df8355f92fc29aa000beae32cae8 SHA512 2473f4b9afe3fddbd2d0477bdc85d93697e413410253a7f7f0f030fba919dfb63dabd2d2d13829f59f3f901643ab842d230a9f08fb667e2c16cef0e751a8a687

diff --git a/media-gfx/alembic/alembic-1.8.3-r2.ebuild b/media-gfx/alembic/alembic-1.8.3-r2.ebuild
deleted file mode 100644
index 55cf6d2bd757..000000000000
--- a/media-gfx/alembic/alembic-1.8.3-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-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 ~arm ~arm64 ~x86"
-IUSE="examples hdf5 python test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/imath:=
-	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
-	hdf5? (
-		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
-		>=sys-libs/zlib-1.2.11-r1
-	)
-	python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') )
-"
-DEPEND="${RDEPEND}"
-
-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 )
-
-src_prepare() {
-	cmake_src_prepare
-	# PyAlembic test doesn't properly find Imath, comment it for now
-	cmake_run_in python/PyAlembic cmake_comment_add_subdirectory Tests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DALEMBIC_BUILD_LIBS=ON
-		-DALEMBIC_SHARED_LIBS=ON
-		# currently does nothing but require doxygen
-		-DDOCS_PATH=OFF
-		-DUSE_ARNOLD=OFF
-		-DUSE_BINARIES=ON
-		-DUSE_EXAMPLES=$(usex examples)
-		-DUSE_HDF5=$(usex hdf5)
-		-DUSE_MAYA=OFF
-		-DUSE_PRMAN=OFF
-		-DUSE_PYALEMBIC=$(usex python)
-		-DUSE_TESTS=$(usex test)
-	)
-
-	use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} )
-
-	cmake_src_configure
-}

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
deleted file mode 100644
index bc7ac9f507a8..000000000000
--- a/media-gfx/alembic/files/alembic-1.8.3-0001-find-py-ilmbase-in-config-mode.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/
@ 2023-04-11  5:38 Viorel Munteanu
  0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2023-04-11  5:38 UTC (permalink / raw
  To: gentoo-commits

commit:     998fda58ce8b81855ad9472de53a58fbb7244a72
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Mar 18 18:54:37 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Apr 11 05:29:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998fda58

media-gfx/alembic: add 1.8.5

Drop python test for now, until issue of failing test is resolved.

Bug: https://github.com/alembic/alembic/issues/411
Closes: https://bugs.gentoo.org/901203
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/30218
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 media-gfx/alembic/Manifest                         |  1 +
 media-gfx/alembic/alembic-1.8.5.ebuild             | 71 ++++++++++++++++++++++
 .../files/alembic-1.8.5-set-correct-libdir.patch   | 48 +++++++++++++++
 3 files changed, 120 insertions(+)

diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 945025e06f5b..158586ffd746 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1 +1,2 @@
 DIST alembic-1.8.4.tar.gz 867788 BLAKE2B b7bc5ebcaebc5905a9a2e45be21170a72923fd6af6d9f97b81bdc7e8b80bb037ed3f667ea15a5b96194b33687010fda455e4df8355f92fc29aa000beae32cae8 SHA512 2473f4b9afe3fddbd2d0477bdc85d93697e413410253a7f7f0f030fba919dfb63dabd2d2d13829f59f3f901643ab842d230a9f08fb667e2c16cef0e751a8a687
+DIST alembic-1.8.5.tar.gz 867976 BLAKE2B 715ff6212ab78b2b4d3f5ea3b448468ade488008a8362193b4976671a69ad89337f926082c7736e64a0b07bf71e04d774df5e22abe409f8cfab1a15ccb3c86bb SHA512 89a480970eb09893112bf650011ede852205d1fa3718680a3983392bbcf3eb3f22f4ec01f42d12bfcaf655ce43d7d6f583b764ec03f4c5a84023359502b3636e

diff --git a/media-gfx/alembic/alembic-1.8.5.ebuild b/media-gfx/alembic/alembic-1.8.5.ebuild
new file mode 100644
index 000000000000..acfb913ecfbc
--- /dev/null
+++ b/media-gfx/alembic/alembic-1.8.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-single-r1
+
+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 ~arm ~arm64 ~x86"
+IUSE="examples hdf5 python test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	examples? ( python )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/imath:=
+	python? ( dev-libs/imath:=[python,${PYTHON_SINGLE_USEDEP}] )
+	hdf5? (
+		>=sci-libs/hdf5-1.10.2:=[zlib(+)]
+		>=sys-libs/zlib-1.2.11-r1
+	)
+	python? ( $(python_gen_cond_dep 'dev-libs/boost[python,${PYTHON_USEDEP}]') )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.5-set-correct-libdir.patch )
+
+DOCS=( ACKNOWLEDGEMENTS.txt FEEDBACK.txt NEWS.txt README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_run_in "${S}/python/PyAlembic" cmake_comment_add_subdirectory Tests
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DALEMBIC_BUILD_LIBS=ON
+		-DALEMBIC_DEBUG_WARNINGS_AS_ERRORS=OFF
+		-DALEMBIC_SHARED_LIBS=ON
+		# currently does nothing but require doxygen
+		-DDOCS_PATH=OFF
+		-DUSE_ARNOLD=OFF
+		-DUSE_BINARIES=ON
+		-DUSE_EXAMPLES=$(usex examples)
+		-DUSE_HDF5=$(usex hdf5)
+		-DUSE_MAYA=OFF
+		-DUSE_PRMAN=OFF
+		-DUSE_PYALEMBIC=$(usex python)
+		-DUSE_TESTS=$(usex test)
+	)
+
+	use python && mycmakeargs+=( -DPython3_EXECUTABLE=${PYTHON} )
+
+	cmake_src_configure
+}
+
+# some tests may fail if run in parallel mode
+# see https://github.com/alembic/alembic/issues/401
+src_test() {
+	cmake_src_test -j1
+}

diff --git a/media-gfx/alembic/files/alembic-1.8.5-set-correct-libdir.patch b/media-gfx/alembic/files/alembic-1.8.5-set-correct-libdir.patch
new file mode 100644
index 000000000000..70071a68e49b
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.8.5-set-correct-libdir.patch
@@ -0,0 +1,48 @@
+From fade0b08f9343fa3cd941b281a3ce49a1918acca Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 18 Mar 2023 19:08:51 +0100
+Subject: [PATCH] Gentoo-specific: set correct libdir
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,12 +74,12 @@ option(DOCS_PATH
+ 
+ # Set static/dynamic build options
+ SET(LIB_TYPE STATIC)
+-SET(RUNTIME_INSTALL_DIR lib)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(ARCHIVE_INSTALL_DIR lib)
++SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
++SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
++SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+ IF (ALEMBIC_SHARED_LIBS)
+     SET(LIB_TYPE SHARED)
+-    SET(ARCHIVE_INSTALL_DIR lib)
++    SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+     IF (WIN32)
+         ADD_DEFINITIONS(-DALEMBIC_DLL)
+     ENDIF()
+--- a/lib/Alembic/CMakeLists.txt
++++ b/lib/Alembic/CMakeLists.txt
+@@ -84,7 +84,7 @@ TARGET_LINK_LIBRARIES(Alembic
+     ${ZLIB_LIBRARY}
+   )
+ 
+-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE STRING "Where to install the Alembic libs")
++SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE STRING "Where to install the Alembic libs")
+ INSTALL(TARGETS Alembic
+         EXPORT AlembicTargets
+         LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
+@@ -97,7 +97,7 @@ INSTALL(TARGETS Alembic
+ 
+ set(alembic_targets_file "${PROJECT_NAME}Targets.cmake")
+ 
+-SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
++SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
+         "Where to install the Alembic's cmake files")
+ 
+ INCLUDE(CMakePackageConfigHelpers)
+-- 
+2.40.0
+


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-04-11  5:38 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-16 12:59 [gentoo-commits] repo/gentoo:master commit in: media-gfx/alembic/, media-gfx/alembic/files/ Patrice Clement
  -- strict thread matches above, loose matches on Subject: below --
2018-10-03 16:13 Andreas Sturmlechner
2019-06-12 10:03 Andreas Sturmlechner
2020-06-08 16:47 Joonas Niilola
2021-02-12 16:20 Sam James
2021-05-04 22:02 Sam James
2023-01-13 12:03 Arthur Zamarin
2023-04-11  5:38 Viorel Munteanu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox