6 files changed, 207 insertions, 36 deletions
diff --git a/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in b/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in
new file mode 100644
index 000000000000..6df00e7a3ac8
--- /dev/null
+++ b/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in
@@ -0,0 +1,14 @@
+--- cmake/inputs/Config.cmake.in.orig	2023-12-13 20:43:06 UTC
++++ cmake/inputs/Config.cmake.in
+@@ -14,11 +14,9 @@ if(@TILEDB_STATIC@) # TILEDB_STATIC
+   include(CMakeFindDependencyMacro)
+   find_dependency(Threads)
+   find_dependency(BZip2)
+-  find_dependency(lz4)
+   find_dependency(spdlog)
+   find_dependency(ZLIB)
+   find_dependency(zstd)
+-  find_dependency(unofficial-libmagic)
+   if(NOT WIN32)
+     find_dependency(OpenSSL)
+   endif()
diff --git a/databases/tiledb/files/patch-cmake-openssl b/databases/tiledb/files/patch-cmake-openssl
new file mode 100644
index 000000000000..924f7a6ea2c5
--- /dev/null
+++ b/databases/tiledb/files/patch-cmake-openssl
@@ -0,0 +1,15 @@
+Fix search for OpenSSL with CMake >= 3.27. This port uses OPENSSL_PATHS to set
+OPENSSL_ROOT_DIR, so CMake tries to find OpenSSL in TILEDB_EP_INSTALL_PREFIX
+which is problably not where we want to look.
+
+--- cmake/Modules/FindOpenSSL_EP.cmake.orig    2023-10-25 06:36:39 UTC
++++ cmake/Modules/FindOpenSSL_EP.cmake
+@@ -41,7 +41,7 @@ endif()
+ endif()
+ 
+ # Search the path set during the superbuild for the EP.
+-set(OPENSSL_PATHS ${TILEDB_EP_INSTALL_PREFIX})
++set(OPENSSL_PATHS ${FREEBSD_OPENSSLBASE})
+ 
+ # Add /usr/local/opt, as Homebrew sometimes installs it there.
+ set (HOMEBREW_BASE "/usr/local/opt/openssl")
diff --git a/databases/tiledb/files/patch-external-src-blosc-shuffle.cc b/databases/tiledb/files/patch-external-src-blosc-shuffle.cc
deleted file mode 100644
index c72dfceb3e97..000000000000
--- a/databases/tiledb/files/patch-external-src-blosc-shuffle.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- external/src/blosc/shuffle.cc.orig	2020-07-31 17:44:09 UTC
-+++ external/src/blosc/shuffle.cc
-@@ -158,6 +158,8 @@ __cpuidex(int32_t cpuInfo[4], int32_t function_id, int
- /* Reads the content of an extended control register.
-    https://software.intel.com/en-us/articles/how-to-detect-new-instruction-support-in-the-4th-generation-intel-core-processor-family
- */
-+
-+#if defined(__clang_major__) && __clang_major__ < 9
- static inline uint64_t
- _xgetbv(uint32_t xcr) {
-   uint32_t eax, edx;
-@@ -173,6 +175,7 @@ _xgetbv(uint32_t xcr) {
-     );
-   return ((uint64_t)edx << 32) | eax;
- }
-+#endif
- 
- #endif /* defined(_MSC_FULL_VER) */
- 
-@@ -385,4 +388,4 @@ unshuffle(const size_t bytesoftype, const size_t block
-   (host_implementation.unshuffle)(bytesoftype, blocksize, _src, _dest);
- }
- 
--}
-\ No newline at end of file
-+}
diff --git a/databases/tiledb/files/patch-magic b/databases/tiledb/files/patch-magic
new file mode 100644
index 000000000000..b1a0812ff549
--- /dev/null
+++ b/databases/tiledb/files/patch-magic
@@ -0,0 +1,165 @@
+Obtained from:	https://github.com/TileDB-Inc/TileDB/pull/3270
+
+--- cmake/Modules/FindMagic_EP.cmake.orig	2022-08-25 01:25:52 UTC
++++ cmake/Modules/FindMagic_EP.cmake
+@@ -3,7 +3,7 @@
+ #
+ # The MIT License
+ #
+-# Copyright (c) 2018-2021 TileDB, Inc.
++# Copyright (c) 2022 TileDB, Inc.
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
+ # of this software and associated documentation files (the "Software"), to deal
+@@ -34,47 +34,47 @@
+ # Include some common helper functions.
+ include(TileDBCommon)
+ 
+-# Search the path set during the superbuild for the EP.
+-set(LIBMAGIC_PATHS ${TILEDB_EP_INSTALL_PREFIX})
++# First check for a static version in the EP prefix.
++find_library(libmagic_LIBRARIES
++        NAMES
++        magic${CMAKE_STATIC_LIBRARY_SUFFIX}
++        libmagic${CMAKE_STATIC_LIBRARY_SUFFIX}
++        PATHS ${TILEDB_EP_INSTALL_PREFIX}
++        PATH_SUFFIXES lib
++        NO_DEFAULT_PATH
++)
+ 
+-if(TILEDB_LIBMAGIC_EP_BUILT)
+-  find_package(libmagic PATHS ${TILEDB_EP_INSTALL_PREFIX} ${TILEDB_DEPS_NO_DEFAULT_PATH})
+-endif()
+-
+-if (TILEDB_LIBMAGIC_EP_BUILT)
++if (libmagic_LIBRARIES)
++  set(libmagic_STATIC_EP_FOUND TRUE)
+   find_path(libmagic_INCLUDE_DIR
+-    NAMES magic.h
+-    PATHS ${LIBMAGIC_PATHS}
+-    PATH_SUFFIXES include
+-    ${NO_DEFAULT_PATH}
+-  )
+-
+-  if (NOT libmagic_INCLUDE_DIR)
+-    find_path(libmagic_INCLUDE_DIR
+-      NAMES file/file.h
+-      PATHS ${LIBMAGIC_PATHS}
+-      PATH_SUFFIXES include
+-      ${NO_DEFAULT_PATH}
+-    )
+-  endif()
+-
+-  # Link statically if installed with the EP.
++          NAMES magic.h
++          PATHS ${TILEDB_EP_INSTALL_PREFIX}
++          PATH_SUFFIXES include
++          NO_DEFAULT_PATH
++          )
++elseif(NOT TILEDB_FORCE_ALL_DEPS)
++  set(libmagic_STATIC_EP_FOUND FALSE)
++  # Static EP not found, search in system paths.
+   find_library(libmagic_LIBRARIES
+-    libmagic
+-    PATHS ${LIBMAGIC_PATHS}
+-    PATH_SUFFIXES lib a
+-    #${TILEDB_DEPS_NO_DEFAULT_PATH}
+-    ${NO_DEFAULT_PATH}
+-  )
+-
+-  include(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(libmagic
+-    REQUIRED_VARS libmagic_LIBRARIES libmagic_INCLUDE_DIR
+-  )
++          NAMES
++          magic libmagic
++          PATH_SUFFIXES lib bin
++          ${TILEDB_DEPS_NO_DEFAULT_PATH}
++          )
++  find_path(libmagic_INCLUDE_DIR
++          NAMES magic.h
++          PATH_SUFFIXES include
++          ${TILEDB_DEPS_NO_DEFAULT_PATH}
++          )
+ endif()
+ 
++include(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(libmagic
++        REQUIRED_VARS libmagic_LIBRARIES libmagic_INCLUDE_DIR
++)
++
+ # if not yet built add it as an external project
+-if(NOT TILEDB_LIBMAGIC_EP_BUILT)
++if(NOT libmagic_FOUND)
+   if (TILEDB_SUPERBUILD)
+     message(STATUS "Adding Magic as an external project")
+ 
+@@ -115,11 +115,22 @@ if(NOT TILEDB_LIBMAGIC_EP_BUILT)
+   endif()
+ endif()
+ 
+-find_file(libmagic_DICTIONARY magic.mgc
+-  PATHS ${LIBMAGIC_PATHS}
+-  PATH_SUFFIXES bin share
+-  ${NO_DEFAULT_PATH}
+-)
++if(TILEDB_LIBMAGIC_EP_BUILT)
++  find_file(libmagic_DICTIONARY magic.mgc
++          PATHS ${LIBMAGIC_PATHS}
++          PATH_SUFFIXES bin share misc
++          ${TILEDB_DEPS_NO_DEFAULT_PATH}
++          )
++else()
++  find_file(libmagic_DICTIONARY magic.mgc
++    PATH_SUFFIXES bin share misc share/misc
++    ${TILEDB_DEPS_NO_DEFAULT_PATH}
++  )
++endif()
++
++if(NOT TILEDB_SUPERBUILD AND NOT libmagic_DICTIONARY)
++  message(FATAL_ERROR "Unable to find libmagic dictionary")
++endif()
+ 
+ if (libmagic_FOUND AND NOT TARGET libmagic)
+   message(STATUS "Found Magic, adding imported target: ${libmagic_LIBRARIES}")
+--- tiledb/CMakeLists.txt.orig	2022-08-25 01:25:52 UTC
++++ tiledb/CMakeLists.txt
+@@ -357,14 +357,18 @@ target_link_libraries(TILEDB_CORE_OBJECTS PRIVATE $<BU
+ ############################################################
+ # provide actions/target for preparation of magic.mgc data for embedding/build
+ 
+-set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..")
++set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/sm/misc")
+ set(MGC_GZIPPED_BIN_OUTPUT_FILE "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}/magic_mgc_gzipped.bin")
+ set(MGC_GZIPPED_BIN_INPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sm/misc")
+ set(MGC_GZIPPED_BIN_INPUT_FILE "${MGC_GZIPPED_BIN_INPUT_DIRECTORY}/magic_mgc_gzipped.bin.tar.bz2")
+ 
++# Create the output directory if it does not exist
++add_custom_target(create_magic_bin_output_directory ALL
++        COMMAND ${CMAKE_COMMAND} -E make_directory ${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY})
++
+ add_custom_command(
+   OUTPUT "${MGC_GZIPPED_BIN_OUTPUT_FILE}"
+-  DEPENDS "${MGC_GZIPPED_BIN_INPUT_FILE}"
++  DEPENDS "${MGC_GZIPPED_BIN_INPUT_FILE}" create_magic_bin_output_directory
+   COMMAND ${CMAKE_COMMAND} -E tar x "${MGC_GZIPPED_BIN_INPUT_FILE}"
+   WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}"
+ )
+@@ -380,7 +384,7 @@ add_custom_target(
+   WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}"
+   COMMAND ${CMAKE_COMMAND} -E tar cvj "magic_mgc_gzipped.bin.tar.bz2" "magic_mgc_gzipped.bin"
+   COMMAND ${CMAKE_COMMAND} -E copy "magic_mgc_gzipped.bin.tar.bz2" "${MGC_GZIPPED_BIN_INPUT_FILE}"
+-  DEPENDS "${libmagic_DICTIONARY}"
++  DEPENDS "${libmagic_DICTIONARY}" create_magic_bin_output_directory
+   COMMENT "Re-generate ${MGC_GZIPPED_BIN_INPUT_FILE} for embedded magic.mgc support"
+ )
+ 
+@@ -394,6 +398,8 @@ target_include_directories(TILEDB_CORE_OBJECTS
+     "${TILEDB_EXTERNALS_INCLUDE_DIRS}"
+ 	# to pickup <build_dir>/tiledb for capnp gen'd files
+     "${CMAKE_CURRENT_BINARY_DIR}/.."
++    # For libmagic binary data include
++    "${CMAKE_CURRENT_BINARY_DIR}/sm/misc"
+ )
+ 
+ # Build a separate copy of the object library for use with static TileDB
diff --git a/databases/tiledb/files/patch-tiledb-common-logger.h b/databases/tiledb/files/patch-tiledb-common-logger.h
deleted file mode 100644
index 8e18c0e2f4c8..000000000000
--- a/databases/tiledb/files/patch-tiledb-common-logger.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- tiledb/common/logger.h.orig	2021-01-07 18:31:04 UTC
-+++ tiledb/common/logger.h
-@@ -37,6 +37,7 @@
- 
- #include <spdlog/fmt/ostr.h>
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_color_sinks.h>
- 
- #include "tiledb/common/status.h"
- 
diff --git a/databases/tiledb/files/patch-vcpkg b/databases/tiledb/files/patch-vcpkg
new file mode 100644
index 000000000000..4e94fd2d56cb
--- /dev/null
+++ b/databases/tiledb/files/patch-vcpkg
@@ -0,0 +1,13 @@
+--- cmake/Options/BuildOptions.cmake.orig	2024-05-02 16:58:42 UTC
++++ cmake/Options/BuildOptions.cmake
+@@ -48,10 +48,6 @@ endif()
+   endif()
+ endif()
+ 
+-if (NOT TILEDB_VCPKG)
+-  message(FATAL_ERROR "Disabling TILEDB_VCPKG is not supported.")
+-endif()
+-
+ # enable assertions by default for debug builds
+ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+   set(TILEDB_ASSERTIONS TRUE)