git: 79893751643a - main - databases/tiledb: Update to 2.26.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 18 Sep 2024 06:19:06 UTC
The branch main has been updated by sunpoet:
URL: https://cgit.FreeBSD.org/ports/commit/?id=79893751643ae9e162011ace70e383cc0cd8e6c3
commit 79893751643ae9e162011ace70e383cc0cd8e6c3
Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-09-18 05:56:09 +0000
Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-09-18 06:13:10 +0000
databases/tiledb: Update to 2.26.0
Changes: https://github.com/TileDB-Inc/TileDB/releases
---
databases/tiledb/Makefile | 19 +---
databases/tiledb/distinfo | 6 +-
.../files/patch-cmake-inputs-Config.cmake.in | 14 ---
databases/tiledb/files/patch-cmake-openssl | 15 ---
databases/tiledb/files/patch-magic | 124 ---------------------
databases/tiledb/files/patch-tools-CMakeLists.txt | 26 +++++
databases/tiledb/files/patch-vcpkg | 13 ---
databases/tiledb/pkg-plist | 3 -
8 files changed, 33 insertions(+), 187 deletions(-)
diff --git a/databases/tiledb/Makefile b/databases/tiledb/Makefile
index c2b151a539bd..44403b0721bf 100644
--- a/databases/tiledb/Makefile
+++ b/databases/tiledb/Makefile
@@ -1,6 +1,5 @@
PORTNAME= tiledb
-PORTVERSION= 2.25.0
-PORTREVISION= 1
+PORTVERSION= 2.26.0
CATEGORIES= databases
MAINTAINER= sunpoet@FreeBSD.org
@@ -16,9 +15,9 @@ LIB_DEPENDS= libcapnp.so:devel/capnproto1 \
libcurl.so:ftp/curl \
libfmt.so:devel/libfmt \
liblz4.so:archivers/liblz4 \
+ libpng.so:graphics/png \
libzstd.so:archivers/zstd
RUN_DEPENDS= capnproto1>=1.0.1:devel/capnproto1 \
- catch2>=3.1:devel/catch2 \
clipp>=1.2.3_1:devel/clipp \
curl>=7.74.0:ftp/curl \
liblz4>=1.9.3,1:archivers/liblz4 \
@@ -32,35 +31,28 @@ CFLAGS_armv6= -Wno-c++11-narrowing
CFLAGS_armv7= -Wno-c++11-narrowing
CFLAGS_i386= -Wno-c++11-narrowing
CFLAGS_powerpc= -Wno-c++11-narrowing
-CMAKE_ARGS= -DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2 \
- -DFREEBSD_OPENSSLBASE=${OPENSSLBASE} \
- -Dlibmagic_DICTIONARY=/usr/share/misc/magic.mgc
+CMAKE_ARGS= -Dlibmagic_DICTIONARY=/usr/share/misc/magic.mgc
CMAKE_OFF= TILEDB_ALLOW_REGEX_CHAR_PATH \
TILEDB_ARROW_TESTS \
TILEDB_ASSERTIONS \
TILEDB_AZURE \
- TILEDB_CMAKE_IDE \
TILEDB_EXPERIMENTAL_FEATURES \
- TILEDB_FORCE_ALL_DEPS \
TILEDB_GCS \
TILEDB_HDFS \
TILEDB_S3 \
TILEDB_SANITIZER \
- TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK \
- TILEDB_SUPERBUILD \
TILEDB_TESTS \
TILEDB_TESTS_AWS_S3_CONFIG \
- TILEDB_VCPKG \
TILEDB_VCPKG_BASE_TRIPLET \
TILEDB_VERBOSE \
TILEDB_WEBP \
TILEDB_WERROR
CMAKE_ON= BUILD_SHARED_LIBS \
+ CMAKE_DISABLE_FIND_PACKAGE_Doxygen \
CMAKE_EXPORT_COMPILE_COMMANDS \
TILEDB_CCACHE \
TILEDB_CPP_API \
TILEDB_DISABLE_AUTO_VCPKG \
- TILEDB_LOG_OUTPUT_ON_FAILURE \
TILEDB_REMOVE_DEPRECATIONS \
TILEDB_SERIALIZATION \
TILEDB_STATS \
@@ -76,7 +68,4 @@ AVX2_DESC= AVX2 instructions support
AVX2_CMAKE_BOOL= COMPILER_SUPPORTS_AVX2
-post-install:
- ${RM} ${STAGEDIR}${PREFIX}/lib/libbz2.so ${STAGEDIR}${PREFIX}/lib/liblz4.so ${STAGEDIR}${PREFIX}/lib/libzstd.so
-
.include <bsd.port.mk>
diff --git a/databases/tiledb/distinfo b/databases/tiledb/distinfo
index e35dabb3219c..36288d90540e 100644
--- a/databases/tiledb/distinfo
+++ b/databases/tiledb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1721858369
-SHA256 (TileDB-Inc-TileDB-2.25.0_GH0.tar.gz) = edadfc63b419c605d37304236ca6de55a46a9905015e122e597b82075135d39e
-SIZE (TileDB-Inc-TileDB-2.25.0_GH0.tar.gz) = 4222271
+TIMESTAMP = 1726487328
+SHA256 (TileDB-Inc-TileDB-2.26.0_GH0.tar.gz) = 040fa23ccef23f05d96305b29332686062bd5d67e1d6e6d830f992261ffeda9d
+SIZE (TileDB-Inc-TileDB-2.26.0_GH0.tar.gz) = 4214151
diff --git a/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in b/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in
deleted file mode 100644
index 6df00e7a3ac8..000000000000
--- a/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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
deleted file mode 100644
index 924f7a6ea2c5..000000000000
--- a/databases/tiledb/files/patch-cmake-openssl
+++ /dev/null
@@ -1,15 +0,0 @@
-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-magic b/databases/tiledb/files/patch-magic
deleted file mode 100644
index 805e79d98495..000000000000
--- a/databases/tiledb/files/patch-magic
+++ /dev/null
@@ -1,124 +0,0 @@
-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}")
diff --git a/databases/tiledb/files/patch-tools-CMakeLists.txt b/databases/tiledb/files/patch-tools-CMakeLists.txt
new file mode 100644
index 000000000000..03fa87990cde
--- /dev/null
+++ b/databases/tiledb/files/patch-tools-CMakeLists.txt
@@ -0,0 +1,26 @@
+--- tools/CMakeLists.txt.orig 2024-09-10 19:34:18 UTC
++++ tools/CMakeLists.txt
+@@ -25,8 +25,6 @@
+ # THE SOFTWARE.
+ #
+
+-find_package(Clipp CONFIG REQUIRED)
+-
+ add_executable(tiledb-cli EXCLUDE_FROM_ALL
+ src/commands/help_command.cc
+ src/commands/info_command.cc
+@@ -45,7 +43,6 @@ foreach(TOOL ${TILEDB_TOOLS})
+ target_link_libraries(${TOOL} PRIVATE
+ TILEDB_CORE_OBJECTS_ILIB
+ TILEDB_CORE_OBJECTS
+- clipp::clipp
+ )
+ target_include_directories(${TOOL} PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/..
+@@ -54,4 +51,4 @@ endforeach()
+ endforeach()
+
+ # Add custom target 'tools' to build all tools.
+-add_custom_target(tools ALL DEPENDS ${TILEDB_TOOLS})
+\ No newline at end of file
++add_custom_target(tools ALL DEPENDS ${TILEDB_TOOLS})
diff --git a/databases/tiledb/files/patch-vcpkg b/databases/tiledb/files/patch-vcpkg
deleted file mode 100644
index 4708f20deea0..000000000000
--- a/databases/tiledb/files/patch-vcpkg
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/Options/BuildOptions.cmake.orig 2024-07-24 15:05:06 UTC
-+++ cmake/Options/BuildOptions.cmake
-@@ -49,10 +49,6 @@ endif()
- endif()
- endif()
-
--if (NOT TILEDB_VCPKG)
-- message(FATAL_ERROR "Disabling TILEDB_VCPKG is not supported. To disable automatically downloading vcpkg, enable the TILEDB_DISABLE_AUTO_VCPKG option, or set ENV{TILEDB_DISABLE_AUTO_VCPKG} to any value.")
--endif()
--
- if (TILEDB_HDFS)
- message(DEPRECATION "The HDFS storage backend is deprecated and receiving build-only official validation. It will be removed in TileDB 2.28.")
- endif()
diff --git a/databases/tiledb/pkg-plist b/databases/tiledb/pkg-plist
index 9b5e5f29d13f..c285e8d1125d 100644
--- a/databases/tiledb/pkg-plist
+++ b/databases/tiledb/pkg-plist
@@ -35,10 +35,8 @@ include/tiledb/api/c_api/vfs/vfs_api_enum.h
include/tiledb/api/c_api/vfs/vfs_api_experimental.h
include/tiledb/api/c_api/vfs/vfs_api_external.h
include/tiledb/array.h
-include/tiledb/array_deprecated.h
include/tiledb/array_experimental.h
include/tiledb/array_schema.h
-include/tiledb/array_schema_deprecated.h
include/tiledb/array_schema_evolution.h
include/tiledb/array_schema_experimental.h
include/tiledb/arrow_io_impl.h
@@ -73,7 +71,6 @@ include/tiledb/query.h
include/tiledb/query_channel.h
include/tiledb/query_condition.h
include/tiledb/query_condition_experimental.h
-include/tiledb/query_deprecated.h
include/tiledb/query_experimental.h
include/tiledb/schema_base.h
include/tiledb/stats.h