From nobody Tue Dec 20 07:20:56 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nbnzr5mKYz1G1f4; Tue, 20 Dec 2022 07:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nbnzr5CTzz3Cxv; Tue, 20 Dec 2022 07:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671520856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kWeUjHFpgA5Ar7cwdvB4GE8+RNbANUFCwGt/fwMY+i4=; b=KvpA3a5q9CVfGHG1l0xih7n1b4AiukfDQu5rIeHVy3RhrOY7n/eqaQr4AYbbHhWCFBXVEN hxVeqZenzzC4r0r2kN3stKZDpyzGZjgkpqlpUMGI8DSptPKz2shjMt893KTCTlsXMi66nf uvvqYDOVoSLkpQT0oif0vNjjppAm7DfE735BeVE2OP/IXBtucvlswKEXgxEq5/wSqgAaHH 1xdTfMV7x93O+UxbVwsfgUj91qYmdmxDRsxau10YrZsYexIco/wY1eXz1dbge/Gj3tsoVK FRYazYXhKiYkmiLVQ75M5a3EMw8PJ0oQAc9y0wHOJPCFNVjfY66Ofl0b6ICoVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671520856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kWeUjHFpgA5Ar7cwdvB4GE8+RNbANUFCwGt/fwMY+i4=; b=QT+U9QSPNeHQpdzlaZI8u3cbQQ1DBttCui7KK9+6E+PzEKHNJK4Gv6H96ZhoUNA5oJNTt4 fiHyFwMfHQPhQRFBSdaJMrB8S0nzTioHwlZuOwj1asSYkgO/2RyFw55yxfeoH5I5sS0NOG XpXBRx0pD+S4nZwVquz47tN9O8uEXUAHv2clhSdP1Xt+GXgiOV8uTQFHfK7P2qGleJat6N MxL7kNvR1HcDy1IR/3Rp9258x7rjs1PSR5H+gXlPd5oyFQI66RmC8VEgJNqHuD11H6Bv1z RVvznoGTTCmPOJYeG/Bv/Bsn3FfWum7xuuHd5V0J9d7i8dpeT1JBKz+TXqfHcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671520856; a=rsa-sha256; cv=none; b=JL6kS/dNJMzdGsBhp5v/cJw7EJaVphy7+J7Nn5Qyg3RVrPjIEBkYKsrslzxrOFHNe0X4Yk iPtmRtPywnlMon7OWADa3HarL7UdPdRCAeJC+ff6WdDc9ztFSlBcuXUSBZSG8WvC/dDS6z 7utXJyagRLE2HS+tiGlUwX5mdxnLbiAHOkHimK3JrYREFjA/WGwk6Fx4Gf+FmqwZeqbpO8 3Ma09bAK0Sfx8xK/7G17y1cl2r+NlcSl2ZrOtJUVBBs8luWEh+KTea8wl6L1LcIZVqbQON hTjag73A3ERnqC4Y81z238OuoB38S7uXEuGt7ZcIIltkukYfnNDkJIus5/h4uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Nbnzr4GPgzR8N; Tue, 20 Dec 2022 07:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BK7KuvJ043243; Tue, 20 Dec 2022 07:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BK7KuVs043242; Tue, 20 Dec 2022 07:20:56 GMT (envelope-from git) Date: Tue, 20 Dec 2022 07:20:56 GMT Message-Id: <202212200720.2BK7KuVs043242@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 805e6e1d61f0 - main - Cleanup dependencies of blender-lts28 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 805e6e1d61f0a4e6b8c759888e217372c30ce1c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=805e6e1d61f0a4e6b8c759888e217372c30ce1c5 commit 805e6e1d61f0a4e6b8c759888e217372c30ce1c5 Author: Li-Wen Hsu AuthorDate: 2022-12-20 07:20:34 +0000 Commit: Li-Wen Hsu CommitDate: 2022-12-20 07:20:34 +0000 Cleanup dependencies of blender-lts28 graphics/opencoloriov1 and graphics/openimageio-ociov1 were created to provide old library versions to support the blender-lts28 port which has been deleted after EOL. PR: 268477 Reported by: Shane (maintainer) --- MOVED | 2 + graphics/opencoloriov1/Makefile | 60 ------------ graphics/opencoloriov1/distinfo | 3 - graphics/opencoloriov1/files/patch-CMakeLists.txt | 60 ------------ .../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 --- graphics/opencoloriov1/pkg-descr | 5 - graphics/opencoloriov1/pkg-plist | 11 --- graphics/openimageio-ociov1/Makefile | 105 --------------------- graphics/openimageio-ociov1/distinfo | 3 - .../openimageio-ociov1/files/patch-CMakeLists.txt | 13 --- .../patch-src_cmake_modules_FindOpenColorIO.cmake | 41 -------- .../files/patch-src_cmake_modules_FindPtex.cmake | 10 -- .../files/patch-src_include_CMakeLists.txt | 34 ------- .../files/patch-src_libOpenImageIO_CMakeLists.txt | 11 --- .../files/patch-src_libutil_CMakeLists.txt | 11 --- graphics/openimageio-ociov1/pkg-descr | 8 -- graphics/openimageio-ociov1/pkg-plist | 73 -------------- graphics/openimageio-ociov1/pkg-plist-pybind | 1 - 23 files changed, 2 insertions(+), 562 deletions(-) diff --git a/MOVED b/MOVED index 1b2ab4f91a95..51ead3aad02c 100644 --- a/MOVED +++ b/MOVED @@ -17639,3 +17639,5 @@ 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 diff --git a/graphics/opencoloriov1/Makefile b/graphics/opencoloriov1/Makefile deleted file mode 100644 index 814b463cf73d..000000000000 --- a/graphics/opencoloriov1/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -PORTNAME= opencolorio -DISTVERSIONPREFIX= v -DISTVERSION= 1.1.1 -CATEGORIES= graphics multimedia -PKGNAMESUFFIX= v1 - -MAINTAINER?= FreeBSD@Shaneware.biz -COMMENT?= Complete color management solution v1 -WWW= https://www.opencolorio.org - -LICENSE= BSD3CLAUSE - -LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \ - libyaml-cpp03.so:devel/yaml-cpp03 - -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-patch: - ${REINPLACE_CMD} -e 's|yaml-cpp|&03|' ${WRKSRC}/src/core/OCIOYaml.cpp - -post-install: - ${RM} -R ${STAGEDIR}/${PREFIX}/share/ocio - # add v1 suffix - ${REINPLACE_CMD} -e 's| diff --git a/graphics/opencoloriov1/distinfo b/graphics/opencoloriov1/distinfo deleted file mode 100644 index 3769187a82a3..000000000000 --- a/graphics/opencoloriov1/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1627452433 -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 deleted file mode 100644 index b4b4337be911..000000000000 --- a/graphics/opencoloriov1/files/patch-CMakeLists.txt +++ /dev/null @@ -1,60 +0,0 @@ ---- CMakeLists.txt.orig 2021-12-07 15:34:51 UTC -+++ CMakeLists.txt -@@ -252,10 +252,10 @@ if(USE_EXTERNAL_YAML) - # Set minimum yaml version for non-patched sources. - set(YAML_VERSION_MIN "0.3.0") - include(FindPkgConfig) -- pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp) -- find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h -+ pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp03) -+ find_path(YAML_CPP_INCLUDE_DIR yaml-cpp03/yaml.h - HINTS ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} ) -- find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp -+ find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp03 libyaml-cpp - HINTS ${PC_YAML_CPP_LIBRARY_DIRS} ) - set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY}) - set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR}) -@@ -531,7 +531,7 @@ 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/) -+#INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/) - - ############################################################################### - ### CPACK ### -@@ -597,7 +597,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 +607,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 +646,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 deleted file mode 100644 index ec6849ef2dc6..000000000000 --- a/graphics/opencoloriov1/files/patch-docs_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 deleted file mode 100644 index dfb38fb8e42e..000000000000 --- a/graphics/opencoloriov1/files/patch-export_pkgconfig_OpenColorIO.pc.in +++ /dev/null @@ -1,8 +0,0 @@ ---- 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 deleted file mode 100644 index 9edaa87e95ed..000000000000 --- a/graphics/opencoloriov1/files/patch-share_cmake_OCIOMacros.cmake +++ /dev/null @@ -1,39 +0,0 @@ ---- 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 deleted file mode 100644 index 8fe811eb1290..000000000000 --- a/graphics/opencoloriov1/files/patch-src_apps_ociodisplay_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 34588903eba0..000000000000 --- a/graphics/opencoloriov1/files/patch-src_core_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 deleted file mode 100644 index bc5f727a585f..000000000000 --- a/graphics/opencoloriov1/files/patch-src_core_Config.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/pkg-descr b/graphics/opencoloriov1/pkg-descr deleted file mode 100644 index cbf0c19caa54..000000000000 --- a/graphics/opencoloriov1/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 619dacb61e1a..000000000000 --- a/graphics/opencoloriov1/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -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 diff --git a/graphics/openimageio-ociov1/Makefile b/graphics/openimageio-ociov1/Makefile deleted file mode 100644 index b0089c9d4620..000000000000 --- a/graphics/openimageio-ociov1/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -PORTNAME= openimageio -DISTVERSIONPREFIX= Release- -DISTVERSION= 2.2.21.0 -PORTREVISION= 8 -CATEGORIES= graphics multimedia -PKGNAMESUFFIX= -ociov1 -# special port to link oiio libs with ociov1 -# specifically to build blender-lts28 while still officially supported - -MAINTAINER= FreeBSD@Shaneware.biz -COMMENT= OpenImageIO graphics library linked to ocio v1 -WWW= https://www.openimageio.org/ - -LICENSE= BSD3CLAUSE - -BUILD_DEPENDS= ${LOCALBASE}/include/tsl/robin_map.h:devel/robin-map -LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ - libfmt.so:devel/libfmt \ - libhdf5.so:science/hdf5 \ - libheif.so:graphics/libheif \ - libImath.so:math/Imath \ - libOpenColorIOv1.so:graphics/opencoloriov1 \ - libOpenEXR.so:graphics/openexr \ - libpng.so:graphics/png \ - libsquish.so:graphics/squish \ - libtiff.so:graphics/tiff \ - libwebp.so:graphics/webp - -USES= cmake jpeg compiler:c++14-lang iconv:wchar_t -USE_GITHUB= yes -GH_ACCOUNT= OpenImageIO -GH_PROJECT= oiio - -PORTSCOUT= limit:^2\.2\. - -CMAKE_ON= USE_OCIO -CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS \ - STOP_ON_WARNING USE_OPENSSL USE_QT USE_OPENGL \ - OIIO_BUILD_TESTS OIIO_BUILD_TOOLS USE_PYTHON -USE_LDCONFIG= yes - -OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF \ - OPENCV OPENJPEG PTEX RAW TBB VDB -OPTIONS_DEFAULT= DICOM FREETYPE GIF OPENJPEG PTEX -OPTIONS_SUB= yes - -DOCS_CMAKE_BOOL= INSTALL_DOCS -DOCS_CMAKE_ON= -DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} - -DICOM_DESC= DICOM/MEDICOM support -DICOM_CMAKE_BOOL= USE_DICOM -DICOM_LIB_DEPENDS= libdcmimage.so:graphics/dcmtk - -FFMPEG_DESC= Use FFmpeg to support extra file types -FFMPEG_CMAKE_BOOL= USE_FFMPEG -FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg - -FREETYPE_CMAKE_BOOL= USE_FREETYPE -FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 -FREETYPE_RUN_DEPENDS= ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf - -GIF_CMAKE_BOOL= USE_GIF -GIF_LIB_DEPENDS= libgif.so:graphics/giflib - -OPENCV_CMAKE_BOOL= USE_OPENCV -OPENCV_IMPLIES= OPENJPEG -OPENCV_LIB_DEPENDS= libopencv_core.so:graphics/opencv - -OPENJPEG_CMAKE_BOOL= USE_OPENJPEG -OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg - -PTEX_DESC= ptex support -PTEX_LIB_DEPENDS= libPtex.so:graphics/ptex - -RAW_CMAKE_BOOL= USE_LIBRAW -RAW_LIB_DEPENDS= libraw_r.so:graphics/libraw - -TBB_DESC= Intel tbb support -TBB_CMAKE_BOOL= USE_TBB -TBB_LIB_DEPENDS= libtbb.so:devel/onetbb - -VDB_DESC= OpenVDB support -VDB_CMAKE_ARGS= -DCMAKE_CXX_STANDARD=14 -VDB_CMAKE_BOOL= USE_OPENVDB -VDB_LIB_DEPENDS= libopenvdb.so:misc/openvdb - -# DISTVERSION has an extra digit which isn't in the lib name -# for LIBVERS we want the first three digits -PLIST_SUB= SHL3=${PORTVERSION:R} SHL2=${PORTVERSION:R:R} -DOCSDIR= ${PREFIX}/share/doc/openimageio-${PKGNAMESUFFIX} - -post-patch: - ${REINPLACE_CMD} -e 's| diff --git a/graphics/openimageio-ociov1/distinfo b/graphics/openimageio-ociov1/distinfo deleted file mode 100644 index 2726251b7d01..000000000000 --- a/graphics/openimageio-ociov1/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1656842486 -SHA256 (OpenImageIO-oiio-Release-2.2.21.0_GH0.tar.gz) = 85332935c06b268df2adccbf785e38cb493a59971dd4e628924f7970907c2f03 -SIZE (OpenImageIO-oiio-Release-2.2.21.0_GH0.tar.gz) = 29255709 diff --git a/graphics/openimageio-ociov1/files/patch-CMakeLists.txt b/graphics/openimageio-ociov1/files/patch-CMakeLists.txt deleted file mode 100644 index 949c1994bdef..000000000000 --- a/graphics/openimageio-ociov1/files/patch-CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- CMakeLists.txt.orig 2021-10-31 17:08:10 UTC -+++ CMakeLists.txt -@@ -214,8 +214,8 @@ endif () - - # install pkgconfig file - if (NOT MSVC) -- configure_file(src/build-scripts/OpenImageIO.pc.in "${CMAKE_BINARY_DIR}/OpenImageIO.pc" @ONLY) -- install (FILES "${CMAKE_BINARY_DIR}/OpenImageIO.pc" -+ configure_file(src/build-scripts/OpenImageIO.pc.in "${CMAKE_BINARY_DIR}/OpenImageIO-ociov1.pc" @ONLY) -+ install (FILES "${CMAKE_BINARY_DIR}/OpenImageIO-ociov1.pc" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT developer) - endif() diff --git a/graphics/openimageio-ociov1/files/patch-src_cmake_modules_FindOpenColorIO.cmake b/graphics/openimageio-ociov1/files/patch-src_cmake_modules_FindOpenColorIO.cmake deleted file mode 100644 index 09ddd3394fdd..000000000000 --- a/graphics/openimageio-ociov1/files/patch-src_cmake_modules_FindOpenColorIO.cmake +++ /dev/null @@ -1,41 +0,0 @@ ---- src/cmake/modules/FindOpenColorIO.cmake.orig 2021-12-08 14:45:20 UTC -+++ src/cmake/modules/FindOpenColorIO.cmake -@@ -14,21 +14,22 @@ include (FindPackageHandleStandardArgs) - include (FindPackageMessage) - - find_path (OPENCOLORIO_INCLUDE_DIR -- OpenColorIO/OpenColorIO.h -+ OpenColorIOv1/OpenColorIO.h - HINTS - ${OPENCOLORIO_INCLUDE_PATH} - ENV OPENCOLORIO_INCLUDE_PATH - PATHS -+ /usr/local/include - /sw/include - /opt/local/include -- DOC "The directory where OpenColorIO/OpenColorIO.h resides") -+ DOC "The directory where OpenColorIOv1/OpenColorIO.h resides") - --if (EXISTS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h") -+if (EXISTS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIOv1/OpenColorABI.h") - # Search twice, because this symbol changed between OCIO 1.x and 2.x -- file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h" TMP -+ file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIOv1/OpenColorABI.h" TMP - REGEX "^#define OCIO_VERSION_STR[ \t].*$") - if (NOT TMP) -- file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIO/OpenColorABI.h" TMP -+ file(STRINGS "${OPENCOLORIO_INCLUDE_DIR}/OpenColorIOv1/OpenColorABI.h" TMP - REGEX "^#define OCIO_VERSION[ \t].*$") - endif () - string (REGEX MATCHALL "([0-9]+)\\.([0-9]+)\\.[0-9]+" OPENCOLORIO_VERSION ${TMP}) -@@ -38,8 +39,8 @@ endif () - - find_library (OPENCOLORIO_LIBRARY - NAMES -- OpenColorIO -- OpenColorIO_${OPENCOLORIO_VERSION_MAJOR}_${OPENCOLORIO_VERSION_MINOR} -+ OpenColorIOv1 -+ OpenColorIO_1_1 - HINTS - ${OPENCOLORIO_LIBRARY_PATH} - ENV OPENCOLORIO_LIBRARY_PATH diff --git a/graphics/openimageio-ociov1/files/patch-src_cmake_modules_FindPtex.cmake b/graphics/openimageio-ociov1/files/patch-src_cmake_modules_FindPtex.cmake deleted file mode 100644 index 8e3b9ee29028..000000000000 --- a/graphics/openimageio-ociov1/files/patch-src_cmake_modules_FindPtex.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- src/cmake/modules/FindPtex.cmake.orig 2021-10-31 17:08:10 UTC -+++ src/cmake/modules/FindPtex.cmake -@@ -70,6 +70,7 @@ else () - PATHS - /usr/include - /usr/local/include -+ /usr/local/include/ptex - DOC "The directory where Ptexture.h resides") - find_library( PTEX_LIBRARY - NAMES diff --git a/graphics/openimageio-ociov1/files/patch-src_include_CMakeLists.txt b/graphics/openimageio-ociov1/files/patch-src_include_CMakeLists.txt deleted file mode 100644 index 9374214cfd0e..000000000000 --- a/graphics/openimageio-ociov1/files/patch-src_include_CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ ---- src/include/CMakeLists.txt.orig 2021-12-07 16:54:34 UTC -+++ src/include/CMakeLists.txt -@@ -48,12 +48,12 @@ list (APPEND public_headers "${CMAKE_BINARY_DIR}/inclu - - - install (FILES ${public_headers} -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-ociov1 - COMPONENT developer) - - file (GLOB detail_headers OpenImageIO/detail/*.h) - install (FILES ${detail_headers} -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/detail -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-ociov1/detail - COMPONENT developer) - - set (fmt_headers -@@ -65,7 +65,7 @@ set (fmt_headers - file (COPY ${fmt_headers} - DESTINATION ${CMAKE_BINARY_DIR}/include/OpenImageIO/detail/fmt) - install (FILES ${fmt_headers} -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/detail/fmt -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-ociov1/detail/fmt - COMPONENT developer) - - if (NOT USE_EXTERNAL_PUGIXML) -@@ -76,6 +76,6 @@ if (NOT USE_EXTERNAL_PUGIXML) - file (COPY ${pugixml_headers} - DESTINATION ${CMAKE_BINARY_DIR}/include/OpenImageIO/detail/pugixml) - install (FILES ${pugixml_headers} -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/detail/pugixml -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}-ociov1/detail/pugixml - COMPONENT developer) - endif () diff --git a/graphics/openimageio-ociov1/files/patch-src_libOpenImageIO_CMakeLists.txt b/graphics/openimageio-ociov1/files/patch-src_libOpenImageIO_CMakeLists.txt deleted file mode 100644 index 77fc06d47161..000000000000 --- a/graphics/openimageio-ociov1/files/patch-src_libOpenImageIO_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libOpenImageIO/CMakeLists.txt.orig 2021-12-07 17:19:26 UTC -+++ src/libOpenImageIO/CMakeLists.txt -@@ -195,7 +195,7 @@ set_target_properties(OpenImageIO - PROPERTIES - VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} - SOVERSION ${SOVERSION} -- OUTPUT_NAME OpenImageIO${OIIO_LIBNAME_SUFFIX} -+ OUTPUT_NAME OpenImageIO-ociov1${OIIO_LIBNAME_SUFFIX} - POSITION_INDEPENDENT_CODE ON - ) - if (VISIBILITY_MAP_COMMAND) diff --git a/graphics/openimageio-ociov1/files/patch-src_libutil_CMakeLists.txt b/graphics/openimageio-ociov1/files/patch-src_libutil_CMakeLists.txt deleted file mode 100644 index ee2187014abb..000000000000 --- a/graphics/openimageio-ociov1/files/patch-src_libutil_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- src/libutil/CMakeLists.txt.orig 2021-12-07 17:17:50 UTC -+++ src/libutil/CMakeLists.txt -@@ -43,7 +43,7 @@ set_target_properties(OpenImageIO_Util - PROPERTIES - VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} - SOVERSION ${SOVERSION} -- OUTPUT_NAME OpenImageIO_Util${OIIO_LIBNAME_SUFFIX} -+ OUTPUT_NAME OpenImageIO_Util-ociov1${OIIO_LIBNAME_SUFFIX} - POSITION_INDEPENDENT_CODE ON - ) - diff --git a/graphics/openimageio-ociov1/pkg-descr b/graphics/openimageio-ociov1/pkg-descr deleted file mode 100644 index dfc0d37cab36..000000000000 --- a/graphics/openimageio-ociov1/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -OpenImageIO is a library for reading and writing images, and a bunch of -related classes, utilities, and applications. - -There is a particular emphasis on formats and functionality used -in professional, large-scale animation and visual effects work for film. - -OpenImageIO is used extensively in animation and VFX studios all over the -world, and is also incorporated into several commercial products. diff --git a/graphics/openimageio-ociov1/pkg-plist b/graphics/openimageio-ociov1/pkg-plist deleted file mode 100644 index 4c259d5a9038..000000000000 --- a/graphics/openimageio-ociov1/pkg-plist +++ /dev/null @@ -1,73 +0,0 @@ -include/OpenImageIO-ociov1/argparse.h -include/OpenImageIO-ociov1/array_view.h -include/OpenImageIO-ociov1/atomic.h -include/OpenImageIO-ociov1/attrdelegate.h -include/OpenImageIO-ociov1/benchmark.h -include/OpenImageIO-ociov1/color.h -include/OpenImageIO-ociov1/dassert.h -include/OpenImageIO-ociov1/deepdata.h -include/OpenImageIO-ociov1/detail/farmhash.h -include/OpenImageIO-ociov1/detail/fmt/core.h -include/OpenImageIO-ociov1/detail/fmt/format-inl.h -include/OpenImageIO-ociov1/detail/fmt/format.h -include/OpenImageIO-ociov1/detail/fmt/ostream.h -include/OpenImageIO-ociov1/detail/fmt/printf.h -include/OpenImageIO-ociov1/detail/pugixml/pugiconfig.hpp -include/OpenImageIO-ociov1/detail/pugixml/pugixml.cpp -include/OpenImageIO-ociov1/detail/pugixml/pugixml.hpp -include/OpenImageIO-ociov1/errorhandler.h -include/OpenImageIO-ociov1/export.h -include/OpenImageIO-ociov1/filesystem.h -include/OpenImageIO-ociov1/filter.h -include/OpenImageIO-ociov1/fmath.h -include/OpenImageIO-ociov1/fstream_mingw.h -include/OpenImageIO-ociov1/function_view.h -include/OpenImageIO-ociov1/hash.h -include/OpenImageIO-ociov1/image_view.h -include/OpenImageIO-ociov1/imagebuf.h -include/OpenImageIO-ociov1/imagebufalgo_util.h -include/OpenImageIO-ociov1/imagebufalgo.h -include/OpenImageIO-ociov1/imagecache.h -include/OpenImageIO-ociov1/imageio.h -include/OpenImageIO-ociov1/Imath.h -include/OpenImageIO-ociov1/missing_math.h -include/OpenImageIO-ociov1/oiioversion.h -include/OpenImageIO-ociov1/optparser.h -include/OpenImageIO-ociov1/parallel.h -include/OpenImageIO-ociov1/paramlist.h -include/OpenImageIO-ociov1/platform.h -include/OpenImageIO-ociov1/plugin.h -include/OpenImageIO-ociov1/refcnt.h -include/OpenImageIO-ociov1/simd.h -include/OpenImageIO-ociov1/span.h -include/OpenImageIO-ociov1/strided_ptr.h -include/OpenImageIO-ociov1/string_view.h -include/OpenImageIO-ociov1/strutil.h -include/OpenImageIO-ociov1/sysutil.h -include/OpenImageIO-ociov1/texture.h -include/OpenImageIO-ociov1/thread.h -include/OpenImageIO-ociov1/tiffutils.h -include/OpenImageIO-ociov1/timer.h -include/OpenImageIO-ociov1/typedesc.h -include/OpenImageIO-ociov1/unittest.h -include/OpenImageIO-ociov1/unordered_map_concurrent.h -include/OpenImageIO-ociov1/ustring.h -include/OpenImageIO-ociov1/varyingref.h -include/OpenImageIO-ociov1/version.h -lib/libOpenImageIO-ociov1.so -lib/libOpenImageIO-ociov1.so.%%SHL2%% -lib/libOpenImageIO-ociov1.so.%%SHL3%% -lib/libOpenImageIO_Util-ociov1.so -lib/libOpenImageIO_Util-ociov1.so.%%SHL2%% -lib/libOpenImageIO_Util-ociov1.so.%%SHL3%% -libdata/pkgconfig/OpenImageIO-ociov1.pc -share/cmake/Modules/FindOpenImageIO-ociov1.cmake -lib/cmake/OpenImageIO-ociov1/OpenImageIOConfig.cmake -lib/cmake/OpenImageIO-ociov1/OpenImageIOConfigVersion.cmake -lib/cmake/OpenImageIO-ociov1/OpenImageIOTargets-release.cmake -lib/cmake/OpenImageIO-ociov1/OpenImageIOTargets.cmake -%%PORTDOCS%%%%DOCSDIR%%/CHANGES.md -%%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.x.md -%%PORTDOCS%%%%DOCSDIR%%/CHANGES-1.x.md -%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY.md -%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md diff --git a/graphics/openimageio-ociov1/pkg-plist-pybind b/graphics/openimageio-ociov1/pkg-plist-pybind deleted file mode 100644 index 598a435380d1..000000000000 --- a/graphics/openimageio-ociov1/pkg-plist-pybind +++ /dev/null @@ -1 +0,0 @@ -%%PYTHON_SITELIBDIR%%/OpenImageIO21.so