diff --git a/ports/htscodecs/portfile.cmake b/ports/htscodecs/portfile.cmake index 3ee2ddc82f..6285be18a9 100644 --- a/ports/htscodecs/portfile.cmake +++ b/ports/htscodecs/portfile.cmake @@ -1,37 +1,37 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO samtools/htscodecs - REF "v${VERSION}" - SHA512 79393d6e38677a5538c8e8a4d0077012368476b87fc729acfb1f2e5737d0bd0dd0873e86b0090a9ac5227113ff834cfb30a264afd524038fcef6ba91128495eb - HEAD_REF master - PATCHES - 0001-no-tests.patch # https://github.com/samtools/htscodecs/pull/120 - configure_bz2.patch -) - -set(FEATURE_OPTIONS "") - -macro(enable_feature feature switch) - if("${feature}" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS "--enable-${switch}") - else() - list(APPEND FEATURE_OPTIONS "--disable-${switch}") - endif() -endmacro() - -enable_feature("bzip2" "bz2") - -vcpkg_make_configure( - AUTORECONF - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} -) - -vcpkg_make_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_fixup_pkgconfig() - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO samtools/htscodecs + REF "v${VERSION}" + SHA512 f89ab2d70a27dc63c30c8dc89b4102b3e18a6a3341814448acc45e304dbf766915e532dba449342fc53c481414268fe662c9389898bd76a10db90725ac3d2f83 + HEAD_REF master + PATCHES + 0001-no-tests.patch # https://github.com/samtools/htscodecs/pull/120 + configure_bz2.patch +) + +set(FEATURE_OPTIONS "") + +macro(enable_feature feature switch) + if("${feature}" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "--enable-${switch}") + else() + list(APPEND FEATURE_OPTIONS "--disable-${switch}") + endif() +endmacro() + +enable_feature("bzip2" "bz2") + +vcpkg_make_configure( + AUTORECONF + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_make_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") diff --git a/ports/htscodecs/vcpkg.json b/ports/htscodecs/vcpkg.json index cd6a247621..ea5d3ddce1 100644 --- a/ports/htscodecs/vcpkg.json +++ b/ports/htscodecs/vcpkg.json @@ -1,10 +1,9 @@ { "name": "htscodecs", - "version": "1.6.6", - "port-version": 1, + "version": "1.6.7", "description": "Custom compression for CRAM and others.", "homepage": "https://github.com/samtools/htscodecs", - "license": "MIT", + "license": null, "supports": "!windows", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index a3d30dca0f..bb07bfe63d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3869,8 +3869,8 @@ "port-version": 0 }, "htscodecs": { - "baseline": "1.6.6", - "port-version": 1 + "baseline": "1.6.7", + "port-version": 0 }, "htslib": { "baseline": "1.23.1", diff --git a/versions/h-/htscodecs.json b/versions/h-/htscodecs.json index 31fb020f33..3c576adf8b 100644 --- a/versions/h-/htscodecs.json +++ b/versions/h-/htscodecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91ca111721e0f70ac37e021d12bd45cab53ad406", + "version": "1.6.7", + "port-version": 0 + }, { "git-tree": "86df5a61591944647b05260ee413b712a5c24d3c", "version": "1.6.6",