From bb1ca2757bca8f8e372a4deb35943828e3b0d155 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 30 Oct 2024 05:05:38 +0800 Subject: [PATCH] [turbobase64] update to 2023.08 (#41748) --- ports/turbobase64/CMakeLists.txt | 66 -------------------------------- ports/turbobase64/portfile.cmake | 21 +++++----- ports/turbobase64/vcpkg.json | 5 +-- scripts/ci.baseline.txt | 1 - versions/baseline.json | 4 +- versions/t-/turbobase64.json | 5 +++ 6 files changed, 21 insertions(+), 81 deletions(-) delete mode 100644 ports/turbobase64/CMakeLists.txt diff --git a/ports/turbobase64/CMakeLists.txt b/ports/turbobase64/CMakeLists.txt deleted file mode 100644 index c62f679e7e..0000000000 --- a/ports/turbobase64/CMakeLists.txt +++ /dev/null @@ -1,66 +0,0 @@ -cmake_minimum_required(VERSION 3.14) - -project(turbobase64 C) -if (SOURCE_PATH) - set(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -endif () - -#Copyright 2016-2020 Yandex LLC -# https://github.com/ClickHouse/ClickHouse/blob/master/contrib/base64-cmake/CMakeLists.txt -# -#Apache License -#Version 2.0, January 2004 -#http://www.apache.org/licenses/ -#Yandex code starts - -SET(LIBRARY_DIR ${CMAKE_SOURCE_DIR}) - -add_library(base64_scalar OBJECT ${LIBRARY_DIR}/turbob64c.c ${LIBRARY_DIR}/turbob64d.c) -add_library(base64_ssse3 OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This file also contains code for ARM NEON - -if (ARCH_AMD64) - add_library(base64_avx OBJECT ${LIBRARY_DIR}/turbob64sse.c) # This is not a mistake. One file is compiled twice. - add_library(base64_avx2 OBJECT ${LIBRARY_DIR}/turbob64avx2.c) -endif () - -target_compile_options(base64_scalar PRIVATE -falign-loops) - -if (ARCH_AMD64) - target_compile_options(base64_ssse3 PRIVATE -mssse3 -falign-loops) - target_compile_options(base64_avx PRIVATE -falign-loops -mavx) - target_compile_options(base64_avx2 PRIVATE -falign-loops -mavx2) -else () - target_compile_options(base64_ssse3 PRIVATE -falign-loops) -endif () - -if (ARCH_AMD64) - add_library(tb64 - $ - $ - $ - $) -else () - add_library(tb64 - $ - $) -endif () - -# End of Yandex code - -include(CMakePackageConfigHelpers) -include(GNUInstallDirs) - -target_include_directories(tb64 PUBLIC - $ - $ - ) - -install(TARGETS tb64 - EXPORT unofficial-turbobase64-config - ) -install(FILES "${CMAKE_SOURCE_DIR}/turbob64.h" TYPE INCLUDE) - -install(EXPORT unofficial-turbobase64-config - DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-turbobase64" - NAMESPACE unofficial::turbobase64:: - ) \ No newline at end of file diff --git a/ports/turbobase64/portfile.cmake b/ports/turbobase64/portfile.cmake index ddd4266b10..5804653bb7 100644 --- a/ports/turbobase64/portfile.cmake +++ b/ports/turbobase64/portfile.cmake @@ -1,20 +1,23 @@ +string(REGEX REPLACE "^([0-9]+)[.]([0-9])$" "\\1.0\\2" TURBO_VERSION "${VERSION}") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO powturbo/Turbo-Base64 - REF 95ba56a9b041f9933f5cd2bbb2ee4e083468c20a - SHA512 bacab8ede5e20974207e01c13a93e6d8afc8d08bc84f1da2b6efa1b4d17408cef6cea085e209a8b7d3b2e2a7223a785f8c76aa954c3c787e9b8d891880b63606 - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO powturbo/Turbo-Base64 + REF ${TURBO_VERSION} + SHA512 de8aaace0faf6552cf692f131a4d03882b88252732bb4160c48e5cc630a0c2f637fa27309e084d02305cdf7ef28020e6c9fbb82b50c1916e46aabc95baea75ad + HEAD_REF master ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/turbobase64/vcpkg.json b/ports/turbobase64/vcpkg.json index 41ac724e67..eeac70c38a 100644 --- a/ports/turbobase64/vcpkg.json +++ b/ports/turbobase64/vcpkg.json @@ -1,11 +1,10 @@ { "name": "turbobase64", - "version-date": "2020-01-12", - "port-version": 3, + "version": "2023.8", "description": "Fastest Base64 SIMD/Neon library", "homepage": "https://github.com/powturbo/Turbo-Base64", "license": "GPL-3.0-only", - "supports": "!windows", + "supports": "!android & !(windows & arm)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0f36865ce9..3c8b8ead09 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1125,7 +1125,6 @@ torch-th:arm64-uwp=fail torch-th:x64-android=fail torch-th:x64-uwp=fail torch-th:x64-windows-static=fail -turbobase64:arm-neon-android=fail tvision:arm-neon-android=fail tvision:arm64-android=fail tvision:x64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index fb28e06355..3e2dd45c69 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9113,8 +9113,8 @@ "port-version": 0 }, "turbobase64": { - "baseline": "2020-01-12", - "port-version": 3 + "baseline": "2023.8", + "port-version": 0 }, "tvision": { "baseline": "2024-05-22", diff --git a/versions/t-/turbobase64.json b/versions/t-/turbobase64.json index e0f08c21c3..ca867e421a 100644 --- a/versions/t-/turbobase64.json +++ b/versions/t-/turbobase64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5b6dbbd578854ad389a0e63b4921bb7e5a3b7ec", + "version": "2023.8", + "port-version": 0 + }, { "git-tree": "20d23821ef39944689c9ec0e8cf02d17c7b68901", "version-date": "2020-01-12",