git: 5016957296b9 - main - devel/apache-orc: Update to 2.2.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 29 Sep 2025 08:24:21 UTC
The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=5016957296b9bedc1fa9b20a7d5c19383449d6be commit 5016957296b9bedc1fa9b20a7d5c19383449d6be Author: Wen Heping <wen@FreeBSD.org> AuthorDate: 2025-09-29 08:23:34 +0000 Commit: Wen Heping <wen@FreeBSD.org> CommitDate: 2025-09-29 08:23:58 +0000 devel/apache-orc: Update to 2.2.0 --- devel/apache-orc/Makefile | 9 ++++----- devel/apache-orc/distinfo | 10 +++++----- .../files/patch-c++_test_TestConvertColumnReader.cc | 11 +++++++++++ .../patch-cmake__modules_ThirdpartyToolchain.cmake | 18 +++++++++--------- devel/apache-orc/pkg-plist | 10 ++++++++++ 5 files changed, 39 insertions(+), 19 deletions(-) diff --git a/devel/apache-orc/Makefile b/devel/apache-orc/Makefile index b3b3bd17cdf7..6cab4a902c24 100644 --- a/devel/apache-orc/Makefile +++ b/devel/apache-orc/Makefile @@ -1,12 +1,11 @@ PORTNAME= orc -DISTVERSION= 2.0.3 -PORTREVISION= 3 +DISTVERSION= 2.2.0 CATEGORIES= devel -MASTER_SITES= https://dlcdn.apache.org/orc/orc-2.0.3/:orc \ - https://archive.apache.org/dist/orc/orc-format-1.0.0/:orc_format +MASTER_SITES= https://dlcdn.apache.org/orc/orc-2.2.0/:orc \ + https://archive.apache.org/dist/orc/orc-format-1.1.0/:orc_format PKGNAMEPREFIX= apache- DISTFILES= ${PORTNAME}-${DISTVERSION}.tar.gz:orc \ - orc-format-1.0.0.tar.gz:orc_format + orc-format-1.1.0.tar.gz:orc_format MAINTAINER= wen@FreeBSD.org COMMENT= Smallest, fastest columnar storage for Hadoop workloads diff --git a/devel/apache-orc/distinfo b/devel/apache-orc/distinfo index c6c765130990..adda6a09dd27 100644 --- a/devel/apache-orc/distinfo +++ b/devel/apache-orc/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1734337150 -SHA256 (orc-2.0.3.tar.gz) = 082cba862b5a8a0d14c225404d0b51cd8d1b64ca81b8f1e500322ce8922cb86d -SIZE (orc-2.0.3.tar.gz) = 13353259 -SHA256 (orc-format-1.0.0.tar.gz) = 739fae5ff94b1f812b413077280361045bf92e510ef04b34a610e23a945d8cd5 -SIZE (orc-format-1.0.0.tar.gz) = 52569 +TIMESTAMP = 1759131441 +SHA256 (orc-2.2.0.tar.gz) = b15aca45a7e73ffbd1bbc36a78cd1422d41f07721092a25f43448e6e16f4763b +SIZE (orc-2.2.0.tar.gz) = 13433904 +SHA256 (orc-format-1.1.0.tar.gz) = d4a7ac76c5442abf7119e2cb84e71b677e075aff53518aa866055e2ead0450d7 +SIZE (orc-format-1.1.0.tar.gz) = 706048 diff --git a/devel/apache-orc/files/patch-c++_test_TestConvertColumnReader.cc b/devel/apache-orc/files/patch-c++_test_TestConvertColumnReader.cc new file mode 100644 index 000000000000..1b6a932c8c7b --- /dev/null +++ b/devel/apache-orc/files/patch-c++_test_TestConvertColumnReader.cc @@ -0,0 +1,11 @@ +--- c++/test/TestConvertColumnReader.cc.orig 2025-09-29 08:02:24 UTC ++++ c++/test/TestConvertColumnReader.cc +@@ -1019,7 +1019,7 @@ namespace orc { + auto h = second_in_day % (3600 * 24) / 3600; + auto min = second_in_day % 3600 / 60; + auto s = second_in_day % 60; +- std::snprintf(buffer, sizeof(buffer), "%04d-%02d-%02d %02ld:%02ld:%02ld", y, m, d, h, min, s); ++ std::snprintf(buffer, sizeof(buffer), "%04d-%02d-%02d %02ld:%02ld:%02ld", y, m, d, (long)h, (long)min, (long)s); + std::string result(buffer); + if (nanos) { + while (nanos % 10 == 0) nanos /= 10; diff --git a/devel/apache-orc/files/patch-cmake__modules_ThirdpartyToolchain.cmake b/devel/apache-orc/files/patch-cmake__modules_ThirdpartyToolchain.cmake index 124de3806523..dba1ab93cddd 100644 --- a/devel/apache-orc/files/patch-cmake__modules_ThirdpartyToolchain.cmake +++ b/devel/apache-orc/files/patch-cmake__modules_ThirdpartyToolchain.cmake @@ -1,11 +1,11 @@ ---- cmake_modules/ThirdpartyToolchain.cmake.orig 2024-12-16 03:22:53 UTC +--- cmake_modules/ThirdpartyToolchain.cmake.orig 2025-09-29 07:31:58 UTC +++ cmake_modules/ThirdpartyToolchain.cmake -@@ -72,7 +72,7 @@ ExternalProject_Add (orc-format_ep - # ---------------------------------------------------------------------- - # ORC Format +@@ -141,7 +141,7 @@ else() + set(ORC_FORMAT_SOURCE_URL "$ENV{ORC_FORMAT_URL}") + message(STATUS "Using ORC_FORMAT_URL: ${ORC_FORMAT_SOURCE_URL}") + else() +- set(ORC_FORMAT_SOURCE_URL "https://www.apache.org/dyn/closer.lua/orc/orc-format-${ORC_FORMAT_VERSION}/orc-format-${ORC_FORMAT_VERSION}.tar.gz?action=download" ) ++ set(ORC_FORMAT_SOURCE_URL "%%MYSITE%%/orc-format-${ORC_FORMAT_VERSION}.tar.gz" ) + message(STATUS "Using DEFAULT URL: ${ORC_FORMAT_SOURCE_URL}") + endif() ExternalProject_Add (orc-format_ep -- URL "https://archive.apache.org/dist/orc/orc-format-${ORC_FORMAT_VERSION}/orc-format-${ORC_FORMAT_VERSION}.tar.gz" -+ URL "%%MYSITE%%/orc-format-${ORC_FORMAT_VERSION}.tar.gz" - URL_HASH SHA256=739fae5ff94b1f812b413077280361045bf92e510ef04b34a610e23a945d8cd5 - CONFIGURE_COMMAND "" - BUILD_COMMAND "" diff --git a/devel/apache-orc/pkg-plist b/devel/apache-orc/pkg-plist index 54fa03c2e868..befdcd873ec8 100644 --- a/devel/apache-orc/pkg-plist +++ b/devel/apache-orc/pkg-plist @@ -10,6 +10,7 @@ include/orc/ColumnPrinter.hh include/orc/Common.hh include/orc/Exceptions.hh include/orc/Int128.hh +include/orc/Geospatial.hh include/orc/MemoryPool.hh include/orc/OrcFile.hh include/orc/Reader.hh @@ -22,3 +23,12 @@ include/orc/sargs/Literal.hh include/orc/sargs/SearchArgument.hh include/orc/sargs/TruthValue.hh lib/liborc.a +lib/cmake/orc/FindLZ4.cmake +lib/cmake/orc/FindProtobuf.cmake +lib/cmake/orc/FindSnappy.cmake +lib/cmake/orc/FindZLIB.cmake +lib/cmake/orc/FindZSTD.cmake +lib/cmake/orc/orcConfig.cmake +lib/cmake/orc/orcConfigVersion.cmake +lib/cmake/orc/orcTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/orc/orcTargets.cmake