[orc] Update to the latest version (#13705)

* [orc] Update to the latest version

* Update patch format

5 files changed, 64 insertions, 56 deletions

diff --git a/ports/orc/0003-dependencies-from-vcpkg.patch b/ports/orc/0003-dependencies-from-vcpkg.patch
index f9cc44b99..f753bbcb3 100644
--- a/ports/orc/0003-dependencies-from-vcpkg.patch
+++ b/ports/orc/0003-dependencies-from-vcpkg.patch
@@ -1,8 +1,8 @@
 diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
-index fae9be0..35cfb5f 100644
+index 3d4a162..6926bc3 100644
 --- a/c++/src/CMakeLists.txt
 +++ b/c++/src/CMakeLists.txt
-@@ -215,11 +215,12 @@ endif(ORC_CXX_HAS_THREAD_LOCAL AND BUILD_LIBHDFSPP)
+@@ -230,12 +230,13 @@ endif(BUILD_LIBHDFSPP)
  add_library (orc STATIC ${SOURCE_FILES})
  
  target_link_libraries (orc
@@ -10,21 +10,23 @@ index fae9be0..35cfb5f 100644
 -  zlib
 -  snappy
 -  lz4
+-  zstd
 -  ${LIBHDFSPP_LIBRARIES}
 +  PRIVATE
 +    protobuf::libprotobuf
 +    ZLIB::ZLIB
 +    Snappy::snappy
-+    ${LZ4_STATIC_LIB}
++    lz4::lz4
++    libzstd
 +    ${LIBHDFSPP_LIBRARIES}
    )
  
  install(TARGETS orc DESTINATION lib)
 diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
-index f8584c0..fe48340 100644
+index 3a35325..56ffd74 100644
 --- a/cmake_modules/ThirdpartyToolchain.cmake
 +++ b/cmake_modules/ThirdpartyToolchain.cmake
-@@ -51,8 +51,8 @@ endif ()
+@@ -59,8 +59,8 @@ endif ()
  # ----------------------------------------------------------------------
  # Snappy
  
@@ -35,7 +37,7 @@ index f8584c0..fe48340 100644
    set(SNAPPY_VENDORED FALSE)
  else ()
    set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install")
-@@ -70,10 +70,6 @@ else ()
+@@ -78,10 +78,6 @@ else ()
    set(SNAPPY_VENDORED TRUE)
  endif ()
  
@@ -46,7 +48,7 @@ index f8584c0..fe48340 100644
  if (SNAPPY_VENDORED)
    add_dependencies (snappy snappy_ep)
    if (INSTALL_VENDORED_LIBS)
-@@ -85,7 +81,7 @@ endif ()
+@@ -93,7 +89,7 @@ endif ()
  # ----------------------------------------------------------------------
  # ZLIB
  
@@ -55,7 +57,7 @@ index f8584c0..fe48340 100644
    find_package (ZLIB REQUIRED)
    set(ZLIB_VENDORED FALSE)
  else ()
-@@ -112,10 +108,6 @@ else ()
+@@ -120,10 +116,6 @@ else ()
    set(ZLIB_VENDORED TRUE)
  endif ()
  
@@ -66,18 +68,40 @@ index f8584c0..fe48340 100644
  if (ZLIB_VENDORED)
    add_dependencies (zlib zlib_ep)
    if (INSTALL_VENDORED_LIBS)
-@@ -127,8 +119,8 @@ endif ()
+@@ -135,8 +127,8 @@ endif ()
+ # ----------------------------------------------------------------------
+ # Zstd
+ 
+-if (NOT "${ZSTD_HOME}" STREQUAL "")
+-  find_package (ZSTD REQUIRED)
++if (1)
++  find_package (zstd CONFIG REQUIRED)
+   set(ZSTD_VENDORED FALSE)
+ else ()
+   set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install")
+@@ -169,10 +161,6 @@ else ()
+   set(ZSTD_VENDORED TRUE)
+ endif ()
+ 
+-include_directories (SYSTEM ${ZSTD_INCLUDE_DIR})
+-add_library (zstd STATIC IMPORTED)
+-set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB})
+-
+ if (ZSTD_VENDORED)
+   add_dependencies (zstd zstd_ep)
+   if (INSTALL_VENDORED_LIBS)
+@@ -184,8 +172,8 @@ endif ()
  # ----------------------------------------------------------------------
  # LZ4
  
 -if (NOT "${LZ4_HOME}" STREQUAL "")
 -  find_package (LZ4 REQUIRED)
 +if (1)
-+  find_library (LZ4_STATIC_LIB NAMES lz4d lz4)
++  find_package (lz4 CONFIG REQUIRED)
    set(LZ4_VENDORED FALSE)
  else ()
    set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install")
-@@ -154,10 +146,6 @@ else ()
+@@ -211,10 +199,6 @@ else ()
    set(LZ4_VENDORED TRUE)
  endif ()
  
@@ -88,7 +112,7 @@ index f8584c0..fe48340 100644
  if (LZ4_VENDORED)
    add_dependencies (lz4 lz4_ep)
    if (INSTALL_VENDORED_LIBS)
-@@ -231,8 +219,8 @@ endif ()
+@@ -288,8 +272,8 @@ endif ()
  # ----------------------------------------------------------------------
  # Protobuf
  
@@ -99,12 +123,10 @@ index f8584c0..fe48340 100644
    set(PROTOBUF_VENDORED FALSE)
  else ()
    set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install")
-@@ -268,14 +256,6 @@ else ()
-   set(PROTOBUF_VENDORED TRUE)
- endif ()
+@@ -327,12 +311,6 @@ endif ()
+ 
+ include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
  
--include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR})
--
 -add_library (protobuf STATIC IMPORTED)
 -set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB})
 -
@@ -115,23 +137,26 @@ index f8584c0..fe48340 100644
    add_dependencies (protoc protobuf_ep)
    add_dependencies (protobuf protobuf_ep)
 diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt
-index 667fab4..7745fe0 100644
+index f5a53ca..ec22e7a 100644
 --- a/tools/src/CMakeLists.txt
 +++ b/tools/src/CMakeLists.txt
-@@ -49,7 +49,6 @@ add_executable (orc-metadata
+@@ -51,7 +51,6 @@ add_executable (orc-metadata
  
  target_link_libraries (orc-metadata
    orc
 -  protobuf
+   ${CMAKE_THREAD_LIBS_INIT}
+   )
+ 
+@@ -92,7 +91,7 @@ target_link_libraries (csv-import
    )
  
-  add_executable (orc-statistics
-@@ -88,4 +87,7 @@ install(TARGETS
-    orc-contents
-    orc-metadata
-    orc-statistics
+ install(TARGETS
+-   orc-contents
+-   orc-metadata
+-   orc-statistics
 -   DESTINATION bin)
-+   orc-scan
-+   orc-memory
-+   csv-import
-+  DESTINATION tools/orc)
++    orc-scan
++    orc-memory
++    csv-import
++   DESTINATION tools/orc)
diff --git a/ports/orc/0004-update-tzdata.patch b/ports/orc/0004-update-tzdata.patch
deleted file mode 100644
index fa9ae2fad..000000000
--- a/ports/orc/0004-update-tzdata.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
-index 1a28b1ae..74f0e61c 100644
---- a/cmake_modules/ThirdpartyToolchain.cmake
-+++ b/cmake_modules/ThirdpartyToolchain.cmake
-@@ -228,8 +228,8 @@ endif ()
- 
- if (WIN32)
-   ExternalProject_Add(tzdata_ep
--    URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2018c-1.tar.xz"
--    URL_HASH MD5=F69FCA5C906FAFF02462D3D06F28267C
-+    URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2019b-1.tar.xz"
-+    URL_HASH MD5=17D8AB346BB1009D4EB35BC08040E51D
-     CONFIGURE_COMMAND ""
-     BUILD_COMMAND ""
-     INSTALL_COMMAND "")
diff --git a/ports/orc/0005-disable-tzdata.patch b/ports/orc/0005-disable-tzdata.patch
index 4b81fd2a4..829bd18b1 100644
--- a/ports/orc/0005-disable-tzdata.patch
+++ b/ports/orc/0005-disable-tzdata.patch
@@ -1,8 +1,8 @@
 diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
-index 0a04aaf..795f5c9 100644
+index ea39023..599d79a 100644
 --- a/c++/test/CMakeLists.txt
 +++ b/c++/test/CMakeLists.txt
-@@ -64,6 +64,7 @@ target_link_libraries (create-test-files
+@@ -67,6 +67,7 @@ target_link_libraries (create-test-files
    protobuf
  )
  
@@ -10,17 +10,16 @@ index 0a04aaf..795f5c9 100644
  if (TEST_VALGRIND_MEMCHECK)
    add_test (orc-test
            valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./orc-test)
-@@ -78,3 +79,4 @@ if (WIN32)
+@@ -86,3 +87,4 @@ if (WIN32)
        ENVIRONMENT "TZDIR=${TZDATA_DIR}"
      )
  endif ()
 +endif()
-\ No newline at end of file
 diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
-index c816cdc..16075f2 100644
+index 3a35325..364470b 100644
 --- a/cmake_modules/ThirdpartyToolchain.cmake
 +++ b/cmake_modules/ThirdpartyToolchain.cmake
-@@ -157,7 +157,7 @@ endif ()
+@@ -226,7 +226,7 @@ endif ()
  # ----------------------------------------------------------------------
  # IANA - Time Zone Database
  
diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL
index f3db7ee4e..c3a1ff40f 100644
--- a/ports/orc/CONTROL
+++ b/ports/orc/CONTROL
@@ -1,5 +1,5 @@
 Source: orc
-Version: 1.5.9
+Version: 1.6.4
 Homepage: https://orc.apache.org/
 Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest
 Description: The smallest, fastest columnar storage for Hadoop workloads.
diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake
index e907e7bfa..722b6a10a 100644
--- a/ports/orc/portfile.cmake
+++ b/ports/orc/portfile.cmake
@@ -1,13 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO apache/orc
-    REF 32be030290905de9c2cd5b8cd84e210d8c0cf25c # rel/release-1.5.9
-    SHA512 91af28d2ceb25a2e09073ab0b1cfc8e5f797bce690300c9548c5e80d50b5daac935842ae4073d157d218d70105a2c9f54297151d0ab210f304bc11d2e93ac6d1
+    REF 23ecc03e87548f6d6783c2d8af2b46672c52214c  # rel/release-1.6.4
+    SHA512 907984c7e036ddaa90e7cbfabb9af4f6fd3520820b9a8732b304f2213030f7d67cef89ad87d50e028a51bff06f68ff359345ad6894850e299b2fca343d7c0c3e
     HEAD_REF master
     PATCHES
-      0003-dependencies-from-vcpkg.patch
-      0004-update-tzdata.patch
-      0005-disable-tzdata.patch
+        0003-dependencies-from-vcpkg.patch
+        0005-disable-tzdata.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
@@ -23,7 +22,7 @@ else()
   set(PROTOBUF_EXECUTABLE ${CURRENT_INSTALLED_DIR}/tools/protobuf/protoc)
 endif()
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if(VCPKG_TARGET_IS_WINDOWS)
   set(BUILD_TOOLS OFF)
 else()
   set(BUILD_TOOLS ON)