From 5662ef4f7e3b67cd29cab2e323d87c9f47ebfd95 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 10 Feb 2022 20:08:04 +0100 Subject: [PATCH] [field3d] Remove port (#22463) * Remove field3d port Also removes the field3d feature from openimageio * Bump port version of openimageio * Update git-tree hash Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/field3d/0001_fix_build_errors.patch | 148 ------------------ .../0002_improve_win_compatibility.patch | 43 ----- ports/field3d/0003_hdf5_api.patch | 12 -- ports/field3d/portfile.cmake | 33 ---- ports/field3d/vcpkg.json | 20 --- ports/openimageio/portfile.cmake | 1 - ports/openimageio/vcpkg.json | 9 +- versions/baseline.json | 6 +- versions/o-/openimageio.json | 5 + 9 files changed, 7 insertions(+), 270 deletions(-) delete mode 100644 ports/field3d/0001_fix_build_errors.patch delete mode 100644 ports/field3d/0002_improve_win_compatibility.patch delete mode 100644 ports/field3d/0003_hdf5_api.patch delete mode 100644 ports/field3d/portfile.cmake delete mode 100644 ports/field3d/vcpkg.json diff --git a/ports/field3d/0001_fix_build_errors.patch b/ports/field3d/0001_fix_build_errors.patch deleted file mode 100644 index 95149e39d893fd..00000000000000 --- a/ports/field3d/0001_fix_build_errors.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1610c2e..b012008 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,25 +31,17 @@ - - # Author : Nicholas Yue yue.nicholas@gmail.com - --CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) -+CMAKE_MINIMUM_REQUIRED( VERSION 3.17 ) - - PROJECT ( field3d ) - - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) - - FIND_PACKAGE (Doxygen) --FIND_PACKAGE (HDF5 COMPONENTS C) --IF ( CMAKE_HOST_WIN32 ) --# f3dinfo relies on program_options but don't include it, since --# for some reason, unlike all the other boost components, a link is --# forced via a pragma. --FIND_PACKAGE (Boost COMPONENTS regex thread) --ELSE () --FIND_PACKAGE (Boost COMPONENTS regex thread program_options system) --FIND_PACKAGE (MPI) --ENDIF () -+FIND_PACKAGE (HDF5 COMPONENTS C REQUIRED) -+FIND_PACKAGE (Boost COMPONENTS regex thread program_options system REQUIRED) - --FIND_PACKAGE (ILMBase) -+FIND_PACKAGE (OpenEXR REQUIRED) - - # Allow the developer to select if Dynamic or Static libraries are built - OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON) -@@ -79,26 +71,14 @@ IF ( CMAKE_HOST_UNIX ) - ENDIF ( ) - IF ( CMAKE_HOST_WIN32 ) - ADD_DEFINITIONS ( -- -D_HAS_ITERATOR_DEBUGGING=0 - -D_CRT_SECURE_NO_WARNINGS=1 - ) - ENDIF ( ) - - SET ( LIB_TYPE SHARED ) - IF ( NOT BUILD_SHARED_LIBS ) -- IF ( CMAKE_HOST_WIN32 ) -- # User wants to build static libraries, so change the LIB_TYPE variable to CMake keyword 'STATIC' - SET ( LIB_TYPE STATIC ) - ADD_DEFINITIONS( -DFIELD3D_STATIC ) -- ENDIF() --ELSE () -- IF ( CMAKE_HOST_WIN32 ) -- ADD_DEFINITIONS ( -- -DOPENEXR_DLL -- -D_HDF5USEDLL_ -- -DHDF5CPP_USEDLL -- ) -- ENDIF() - ENDIF ( NOT BUILD_SHARED_LIBS ) - - ADD_LIBRARY ( Field3D ${LIB_TYPE} -@@ -147,24 +128,22 @@ IF ( CMAKE_HOST_UNIX ) - ${MPI_LIBRARIES} ) - ENDIF ( MPI_FOUND ) - LIST ( APPEND Field3D_Libraries_Shared -- Iex Half IlmThread Imath - pthread dl z ) - SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} ) - SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared} - ${Boost_LIBRARIES} ) - ENDIF ( ) - IF ( CMAKE_HOST_WIN32 ) -- # Add OpenEXR and zlib release/debug -- FOREACH ( lib Iex Half IlmThread Imath zdll ) -+ FOREACH ( lib zlib ) - LIST ( APPEND Field3D_Libraries_Shared - optimized ${lib} -- debug ${lib}_d ) -+ debug ${lib}d ) - ENDFOREACH() - SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} Shlwapi.lib) - SET ( Field3D_BIN_Libraries Field3D ${Boost_LIBRARIES} ) - ENDIF () - --TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES}) -+TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES} OpenEXR::IlmImf) - - # Parase version and soversion from export/ns.h - -@@ -214,33 +193,7 @@ ADD_EXECUTABLE ( f3dinfo - - TARGET_LINK_LIBRARIES ( f3dinfo ${Field3D_BIN_Libraries} ) - --# field3d - sparse_field_io --ADD_EXECUTABLE ( sparse_field_io -- apps/sample_code/sparse_field_io/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( sparse_field_io ${Field3D_BIN_Libraries} ) -- --# field3d - read --ADD_EXECUTABLE ( read -- apps/sample_code/read/main.cpp -- ) - --TARGET_LINK_LIBRARIES ( read ${Field3D_BIN_Libraries} ) -- --# field3d - mixed_types --ADD_EXECUTABLE ( mixed_types -- apps/sample_code/mixed_types/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( mixed_types ${Field3D_BIN_Libraries} ) -- --# field3d - create_and_write --ADD_EXECUTABLE ( create_and_write -- apps/sample_code/create_and_write/main.cpp -- ) -- --TARGET_LINK_LIBRARIES ( create_and_write ${Field3D_BIN_Libraries} ) - - IF (DOXYGEN_FOUND) - ADD_CUSTOM_TARGET ( doc -@@ -249,7 +202,7 @@ IF (DOXYGEN_FOUND) - WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY} - ) - IF (INSTALL_DOCS) -- INSTALL (DIRECTORY -+ INSTALL (DIRECTORY - ${CMAKE_HOME_DIRECTORY}/docs - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) -@@ -263,12 +216,11 @@ INSTALL ( TARGETS - - FILE(GLOB Field3d_Includes "${CMAKE_CURRENT_SOURCE_DIR}/export/*.h") - --INSTALL ( FILES -- ${Field3d_Includes} -+INSTALL ( FILES -+ ${Field3d_Includes} - DESTINATION include/Field3D - ) - --INSTALL ( TARGETS f3dinfo -+INSTALL ( TARGETS f3dinfo - RUNTIME DESTINATION bin - ) -- diff --git a/ports/field3d/0002_improve_win_compatibility.patch b/ports/field3d/0002_improve_win_compatibility.patch deleted file mode 100644 index 08167be692f4c0..00000000000000 --- a/ports/field3d/0002_improve_win_compatibility.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/include/UtilFoundation.h b/include/UtilFoundation.h -index 2eb6290..a449b5b 100644 ---- a/include/UtilFoundation.h -+++ b/include/UtilFoundation.h -@@ -90,6 +90,9 @@ - #ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN - #endif -+#ifndef NOMINMAX -+#define NOMINMAX -+#endif - - // needed for mutex stuff - #include -diff --git a/src/FieldMapping.cpp b/src/FieldMapping.cpp -index b1f1a1f..90612b1 100644 ---- a/src/FieldMapping.cpp -+++ b/src/FieldMapping.cpp -@@ -49,9 +49,6 @@ - #include "FieldMapping.h" - #include "Types.h" - --#ifdef WIN32 --#define isnan(__x__) _isnan(__x__) --#endif - - //----------------------------------------------------------------------------// - -diff --git a/src/Log.cpp b/src/Log.cpp -index f78229c..d095a50 100644 ---- a/src/Log.cpp -+++ b/src/Log.cpp -@@ -40,8 +40,9 @@ - */ - - //----------------------------------------------------------------------------// -- -+#ifndef _WIN32 - #include -+#endif - #include - #include - diff --git a/ports/field3d/0003_hdf5_api.patch b/ports/field3d/0003_hdf5_api.patch deleted file mode 100644 index 183a49c9e6e071..00000000000000 --- a/ports/field3d/0003_hdf5_api.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b57057f..e809880 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,6 +35,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 3.17 ) - - PROJECT ( field3d ) - -+add_definitions(-DH5_USE_110_API) - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake ) - - FIND_PACKAGE (Doxygen) diff --git a/ports/field3d/portfile.cmake b/ports/field3d/portfile.cmake deleted file mode 100644 index ff5f2c413e6a5d..00000000000000 --- a/ports/field3d/portfile.cmake +++ /dev/null @@ -1,33 +0,0 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO imageworks/Field3D - REF 0cf75ad982917e0919f59e5cb3d483517d06d7da - SHA512 e6f137013dd7b64b51b2ec3cc3ed8f4dbfadb85858946f08393653d78136cf8f93ae124716db11358e325c5e64ba04802afd4b89ca36ad65a14dd3db17f3072c - HEAD_REF master - PATCHES - 0001_fix_build_errors.patch - 0002_improve_win_compatibility.patch - 0003_hdf5_api.patch # Switches the HDF5 default API for this port to 1.10 -) - -file(REMOVE ${SOURCE_PATH}/cmake/FindILMBase.cmake) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - "-DINSTALL_DOCS:BOOL=OFF" -) - -vcpkg_install_cmake() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/field3d/vcpkg.json b/ports/field3d/vcpkg.json deleted file mode 100644 index 691933de362cdc..00000000000000 --- a/ports/field3d/vcpkg.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "field3d", - "version": "1.7.3", - "port-version": 3, - "description": "An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk.", - "homepage": "https://github.com/imageworks/Field3D", - "supports": "!uwp", - "dependencies": [ - "boost-foreach", - "boost-format", - "boost-program-options", - "boost-regex", - "boost-system", - "boost-test", - "boost-thread", - "boost-timer", - "hdf5", - "openexr" - ] -} diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 0e75e7d68ce765..a69fae17c95323 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -24,7 +24,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libraw USE_LIBRAW opencolorio USE_OPENCOLORIO ffmpeg USE_FFMPEG - field3d USE_FIELD3D freetype USE_FREETYPE gif USE_GIF opencv USE_OPENCV diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 56fa0b60dbc58e..e5b6a47cd883a7 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.3.10.1", - "port-version": 1, + "port-version": 2, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ @@ -48,13 +48,6 @@ } ] }, - "field3d": { - "description": "Enable field3D support for openimageio", - "supports": "!windows", - "dependencies": [ - "field3d" - ] - }, "freetype": { "description": "Enable freetype support for openimageio", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9ff6dbf6363930..c1a28379d391e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2168,10 +2168,6 @@ "baseline": "2019-12-19", "port-version": 2 }, - "field3d": { - "baseline": "1.7.3", - "port-version": 3 - }, "fixed-string": { "baseline": "0.1.0", "port-version": 1 @@ -5034,7 +5030,7 @@ }, "openimageio": { "baseline": "2.3.10.1", - "port-version": 1 + "port-version": 2 }, "openjpeg": { "baseline": "2.4.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index e8b216c472357a..ea3310044ddadc 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a52afa5ed0495b47dd1c123d975746fdfa0b3459", + "version": "2.3.10.1", + "port-version": 2 + }, { "git-tree": "00b94623cc9528075483e57034da95bb356c6848", "version": "2.3.10.1",