diff options
author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2017-03-26 11:27:05 +0000 |
---|---|---|
committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2017-03-26 11:27:05 +0000 |
commit | ac78e0384b52a694dc802e59b47556e988cd953a (patch) | |
tree | 2834a1384b2a2cc9ad9ca7f0e0f149ae0e17c932 /graphics | |
parent | 22c93431abee335f540294bfdcce170272640623 (diff) | |
download | ports-ac78e0384b52a694dc802e59b47556e988cd953a.tar.gz ports-ac78e0384b52a694dc802e59b47556e988cd953a.zip |
- Update `graphics/alembic' to version 1.7.1 [*]
- Make HDF5 support (and thus the dependency) optional
- USE_GL and Boost dependencies are no longer needed, remove them and
their associated patch files
- Remove CMAKE_ARGS: it was setting values which are the defaults now
- Add missing USE_LDCONFIG and move USE_GITHUB together with other USE_*
knobs: while it makes sense to have a dedicated GitHub-related block
of knobs, single USE_GITHUB does not really warrant it
- Remove HDF5_ROOT gimmick for Alembic < 1.6.0's AlembicHDF5.cmake as it
is no longer required (ditto for the patch)
Reported by: portscout [*]
Because GitHub releases (tarballs) are not fetched with correct modification
time, set TIMESTAMP to 1490314701 which corresponds to commit 895a7c6 tagged
as this release.
Notes
Notes:
svn path=/head/; revision=436956
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/alembic/Makefile | 22 | ||||
-rw-r--r-- | graphics/alembic/distinfo | 5 | ||||
-rw-r--r-- | graphics/alembic/files/patch-CMakeLists.txt | 74 | ||||
-rw-r--r-- | graphics/alembic/files/patch-build_AlembicBoost.cmake | 18 | ||||
-rw-r--r-- | graphics/alembic/files/patch-build_AlembicHDF5.cmake | 17 | ||||
-rw-r--r-- | graphics/alembic/files/patch-lib_Alembic_AbcCoreOgawa_CMakeLists.txt | 9 | ||||
-rw-r--r-- | graphics/alembic/files/patch-lib_Alembic_AbcCoreOgawa_StreamManager.cpp | 22 | ||||
-rw-r--r-- | graphics/alembic/pkg-plist | 60 |
8 files changed, 42 insertions, 185 deletions
diff --git a/graphics/alembic/Makefile b/graphics/alembic/Makefile index 7af55c3f57d2..26994d858989 100644 --- a/graphics/alembic/Makefile +++ b/graphics/alembic/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= alembic -PORTVERSION= 1.5.8 -PORTREVISION= 3 +PORTVERSION= 1.7.1 CATEGORIES= graphics MAINTAINER= danfe@FreeBSD.org @@ -11,22 +10,19 @@ COMMENT= Open framework for storing and sharing graphic scene data LICENSE= BSD3CLAUSE -LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ - libImath-2_2.so:graphics/ilmbase \ - libhdf5.so:science/hdf5 - -USE_GITHUB= yes +LIB_DEPENDS= libImath-2_2.so:graphics/ilmbase USES= cmake compiler:c++11-lang USE_CXXSTD= c++11 -USE_GL= glew glut +USE_GITHUB= yes +USE_LDCONFIG= yes -CMAKE_ARGS= -DBUILD_SHARED_LIBS:BOOL=ON -DUSE_PYALEMBIC:BOOL=OFF +OPTIONS_DEFINE= HDF5 +OPTIONS_DEFAULT= HDF5 +OPTIONS_SUB= yes -# Alembic < 1.6.0's AlembicHDF5.cmake sets HDF5_ROOT to a bogus value if one is -# not specified, and this confuses CMake >= 3.6.0 which started honoring -# HDF5_ROOT more thoroughly. -CMAKE_ARGS+= -DHDF5_ROOT:PATH="${LOCALBASE}" +HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 +HDF5_CMAKE_ON= -DUSE_HDF5:BOOL=ON post-patch: @${REINPLACE_CMD} -e 's,H5Rdereference,&1,' \ diff --git a/graphics/alembic/distinfo b/graphics/alembic/distinfo index 38ae3d68594d..ee657dfda047 100644 --- a/graphics/alembic/distinfo +++ b/graphics/alembic/distinfo @@ -1,2 +1,3 @@ -SHA256 (alembic-alembic-1.5.8_GH0.tar.gz) = d5e94c5bee16bc7c2971338c5aada4f585794f01b2aa7e4bb4267d7d1002b533 -SIZE (alembic-alembic-1.5.8_GH0.tar.gz) = 1307347 +TIMESTAMP = 1490314701 +SHA256 (alembic-alembic-1.7.1_GH0.tar.gz) = d9aa4f318df9e8f4bbc31a540209ef47a808b99a5627852e42d2550bd979ccc3 +SIZE (alembic-alembic-1.7.1_GH0.tar.gz) = 803755 diff --git a/graphics/alembic/files/patch-CMakeLists.txt b/graphics/alembic/files/patch-CMakeLists.txt index 9d6730388416..ec914f9506ff 100644 --- a/graphics/alembic/files/patch-CMakeLists.txt +++ b/graphics/alembic/files/patch-CMakeLists.txt @@ -1,67 +1,21 @@ ---- CMakeLists.txt.orig 2015-01-15 18:28:49 UTC +--- CMakeLists.txt.orig 2017-03-24 00:18:21 UTC +++ CMakeLists.txt -@@ -78,7 +78,7 @@ IF( "${CMAKE_SYSTEM_NAME}" MATCHES "Darw +@@ -111,7 +111,7 @@ IF ("${CMAKE_SYSTEM_NAME}" MATCHES "Darw ENDIF() - SET( LINUX FALSE ) --IF( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux" ) -+IF( "${CMAKE_SYSTEM_NAME}" MATCHES "Linux|FreeBSD" ) - SET( LINUX TRUE ) + SET(LINUX FALSE) +-IF ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") ++IF ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux|FreeBSD") + SET(LINUX TRUE) ENDIF() -@@ -90,9 +90,6 @@ IF ( "${CMAKE_BUILD_TYPE}" MATCHES "Debu - ENDIF() - ELSEIF ( "${CMAKE_BUILD_TYPE}" MATCHES "Release" ) - ADD_DEFINITIONS( -DNDEBUG=1 -UDEBUG ) -- IF ( NOT WINDOWS ) -- ADD_DEFINITIONS( -O3 ) -- ENDIF() - ENDIF() - - IF ( NOT WINDOWS ) -@@ -130,10 +127,6 @@ endif () - IF ( DEFINED ENV{ALEMBIC_INSTALL_PREFIX} ) - SET( CMAKE_INSTALL_PREFIX - $ENV{ALEMBIC_INSTALL_PREFIX}/alembic-${VERSION} ) --ELSE () -- SET( ORIGINAL_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) -- SET( CMAKE_INSTALL_PREFIX -- ${ORIGINAL_INSTALL_PREFIX}/alembic-${VERSION} ) - ENDIF () - - # Tell me what my install location would be -@@ -192,6 +185,7 @@ FIND_PACKAGE(ZLIB REQUIRED) - #-****************************************************************************** - FIND_PACKAGE( OpenGL ) - FIND_PACKAGE( GLUT ) -+FIND_PACKAGE( GLEW ) - - IF ( ${WINDOWS} ) - # Do a windows OpenGL thing, whatever that may be -@@ -203,7 +197,7 @@ ELSEIF( ${DARWIN} ) - # Do a darwin OpenGL thing. - SET( ALEMBIC_GL_LIBS ${GLUT_LIBRARY} "-framework OpenGL" ) - ELSE() -- SET( ALEMBIC_GL_LIBS GLEW ${GLUT_LIBRARY} ${OPENGL_LIBRARIES} ) -+ SET( ALEMBIC_GL_LIBS ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${OPENGL_LIBRARIES} ) - ENDIF() - - MESSAGE( STATUS "OpenGL Libraries: ${ALEMBIC_GL_LIBS}" ) -@@ -250,9 +244,6 @@ ELSE() - INCLUDE_DIRECTORIES( ${ALEMBIC_PYILMBASE_INCLUDE_DIRECTORY} ) - ENDIF () - --# Include Python stuff --INCLUDE("./build/AlembicPython.cmake") -- - # Include HDF5 stuff - INCLUDE("./build/AlembicHDF5.cmake") - if ( ALEMBIC_HDF5_FOUND ) -@@ -310,6 +301,7 @@ IF(DEFINED USE_PYALEMBIC AND NOT USE_PYA - MESSAGE(STATUS "Skipping Alembic Python bindings") - ELSE() - MESSAGE(STATUS "About to include Python cmake files") -+ INCLUDE("./build/AlembicPython.cmake") - ADD_SUBDIRECTORY( python ) +@@ -140,9 +140,6 @@ IF ("${CMAKE_BUILD_TYPE}" MATCHES "Debug + ENDIF() + ELSEIF ("${CMAKE_BUILD_TYPE}" MATCHES "Release") + ADD_DEFINITIONS(-DNDEBUG=1 -UDEBUG) +- IF (NOT WINDOWS) +- ADD_DEFINITIONS(-O3) +- ENDIF() ENDIF() + IF (NOT ${WINDOWS}) diff --git a/graphics/alembic/files/patch-build_AlembicBoost.cmake b/graphics/alembic/files/patch-build_AlembicBoost.cmake deleted file mode 100644 index f36a58a98276..000000000000 --- a/graphics/alembic/files/patch-build_AlembicBoost.cmake +++ /dev/null @@ -1,18 +0,0 @@ ---- build/AlembicBoost.cmake.orig 2015-01-15 18:28:49 UTC -+++ build/AlembicBoost.cmake -@@ -107,13 +107,13 @@ ENDIF() - # Find the static and multi-threaded version only - #-****************************************************************************** - #-****************************************************************************** --SET( Boost_USE_STATIC_LIBS TRUE ) -+SET( Boost_USE_STATIC_LIBS FALSE ) - SET( Boost_USE_MULTITHREADED TRUE ) - SET( Boost_NO_BOOST_CMAKE TRUE ) - - #- Alembic's python bridge boost-python 1.44 (for bug fixes) - SET( Boost_ADDITIONAL_VERSIONS "1.44" "1.42" "1.42.0" "1.43" "1.43.0" "1.44" "1.44.0" "1.45.0" ) --FIND_PACKAGE( Boost COMPONENTS program_options python REQUIRED thread ) -+FIND_PACKAGE( Boost COMPONENTS thread OPTIONAL_COMPONENTS python) - - - #-****************************************************************************** diff --git a/graphics/alembic/files/patch-build_AlembicHDF5.cmake b/graphics/alembic/files/patch-build_AlembicHDF5.cmake deleted file mode 100644 index 76a97477cd95..000000000000 --- a/graphics/alembic/files/patch-build_AlembicHDF5.cmake +++ /dev/null @@ -1,17 +0,0 @@ -Required by CMake >= 3.6.0, which properly separates HDF5_LIBRARIES (libraries -for the requested language bindings) and HDF5_HL_LIBRARIES (high-level -libraries for the requested language bindings). - -This patch can be removed when Alembic is updated to 1.6.0 or later, which -drops the usage of HDF5's high-level libraries. ---- build/AlembicHDF5.cmake.orig 2016-07-23 11:57:11 UTC -+++ build/AlembicHDF5.cmake -@@ -87,7 +87,7 @@ IF( HDF5_FOUND ) - ENDIF() - SET( ALEMBIC_HDF5_LIB ${HDF5_C_LIBRARIES} ) - SET( ALEMBIC_HDF5_HL_LIB ${HDF5_CXX_LIBRARIES} ) -- SET( ALEMBIC_HDF5_LIBS ${HDF5_LIBRARIES} ) -+ SET( ALEMBIC_HDF5_LIBS ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ) - SET( ALEMBIC_HDF5_FOUND TRUE ) - - MESSAGE(STATUS "HDF5 INCLUDE PATH: ${ALEMBIC_HDF5_INCLUDE_PATH}" ) diff --git a/graphics/alembic/files/patch-lib_Alembic_AbcCoreOgawa_CMakeLists.txt b/graphics/alembic/files/patch-lib_Alembic_AbcCoreOgawa_CMakeLists.txt deleted file mode 100644 index aabf015a6dc5..000000000000 --- a/graphics/alembic/files/patch-lib_Alembic_AbcCoreOgawa_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- lib/Alembic/AbcCoreOgawa/CMakeLists.txt.orig 2015-01-15 18:28:49 UTC -+++ lib/Alembic/AbcCoreOgawa/CMakeLists.txt -@@ -100,3 +100,6 @@ IF( NOT ALEMBIC_NO_TESTS ) - ADD_SUBDIRECTORY( Tests ) - ENDIF() - -+IF( CMAKE_COMPILER_IS_GNUCXX ) -+ TARGET_LINK_LIBRARIES( AlembicAbcCoreOgawa atomic ) -+ENDIF() diff --git a/graphics/alembic/files/patch-lib_Alembic_AbcCoreOgawa_StreamManager.cpp b/graphics/alembic/files/patch-lib_Alembic_AbcCoreOgawa_StreamManager.cpp deleted file mode 100644 index 6691a0b1cd53..000000000000 --- a/graphics/alembic/files/patch-lib_Alembic_AbcCoreOgawa_StreamManager.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- lib/Alembic/AbcCoreOgawa/StreamManager.cpp.orig 2015-01-15 18:28:49 UTC -+++ lib/Alembic/AbcCoreOgawa/StreamManager.cpp -@@ -111,7 +111,8 @@ StreamIDPtr StreamManager::get() - - newVal = oldVal & ~( 1 << (val - 1) ); - } -- while ( !__sync_bool_compare_and_swap( &m_streams, oldVal, newVal ) ); -+ while ( !__atomic_compare_exchange_n( &m_streams, &oldVal, newVal, -+ false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ); - - return StreamIDPtr( new StreamID( this, ( std::size_t ) val - 1 ) ); - } -@@ -140,7 +141,8 @@ void StreamManager::put( std::size_t iSt - newVal = oldVal | ( 1 << iStreamID ); - - } -- while ( !__sync_bool_compare_and_swap( &m_streams, oldVal, newVal ) ); -+ while ( !__atomic_compare_exchange_n( &m_streams, &oldVal, newVal, -+ false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST ) ); - } - - #else diff --git a/graphics/alembic/pkg-plist b/graphics/alembic/pkg-plist index cd3015cfbed8..4d09e47d10f1 100644 --- a/graphics/alembic/pkg-plist +++ b/graphics/alembic/pkg-plist @@ -1,27 +1,10 @@ -bin/SimpleAbcViewer -bin/abcconvert +%%HDF5%%bin/abcconvert +bin/abcdiff bin/abcecho bin/abcechobounds +bin/abcls bin/abcstitcher -include/AbcClients/WFObjConvert/AbcReader.h -include/AbcClients/WFObjConvert/All.h -include/AbcClients/WFObjConvert/Foundation.h -include/AbcClients/WFObjConvert/Parser.h -include/AbcClients/WFObjConvert/Reader.h -include/AbcOpenGL/DrawContext.h -include/AbcOpenGL/Drawable.h -include/AbcOpenGL/Foundation.h -include/AbcOpenGL/GLCamera.h -include/AbcOpenGL/ICurvesDrw.h -include/AbcOpenGL/INuPatchDrw.h -include/AbcOpenGL/IObjectDrw.h -include/AbcOpenGL/IPointsDrw.h -include/AbcOpenGL/IPolyMeshDrw.h -include/AbcOpenGL/ISubDDrw.h -include/AbcOpenGL/IXformDrw.h -include/AbcOpenGL/MeshDrwHelper.h -include/AbcOpenGL/Scene.h -include/AbcOpenGL/SceneWrapper.h +bin/abctree include/Alembic/Abc/All.h include/Alembic/Abc/ArchiveInfo.h include/Alembic/Abc/Argument.h @@ -84,8 +67,10 @@ include/Alembic/AbcCoreAbstract/TimeSampling.h include/Alembic/AbcCoreAbstract/TimeSamplingType.h include/Alembic/AbcCoreFactory/All.h include/Alembic/AbcCoreFactory/IFactory.h -include/Alembic/AbcCoreHDF5/All.h -include/Alembic/AbcCoreHDF5/ReadWrite.h +%%HDF5%%include/Alembic/AbcCoreHDF5/All.h +%%HDF5%%include/Alembic/AbcCoreHDF5/ReadWrite.h +include/Alembic/AbcCoreLayer/Read.h +include/Alembic/AbcCoreLayer/Util.h include/Alembic/AbcCoreOgawa/All.h include/Alembic/AbcCoreOgawa/ReadWrite.h include/Alembic/AbcGeom/All.h @@ -123,24 +108,18 @@ include/Alembic/AbcGeom/SchemaInfoDeclarations.h include/Alembic/AbcGeom/Visibility.h include/Alembic/AbcGeom/XformOp.h include/Alembic/AbcGeom/XformSample.h +include/Alembic/AbcMaterial/All.h include/Alembic/AbcMaterial/IMaterial.h include/Alembic/AbcMaterial/MaterialAssignment.h include/Alembic/AbcMaterial/MaterialFlatten.h include/Alembic/AbcMaterial/OMaterial.h include/Alembic/AbcMaterial/SchemaInfoDeclarations.h -include/Alembic/Ogawa/Foundation.h -include/Alembic/Ogawa/IArchive.h -include/Alembic/Ogawa/IData.h -include/Alembic/Ogawa/IGroup.h -include/Alembic/Ogawa/IStreams.h -include/Alembic/Ogawa/OArchive.h -include/Alembic/Ogawa/OData.h -include/Alembic/Ogawa/OGroup.h -include/Alembic/Ogawa/OStream.h include/Alembic/Util/All.h +include/Alembic/Util/Config.h include/Alembic/Util/Digest.h include/Alembic/Util/Dimensions.h include/Alembic/Util/Exception.h +include/Alembic/Util/Export.h include/Alembic/Util/Foundation.h include/Alembic/Util/Murmur3.h include/Alembic/Util/Naming.h @@ -148,15 +127,8 @@ include/Alembic/Util/OperatorBool.h include/Alembic/Util/PlainOldDataType.h include/Alembic/Util/SpookyV2.h include/Alembic/Util/TokenMap.h -lib/libAbcWFObjConvert.so -lib/libAlembicAbc.so -lib/libAlembicAbcCollection.so -lib/libAlembicAbcCoreAbstract.so -lib/libAlembicAbcCoreFactory.so -lib/libAlembicAbcCoreHDF5.so -lib/libAlembicAbcCoreOgawa.so -lib/libAlembicAbcGeom.so -lib/libAlembicAbcMaterial.so -lib/libAlembicAbcOpenGL.so -lib/libAlembicOgawa.so -lib/libAlembicUtil.so +lib/cmake/Alembic/AlembicConfig.cmake +lib/cmake/Alembic/AlembicConfigVersion.cmake +lib/cmake/Alembic/AlembicTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Alembic/AlembicTargets.cmake +lib/libAlembic.so |