git: 7ac962e08a91 - main - graphics/opencoloriov1: the port had been resurrected^Wreadded.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Wed, 29 Nov 2023 10:56:17 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7ac962e08a912cfe40c9d43ddd44a9444718b488

commit 7ac962e08a912cfe40c9d43ddd44a9444718b488
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-11-29 10:54:44 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-11-29 10:54:44 +0000

    graphics/opencoloriov1: the port had been resurrected^Wreadded.
---
 MOVED                                              |  1 -
 graphics/Makefile                                  |  1 +
 graphics/opencoloriov1/Makefile                    | 57 ++++++++++++++++++++++
 graphics/opencoloriov1/distinfo                    |  3 ++
 graphics/opencoloriov1/files/patch-CMakeLists.txt  | 55 +++++++++++++++++++++
 .../opencoloriov1/files/patch-docs_CMakeLists.txt  | 17 +++++++
 .../files/patch-export_pkgconfig_OpenColorIO.pc.in |  8 +++
 .../files/patch-share_cmake_OCIOMacros.cmake       | 39 +++++++++++++++
 .../patch-src_apps_ociodisplay_CMakeLists.txt      | 11 +++++
 .../files/patch-src_core_CMakeLists.txt            | 27 ++++++++++
 .../opencoloriov1/files/patch-src_core_Config.cpp  | 11 +++++
 .../files/patch-src_core_OCIOYaml.cpp              | 20 ++++++++
 graphics/opencoloriov1/pkg-descr                   |  5 ++
 graphics/opencoloriov1/pkg-plist                   | 11 +++++
 14 files changed, 265 insertions(+), 1 deletion(-)

diff --git a/MOVED b/MOVED
index 8da6138daff1..0177e774cd74 100644
--- a/MOVED
+++ b/MOVED
@@ -7190,7 +7190,6 @@ sysutils/cfengine-masterfiles317||2022-12-10|Has expired: Expire one year after
 net-mgmt/icingaweb2-module-ipl|net-mgmt/icinga-php-library|2022-12-13|Renamed by project
 x11/darkman|accessibility/darkman|2022-12-14|Moved to a better category
 net/samba412||2022-12-18|Has expired: Reached its EoL on September 20, 2021
-graphics/opencoloriov1|graphics/opencolorio|2022-12-20|Used by blender-lts28 which is EOL'd
 graphics/openimageio-ociov1|graphics/openimageio|2022-12-20|Used by blender-lts28 which is EOL'd
 textproc/retext|editors/retext|2022-12-21|Moved to a better category
 math/vtk6||2022-12-24|Has expired: Old version not used anywhere in the ports tree
diff --git a/graphics/Makefile b/graphics/Makefile
index 9b2fc7cb0fe3..e3ef342004ba 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -598,6 +598,7 @@
     SUBDIR += opencollada
     SUBDIR += opencolorio
     SUBDIR += opencolorio-tools
+    SUBDIR += opencoloriov1
     SUBDIR += opencsg
     SUBDIR += opencv
     SUBDIR += opendx
diff --git a/graphics/opencoloriov1/Makefile b/graphics/opencoloriov1/Makefile
new file mode 100644
index 000000000000..a3158ed40ee1
--- /dev/null
+++ b/graphics/opencoloriov1/Makefile
@@ -0,0 +1,57 @@
+PORTNAME=	opencolorio
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.1
+CATEGORIES=	graphics multimedia
+PKGNAMESUFFIX=	v1
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Complete color management solution v1
+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 \
+		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-install:
+	${RM} -R ${STAGEDIR}/${PREFIX}/share/ocio
+	# add v1 suffix
+	${REINPLACE_CMD} -e 's|<OpenColorIO/|<OpenColorIOv1/|g' \
+		${STAGEDIR}/${PREFIX}/include/OpenColorIOv1/*
+	${FIND} ${STAGEDIR}${PREFIX}/include/OpenColorIOv1 -name '*.bak' -delete
+	@(cd ${STAGEDIR}/${PREFIX} && ${MKDIR} lib/cmake/Modules && \
+		${MV} OpenColorIOv1Config.cmake lib/cmake/Modules/ && \
+		${MV} cmake/OpenColorIO-release.cmake lib/cmake/Modules/OpenColorIOv1-release.cmake && \
+		${MV} cmake/OpenColorIO.cmake lib/cmake/Modules/OpenColorIOv1.cmake && \
+		${RMDIR} cmake)
+
+.include <bsd.port.mk>
diff --git a/graphics/opencoloriov1/distinfo b/graphics/opencoloriov1/distinfo
new file mode 100644
index 000000000000..81d2002d3cb5
--- /dev/null
+++ b/graphics/opencoloriov1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1553749977
+SHA256 (AcademySoftwareFoundation-OpenColorIO-v1.1.1_GH0.tar.gz) = c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8
+SIZE (AcademySoftwareFoundation-OpenColorIO-v1.1.1_GH0.tar.gz) = 13828483
diff --git a/graphics/opencoloriov1/files/patch-CMakeLists.txt b/graphics/opencoloriov1/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..8f6a7aab459a
--- /dev/null
+++ b/graphics/opencoloriov1/files/patch-CMakeLists.txt
@@ -0,0 +1,55 @@
+--- 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)
+@@ -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-docs_CMakeLists.txt b/graphics/opencoloriov1/files/patch-docs_CMakeLists.txt
new file mode 100644
index 000000000000..ec6849ef2dc6
--- /dev/null
+++ b/graphics/opencoloriov1/files/patch-docs_CMakeLists.txt
@@ -0,0 +1,17 @@
+--- docs/CMakeLists.txt.orig	2014-09-11 19:08:18 UTC
++++ docs/CMakeLists.txt
+@@ -110,12 +115,11 @@ add_custom_target(doc ALL
+ add_dependencies(doc Sphinx) 
+ 
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
++        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/opencoloriov1
+         PATTERN .* EXCLUDE
+ )
+ 
+-find_package(LATEX)
+-if(PDFLATEX_COMPILER)
++if(0)
+     
+     add_custom_target(latex
+         COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
diff --git a/graphics/opencoloriov1/files/patch-export_pkgconfig_OpenColorIO.pc.in b/graphics/opencoloriov1/files/patch-export_pkgconfig_OpenColorIO.pc.in
new file mode 100644
index 000000000000..dfb38fb8e42e
--- /dev/null
+++ b/graphics/opencoloriov1/files/patch-export_pkgconfig_OpenColorIO.pc.in
@@ -0,0 +1,8 @@
+--- export/pkgconfig/OpenColorIO.pc.in.orig	2021-12-06 23:53:07 UTC
++++ export/pkgconfig/OpenColorIO.pc.in
+@@ -7,4 +7,4 @@ Name: OpenColorIO
+ Description: A color management framework for visual effects and animation
+ Version: @OCIO_VERSION@
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -lOpenColorIO
++Libs: -L${libdir} -lOpenColorIOv1
diff --git a/graphics/opencoloriov1/files/patch-share_cmake_OCIOMacros.cmake b/graphics/opencoloriov1/files/patch-share_cmake_OCIOMacros.cmake
new file mode 100644
index 000000000000..9edaa87e95ed
--- /dev/null
+++ b/graphics/opencoloriov1/files/patch-share_cmake_OCIOMacros.cmake
@@ -0,0 +1,39 @@
+--- share/cmake/OCIOMacros.cmake.orig	2019-03-28 05:12:57 UTC
++++ share/cmake/OCIOMacros.cmake
+@@ -96,27 +96,6 @@ MACRO(OCIOFindOpenImageIO)
+         set(OIIO_FOUND TRUE)
+         message(STATUS "Found OIIO library ${OIIO_LIBRARIES}")
+         message(STATUS "Found OIIO includes ${OIIO_INCLUDES}")
+-
+-        # Unfortunately, OIIO hides a dependency to Ilmbase includes
+-
+-        if(ILMBASE_PATH)
+-            message(STATUS "Ilmbase path explicitly specified: ${ILMBASE_PATH}")
+-        endif()
+-
+-        FIND_PATH( ILMBASE_INCLUDES OpenEXR/half.h
+-            ${ILMBASE_PATH}/include/
+-            /usr/include
+-            /usr/local/include
+-            /sw/include
+-            /opt/local/include
+-            DOC "The directory where OpenEXR/half.h resides")
+-
+-        if(ILMBASE_INCLUDES)
+-            message(STATUS "Found Ilmbase includes ${ILMBASE_INCLUDES}")
+-        else()
+-            set(OIIO_FOUND FALSE)
+-            message(STATUS "Ilmbase not found. Specify ILMBASE_PATH to locate it")
+-        endif()
+     else()
+         set(OIIO_FOUND FALSE)
+         message(STATUS "OIIO not found. Specify OIIO_PATH to locate it")
+@@ -222,7 +201,7 @@ MACRO(OCIOFindPython)
+         file(TO_CMAKE_PATH "${PYTHON_LIBRARY_DIRS_RAW}" PYTHON_LIBRARY_DIRS)
+ 
+         FIND_LIBRARY(PYTHON_LIBRARY
+-            NAMES "python${PYTHON_VERSION}"
++            NAMES "${PYTHON_VERSION}${PYTHON_ABIVER}"
+             PATHS ${PYTHON_LIBRARY_DIRS}
+             NO_DEFAULT_PATH # Don't be "helpful" and randomly grab library from /usr/lib etc
+         )
diff --git a/graphics/opencoloriov1/files/patch-src_apps_ociodisplay_CMakeLists.txt b/graphics/opencoloriov1/files/patch-src_apps_ociodisplay_CMakeLists.txt
new file mode 100644
index 000000000000..8fe811eb1290
--- /dev/null
+++ b/graphics/opencoloriov1/files/patch-src_apps_ociodisplay_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/apps/ociodisplay/CMakeLists.txt.orig	2019-03-28 05:12:57 UTC
++++ src/apps/ociodisplay/CMakeLists.txt
+@@ -13,7 +13,7 @@ if (OIIO_FOUND)
+ 
+     # set_target_properties(ociodisplay PROPERTIES INSTALL_RPATH ${OIIO_LIBRARIES} )
+     set_target_properties(ociodisplay PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+-    target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES})
++    target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${GLUT_LIBRARIES} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES})
+     target_link_OCIO(ociodisplay)
+ 
+     install(TARGETS ociodisplay EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
diff --git a/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt b/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt
new file mode 100644
index 000000000000..34588903eba0
--- /dev/null
+++ b/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt
@@ -0,0 +1,27 @@
+--- src/core/CMakeLists.txt.orig	2021-12-07 20:11:03 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
++    ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIOv1.pc @ONLY)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/OpenColorIOv1.pc
+     DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/)
diff --git a/graphics/opencoloriov1/files/patch-src_core_Config.cpp b/graphics/opencoloriov1/files/patch-src_core_Config.cpp
new file mode 100644
index 000000000000..bc5f727a585f
--- /dev/null
+++ b/graphics/opencoloriov1/files/patch-src_core_Config.cpp
@@ -0,0 +1,11 @@
+--- src/core/Config.cpp.orig	2018-09-04 18:15:21 UTC
++++ src/core/Config.cpp
+@@ -324,7 +324,7 @@ OCIO_NAMESPACE_ENTER
+                 sanitytext_ = rhs.sanitytext_;
+                 
+                 cacheids_ = rhs.cacheids_;
+-                cacheidnocontext_ = cacheidnocontext_;
++                cacheidnocontext_ = rhs.cacheidnocontext_;
+             }
+             return *this;
+         }
diff --git a/graphics/opencoloriov1/files/patch-src_core_OCIOYaml.cpp b/graphics/opencoloriov1/files/patch-src_core_OCIOYaml.cpp
new file mode 100644
index 000000000000..06dd2b01b23e
--- /dev/null
+++ b/graphics/opencoloriov1/files/patch-src_core_OCIOYaml.cpp
@@ -0,0 +1,20 @@
+--- src/core/OCIOYaml.cpp.orig	2019-03-28 05:12:57 UTC
++++ src/core/OCIOYaml.cpp
+@@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O
+ 
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+-#ifndef WIN32
++#ifdef OLDYAML
+ 
+ // fwd declare yaml-cpp visibility
+ #pragma GCC visibility push(hidden)
+@@ -1442,7 +1442,7 @@ OCIO_NAMESPACE_ENTER
+ #ifdef OLDYAML
+             if(node.FindValue("ocio_profile_version") == NULL)
+ #else
+-            if(node["ocio_profile_version"] == NULL)
++            if(!node["ocio_profile_version"].IsDefined())
+ #endif
+             {
+                 std::ostringstream os;
diff --git a/graphics/opencoloriov1/pkg-descr b/graphics/opencoloriov1/pkg-descr
new file mode 100644
index 000000000000..cbf0c19caa54
--- /dev/null
+++ b/graphics/opencoloriov1/pkg-descr
@@ -0,0 +1,5 @@
+OpenColorIO (OCIO) is a complete color management solution geared
+towards motion picture production with an emphasis on visual effects
+and computer animation.
+
+This port provides v1 for ports that don't support v2 yet.
diff --git a/graphics/opencoloriov1/pkg-plist b/graphics/opencoloriov1/pkg-plist
new file mode 100644
index 000000000000..619dacb61e1a
--- /dev/null
+++ b/graphics/opencoloriov1/pkg-plist
@@ -0,0 +1,11 @@
+include/OpenColorIOv1/OpenColorABI.h
+include/OpenColorIOv1/OpenColorIO.h
+include/OpenColorIOv1/OpenColorTransforms.h
+include/OpenColorIOv1/OpenColorTypes.h
+lib/libOpenColorIOv1.so
+lib/libOpenColorIOv1.so.%%SHL1%%
+lib/libOpenColorIOv1.so.%%SHL3%%
+libdata/pkgconfig/OpenColorIOv1.pc
+lib/cmake/Modules/OpenColorIOv1Config.cmake
+lib/cmake/Modules/OpenColorIOv1-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Modules/OpenColorIOv1.cmake