From 4435f22d9bda6409a433f881f1920a225248091d Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Tue, 25 Jun 2024 10:33:05 +0200 Subject: [PATCH 01/10] [vtk] qttools is not needed But need qtbase[sql-sqlite] --- ports/vtk/vcpkg.json | 9 +++------ versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 4ee9ebafca68d4..f180d56a88cb4b 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.3.0-pv5.12.1", - "port-version": 1, + "port-version": 2, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", @@ -213,15 +213,12 @@ "features": [ "gui", "opengl", + "sql-sqlite", "widgets" ] }, "qtdeclarative", - "qtimageformats", - { - "name": "qttools", - "default-features": false - } + "qtimageformats" ] }, "utf8": { diff --git a/versions/baseline.json b/versions/baseline.json index 13dbe8ce87ac51..1b789341b0211a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9310,7 +9310,7 @@ }, "vtk": { "baseline": "9.3.0-pv5.12.1", - "port-version": 1 + "port-version": 2 }, "vtk-dicom": { "baseline": "0.8.14", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index aab22fc0174b9b..b1a3f9bcc377a9 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b47305babe848e39f6df38135489590cff3531f0", + "version-semver": "9.3.0-pv5.12.1", + "port-version": 2 + }, { "git-tree": "a29da0e8cb31a173e6d7aacf0f1fdfc0f7178744", "version-semver": "9.3.0-pv5.12.1", From 5d3d7ebadd0999e57a1915658614fec284c49447 Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Wed, 26 Jun 2024 12:07:01 +0200 Subject: [PATCH 02/10] [vtk] freetype in vtk only use zlib See ThirdParty\freetype\vtkfreetype\include\freetype\config\ftoption.h --- ports/vtk/vcpkg.json | 8 +++++++- versions/v-/vtk.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index f180d56a88cb4b..a975f64d09284f 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -12,7 +12,13 @@ "exprtk", "fast-float", "fmt", - "freetype", + { + "name": "freetype", + "default-features": false, + "features": [ + "zlib" + ] + }, "glew", { "name": "hdf5", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index b1a3f9bcc377a9..84c4a22f290a95 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b47305babe848e39f6df38135489590cff3531f0", + "git-tree": "4a06086009d89e2110d9e04c19847880ba6a87fe", "version-semver": "9.3.0-pv5.12.1", "port-version": 2 }, From 68b2623b72bd0b3f0b02d5f99eae410ce4524e4c Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Wed, 26 Jun 2024 16:14:50 +0200 Subject: [PATCH 03/10] [vtk] libxml2 in vtk only use zlib See ThirdParty\libxml2\vtk.module --- ports/vtk/vcpkg.json | 8 +++++++- versions/v-/vtk.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index a975f64d09284f..195ed59bbaf7c4 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -34,7 +34,13 @@ "libogg", "libpng", "libtheora", - "libxml2", + { + "name": "libxml2", + "default-features": false, + "features": [ + "zlib" + ] + }, "lz4", "netcdf-c", "pegtl", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 84c4a22f290a95..574a3fe68a2342 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "4a06086009d89e2110d9e04c19847880ba6a87fe", + "git-tree": "b3714c3b4ff6292945aeda34e43f4bdfecc75355", "version-semver": "9.3.0-pv5.12.1", "port-version": 2 }, From ad50b03a0629d1e961c216456641b665bac6cfe4 Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Fri, 28 Jun 2024 11:59:12 +0200 Subject: [PATCH 04/10] [vtk] hdf5 needs zlib --- ports/vtk/vcpkg.json | 5 ++++- versions/v-/vtk.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 195ed59bbaf7c4..4c171330880e29 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -22,7 +22,10 @@ "glew", { "name": "hdf5", - "default-features": false + "default-features": false, + "features": [ + "zlib" + ] }, "jsoncpp", { diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 574a3fe68a2342..9f7537a61f1a75 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b3714c3b4ff6292945aeda34e43f4bdfecc75355", + "git-tree": "91a008c8c2e70ff4fe47a30c485fccef610e9f8a", "version-semver": "9.3.0-pv5.12.1", "port-version": 2 }, From b82f131e89003fcbd3ba86767e3f8d983f2b27c0 Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Fri, 28 Jun 2024 11:59:21 +0200 Subject: [PATCH 05/10] [seacas] cgns only needs hdf5 --- ports/seacas/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/s-/seacas.json | 5 +++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index d18427453539ad..300298002ac73e 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -1,13 +1,19 @@ { "name": "seacas", "version-date": "2022-11-22", - "port-version": 5, + "port-version": 6, "description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.", "homepage": "https://github.com/sandialabs/seacas", "license": null, "dependencies": [ "cereal", - "cgns", + { + "name": "cgns", + "default-features": false, + "features": [ + "hdf5" + ] + }, "fmt", { "name": "hdf5", diff --git a/versions/baseline.json b/versions/baseline.json index 1b789341b0211a..f5a8f120872afb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8070,7 +8070,7 @@ }, "seacas": { "baseline": "2022-11-22", - "port-version": 5 + "port-version": 6 }, "seal": { "baseline": "4.1.1", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index faa6b3c98d9f54..6ad7d2f44d014d 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29eca3888f7e54ca7c8ef9b359efca3e0f77ff73", + "version-date": "2022-11-22", + "port-version": 6 + }, { "git-tree": "0107d3359b2fa880981554b822946ccb2109baea", "version-date": "2022-11-22", From 54841fd7bb7d7b115b684199f982bfc5f9c16ab7 Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Fri, 28 Jun 2024 11:59:28 +0200 Subject: [PATCH 06/10] [vtk] netcdf-c only needs hdf5 --- ports/vtk/vcpkg.json | 8 +++++++- versions/v-/vtk.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 4c171330880e29..57edec8152a3a9 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -45,7 +45,13 @@ ] }, "lz4", - "netcdf-c", + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "hdf5" + ] + }, "pegtl", { "name": "proj", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 9f7537a61f1a75..5025730d986dbe 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "91a008c8c2e70ff4fe47a30c485fccef610e9f8a", + "git-tree": "b1cd891175ff37d3aa4ad5e05e792185f3932515", "version-semver": "9.3.0-pv5.12.1", "port-version": 2 }, From 9a366643a93b009e73db3caf96b685d922e66427 Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Fri, 28 Jun 2024 11:59:36 +0200 Subject: [PATCH 07/10] [seacas] matio is now optional --- ports/seacas/portfile.cmake | 3 ++- ports/seacas/vcpkg.json | 22 +++++++++++++++------- versions/s-/seacas.json | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ports/seacas/portfile.cmake b/ports/seacas/portfile.cmake index a2b622aa4309c7..dd78fb15714326 100644 --- a/ports/seacas/portfile.cmake +++ b/ports/seacas/portfile.cmake @@ -23,6 +23,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES mpi TPL_ENABLE_MPI + matio TPL_ENABLE_Matio # mpi TPL_ENABLE_Pnetcdf # missing Pnetcdf port ${PARMETIS_FEATURES} ) @@ -33,7 +34,7 @@ endif() set(tpl_disable_list GTest DataWarp Pamgen X11 CUDA Kokkos Faodel Pnetcdf ADIOS2 Catalyst2) -set(tpl_enable_list Zlib HDF5 Netcdf CGNS Matio fmt Cereal) +set(tpl_enable_list Zlib HDF5 Netcdf CGNS fmt Cereal) if(VCPKG_TARGET_IS_OSX) list(APPEND tpl_disable_list METIS) diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index 300298002ac73e..335a4b86f86881 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -19,13 +19,6 @@ "name": "hdf5", "default-features": false }, - { - "name": "matio", - "default-features": false, - "features": [ - "hdf5" - ] - }, "metis", { "name": "netcdf-c", @@ -44,7 +37,22 @@ }, "zlib" ], + "default-features": [ + "matio" + ], "features": { + "matio": { + "description": "Enable Matio support", + "dependencies": [ + { + "name": "matio", + "default-features": false, + "features": [ + "hdf5" + ] + } + ] + }, "mpi": { "description": "Enable MPI support", "dependencies": [ diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index 6ad7d2f44d014d..5f736a69f3896b 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "29eca3888f7e54ca7c8ef9b359efca3e0f77ff73", + "git-tree": "965ee0f753402c101ee5b8788cc919105402c89d", "version-date": "2022-11-22", "port-version": 6 }, From 1044709d1a813b8c7739527f967359a56b94b10b Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Mon, 8 Jul 2024 11:29:13 +0200 Subject: [PATCH 08/10] [vtk] qt doesn't need qtimageformats See .gitlab\ci\download_qt.cmake and .gitlab\ci\download_qt_hashes.cmake --- ports/vtk/vcpkg.json | 3 +-- versions/v-/vtk.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 57edec8152a3a9..be2df6c6ffcb4f 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -238,8 +238,7 @@ "widgets" ] }, - "qtdeclarative", - "qtimageformats" + "qtdeclarative" ] }, "utf8": { diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 5025730d986dbe..dcce389e1899eb 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b1cd891175ff37d3aa4ad5e05e792185f3932515", + "git-tree": "75ff1160df1785eaaf6ae614abd5ce48771f838e", "version-semver": "9.3.0-pv5.12.1", "port-version": 2 }, From 50df84061589a5991dfeb337b5f8c7f57226b91a Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Tue, 9 Jul 2024 11:04:28 +0200 Subject: [PATCH 09/10] [vtk] Fix usage The `VTK_USE_FILE` is no longer used starting with 8.90. --- ports/vtk/usage | 1 - versions/v-/vtk.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/vtk/usage b/ports/vtk/usage index bba2f639079441..3324011b508ef3 100644 --- a/ports/vtk/usage +++ b/ports/vtk/usage @@ -1,5 +1,4 @@ The package vtk provides CMake targets: find_package(VTK REQUIRED) - include("${VTK_USE_FILE}") target_link_libraries(main PRIVATE ${VTK_LIBRARIES}) diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index dcce389e1899eb..911db0e2b2801f 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "75ff1160df1785eaaf6ae614abd5ce48771f838e", + "git-tree": "0c230cc0e6003a34330671080a7c00f3618c23e4", "version-semver": "9.3.0-pv5.12.1", "port-version": 2 }, From 4ef90d3de5b157199e8e1b719f6947d89b1ad49a Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Tue, 16 Jul 2024 09:37:09 +0200 Subject: [PATCH 10/10] [seacas] Don't enable Matio by default --- ports/seacas/vcpkg.json | 3 --- versions/s-/seacas.json | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json index 335a4b86f86881..3f4792cfefb255 100644 --- a/ports/seacas/vcpkg.json +++ b/ports/seacas/vcpkg.json @@ -37,9 +37,6 @@ }, "zlib" ], - "default-features": [ - "matio" - ], "features": { "matio": { "description": "Enable Matio support", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json index 5f736a69f3896b..a0a68f42b94088 100644 --- a/versions/s-/seacas.json +++ b/versions/s-/seacas.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "965ee0f753402c101ee5b8788cc919105402c89d", + "git-tree": "bebbef6d1a82c6848bbb8d619a5e379f9b29b3f9", "version-date": "2022-11-22", "port-version": 6 },