From nobody Mon Sep 11 03:14:10 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RkWyq1Q5Qz4tGhH; Mon, 11 Sep 2023 03:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkWyp4LLbz3cF9; Mon, 11 Sep 2023 03:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694402050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cpYWo+bkQ+NX9t0bACioe9+D2Wsay4ct/wRrW3niArQ=; b=q66qEGgFk1UGx+KPgioNa1j7ESNvr6YRJXqyDCOTxyFpRX4WBp6bA/6wuhQ7bkIaLE0lzC Gp0a4M3/rLqlfGcUS2YdxYZXrtqO4THouian7DsaQ6abqNVweJRrzXKq3ssfZtlUMBh6F4 VoowsB6wfC2Hc7ge2AE0TbR42wAEmLyGvK1rnI2BX1mh8JIlWKLwnT//oYhOC870yyOT2l T+bxELyIDt4pJfedNVVhRu20khMZ0fdfN7Q3k3CXNdfhPpQYMU7hC18kxst7gcKcnzWkI/ QUQgZ8lx4UYBoqRBZkp9k/3aYC2TSvOe8OEkS3hJPbj16b+KgqbGODMZuTMdrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694402050; a=rsa-sha256; cv=none; b=cEwGJO5b4tZn/ttHiOPXLcmKSUvyItzblGG6c+xue9IYOYA1q02DTKyKNdIDe8bpRoncZ8 VQqyMVgmne3ARGiPHidNVIiSBM5K5LTX0PSR78TND1SauRKCSRQyaF3h3SV650kC8gx3uS HNgoIYRgNLBXmI5msh+qiGqCbEmsE0X9kNUwNibYvXcPQgJJEybF+TA+fLwqpBeiEe/FkT aS/bRYGK8uBUXlYpZ/CJZ5a2z4y3n0SH6+HDVIZ32UN1vPX/tQRM2epqLygQEtTybBow8g cnixO9bfDFltlSICFddr9rwqYplY8ljhxDIbolXRPpWqfwZOWAlppJj2B2QImg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694402050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cpYWo+bkQ+NX9t0bACioe9+D2Wsay4ct/wRrW3niArQ=; b=SsBDHrZEjFxImxPvDp4zHNeFNeu5SSGQxEupBJ6/IMAvaoKQPMUVsl6bWpSimFCdhTVXTr H4ceCZ0kQ5f+T+A+fC6jSO6cCZu4K1Y2IdFcoUt+l8zoDRY9t5yuR9IdqWGj5eY/FN2Kka YP2Uvsd8pPPGOAjmHOD7dm9qMG+KTnrBDZ5QW2brlUxC0J2sczTJ/TyOYpPiB94rqPRmek tbPTI7ywnqIkrLL02F69RrhHGP/N0TzB+G2Zk3Lu/jZdyrff9fUbrmrF/Xrd8fNP8jD1Ks 0bRa5WeenRYpgx11sMUAGjxMZnBYmygwlo4GsY/ynviZ24hYBODMzv4pbCeUXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RkWyp3KVVzYgc; Mon, 11 Sep 2023 03:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38B3EAdu022104; Mon, 11 Sep 2023 03:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38B3EAd3022101; Mon, 11 Sep 2023 03:14:10 GMT (envelope-from git) Date: Mon, 11 Sep 2023 03:14:10 GMT Message-Id: <202309110314.38B3EAd3022101@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 821a031c3986 - main - archivers/py-brotli: Update to 1.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 821a031c3986aed61bfaa368f140c182bc0dd70b Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=821a031c3986aed61bfaa368f140c182bc0dd70b commit 821a031c3986aed61bfaa368f140c182bc0dd70b Author: Po-Chuan Hsieh AuthorDate: 2023-09-11 03:08:05 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-11 03:08:05 +0000 archivers/py-brotli: Update to 1.1.0 - Convert to USE_PYTHON=pep517 Changes: https://github.com/google/brotli/releases --- archivers/py-brotli/Makefile | 18 +++++++--------- archivers/py-brotli/distinfo | 6 +++--- archivers/py-brotli/files/patch-MANIFEST.in | 19 +++++++++++++++++ archivers/py-brotli/files/patch-setup.py | 32 ++++++++++++++++------------- 4 files changed, 47 insertions(+), 28 deletions(-) diff --git a/archivers/py-brotli/Makefile b/archivers/py-brotli/Makefile index 6138c5a79e01..469fb77231b7 100644 --- a/archivers/py-brotli/Makefile +++ b/archivers/py-brotli/Makefile @@ -1,6 +1,5 @@ PORTNAME= brotli -PORTVERSION= 1.0.9 -PORTREVISION= 1 +PORTVERSION= 1.1.0 CATEGORIES= archivers python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,25 +12,22 @@ WWW= https://github.com/google/brotli LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= brotli>=${PORTVERSION}:archivers/brotli +BUILD_DEPENDS= brotli>=${PORTVERSION},1<${PORTVERSION}_99,1:archivers/brotli \ + ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libbrotlicommon.so:archivers/brotli -USES= compiler:c++0x cpe pkgconfig python shebangfix zip -USE_PYTHON= autoplist concurrent distutils +USES= cpe python +USE_PYTHON= autoplist concurrent pep517 CPE_VENDOR= google -SHEBANG_FILES= python/bro.py - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.py - @${MKDIR} ${WRKSRC}/common/ + @${MV} ${WRKSRC}/c/common/version.h ${WRKSRC}/ # Clean up bundled libraries @${RM} -r ${WRKSRC}/c/ -pre-configure: - @${PRINTF} "#define BROTLI_VERSION 0x%x%03x%03x\n" `pkgconf --modversion libbrotlicommon | sed 's|\.| |g'` > ${WRKSRC}/common/version.h - post-install: ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + diff --git a/archivers/py-brotli/distinfo b/archivers/py-brotli/distinfo index 96353356150e..47ce4f770c02 100644 --- a/archivers/py-brotli/distinfo +++ b/archivers/py-brotli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1598605172 -SHA256 (Brotli-1.0.9.zip) = 4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438 -SIZE (Brotli-1.0.9.zip) = 510202 +TIMESTAMP = 1694348256 +SHA256 (Brotli-1.1.0.tar.gz) = 81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724 +SIZE (Brotli-1.1.0.tar.gz) = 7372270 diff --git a/archivers/py-brotli/files/patch-MANIFEST.in b/archivers/py-brotli/files/patch-MANIFEST.in new file mode 100644 index 000000000000..7e2266d92276 --- /dev/null +++ b/archivers/py-brotli/files/patch-MANIFEST.in @@ -0,0 +1,19 @@ +--- 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 9f97287a706f..fae3c7a6665f 100644 --- a/archivers/py-brotli/files/patch-setup.py +++ b/archivers/py-brotli/files/patch-setup.py @@ -1,22 +1,23 @@ ---- setup.py.orig 2020-08-27 06:24:08 UTC +--- setup.py.orig 2023-09-07 13:16:56 UTC +++ setup.py -@@ -25,7 +25,7 @@ CURR_DIR = os.path.abspath(os.path.dirname(os.path.rea +@@ -35,7 +35,7 @@ def read_define(path, macro): def get_version(): - """ Return BROTLI_VERSION string as defined in 'common/version.h' file. """ -- version_file_path = os.path.join(CURR_DIR, 'c', 'common', 'version.h') -+ version_file_path = os.path.join(CURR_DIR, 'common', 'version.h') - version = 0 - with open(version_file_path, 'r') as f: - for line in f: -@@ -181,92 +181,17 @@ EXT_MODULES = [ + """ 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') +@@ -177,96 +177,17 @@ EXT_MODULES = [ '_brotli', sources=[ - 'python/_brotli.cc', + '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', @@ -29,6 +30,7 @@ - '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', @@ -48,6 +50,7 @@ - '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', @@ -66,6 +69,7 @@ - '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', @@ -99,13 +103,13 @@ ], include_dirs=[ - 'c/include', -+ '%%LOCALBASE%%/include', ++ '/usr/local/include', + ], + libraries=[ + 'brotlicommon', 'brotlidec', 'brotlienc', + ], + library_dirs=[ -+ '%%LOCALBASE%%/lib', - ], - language='c++'), ++ '/usr/local/lib', + ]), ] +