Date: Sun, 16 Nov 2025 01:34:34 GMT From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bbf491027c2b - main - archivers/brotli: update 1.1.0 -> 1.2.0 Message-ID: <202511160134.5AG1YYGZ003546@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbf491027c2b48691b28f7568e334f807c639bd0 commit bbf491027c2b48691b28f7568e334f807c639bd0 Author: Sergey A. Osokin <osa@FreeBSD.org> AuthorDate: 2025-11-16 01:31:00 +0000 Commit: Sergey A. Osokin <osa@FreeBSD.org> CommitDate: 2025-11-16 01:31:00 +0000 archivers/brotli: update 1.1.0 -> 1.2.0 ChangeLog: https://github.com/google/brotli/compare/v1.1.0...v1.2.0 Reported by: diizzy Reviewed by: sunpoet, diizzy PR: 290637 Sponsored by: tipi.work --- archivers/brotli/Makefile | 18 +++++++----- archivers/brotli/distinfo | 10 +++---- archivers/brotli/files/extra-patch-static-libs | 40 -------------------------- archivers/brotli/files/patch-CMakeLists.txt | 11 +++++++ 4 files changed, 27 insertions(+), 52 deletions(-) diff --git a/archivers/brotli/Makefile b/archivers/brotli/Makefile index 9878b7513768..6e77060e2902 100644 --- a/archivers/brotli/Makefile +++ b/archivers/brotli/Makefile @@ -1,11 +1,11 @@ PORTNAME= brotli DISTVERSIONPREFIX= v -DISTVERSION= 1.1.0 +DISTVERSION= 1.2.0 PORTEPOCH= 1 CATEGORIES= archivers devel - -PATCH_SITES= https://github.com/google/${PORTNAME}/commit/ -PATCHFILES= 741610efd335a8b6ff9be4c9bed643e0a74fdb6a.patch:-p1 +MASTER_SITES+= https://github.com/google/${PORTNAME}/releases/download/${DISTVERSIONFULL}/ +DISTFILES+= testdata.txz +DIST_SUBDIR= ${PORTNAME}/${DISTVERSION} MAINTAINER= osa@FreeBSD.org COMMENT= Generic-purpose lossless compression algorithm @@ -14,7 +14,7 @@ WWW= https://github.com/google/brotli LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= cmake:testing cpe pkgconfig +USES= cmake cpe pathfix CPE_VENDOR= google USE_LDCONFIG= yes @@ -23,12 +23,16 @@ GH_ACCOUNT= google PLIST_SUB= SHLIBVER=${DISTVERSION:R} -CMAKE_OFF= BUILD_TESTING +TEST_TARGET= test + CMAKE_ARGS= -DSHARE_INSTALL_PREFIX=share OPTIONS_DEFINE= STATIC OPTIONS_SUB= yes -STATIC_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-static-libs +STATIC_CMAKE_BOOL= BROTLI_BUILD_FOR_PACKAGE + +post-extract: + ${MV} ${WRKDIR}/tests/testdata/* ${WRKSRC}/tests/testdata/ .include <bsd.port.mk> diff --git a/archivers/brotli/distinfo b/archivers/brotli/distinfo index 9adf1b378f4a..bf61b532f163 100644 --- a/archivers/brotli/distinfo +++ b/archivers/brotli/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1736034427 -SHA256 (google-brotli-v1.1.0_GH0.tar.gz) = e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff -SIZE (google-brotli-v1.1.0_GH0.tar.gz) = 511969 -SHA256 (741610efd335a8b6ff9be4c9bed643e0a74fdb6a.patch) = 99ccada03a1c0ac09a93d14c81a5c2ee7bf4563aaafacc290a5070503dc60c1b -SIZE (741610efd335a8b6ff9be4c9bed643e0a74fdb6a.patch) = 1024 +TIMESTAMP = 1761638001 +SHA256 (brotli/1.2.0/testdata.txz) = e8624d888f13067e7635353397cf42956bf4ca1382da67f9cec8d43e800deecb +SIZE (brotli/1.2.0/testdata.txz) = 3830712 +SHA256 (brotli/1.2.0/google-brotli-v1.2.0_GH0.tar.gz) = 816c96e8e8f193b40151dad7e8ff37b1221d019dbcb9c35cd3fadbfe6477dfec +SIZE (brotli/1.2.0/google-brotli-v1.2.0_GH0.tar.gz) = 646315 diff --git a/archivers/brotli/files/extra-patch-static-libs b/archivers/brotli/files/extra-patch-static-libs deleted file mode 100644 index 857fb4515bdf..000000000000 --- a/archivers/brotli/files/extra-patch-static-libs +++ /dev/null @@ -1,40 +0,0 @@ ---- CMakeLists.txt.orig 2023-08-21 13:36:24 UTC -+++ CMakeLists.txt -@@ -122,12 +122,15 @@ endif() - - file(GLOB_RECURSE BROTLI_COMMON_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} c/common/*.c) - add_library(brotlicommon ${BROTLI_COMMON_SOURCES}) -+add_library(brotlicommonstatic STATIC ${BROTLI_COMMON_SOURCES}) - - file(GLOB_RECURSE BROTLI_DEC_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} c/dec/*.c) - add_library(brotlidec ${BROTLI_DEC_SOURCES}) -+add_library(brotlidecstatic STATIC ${BROTLI_DEC_SOURCES}) - - file(GLOB_RECURSE BROTLI_ENC_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} c/enc/*.c) - add_library(brotlienc ${BROTLI_ENC_SOURCES}) -+add_library(brotliencstatic STATIC ${BROTLI_ENC_SOURCES}) - - # Older CMake versions does not understand INCLUDE_DIRECTORIES property. - include_directories(${BROTLI_INCLUDE_DIRS}) -@@ -152,6 +155,10 @@ foreach(lib ${BROTLI_LIBRARIES_CORE}) - set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>") - endforeach() - -+set_property(TARGET brotlicommonstatic PROPERTY OUTPUT_NAME brotlicommon) -+set_property(TARGET brotlidecstatic PROPERTY OUTPUT_NAME brotlidec) -+set_property(TARGET brotliencstatic PROPERTY OUTPUT_NAME brotlienc) -+ - if(NOT BROTLI_EMSCRIPTEN) - target_link_libraries(brotlidec brotlicommon) - target_link_libraries(brotlienc brotlicommon) -@@ -185,7 +192,9 @@ if(NOT BROTLI_BUNDLED_MODE) - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) -- -+ install(TARGETS brotlicommonstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ install(TARGETS brotlidecstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ install(TARGETS brotliencstatic ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") - install( - DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli - DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" diff --git a/archivers/brotli/files/patch-CMakeLists.txt b/archivers/brotli/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..c385c8a8cab8 --- /dev/null +++ b/archivers/brotli/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2025-10-27 13:07:48 UTC ++++ CMakeLists.txt +@@ -153,6 +153,8 @@ foreach(lib ${BROTLI_SHARED_LIBRARIES} ${BROTLI_STATIC + foreach(lib ${BROTLI_SHARED_LIBRARIES} ${BROTLI_STATIC_LIBRARIES}) + target_link_libraries(${lib} ${LIBM_LIBRARY}) + set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS}) ++ string(REGEX REPLACE "-static$" "" lib_base "${lib}") ++ set_property(TARGET ${lib} PROPERTY OUTPUT_NAME ${lib_base}) + set_target_properties(${lib} PROPERTIES + VERSION "${BROTLI_ABI_COMPATIBILITY}.${BROTLI_ABI_AGE}.${BROTLI_ABI_REVISION}" + SOVERSION "${BROTLI_ABI_COMPATIBILITY}")home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511160134.5AG1YYGZ003546>