Merge remote-tracking branch 'origin/master' into android-r26

microsoft · Apr 2, 2024 · e5750ea · e5750ea
2 parents d33f7a2 + a164ace
commit e5750ea
Show file tree

Hide file tree

Showing 105 changed files with 881 additions and 492 deletions.
diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-s3
     REF "v${VERSION}"
-    SHA512 2fe2a33fa1470a6f993e53c66dff3cc984dcd25b50001fb49e8e901602ea22a6b363a6d5221e56e54356615245718459eed73f63d1d2425c88b35496572845f1
+    SHA512 93ab37e8132c9e97e4ca4f1711331e6531ccb75c92eb6cd547576d2c3b0d9fe3c504bb61f1da35c3aae1eeec36e0f556acb2b618af9827b7b3195b3c3d8130a9
     HEAD_REF master
 )
 

diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-s3",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.",
   "homepage": "https://github.com/awslabs/aws-c-s3",
   "license": "Apache-2.0",

diff --git a/ports/cpptrace/portfile.cmake b/ports/cpptrace/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO jeremy-rifkin/cpptrace
     REF "v${VERSION}"
-    SHA512 ae2f9a317d70ce798c1a85d6898d073e65e21febc17c6c0127467ecb9d639f4df102cba37f2199a941a46201933fb75ae1b37cc3042d31f4c94e0279969e642a
+    SHA512 e05a8a070ec7be0a1b36f25901c3ed7b566e4ca69e8e87cde558a0e65743d2dabd4cbad614af32d62a4da4b6a77144853adf7cb1be33335a86f7b1ef2d08c72f
     HEAD_REF main
 )
 

diff --git a/ports/cpptrace/vcpkg.json b/ports/cpptrace/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cpptrace",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Simple, portable, and self-contained stacktrace library for C++11 and newer",
   "homepage": "https://github.com/jeremy-rifkin/cpptrace",
   "license": "MIT",

diff --git a/ports/gklib/android.patch b/ports/gklib/android.patch
@@ -1,8 +1,8 @@
 diff --git a/GKlibSystem.cmake b/GKlibSystem.cmake
-index d83b208..bd94c9d 100644
+index 31a1cf1..848fd05 100644
 --- a/GKlibSystem.cmake
 +++ b/GKlibSystem.cmake
-@@ -98,7 +98,9 @@ endif(GKRAND)
+@@ -113,7 +113,9 @@ endif(GKRAND)
 
 
  # Check for features.

diff --git a/ports/gklib/build-fixes.patch b/ports/gklib/build-fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9cd1b4b..a6b629e 100644
+index 9cd1b4b..3912b26 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,4 +1,4 @@
@@ -8,80 +8,83 @@ index 9cd1b4b..a6b629e 100644
  project(GKlib C)
 
  option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF)
-@@ -22,10 +22,12 @@ if(UNIX)
+@@ -22,10 +22,11 @@ if(UNIX)
    target_link_libraries(GKlib m)
  endif(UNIX)
 
 -include_directories("test")
 -add_subdirectory("test")
--
--install(TARGETS GKlib
+ 
+ install(TARGETS GKlib
 -  ARCHIVE DESTINATION lib/${LINSTALL_PATH}
 -  LIBRARY DESTINATION lib/${LINSTALL_PATH})
--install(FILES ${GKlib_includes} DESTINATION include/${HINSTALL_PATH})
-+install(TARGETS GKlib EXPORT GKlibTargets
++  EXPORT GKlibTargets
 +  INCLUDES DESTINATION "include/GKlib"
-+  )
-+install(FILES ${GKlib_includes} DESTINATION "include/GKlib")
-+install(FILES "win32/adapt.h" DESTINATION "include/GKlib/win32")
-+install(EXPORT GKlibTargets FILE "GKlibTargets.cmake" DESTINATION "share/gklib")
-+file(WRITE "${CMAKE_INSTALL_PREFIX}/share/gklib/GKlibConfig.cmake" [=[
-+include("${CMAKE_CURRENT_LIST_DIR}/GKlibTargets.cmake")
-+]=])
++)
++install(EXPORT GKlibTargets FILE "GKlibConfig.cmake" DESTINATION "share/gklib")
++install(FILES "win32/adapt.h" DESTINATION "include/${HINSTALL_PATH}/win32")
+ install(FILES ${GKlib_includes} DESTINATION include/${HINSTALL_PATH})
 diff --git a/GKlibSystem.cmake b/GKlibSystem.cmake
-index d83b208..8019067 100644
+index 31a1cf1..172a386 100644
 --- a/GKlibSystem.cmake
 +++ b/GKlibSystem.cmake
-@@ -16,7 +16,6 @@ option(GKRAND "enable GKRAND support" OFF)
+@@ -18,7 +18,6 @@ option(NO_X86 "enable NO_X86 support" OFF)
 
  # Add compiler flags.
  if(MSVC)
 -  set(GKlib_COPTS "/Ox")
    set(GKlib_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX")
  elseif(MINGW)
    set(GKlib_COPTS "-DUSE_GKREGEX")
-@@ -34,7 +33,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
-       set(GKlib_COPTIONS "${GKlib_COPTIONS} -fPIC")
+@@ -33,6 +32,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
+   set(GKlib_COPTIONS "${GKlib_COPTIONS} -std=c99 -fno-strict-aliasing")
+ if(VALGRIND)
+   set(GKlib_COPTIONS "${GK_COPTIONS} -march=x86-64 -mtune=generic")
++elseif(1)
++  # Use flags from toolchain and triplet
+ else()
+ # -march=native is not a valid flag on PPC:
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "power|ppc|powerpc|ppc64|powerpc64" OR (APPLE AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64"))
+@@ -46,6 +47,7 @@ endif(VALGRIND)
    endif(NOT MINGW)
  # GCC warnings.
--  set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label")
-+  set(GKlib_COPTIONS "${GKlib_COPTIONS} -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label")
+   set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label")
++  string(REPLACE " -Werror " " " GKlib_COPTIONS "${GKlib_COPTIONS}")
  elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun")
  # Sun insists on -xc99.
    set(GKlib_COPTIONS "${GKlib_COPTIONS} -xc99")
-@@ -60,7 +59,7 @@ endif(OPENMP)
+@@ -75,6 +77,8 @@ endif(NO_X86)
  if(GDB)
    set(GKlib_COPTS "${GKlib_COPTS} -g")
    set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror")
--else()
-+elseif(0)
++elseif(1)
++  # Use flags from toolchain and triplet
+ else()
    set(GKlib_COPTS "-O3")
  endif(GDB)
+diff --git a/gk_ms_inttypes.h b/gk_ms_inttypes.h
+index b89fc10..7247c38 100644
+--- a/gk_ms_inttypes.h
++++ b/gk_ms_inttypes.h
+@@ -35,6 +35,8 @@
 
-diff --git a/gk_arch.h b/gk_arch.h
-index 8c8ac50..122e087 100644
---- a/gk_arch.h
-+++ b/gk_arch.h
-@@ -31,9 +31,9 @@
- #endif
+ #ifndef _MSC_INTTYPES_H_ // [
+ #define _MSC_INTTYPES_H_
++#include <inttypes.h>
++#elif 0
 
+ #if _MSC_VER > 1000
+ #pragma once
+diff --git a/gk_ms_stdint.h b/gk_ms_stdint.h
+index 7e200dc..1c51958 100644
+--- a/gk_ms_stdint.h
++++ b/gk_ms_stdint.h
+@@ -35,6 +35,8 @@
 
--#ifdef __MSC__ 
--  #include "ms_stdint.h"
--  #include "ms_inttypes.h"
-+#ifdef __MSC__
-+  #include <stdint.h>
-+  #include <inttypes.h>
-   #include "ms_stat.h"
-   #include "win32/adapt.h"
- #else
-@@ -60,9 +60,4 @@ typedef ptrdiff_t ssize_t;
- #define PTRDIFF_MAX  INT64_MAX
- #endif
+ #ifndef _MSC_STDINT_H_ // [
+ #define _MSC_STDINT_H_
++#include <stdint.h>
++#elif 0
 
--/* MSC does not have INFINITY defined */
--#ifndef INFINITY
--#define INFINITY FLT_MAX
--#endif
--
- #endif
+ #if _MSC_VER > 1000
+ #pragma once
diff --git a/ports/gklib/fix-mingw.patch b/ports/gklib/fix-mingw.patch
diff --git a/ports/gklib/portfile.cmake b/ports/gklib/portfile.cmake
@@ -1,27 +1,26 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+if(VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KarypisLab/GKlib
-    REF b1cb3bd7f6bf4da641af901c8d455c0f858c816f
-    SHA512 e906c7af8b40ce1c4c4ea43cbfca3e3970e5595686333ac9ac80c6cbc558feb0e833f530f034161927030edac5272234c6ac9cad5287cb6edab0c0671ba3644c
+    REF 8bd6bad750b2b0d90800c632cf18e8ee93ad72d7
+    SHA512 128cd9a48047b18b8013288162556f0b0f1d81845f5445f7cc62590ab28c06ee0a6c602cc999ce268ab27237eca3e8295df6432d377e45071946b98558872997
     PATCHES
         android.patch
         build-fixes.patch
-        fix-mingw.patch
 )
 
-# Delete files that are workarounds for very old copies of msvc.
-file(REMOVE "${SOURCE_PATH}/ms_inttypes.h" "${SOURCE_PATH}/ms_stdint.h")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DHINSTALL_PATH=GKlib
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup()
+
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
-file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[
-gklib provides CMake targets:
-    find_package(GKlib CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE GKlib)
-]=])
diff --git a/ports/gklib/vcpkg.json b/ports/gklib/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "gklib",
-  "version-date": "2022-07-27",
-  "port-version": 3,
+  "version-date": "2023-03-27",
   "description": "General helper libraries for KarypisLab.",
   "homepage": "https://github.com/KarypisLab/GKlib/",
   "license": "Apache-2.0",

diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO harfbuzz/harfbuzz
     REF ${VERSION}
-    SHA512 95450420922a96d20841c6ea3954ae5a720b9f5e8946409f698748735c4fa2399621c973e5a4cb5c672bf298788741e6b8f6d4fd190dcbdc79ac68e9b55181a1
+    SHA512 c90fc8f67ed6d75536a6a0d83434c51756863e51631f00fa390d124d721b003cba4739777b51ac2e9f107914eb5e2ab3daa00dab257435800bb60ff6d5dd45f6
     HEAD_REF master
     PATCHES
         fix-win32-build.patch

diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "harfbuzz",
-  "version": "8.3.1",
-  "port-version": 1,
+  "version": "8.4.0",
   "description": "HarfBuzz OpenType text shaping engine",
   "homepage": "https://github.com/harfbuzz/harfbuzz",
   "license": "MIT-Modern-Variant",

diff --git a/ports/iowa-hills-dsp/portfile.cmake b/ports/iowa-hills-dsp/portfile.cmake
@@ -0,0 +1,17 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO hayguen/iowahills_dsp
+    REF "v${VERSION}"
+    SHA512 095fecb1a4bf074a3e11da7e6edaba4d375c5603bed5f2578b52f900dbd20ac59f2414a8f9432eba1742807fe8553cc1edd63606fc38400cdda77bf32ee49eb1
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
diff --git a/ports/iowa-hills-dsp/vcpkg.json b/ports/iowa-hills-dsp/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "iowa-hills-dsp",
+  "version": "0.1.0",
+  "description": "A platform-independent C/C++ library with many DSP (digital signal processing) functions, amongst also FIR and IIR filter design - but also FFT, DFT, Goertzel and Windowing functions.",
+  "homepage": "https://github.com/hayguen/iowahills_dsp",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/libcap/portfile.cmake b/ports/libcap/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-3c7dda330bd9a154bb5b878d31fd591e4951fe17.tar.gz
-    FILENAME libpcap-${VERSION}.tar.gz
-    SHA512 0732c9f07be38c2bb06409f1f31d7ed5ad31b38ae380650b334074856f89b885deabb9603e21a989e81b530050c068bbbf60157adbf3ca3893e4bca7d61f63d2
+    URLS "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-${VERSION}.tar.gz"
+    FILENAME "libcap-${VERSION}.tar.gz"
+    SHA512 b243ae403d45af2ff1204931b9e24c3b7f3e0c444f1ff2f3ed524c212b61a7ff1bc3c98df1855b2f0d300ebabf604b95440cdaddd666914ad60575e2e2f29fe8
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH

diff --git a/ports/libcap/vcpkg.json b/ports/libcap/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libcap",
   "version": "2.69",
-  "port-version": 3,
+  "port-version": 4,
   "description": "A library for getting and setting POSIX.1e (formerly POSIX 6) draft 15 capabilities.",
   "homepage": "https://git.kernel.org/pub/scm/libs/libcap/libcap.git",
   "license": "BSD-3-Clause OR GPL-2.0-only",

diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake
@@ -3,7 +3,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MediaArea/MediaInfoLib
     REF "v${MEDIAINFO_VERSION}"
-    SHA512 e664153197611647ee5496a0eb2105ac0574522585ecae2c51e35ea018a33a3da230158a4d1159e0abb5935ef953b7f841c6719eecfbba13de3fd9fdf06b8556
+    SHA512 0a7d40302ac90846f868614a2b292b0d918910614b3ff314ef2f41818a383219008f0458339667f39515957f674bd09e936fcde25612e2124af1e107324ee2fd
     HEAD_REF master
     PATCHES
         msvc-arm.diff

diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libmediainfo",
-  "version": "24.1",
+  "version": "24.3",
   "description": "Get most relevant technical and tag data from video and audio files",
   "homepage": "https://github.com/MediaArea/MediaInfoLib",
   "dependencies": [

diff --git a/ports/libmount/hide-private-symbols.diff b/ports/libmount/hide-private-symbols.diff
@@ -0,0 +1,15 @@
+diff --git a/include/strutils.h b/include/strutils.h
+index e9f8a0c..2f6d285 100644
+--- a/include/strutils.h
++++ b/include/strutils.h
+@@ -16,6 +16,10 @@
+
+ #include "c.h"
+
++// private, and clashing with libsystemd.
++#define parse_size ul__parse_size
++#define parse_range ul__parse_range
++
+ /* initialize a custom exit code for all *_or_err functions */
+ extern void strutils_set_exitcode(int exit_code);
+
diff --git a/ports/libmount/portfile.cmake b/ports/libmount/portfile.cmake
@@ -1,13 +1,15 @@
 vcpkg_download_distfile(ARCHIVE
     URLS "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${VERSION}/util-linux-${VERSION}.tar.xz"
     FILENAME "util-linux-${VERSION}.tar.xz"
-    SHA512 3d59a0f114c06be19ef7f86fca37ba5b9073823d011b3fc37997ddb00124b4505ea32903b78798a64dffbccf0ba645a692678ee845cc65a5b321824448a82a94
+    SHA512 f06e61d4ee0e196223f7341ec75a16a6671f82d6e353823490ecff17e947bb169a6b65177e3ab0da6e733e079b24d6a77905a0e8bbfed82ca9aa22a3facb6180
 )
 
 vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE ${VERSION}
+    PATCHES
+        hide-private-symbols.diff
 )
 
 set(ENV{GTKDOCIZE} true)

diff --git a/ports/libmount/vcpkg.json b/ports/libmount/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "libmount",
-  "version": "2.39",
+  "version": "2.40",
   "description": "Block device identification library from util-linux",
   "homepage": "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/about/",
   "license": null,