Skip to content

Commit 8f4c06d

Browse files
Address review feedback: bump vcpkg and bundled Brotli to 1.2.1
- Bump the vcpkg pin (.env, cpp/vcpkg.json, c_glib/vcpkg.json) to 61d7eaeb, the upstream commit that updates the brotli port to 1.2.1, and drop the brotli hunk from ci/vcpkg/ports.patch. - Drop the llvm hunk from ci/vcpkg/ports.patch: upstream restructured the port and the hunk no longer applies. - Revert the PYTHON_WHEEL_WINDOWS_IMAGE_REVISION bump; the image tag already changes with VCPKG. - Bump the bundled Brotli to v1.2.1. Brotli >= 1.1.0 names static libraries without the "-static" suffix and installs normally on Emscripten, so update build_brotli accordingly and stop building the CLI tool and tests. - Revert the Meson wrap changes; the C++ Meson build isn't used for any released artifact, so keep tracking WrapDB. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 747092e commit 8f4c06d

9 files changed

Lines changed: 23 additions & 260 deletions

File tree

‎.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ TZ=UTC
9292
# Used through compose.yaml and serves as the default version for the
9393
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9494
# docker tags more readable.
95-
VCPKG="9b965a116838c6cdcd36bca60d1b81b030c8ab8d" # 2026.05.27 (not release, upstream commit)
95+
VCPKG="61d7eaeb094a6acbc23d9c2e54de9208175fda47" # 2026.10.24 (not release, upstream commit)
9696

9797
# This must be updated when we update
9898
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
9999
# This is a workaround for our CI problem that "archery docker build" doesn't
100100
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
101-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-10-23
101+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-10-11
102102
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-11-11
103103

‎c_glib/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
"pkgconf"
88
],
99
"$comment": "We can update builtin-baseline by 'vcpkg x-update-baseline'",
10-
"builtin-baseline": "9b965a116838c6cdcd36bca60d1b81b030c8ab8d"
10+
"builtin-baseline": "61d7eaeb094a6acbc23d9c2e54de9208175fda47"
1111
}

‎ci/vcpkg/ports.patch‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,3 @@
1-
diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake
2-
index e55c69c3d1..7d7cb1d67e 100644
3-
--- a/ports/brotli/portfile.cmake
4-
+++ b/ports/brotli/portfile.cmake
5-
@@ -2,7 +2,7 @@ vcpkg_from_github(
6-
OUT_SOURCE_PATH SOURCE_PATH
7-
REPO google/brotli
8-
REF v${VERSION} # v1.1.0
9-
- SHA512 f94542afd2ecd96cc41fd21a805a3da314281ae558c10650f3e6d9ca732b8425bba8fde312823f0a564c7de3993bdaab5b43378edab65ebb798cefb6fd702256
10-
+ SHA512 460591287d428c8b5a8a2766b5b424d14501fcda12c7118b8f3cc4bfae44b90ac75ca156557f07b6e22542612724d904533e5f70019be07dbbb604c46f03ab69
11-
HEAD_REF master
12-
PATCHES
13-
install.patch
14-
diff --git a/ports/brotli/vcpkg.json b/ports/brotli/vcpkg.json
15-
index c5bf679166..abaeb1caa8 100644
16-
--- a/ports/brotli/vcpkg.json
17-
+++ b/ports/brotli/vcpkg.json
18-
@@ -1,6 +1,6 @@
19-
{
20-
"name": "brotli",
21-
- "version": "1.2.0",
22-
+ "version": "1.2.1",
23-
"description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.",
24-
"homepage": "https://github.com/google/brotli",
25-
"license": "MIT",
261
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
272
index 73f5aece46..68cdb3966f 100644
283
--- a/ports/curl/portfile.cmake
@@ -44,19 +19,6 @@ index 73f5aece46..68cdb3966f 100644
4419
)
4520
vcpkg_cmake_install()
4621
vcpkg_copy_pdbs()
47-
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
48-
index 7764357a6d..da7374ecec 100644
49-
--- a/ports/llvm/portfile.cmake
50-
+++ b/ports/llvm/portfile.cmake
51-
@@ -302,6 +302,8 @@ vcpkg_cmake_configure(
52-
${FEATURE_OPTIONS}
53-
MAYBE_UNUSED_VARIABLES
54-
COMPILER_RT_ENABLE_IOS
55-
+ BOLT_TOOLS_INSTALL_DIR
56-
+ LIBOMP_INSTALL_ALIASES
57-
)
58-
59-
vcpkg_cmake_install(ADD_BIN_TO_PATH)
6022
diff --git a/ports/orc/orc-fix-exception-propagation.diff b/ports/orc/orc-fix-exception-propagation.diff
6123
new file mode 100644
6224
index 0000000000..25568e70cd

‎cpp/cmake_modules/ThirdpartyToolchain.cmake‎

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,36 +1540,19 @@ macro(build_brotli)
15401540
set(BROTLI_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/brotli_ep/src/brotli_ep-install")
15411541
set(BROTLI_INCLUDE_DIR "${BROTLI_PREFIX}/include")
15421542
set(BROTLI_LIB_DIR "${BROTLI_PREFIX}/lib")
1543+
# Brotli >= 1.1.0 names its static libraries without a "-static"
1544+
# suffix when BUILD_SHARED_LIBS=OFF.
15431545
set(BROTLI_STATIC_LIBRARY_ENC
1544-
"${BROTLI_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
1546+
"${BROTLI_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc${CMAKE_STATIC_LIBRARY_SUFFIX}"
15451547
)
15461548
set(BROTLI_STATIC_LIBRARY_DEC
1547-
"${BROTLI_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
1549+
"${BROTLI_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec${CMAKE_STATIC_LIBRARY_SUFFIX}"
15481550
)
15491551
set(BROTLI_STATIC_LIBRARY_COMMON
1550-
"${BROTLI_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
1552+
"${BROTLI_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon${CMAKE_STATIC_LIBRARY_SUFFIX}"
15511553
)
1552-
set(BROTLI_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${BROTLI_PREFIX}")
1553-
1554-
set(BROTLI_EP_OPTIONS)
1555-
if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
1556-
# "cmake install" is disabled for Brotli on Emscripten, so the
1557-
# default INSTALL_COMMAND fails. We need to disable the default
1558-
# INSTALL_COMMAND.
1559-
list(APPEND
1560-
BROTLI_EP_OPTIONS
1561-
INSTALL_COMMAND
1562-
${CMAKE_COMMAND}
1563-
-E
1564-
true)
1565-
1566-
set(BROTLI_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/brotli_ep-prefix/src/brotli_ep-build)
1567-
set(BROTLI_BUILD_LIBS
1568-
"${BROTLI_BUILD_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
1569-
"${BROTLI_BUILD_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
1570-
"${BROTLI_BUILD_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
1571-
)
1572-
endif()
1554+
set(BROTLI_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${BROTLI_PREFIX}"
1555+
-DBROTLI_BUILD_TOOLS=OFF -DBROTLI_DISABLE_TESTS=ON)
15731556

15741557
externalproject_add(brotli_ep
15751558
${EP_COMMON_OPTIONS}
@@ -1578,22 +1561,8 @@ macro(build_brotli)
15781561
BUILD_BYPRODUCTS "${BROTLI_STATIC_LIBRARY_ENC}"
15791562
"${BROTLI_STATIC_LIBRARY_DEC}"
15801563
"${BROTLI_STATIC_LIBRARY_COMMON}"
1581-
${BROTLI_BUILD_BYPRODUCTS}
15821564
CMAKE_ARGS ${BROTLI_CMAKE_ARGS}
1583-
STEP_TARGETS headers_copy ${BROTLI_EP_OPTIONS})
1584-
1585-
if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
1586-
# Copy the libraries to our install directory manually.
1587-
set(BROTLI_BUILD_INCLUDE_DIR
1588-
${CMAKE_CURRENT_BINARY_DIR}/brotli_ep-prefix/src/brotli_ep/c/include/brotli)
1589-
add_custom_command(TARGET brotli_ep
1590-
POST_BUILD
1591-
COMMAND ${CMAKE_COMMAND} -E copy_if_different
1592-
${BROTLI_BUILD_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}*${CMAKE_STATIC_LIBRARY_SUFFIX}
1593-
${BROTLI_LIB_DIR}
1594-
COMMAND ${CMAKE_COMMAND} -E copy_directory
1595-
${BROTLI_BUILD_INCLUDE_DIR} ${BROTLI_INCLUDE_DIR}/brotli)
1596-
endif()
1565+
STEP_TARGETS headers_copy)
15971566

15981567
file(MAKE_DIRECTORY "${BROTLI_INCLUDE_DIR}")
15991568

‎cpp/subprojects/google-brotli.wrap‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@
1616
# under the License.
1717

1818
[wrap-file]
19-
directory = brotli-1.1.1
20-
source_url = https://github.com/google/brotli/archive/v1.1.1.tar.gz
21-
source_filename = v1.1.1.tar.gz
22-
source_hash = 1a84dfaa740994d19254bf78aa7d74a4a8040d1638f3d5f2cdecb188fd520da8
23-
patch_directory = google-brotli
19+
directory = brotli-1.1.0
20+
source_url = https://github.com/google/brotli/archive/v1.1.0.tar.gz
21+
source_filename = v1.1.0.tar.gz
22+
source_hash = e720a6ca29428b803f4ad165371771f5398faba397edf6778837a18599ea13ff
23+
patch_filename = google-brotli_1.1.0-1_patch.zip
24+
patch_url = https://wrapdb.mesonbuild.com/v2/google-brotli_1.1.0-1/get_patch
25+
patch_hash = 6826873a148c670d90a80715a7083284da7e19d59cda6a135fae6774411914dc
26+
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/google-brotli_1.1.0-1/v1.1.0.tar.gz
27+
wrapdb_version = 1.1.0-1
2428

2529
[provide]
2630
libbrotlicommon = brotli_common_dep

‎cpp/subprojects/packagefiles/google-brotli/LICENSE.build‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎cpp/subprojects/packagefiles/google-brotli/meson.build‎

Lines changed: 0 additions & 153 deletions
This file was deleted.

‎cpp/thirdparty/versions.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ ARROW_AZURE_SDK_BUILD_VERSION=azure-identity_1.9.0
5858
ARROW_AZURE_SDK_BUILD_SHA256_CHECKSUM=97065bfc971ac8df450853ce805f820f52b59457bd7556510186a1569502e4a1
5959
ARROW_BOOST_BUILD_VERSION=1.92.0
6060
ARROW_BOOST_BUILD_SHA256_CHECKSUM=f51707c27359a0df0cac1beada86de31bb5eed5e8285592dadec384df99c2984
61-
ARROW_BROTLI_BUILD_VERSION=v1.0.10
62-
ARROW_BROTLI_BUILD_SHA256_CHECKSUM=b517ebdb5266b963d28d6e639b973479874ec72086deb6ee4a2d639e1b13606b
61+
ARROW_BROTLI_BUILD_VERSION=v1.2.1
62+
ARROW_BROTLI_BUILD_SHA256_CHECKSUM=98d35d11a78dc453aebb7d10c3748f3f73ff78c8267c0dc697b8631f67bf7e8f
6363
ARROW_BZIP2_BUILD_VERSION=1.0.8
6464
ARROW_BZIP2_BUILD_SHA256_CHECKSUM=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
6565
ARROW_CARES_BUILD_VERSION=1.34.6

‎cpp/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@
5959
"zstd"
6060
],
6161
"$comment": "We can update builtin-baseline by 'vcpkg x-update-baseline'",
62-
"builtin-baseline": "9b965a116838c6cdcd36bca60d1b81b030c8ab8d"
62+
"builtin-baseline": "61d7eaeb094a6acbc23d9c2e54de9208175fda47"
6363
}

0 commit comments

Comments
 (0)