[kealib] Update, revise features (#19118)

* Convert manifest to JSON

* Remove purely transitive dependencies

* Parallel is unsupported with HDF5 C++

* Revise portfile

* Update to 1.4.14

* x-add-version
This commit is contained in:
Kai Pastor 2021-09-07 20:56:42 +02:00 committed by GitHub
parent e67f76161c
commit 642d1ccb27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 54 additions and 51 deletions

View File

@ -1,9 +0,0 @@
Source: kealib
Version: 1.4.11-3
Build-Depends: hdf5[cpp], zlib, szip
Homepage: https://bitbucket.org/chchrsc/kealib
Description: kealib is gdal model using HDF5 standard.
Feature: parallel
Description: Use parallel support for HDF5
Build-Depends: hdf5[parallel], mpi

View File

@ -1,4 +1,5 @@
index 1f4b1474..40a0f55d 100644
diff --git a/include/libkea/KEAAttributeTable.h b/include/libkea/KEAAttributeTable.h
index 95a5d7f..fbfebc1 100644
--- a/include/libkea/KEAAttributeTable.h
+++ b/include/libkea/KEAAttributeTable.h
@@ -37,7 +37,7 @@
@ -10,7 +11,8 @@ index 1f4b1474..40a0f55d 100644
#include "libkea/KEACommon.h"
#include "libkea/KEAException.h"
diff --git a/include/libkea/KEAAttributeTableFile.h b/include/libkea/KEAAttributeTableFile.h
index 9987a7c..39dbb21 100644
--- a/include/libkea/KEAAttributeTableFile.h
+++ b/include/libkea/KEAAttributeTableFile.h
@@ -35,7 +35,7 @@
@ -22,19 +24,8 @@ index 1f4b1474..40a0f55d 100644
#include "libkea/KEACommon.h"
#include "libkea/KEAException.h"
--- a/include/libkea/KEACommon.h
+++ b/include/libkea/KEACommon.h
@@ -36,7 +36,7 @@
#include <string>
#include <vector>
-#include "H5Cpp.h"
+#include <H5Cpp.h>
// mark all exported classes/functions with DllExport to have
// them exported by Visual Studio
diff --git a/include/libkea/KEAAttributeTableInMem.h b/include/libkea/KEAAttributeTableInMem.h
index b4f7fad..6a8a8b7 100644
--- a/include/libkea/KEAAttributeTableInMem.h
+++ b/include/libkea/KEAAttributeTableInMem.h
@@ -35,7 +35,7 @@
@ -46,7 +37,21 @@ index 1f4b1474..40a0f55d 100644
#include "libkea/KEACommon.h"
#include "libkea/KEAException.h"
diff --git a/include/libkea/KEACommon.h b/include/libkea/KEACommon.h
index 3175c93..67b02a2 100644
--- a/include/libkea/KEACommon.h
+++ b/include/libkea/KEACommon.h
@@ -38,7 +38,7 @@
#include <string>
#include <vector>
-#include "H5Cpp.h"
+#include <H5Cpp.h>
// MSVC 2008 uses different names....
#ifdef _MSC_VER
diff --git a/include/libkea/KEAImageIO.h b/include/libkea/KEAImageIO.h
index d510cae..4c2aa97 100644
--- a/include/libkea/KEAImageIO.h
+++ b/include/libkea/KEAImageIO.h
@@ -35,7 +35,7 @@
@ -58,5 +63,3 @@ index 1f4b1474..40a0f55d 100644
#include "libkea/KEACommon.h"
#include "libkea/KEAException.h"

View File

@ -1,39 +1,25 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ubarsc/kealib
REF de6dabd414039dd36a1ff01243901cec3f45256e #1.4.11
SHA512 34032dd27aee0714cbe6b76b2f731a05408fd5ff78080343bcfbc3aa7e6eeb06a341a423cee1e7f3624f4c1f661feaf4ea3a3d2e53172933e49982df0c438a6f
REF 4984102cf5867105a28ae754689566217309d120 #1.4.14
SHA512 06628996757bc9cffc5af0f03468ec32246980b6f72f7f1c88a489a8a2aed70924115df0726fcbb9851e44030c6a44ee0f3137660de43af421dec1eab81cc147
HEAD_REF master
PATCHES hdf5_include.patch
)
if ("parallel" IN_LIST FEATURES)
set(ENABLE_PARALLEL ON)
else()
set(ENABLE_PARALLEL OFF)
endif()
if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static")
set(HDF5_USE_STATIC_LIBRARIES ON)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DHDF5_PREFER_PARALLEL=${ENABLE_PARALLEL}
-DLIBKEA_WITH_GDAL=OFF
-DDISABLE_TESTS=ON
-DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES}
-DLIBKEA_WITH_GDAL=OFF
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin")
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL ${SOURCE_PATH}/python/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

18
ports/kealib/vcpkg.json Normal file
View File

@ -0,0 +1,18 @@
{
"name": "kealib",
"version": "1.4.14",
"description": "KEALib provides an implementation of the GDAL data model using HDF5.",
"homepage": "https://github.com/ubarsc/kealib",
"dependencies": [
{
"name": "hdf5",
"features": [
"cpp"
]
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -2877,7 +2877,7 @@
"port-version": 0
},
"kealib": {
"baseline": "1.4.11-3",
"baseline": "1.4.14",
"port-version": 0
},
"kenlm": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "11878c71d1418c0bdcc380e7ebf8e90f9e563260",
"version": "1.4.14",
"port-version": 0
},
{
"git-tree": "cc06088dbd4f6a3bce64af1b452b5ef2543f5b76",
"version-string": "1.4.11-3",