diff --git a/ports/arrow/0002-thrift.patch b/ports/arrow/0002-thrift.patch deleted file mode 100644 index 7c81e23dba..0000000000 --- a/ports/arrow/0002-thrift.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cpp/cmake_modules/FindThriftAlt.cmake b/cpp/cmake_modules/FindThriftAlt.cmake -index f3e4902..65ceac8 100644 ---- a/cpp/cmake_modules/FindThriftAlt.cmake -+++ b/cpp/cmake_modules/FindThriftAlt.cmake -@@ -45,7 +45,7 @@ endif() - # * https://github.com/apache/thrift/pull/2725 - # * https://github.com/apache/thrift/pull/2726 - # * https://github.com/conda-forge/thrift-cpp-feedstock/issues/68 --if(NOT WIN32) -+ - set(find_package_args "") - if(ThriftAlt_FIND_VERSION) - list(APPEND find_package_args ${ThriftAlt_FIND_VERSION}) -@@ -61,7 +61,7 @@ if(NOT WIN32) - "${THRIFT_COMPILER}") - return() - endif() --endif() -+ - - function(extract_thrift_version) - if(ThriftAlt_INCLUDE_DIR) diff --git a/ports/arrow/0003-utf8proc.patch b/ports/arrow/0002-utf8proc.patch similarity index 100% rename from ports/arrow/0003-utf8proc.patch rename to ports/arrow/0002-utf8proc.patch diff --git a/ports/arrow/0004-android-musl.patch b/ports/arrow/0003-android-musl.patch similarity index 100% rename from ports/arrow/0004-android-musl.patch rename to ports/arrow/0003-android-musl.patch diff --git a/ports/arrow/0005-android-datetime.patch b/ports/arrow/0004-android-datetime.patch similarity index 100% rename from ports/arrow/0005-android-datetime.patch rename to ports/arrow/0004-android-datetime.patch diff --git a/ports/arrow/0006-cmake-msvcruntime.patch b/ports/arrow/0005-cmake-msvcruntime.patch similarity index 100% rename from ports/arrow/0006-cmake-msvcruntime.patch rename to ports/arrow/0005-cmake-msvcruntime.patch diff --git a/ports/arrow/0007-fix-path.patch b/ports/arrow/0007-fix-path.patch deleted file mode 100644 index af2baa5e85..0000000000 --- a/ports/arrow/0007-fix-path.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake -index 978f03198..3a6f36350 100644 ---- a/cpp/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake -@@ -975,9 +975,11 @@ set(EP_COMMON_CMAKE_ARGS - - # Enable s/ccache if set by parent. - if(CMAKE_C_COMPILER_LAUNCHER AND CMAKE_CXX_COMPILER_LAUNCHER) -+ file(TO_CMAKE_PATH "${CMAKE_C_COMPILER_LAUNCHER}" EP_CMAKE_C_COMPILER_LAUNCHER) -+ file(TO_CMAKE_PATH "${CMAKE_CXX_COMPILER_LAUNCHER}" EP_CMAKE_CXX_COMPILER_LAUNCHER) - list(APPEND EP_COMMON_CMAKE_ARGS -- -DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER} -- -DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}) -+ -DCMAKE_C_COMPILER_LAUNCHER=${EP_CMAKE_C_COMPILER_LAUNCHER} -+ -DCMAKE_CXX_COMPILER_LAUNCHER=${EP_CMAKE_CXX_COMPILER_LAUNCHER}) - endif() - - if(NOT ARROW_VERBOSE_THIRDPARTY_BUILD) diff --git a/ports/arrow/0008-arrow-parquet-size-statistics-include.patch b/ports/arrow/0008-arrow-parquet-size-statistics-include.patch deleted file mode 100644 index 7df9e7ffaa..0000000000 --- a/ports/arrow/0008-arrow-parquet-size-statistics-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cpp/src/parquet/size_statistics.cc b/cpp/src/parquet/size_statistics.cc -index 1ce6c937ad..618e670b5a 100644 ---- a/cpp/src/parquet/size_statistics.cc -+++ b/cpp/src/parquet/size_statistics.cc -@@ -18,6 +18,7 @@ - #include "parquet/size_statistics.h" - - #include -+#include - #include - #include - #include diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 954b9bbfd4..2fdeaa5d7b 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -2,20 +2,17 @@ vcpkg_download_distfile( ARCHIVE_PATH URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz" FILENAME apache-arrow-${VERSION}.tar.gz - SHA512 524187c6f12bbb677b5d4a53e1608c69b56c83a5c8667bfe82d5a10232c33f151a8a7b5e6e26af48d1e0ca25a5d3dc885b27d9b5e798c7e07f115df8f0779516 + SHA512 067e62d7d311cebfca43473b0aacaacc534da47c3450b75328517df69281d8be1e79b0430cc7e975eb613e05c62a62d6ca92a4c4f7882ae7733f826d774d9081 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE ${ARCHIVE_PATH} PATCHES 0001-msvc-static-name.patch - 0002-thrift.patch - 0003-utf8proc.patch - 0004-android-musl.patch - 0005-android-datetime.patch - 0006-cmake-msvcruntime.patch - 0007-fix-path.patch # From https://github.com/apache/arrow/issues/39023#issuecomment-1835390089 - 0008-arrow-parquet-size-statistics-include.patch + 0002-utf8proc.patch + 0003-android-musl.patch + 0004-android-datetime.patch + 0005-cmake-msvcruntime.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 6b979f81aa..479d6b9f02 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "arrow", - "version": "19.0.1", + "version": "20.0.0", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", diff --git a/ports/rerun-sdk/arrow-20-fix.diff b/ports/rerun-sdk/arrow-20-fix.diff new file mode 100644 index 0000000000..1fb4d6e573 --- /dev/null +++ b/ports/rerun-sdk/arrow-20-fix.diff @@ -0,0 +1,23 @@ +diff --git a/src/rerun/time_column.cpp b/src/rerun/time_column.cpp +index 91fd6f9..8777d8e 100644 +--- a/src/rerun/time_column.cpp ++++ b/src/rerun/time_column.cpp +@@ -4,6 +4,7 @@ + #include "c/rerun.h" + + #include ++#include + #include + #include + +@@ -20,7 +21,9 @@ namespace rerun { + // which may or may not be another copy (if the collection already owns the data this is just a move). + auto length = static_cast(times.size()); + auto buffer = arrow_buffer_from_vector(std::move(times).to_vector()); +- array = std::make_shared(datatype, length, buffer); ++ auto buffers = std::vector>{nullptr, buffer}; ++ auto array_data = std::make_shared(datatype, length, std::move(buffers)); ++ array = arrow::MakeArray(array_data); + } + + TimeColumn TimeColumn::from_nanoseconds( diff --git a/ports/rerun-sdk/portfile.cmake b/ports/rerun-sdk/portfile.cmake index c5b824375c..c300b9de0b 100644 --- a/ports/rerun-sdk/portfile.cmake +++ b/ports/rerun-sdk/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive( PATCHES arrow-use-built-linkage.diff # https://github.com/rerun-io/rerun/pull/9550 arrow-use-find-dependency.diff # https://github.com/rerun-io/rerun/pull/9548 + arrow-20-fix.diff # https://github.com/rerun-io/rerun/commit/d620a649c18d333b02682b190d2b1b656b800746 ) vcpkg_cmake_configure( diff --git a/ports/rerun-sdk/vcpkg.json b/ports/rerun-sdk/vcpkg.json index ddd9f2f6f7..abe461fffe 100644 --- a/ports/rerun-sdk/vcpkg.json +++ b/ports/rerun-sdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rerun-sdk", "version": "0.22.1", + "port-version": 1, "description": "Open source log handling and visualization for spatial and embodied AI. Managed infrastructure to ingest, store, analyze, and stream data at scale with built-in visual debugging. Fast, flexible, and easy to use.", "homepage": "https://rerun.io", "license": "MIT OR Apache-2.0", diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 3c6f349eb7..ae1daa78a8 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -635,7 +635,16 @@ arrayfire[cuda]:x64-windows-static = cascade arrayfire[cuda]:x64-windows-static-md = cascade arrayfire[opencl](uwp) = cascade arrow:x64-uwp = cascade -arrow[cuda](osx) = cascade +arrow[cuda]:x64-linux = feature-fails +arrow[cuda]:x64-windows = feature-fails +arrow[cuda]:x64-windows-release = feature-fails +arrow[cuda]:x64-windows-static = feature-fails +arrow[cuda]:x64-windows-static-md = feature-fails +arrow[cuda](!(windows & x64 & !uwp & !xbox) & !(linux & x64) & !(linux & arm64)) = cascade +arrow[mimalloc]:x64-windows-static-md = feature-fails +arrow[orc]:arm64-android = cascade +arrow[orc]:x64-android = cascade +arrow[orc]:x64-windows = feature-fails asio[coroutine]:arm64-uwp = cascade asio[coroutine]:arm64-windows = cascade asio[coroutine]:x64-uwp = cascade @@ -1925,6 +1934,7 @@ realsense2[openni2]:x64-windows-static = cascade realsense2[openni2](!windows) = cascade # cpkg-tool-lessmsi[core] only supports native & windows redis-plus-plus[async-std,async]:arm64-uwp = cascade redis-plus-plus[async-std,async]:x64-uwp = cascade +rerun-sdk:x64-uwp = cascade restc-cpp:arm64-uwp = cascade restc-cpp:arm64-windows = cascade restc-cpp:x64-uwp = cascade diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 0be92f2eb2..97859de9e6 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "307efc99a4626033510b9823a0205558547a53f5", + "version": "20.0.0", + "port-version": 0 + }, { "git-tree": "baa90a1de700d2ef44a9d17b7b587e4a48c9dd05", "version": "19.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index 4d33885486..736d243be1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -257,7 +257,7 @@ "port-version": 8 }, "arrow": { - "baseline": "19.0.1", + "baseline": "20.0.0", "port-version": 0 }, "arrow-adbc": { @@ -8190,7 +8190,7 @@ }, "rerun-sdk": { "baseline": "0.22.1", - "port-version": 0 + "port-version": 1 }, "rest-rpc": { "baseline": "0.12", diff --git a/versions/r-/rerun-sdk.json b/versions/r-/rerun-sdk.json index 8e95931e09..dfdbaed191 100644 --- a/versions/r-/rerun-sdk.json +++ b/versions/r-/rerun-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9b27cbf042a6738aeef9e6451a797aeef655ff2", + "version": "0.22.1", + "port-version": 1 + }, { "git-tree": "255644b917b0f72edaa87b2044b4f39773eac335", "version": "0.22.1",