Date: Mon, 17 Nov 2025 16:01:54 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: ba641e09b817 - main - archivers/py-brotli: Update to 1.2.0 Message-ID: <202511171601.5AHG1sXV048846@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba641e09b817c181a7a3837a61347710eb826104 commit ba641e09b817c181a7a3837a61347710eb826104 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2025-11-17 14:07:23 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2025-11-17 16:01:46 +0000 archivers/py-brotli: Update to 1.2.0 - Simplify setup.py patch Changes: https://github.com/google/brotli/releases --- archivers/py-brotli/Makefile | 9 +- archivers/py-brotli/distinfo | 6 +- archivers/py-brotli/files/patch-MANIFEST.in | 19 ----- archivers/py-brotli/files/patch-setup.py | 125 ++-------------------------- 4 files changed, 14 insertions(+), 145 deletions(-) diff --git a/archivers/py-brotli/Makefile b/archivers/py-brotli/Makefile index 469fb77231b7..6ff560d669ca 100644 --- a/archivers/py-brotli/Makefile +++ b/archivers/py-brotli/Makefile @@ -1,9 +1,8 @@ PORTNAME= brotli -PORTVERSION= 1.1.0 +PORTVERSION= 1.2.0 CATEGORIES= archivers python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= Brotli-${PORTVERSION} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Generic-purpose lossless compression algorithm @@ -13,6 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= brotli>=${PORTVERSION},1<${PORTVERSION}_99,1:archivers/brotli \ + ${PYTHON_PKGNAMEPREFIX}pkgconfig>=0:devel/py-pkgconfig@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libbrotlicommon.so:archivers/brotli @@ -20,11 +20,12 @@ LIB_DEPENDS= libbrotlicommon.so:archivers/brotli USES= cpe python USE_PYTHON= autoplist concurrent pep517 +MAKE_ENV= USE_SYSTEM_BROTLI=1 + CPE_VENDOR= google post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.py - @${MV} ${WRKSRC}/c/common/version.h ${WRKSRC}/ + @${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/setup.py # Clean up bundled libraries @${RM} -r ${WRKSRC}/c/ diff --git a/archivers/py-brotli/distinfo b/archivers/py-brotli/distinfo index 47ce4f770c02..a710bf7e479b 100644 --- a/archivers/py-brotli/distinfo +++ b/archivers/py-brotli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1694348256 -SHA256 (Brotli-1.1.0.tar.gz) = 81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724 -SIZE (Brotli-1.1.0.tar.gz) = 7372270 +TIMESTAMP = 1762567689 +SHA256 (brotli-1.2.0.tar.gz) = e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a +SIZE (brotli-1.2.0.tar.gz) = 7388632 diff --git a/archivers/py-brotli/files/patch-MANIFEST.in b/archivers/py-brotli/files/patch-MANIFEST.in deleted file mode 100644 index 7e2266d92276..000000000000 --- a/archivers/py-brotli/files/patch-MANIFEST.in +++ /dev/null @@ -1,19 +0,0 @@ ---- MANIFEST.in.orig 2023-09-09 22:24:31 UTC -+++ MANIFEST.in -@@ -1,11 +1,4 @@ - include CONTRIBUTING.md --include c/common/*.c --include c/common/*.h --include c/dec/*.c --include c/dec/*.h --include c/enc/*.c --include c/enc/*.h --include c/include/brotli/*.h - include LICENSE - include MANIFEST.in - include python/_brotli.cc -@@ -16,4 +9,3 @@ include python/tests/* - include README.md - include setup.py - include tests/testdata/* --include c/tools/brotli.c diff --git a/archivers/py-brotli/files/patch-setup.py b/archivers/py-brotli/files/patch-setup.py index 47808c0d1135..2a06bb990889 100644 --- a/archivers/py-brotli/files/patch-setup.py +++ b/archivers/py-brotli/files/patch-setup.py @@ -1,124 +1,11 @@ ---- setup.py.orig 2023-09-07 13:16:56 UTC +--- setup.py.orig 2025-11-05 18:03:58 UTC +++ setup.py -@@ -35,7 +35,7 @@ def read_define(path, macro): +@@ -142,7 +142,7 @@ NAME = "brotli" - def get_version(): - """ Return library version string from 'common/version.h' file. """ -- version_file_path = os.path.join(CURR_DIR, 'c', 'common', 'version.h') -+ version_file_path = os.path.join(CURR_DIR, 'version.h') - major = read_define(version_file_path, 'BROTLI_VERSION_MAJOR') - minor = read_define(version_file_path, 'BROTLI_VERSION_MINOR') - patch = read_define(version_file_path, 'BROTLI_VERSION_PATCH') -@@ -128,7 +128,7 @@ class BuildExt(build_ext): - target_lang=language) + NAME = "brotli" +-VERSION = get_version() ++VERSION = "%%PORTVERSION%%" --NAME = 'Brotli' -+NAME = 'brotli' - - VERSION = get_version() - -@@ -177,96 +177,17 @@ EXT_MODULES = [ - '_brotli', - sources=[ - 'python/_brotli.c', -- 'c/common/constants.c', -- 'c/common/context.c', -- 'c/common/dictionary.c', -- 'c/common/platform.c', -- 'c/common/shared_dictionary.c', -- 'c/common/transform.c', -- 'c/dec/bit_reader.c', -- 'c/dec/decode.c', -- 'c/dec/huffman.c', -- 'c/dec/state.c', -- 'c/enc/backward_references.c', -- 'c/enc/backward_references_hq.c', -- 'c/enc/bit_cost.c', -- 'c/enc/block_splitter.c', -- 'c/enc/brotli_bit_stream.c', -- 'c/enc/cluster.c', -- 'c/enc/command.c', -- 'c/enc/compound_dictionary.c', -- 'c/enc/compress_fragment.c', -- 'c/enc/compress_fragment_two_pass.c', -- 'c/enc/dictionary_hash.c', -- 'c/enc/encode.c', -- 'c/enc/encoder_dict.c', -- 'c/enc/entropy_encode.c', -- 'c/enc/fast_log.c', -- 'c/enc/histogram.c', -- 'c/enc/literal_cost.c', -- 'c/enc/memory.c', -- 'c/enc/metablock.c', -- 'c/enc/static_dict.c', -- 'c/enc/utf8_util.c', - ], - depends=[ -- 'c/common/constants.h', -- 'c/common/context.h', -- 'c/common/dictionary.h', -- 'c/common/platform.h', -- 'c/common/shared_dictionary_internal.h', -- 'c/common/transform.h', -- 'c/common/version.h', -- 'c/dec/bit_reader.h', -- 'c/dec/huffman.h', -- 'c/dec/prefix.h', -- 'c/dec/state.h', -- 'c/enc/backward_references.h', -- 'c/enc/backward_references_hq.h', -- 'c/enc/backward_references_inc.h', -- 'c/enc/bit_cost.h', -- 'c/enc/bit_cost_inc.h', -- 'c/enc/block_encoder_inc.h', -- 'c/enc/block_splitter.h', -- 'c/enc/block_splitter_inc.h', -- 'c/enc/brotli_bit_stream.h', -- 'c/enc/cluster.h', -- 'c/enc/cluster_inc.h', -- 'c/enc/command.h', -- 'c/enc/compound_dictionary.h', -- 'c/enc/compress_fragment.h', -- 'c/enc/compress_fragment_two_pass.h', -- 'c/enc/dictionary_hash.h', -- 'c/enc/encoder_dict.h', -- 'c/enc/entropy_encode.h', -- 'c/enc/entropy_encode_static.h', -- 'c/enc/fast_log.h', -- 'c/enc/find_match_length.h', -- 'c/enc/hash.h', -- 'c/enc/hash_composite_inc.h', -- 'c/enc/hash_forgetful_chain_inc.h', -- 'c/enc/hash_longest_match64_inc.h', -- 'c/enc/hash_longest_match_inc.h', -- 'c/enc/hash_longest_match_quickly_inc.h', -- 'c/enc/hash_rolling_inc.h', -- 'c/enc/hash_to_binary_tree_inc.h', -- 'c/enc/histogram.h', -- 'c/enc/histogram_inc.h', -- 'c/enc/literal_cost.h', -- 'c/enc/memory.h', -- 'c/enc/metablock.h', -- 'c/enc/metablock_inc.h', -- 'c/enc/params.h', -- 'c/enc/prefix.h', -- 'c/enc/quality.h', -- 'c/enc/ringbuffer.h', -- 'c/enc/static_dict.h', -- 'c/enc/static_dict_lut.h', -- 'c/enc/utf8_util.h', -- 'c/enc/write_bits.h', - ], - include_dirs=[ -- 'c/include', -+ '%%LOCALBASE%%/include', -+ ], -+ libraries=[ -+ 'brotlicommon', 'brotlidec', 'brotlienc', -+ ], -+ library_dirs=[ -+ '%%LOCALBASE%%/lib', - ]), - ] + URL = "https://github.com/google/brotli"home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202511171601.5AHG1sXV048846>