git: 4ff18d3a4106 - main - security/libhydrogen: Update to 0.0.0.g20241103
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 25 Dec 2024 19:18:36 UTC
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ff18d3a41066a708836bc1f00a796570a527001 commit 4ff18d3a41066a708836bc1f00a796570a527001 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-12-25 18:46:42 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-12-25 19:15:07 +0000 security/libhydrogen: Update to 0.0.0.g20241103 Changes: https://github.com/jedisct1/libhydrogen/commits/master --- security/libhydrogen/Makefile | 9 ++--- security/libhydrogen/distinfo | 6 ++-- security/libhydrogen/files/patch-CMakeLists.txt | 48 ------------------------- security/libhydrogen/pkg-plist | 4 +-- 4 files changed, 9 insertions(+), 58 deletions(-) diff --git a/security/libhydrogen/Makefile b/security/libhydrogen/Makefile index 21d1bf578eec..04a0f31e3dc3 100644 --- a/security/libhydrogen/Makefile +++ b/security/libhydrogen/Makefile @@ -1,6 +1,5 @@ PORTNAME= libhydrogen -PORTVERSION= 0.0.0.g20240509 -PORTREVISION= 1 +PORTVERSION= 0.0.0.g20241103 CATEGORIES= security MAINTAINER= sunpoet@FreeBSD.org @@ -10,10 +9,12 @@ WWW= https://github.com/jedisct1/libhydrogen LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake +USES= meson + +MESON_ARGS= --default-library=both USE_GITHUB= yes GH_ACCOUNT= jedisct1 -GH_TAGNAME= c18e510 +GH_TAGNAME= 576a38b .include <bsd.port.mk> diff --git a/security/libhydrogen/distinfo b/security/libhydrogen/distinfo index 3db51e90e1f1..6b40503a917f 100644 --- a/security/libhydrogen/distinfo +++ b/security/libhydrogen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726080915 -SHA256 (jedisct1-libhydrogen-0.0.0.g20240509-c18e510_GH0.tar.gz) = 44e155d56a45cea83e7d838ad2b0c7757d83bcddff3d80663c510d77e365fc17 -SIZE (jedisct1-libhydrogen-0.0.0.g20240509-c18e510_GH0.tar.gz) = 45819 +TIMESTAMP = 1734888070 +SHA256 (jedisct1-libhydrogen-0.0.0.g20241103-576a38b_GH0.tar.gz) = f9081648972f9c41f6eccb5052fb4f007e3a38b42d7fbcdc46934f00a7b00daa +SIZE (jedisct1-libhydrogen-0.0.0.g20241103-576a38b_GH0.tar.gz) = 45785 diff --git a/security/libhydrogen/files/patch-CMakeLists.txt b/security/libhydrogen/files/patch-CMakeLists.txt deleted file mode 100644 index c5a4a0d946a6..000000000000 --- a/security/libhydrogen/files/patch-CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ ---- CMakeLists.txt.orig 2024-05-09 19:42:48 UTC -+++ CMakeLists.txt -@@ -39,11 +39,6 @@ set(arduino_files "library.properties") - - # Compile options - --get_setting(target_arch STRING "Target system architecture (fed to the compiler's -march=XXX).") --if(NOT target_arch AND NOT CMAKE_CROSSCOMPILING) -- set(target_arch native) --endif() -- - get_setting(target_device STRING "Target device identifier (defines HYDRO_TARGET_DEVICE_XXX).") - - set(compile_options -@@ -89,8 +84,9 @@ set(compile_options - - # Main library - --add_library("${PROJECT_NAME}") -+add_library("${PROJECT_NAME}" SHARED) - add_library("${PROJECT_NAME}::${PROJECT_NAME}" ALIAS "${PROJECT_NAME}") -+add_library("${PROJECT_NAME}_static" STATIC) - - target_sources("${PROJECT_NAME}" PRIVATE ${source_files}) - -@@ -100,11 +96,21 @@ target_compile_options("${PROJECT_NAME}" PRIVATE ${com - - target_compile_options("${PROJECT_NAME}" PRIVATE ${compile_options}) - -+target_sources("${PROJECT_NAME}_static" PRIVATE ${source_files}) -+ -+target_include_directories("${PROJECT_NAME}_static" -+ PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) -+ -+target_compile_options("${PROJECT_NAME}_static" PRIVATE ${compile_options}) -+ -+set_target_properties("${PROJECT_NAME}_static" PROPERTIES OUTPUT_NAME "${PROJECT_NAME}") -+ - # Installation - - set(targets_export_name "${PROJECT_NAME}-targets") - --install(TARGETS "${PROJECT_NAME}" -+install(TARGETS "${PROJECT_NAME}" "${PROJECT_NAME}_static" - EXPORT "${targets_export_name}" - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/security/libhydrogen/pkg-plist b/security/libhydrogen/pkg-plist index 6c6eab7a85ee..4e0e23f878ef 100644 --- a/security/libhydrogen/pkg-plist +++ b/security/libhydrogen/pkg-plist @@ -1,6 +1,4 @@ include/hydrogen.h lib/libhydrogen.a lib/libhydrogen.so -share/cmake/hydrogen/hydrogen-config.cmake -share/cmake/hydrogen/hydrogen-targets-%%CMAKE_BUILD_TYPE%%.cmake -share/cmake/hydrogen/hydrogen-targets.cmake +libdata/pkgconfig/libhydrogen.pc