Date: Wed, 18 Sep 2024 06:19:05 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a45b8911bcec - main - www/ls-qpack: Update to 2.5.5 Message-ID: <202409180619.48I6J514032687@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=a45b8911bcec42593e8fbe32752e9ec25369e930 commit a45b8911bcec42593e8fbe32752e9ec25369e930 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2024-09-18 05:56:08 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2024-09-18 06:13:09 +0000 www/ls-qpack: Update to 2.5.5 Changes: https://github.com/litespeedtech/ls-qpack/releases --- www/ls-qpack/Makefile | 19 ++++++------------- www/ls-qpack/distinfo | 6 +++--- www/ls-qpack/files/patch-CMakeLists.txt | 16 ---------------- www/ls-qpack/files/patch-bin-CMakeLists.txt | 12 ------------ www/ls-qpack/files/patch-bin-interop-decode.c | 11 ----------- www/ls-qpack/pkg-plist | 6 +++++- 6 files changed, 14 insertions(+), 56 deletions(-) diff --git a/www/ls-qpack/Makefile b/www/ls-qpack/Makefile index ec0399f47296..ea908919f94b 100644 --- a/www/ls-qpack/Makefile +++ b/www/ls-qpack/Makefile @@ -1,5 +1,5 @@ PORTNAME= ls-qpack -PORTVERSION= 2.5.4 +PORTVERSION= 2.5.5 DISTVERSIONPREFIX= v CATEGORIES= www @@ -12,10 +12,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libxxhash.so:devel/xxhash -USES= cmake compiler:c11 +USES= cmake compiler:c11 pathfix pkgconfig -CMAKE_OFF= LSQPACK_TESTS -CMAKE_ON= BUILD_SHARED_LIBS LSQPACK_BIN LSQPACK_XXH +CMAKE_OFF= LSQPACK_TESTS LSQPACK_XXH +CMAKE_ON= BUILD_SHARED_LIBS LSQPACK_BIN GH_ACCOUNT= litespeedtech USE_GITHUB= yes @@ -24,14 +24,7 @@ post-patch: # Clean up bundled libraries @${RM} -r ${WRKSRC}/deps/ -do-install: - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/encode-int ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/fuzz-decode ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/interop-decode ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/interop-encode ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/huff-tables.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_DATA} ${WRKSRC}/lsqpack.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_DATA} ${WRKSRC}/lsxpack_header.h ${STAGEDIR}${PREFIX}/include/ - ${INSTALL_LIB} ${INSTALL_WRKSRC}/libls-qpack.so ${STAGEDIR}${PREFIX}/lib/ +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include <bsd.port.mk> diff --git a/www/ls-qpack/distinfo b/www/ls-qpack/distinfo index c1f93052c0ec..8853f2544ac9 100644 --- a/www/ls-qpack/distinfo +++ b/www/ls-qpack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1703227824 -SHA256 (litespeedtech-ls-qpack-v2.5.4_GH0.tar.gz) = 56b96190a1943d75ef8d384b13cd4592a72e3e2d84284f78d7f8adabbc717f3e -SIZE (litespeedtech-ls-qpack-v2.5.4_GH0.tar.gz) = 708563 +TIMESTAMP = 1726487326 +SHA256 (litespeedtech-ls-qpack-v2.5.5_GH0.tar.gz) = 71c95067e99bb5e889119bd6208fe2b03a0b9b8f386ef5f3bbcb9e3765bcf0cb +SIZE (litespeedtech-ls-qpack-v2.5.5_GH0.tar.gz) = 709160 diff --git a/www/ls-qpack/files/patch-CMakeLists.txt b/www/ls-qpack/files/patch-CMakeLists.txt deleted file mode 100644 index 709abdba2ba1..000000000000 --- a/www/ls-qpack/files/patch-CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt.orig 2020-05-28 18:23:09 UTC -+++ CMakeLists.txt -@@ -20,9 +20,11 @@ add_library(ls-qpack "") - target_include_directories(ls-qpack PUBLIC .) - target_sources(ls-qpack PRIVATE lsqpack.c) - --target_include_directories(ls-qpack PRIVATE deps/xxhash/) - if(LSQPACK_XXH) -- target_sources(ls-qpack PRIVATE deps/xxhash/xxhash.c) -+ find_path(XXHASH_INCLUDE_DIR xxhash.h) -+ find_library(XXHASH_LIBRARY xxhash) -+ include_directories(${XXHASH_INCLUDE_DIR}) -+ link_libraries(${XXHASH_LIBRARY}) - endif() - - if(MSVC) diff --git a/www/ls-qpack/files/patch-bin-CMakeLists.txt b/www/ls-qpack/files/patch-bin-CMakeLists.txt deleted file mode 100644 index 552f48834ceb..000000000000 --- a/www/ls-qpack/files/patch-bin-CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- bin/CMakeLists.txt.orig 2020-05-28 18:23:09 UTC -+++ bin/CMakeLists.txt -@@ -2,8 +2,7 @@ function(lsqpack_add_executable TARGET) - add_executable(${TARGET} "") - target_link_libraries(${TARGET} PRIVATE ls-qpack) - -- target_sources(${TARGET} PRIVATE ${TARGET}.c ../deps/xxhash/xxhash.c) -- target_include_directories(${TARGET} PRIVATE ../deps/xxhash) -+ target_sources(${TARGET} PRIVATE ${TARGET}.c) - - if(MSVC) - target_include_directories(${TARGET} PRIVATE ../wincompat) diff --git a/www/ls-qpack/files/patch-bin-interop-decode.c b/www/ls-qpack/files/patch-bin-interop-decode.c deleted file mode 100644 index 58e3379c6b95..000000000000 --- a/www/ls-qpack/files/patch-bin-interop-decode.c +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/interop-decode.c.orig 2020-05-28 18:23:09 UTC -+++ bin/interop-decode.c -@@ -41,7 +41,7 @@ - - #include "lsqpack.h" - #include "lsxpack_header.h" --#include "xxhash.h" -+#include <xxhash.h> - #ifndef DEBUG - #include "lsqpack-test.h" - #endif diff --git a/www/ls-qpack/pkg-plist b/www/ls-qpack/pkg-plist index 4e2554ae262d..e5d7cbb6de66 100644 --- a/www/ls-qpack/pkg-plist +++ b/www/ls-qpack/pkg-plist @@ -2,7 +2,11 @@ bin/encode-int bin/fuzz-decode bin/interop-decode bin/interop-encode -include/huff-tables.h include/lsqpack.h include/lsxpack_header.h +lib/cmake/ls-qpack/ls-qpack-config-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ls-qpack/ls-qpack-config.cmake lib/libls-qpack.so +lib/libls-qpack.so.2 +lib/libls-qpack.so.2.5.3 +libdata/pkgconfig/lsqpack.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409180619.48I6J514032687>