diff --git a/graphics/opencoloriov1/Makefile b/graphics/opencoloriov1/Makefile index a3158ed40ee1..35dd8259edad 100644 --- a/graphics/opencoloriov1/Makefile +++ b/graphics/opencoloriov1/Makefile @@ -1,57 +1,60 @@ PORTNAME= opencolorio DISTVERSIONPREFIX= v DISTVERSION= 1.1.1 CATEGORIES= graphics multimedia PKGNAMESUFFIX= v1 MAINTAINER= danfe@FreeBSD.org -COMMENT= Complete color management solution v1 +COMMENT= Complete color management solution (legacy version) WWW= https://opencolorio.org/ LICENSE= BSD3CLAUSE LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ libyaml-cpp.so:devel/yaml-cpp -USES= alias cmake compiler:c++11-lang localbase:ldflags pkgconfig \ +USES= alias cmake compiler:c++11-lang pkgconfig \ python:build shebangfix USE_GITHUB= yes GH_ACCOUNT= AcademySoftwareFoundation GH_PROJECT= OpenColorIO CMAKE_ON= USE_EXTERNAL_TINYXML USE_EXTERNAL_YAML OCIO_BUILD_SHARED CMAKE_OFF= OCIO_BUILD_APPS OCIO_BUILD_JNIGLUE OCIO_BUILD_NUKE \ OCIO_BUILD_PYGLUE OCIO_BUILD_STATIC OCIO_BUILD_DOCS CMAKE_ARGS+= -DPYTHON:FILEPATH=${PYTHON_CMD} CXXFLAGS+= ${CXXFLAGS_${CHOSEN_COMPILER_TYPE}} CXXFLAGS_gcc= -Wno-unused-function -Wno-error CXXFLAGS_clang= -Wno-deprecated-register USE_LDCONFIG= yes SHEBANG_FILES= share/sphinx/ExtractRstFromSourceCPP.py \ share/sphinx/ExtractRstFromSourceSimple.py \ src/pyglue/createPyDocH.py PLIST_SUB= SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} .if (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2}) CMAKE_ON+= OCIO_USE_SSE .else CMAKE_OFF+= OCIO_USE_SSE .endif +post-patch: + @${REINPLACE_CMD} -e 's| : std::binary_function.*||' \ + ${WRKSRC}/src/core/PathUtils.h + post-install: - ${RM} -R ${STAGEDIR}/${PREFIX}/share/ocio - # add v1 suffix - ${REINPLACE_CMD} -e 's| diff --git a/graphics/opencoloriov1/files/patch-CMakeLists.txt b/graphics/opencoloriov1/files/patch-CMakeLists.txt index 8f6a7aab459a..c1a16d9e200c 100644 --- a/graphics/opencoloriov1/files/patch-CMakeLists.txt +++ b/graphics/opencoloriov1/files/patch-CMakeLists.txt @@ -1,55 +1,64 @@ --- CMakeLists.txt.orig 2019-03-28 05:12:57 UTC +++ CMakeLists.txt @@ -271,7 +271,7 @@ if(USE_EXTERNAL_YAML) mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND) if(YAML_CPP_FOUND) - if(YAML_CPP_VERSION VERSION_GREATER "0.5.0") + if(FALSE AND YAML_CPP_VERSION VERSION_GREATER "0.5.0") # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them. # Don't bother doing this step if we are already including the boost headers for shared_ptr if(NOT OCIO_USE_BOOST_PTR) +@@ -384,7 +384,7 @@ else() + set(OCIO_INLINES_HIDDEN OFF) + endif() + +-set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}") ++set(EXTERNAL_COMPILE_FLAGS "${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}") + + set(EXTERNAL_LINK_FLAGS "") + set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib) @@ -531,8 +531,6 @@ endif() configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY) -INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/) - ############################################################################### ### CPACK ### @@ -597,7 +595,7 @@ if(TARGET OpenColorIO_STATIC) endif() endif() install(EXPORT OpenColorIO DESTINATION cmake) -file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" +file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOv1Config.cmake" " get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH) @@ -607,14 +605,14 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmak message(STATUS OpenColorIO_INCLUDE_DIRS=\${OpenColorIO_INCLUDE_DIRS}) ## targets libraries + associated definitions - if(NOT TARGET OpenColorIO) - include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target - if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC) + if(NOT TARGET OpenColorIOv1) + include(\"\${OpenColorIO_DIR}/cmake/OpenColorIOv1.cmake\") ## thanks to imported target + if(TARGET OpenColorIOv1 AND NOT OpenColorIO_USE_STATIC) message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\") - set(OpenColorIO_LIBRARY OpenColorIO) + set(OpenColorIO_LIBRARY OpenColorIOv1) set(OCIO_COMPILE_DEFINITIONS ${OCIO_SHARED_COMPILE_DEFINITIONS}) endif() - if(NOT TARGET OpenColorIO AND TARGET OpenColorIO_STATIC) + if(NOT TARGET OpenColorIOv1 AND TARGET OpenColorIO_STATIC) message(STATUS \"static target OpenColorIO_STATIC : see OpenColorIO_LIBRARY\") set(OpenColorIO_LIBRARY OpenColorIO_STATIC) set(OCIO_COMPILE_DEFINITIONS ${OCIO_STATIC_COMPILE_DEFINITIONS}) @@ -646,4 +644,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmak message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND}) " ) -install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .) +install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOv1Config.cmake" DESTINATION .) diff --git a/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt b/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt index 34588903eba0..047e0a79cab7 100644 --- a/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt +++ b/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt @@ -1,27 +1,28 @@ ---- src/core/CMakeLists.txt.orig 2021-12-07 20:11:03 UTC +--- src/core/CMakeLists.txt.orig 2019-03-28 05:12:57 UTC +++ src/core/CMakeLists.txt @@ -56,7 +56,7 @@ if(OCIO_BUILD_SHARED) endif() set_target_properties(OpenColorIO PROPERTIES - OUTPUT_NAME OpenColorIO + OUTPUT_NAME OpenColorIOv1 COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS}" LINK_FLAGS "${EXTERNAL_LINK_FLAGS}") @@ -109,11 +109,11 @@ endmacro() # public interface install(FILES ${core_export_headers} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/) + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIOv1/) # pkg-config -message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in") +message(STATUS "Create OpenColorIOv1.pc from OpenColorIO.pc.in") configure_file(${CMAKE_SOURCE_DIR}/export/pkgconfig/OpenColorIO.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIO.pc +- DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/) + ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIOv1.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIOv1.pc - DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/) ++ DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/libdata/pkgconfig/)