microsoft · dg0yt · Dec 25, 2023 · Dec 25, 2023 · Dec 25, 2023 · Dec 25, 2023
diff --git a/ports/ccfits/portfile.cmake b/ports/ccfits/portfile.cmake
@@ -14,6 +14,8 @@ vcpkg_extract_source_archive(
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 removes std::binary_function
 )
 
 vcpkg_cmake_install()

diff --git a/ports/ccfits/vcpkg.json b/ports/ccfits/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ccfits",
   "version": "2.5",
-  "port-version": 11,
+  "port-version": 12,
   "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.",
   "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/",
   "license": "NASA-1.3",

diff --git a/ports/cello/CMakeLists.txt b/ports/cello/CMakeLists.txt
@@ -16,6 +16,10 @@ target_include_directories(
 
 set_target_properties(cello PROPERTIES PUBLIC_HEADER include/Cello.h)
 
+if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS "33")
+    target_compile_definitions(cello PRIVATE CELLO_NSTRACE)
+endif()
+
 install(TARGETS cello EXPORT unofficial-cello-config)
 
 install(

diff --git a/ports/cello/vcpkg.json b/ports/cello/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "cello",
   "version-date": "2019-07-23",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Higher level programming in C",
   "homepage": "https://libcello.org/",
+  "license": "BSD-2-Clause-Views",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/cgicc/portfile.cmake b/ports/cgicc/portfile.cmake
@@ -19,6 +19,8 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}
 
 vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
+  OPTIONS
+    -DCMAKE_CXX_STANDARD=11 # 17 removes std::unary_function
   OPTIONS_DEBUG
     -DDISABLE_INSTALL_HEADERS=ON
     -DDISABLE_INSTALL_TOOLS=ON

diff --git a/ports/cgicc/vcpkg.json b/ports/cgicc/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "cgicc",
   "version": "3.2.20",
+  "port-version": 1,
   "description": "GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web",
   "homepage": "https://www.gnu.org/software/cgicc/",
   "dependencies": [

diff --git a/ports/chmlib/CMakeLists.txt b/ports/chmlib/CMakeLists.txt
@@ -1,7 +1,13 @@
 cmake_minimum_required(VERSION 3.5)
 project(chm C)
 
+include (CheckIncludeFiles)
+check_include_files(strings.h HAVE_STRINGS_H) # for ffs
+
 add_library(chm src/lzx.c src/chm_lib.c)
+if(HAVE_STRINGS_H)
+    target_compile_definitions(chm PRIVATE CHMLIB_HAVE_STRINGS_H)
+endif()
 
 if(BUILD_TOOLS)
     link_libraries(chm)

diff --git a/ports/chmlib/portfile.cmake b/ports/chmlib/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_extract_source_archive(
     ARCHIVE "${ARCHIVE}"
     PATCHES
         all-platforms.patch
+        strings_h.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")

diff --git a/ports/chmlib/strings_h.patch b/ports/chmlib/strings_h.patch
@@ -0,0 +1,13 @@
+diff --git a/src/chm_lib.c b/src/chm_lib.c
+index 6c6736c..4a3f167 100644
+--- a/src/chm_lib.c
++++ b/src/chm_lib.c
+@@ -62,7 +62,7 @@
+ #include <stdio.h>
+ #endif
+
+-#if __sun || __sgi
++#ifdef CHMLIB_HAVE_STRINGS_H
+ #include <strings.h>
+ #endif
+
diff --git a/ports/chmlib/vcpkg.json b/ports/chmlib/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "chmlib",
   "version": "0.40",
-  "port-version": 7,
+  "port-version": 8,
   "description": "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.",
   "homepage": "http://www.jedrea.com/chmlib/",
   "license": "LGPL-2.1-or-later",

diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}/src"
     OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 removes std::unary_function
         -DBUILD_LOADLIBRARIES=OFF
         -DBUILD_EXAMPLES=OFF
         -DSUFFIX_LIB=

diff --git a/ports/clfft/vcpkg.json b/ports/clfft/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "clfft",
   "version": "2.12.2",
-  "port-version": 6,
+  "port-version": 7,
   "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.",
   "homepage": "https://github.com/clMathLibraries/clFFT",
   "license": "Apache-2.0",

diff --git a/ports/crfsuite/CMakeLists.txt b/ports/crfsuite/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 PROJECT(crfsuite)
 
+if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS 28)
+    set(CMAKE_C_STANDARD 99) # no aligned_alloc
+endif()
+
 file(GLOB SOURCE_FILE_CQDB
     "lib/cqdb/src/*.c"
 )

diff --git a/ports/crfsuite/vcpkg.json b/ports/crfsuite/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "crfsuite",
   "version-date": "2020-08-27",
+  "port-version": 1,
   "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.",
   "homepage": "https://www.chokkan.org/software/crfsuite/",
   "license": null,

diff --git a/ports/dp-thread-pool/portfile.cmake b/ports/dp-thread-pool/portfile.cmake
@@ -14,6 +14,7 @@ vcpkg_cmake_configure(
         -DTP_BUILD_TESTS=OFF
         -DTP_BUILD_EXAMPLES=OFF
         -DTP_BUILD_BENCHMARKS=OFF
+        -DTP_CXX_STANDARD=20
 )
 
 vcpkg_cmake_install()

diff --git a/ports/dp-thread-pool/vcpkg.json b/ports/dp-thread-pool/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dp-thread-pool",
   "version": "0.6.2",
+  "port-version": 1,
   "maintainers": "Paul Tsouchlos <developer.paul.123@gmail.com>",
   "description": "dp::thread_pool - fast, lightweight C++20 thread pool.",
   "homepage": "https://github.com/DeveloperPaul123/thread-pool",

diff --git a/ports/entityx/portfile.cmake b/ports/entityx/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # std::iterator<X,Y> is deprecated in C++17
         -DENTITYX_BUILD_TESTING=false
         -DENTITYX_BUILD_SHARED=0
 )

diff --git a/ports/entityx/vcpkg.json b/ports/entityx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "entityx",
   "version": "1.3.0",
-  "port-version": 5,
+  "port-version": 6,
   "description": "EntityX - A fast, type-safe C++ Entity-Component system.",
   "homepage": "https://github.com/alecthomas/entityx",
   "dependencies": [

diff --git a/ports/freeglut/android.patch b/ports/freeglut/android.patch
@@ -0,0 +1,12 @@
+diff --git a/src/android/native_app_glue/android_native_app_glue.c b/src/android/native_app_glue/android_native_app_glue.c
+index be8d941..6ddae78 100644
+--- a/src/android/native_app_glue/android_native_app_glue.c
++++ b/src/android/native_app_glue/android_native_app_glue.c
+@@ -18,6 +18,7 @@
+ #include <jni.h>
+
+ #include <errno.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/resource.h>
diff --git a/ports/freeglut/gles.patch b/ports/freeglut/gles.patch
@@ -0,0 +1,22 @@
+diff --git a/src/fg_geometry.c b/src/fg_geometry.c
+index ee7cc89..ea42f72 100644
+--- a/src/fg_geometry.c
++++ b/src/fg_geometry.c
+@@ -44,7 +44,7 @@
+
+ /* declare for drawing using the different OpenGL versions here so we can
+    have a nice code order below */
+-#ifndef GL_VERSION_1_1
++#if !(defined(GL_VERSION_1_1) || defined(GL_VERSION_ES_CM_1_0))
+ static void fghDrawGeometryWire10(GLfloat *varr, GLfloat *narr, GLushort *iarr,
+ 		GLsizei nparts, GLsizei npartverts, GLenum prim, GLushort *iarr2,
+ 		GLsizei nparts2, GLsizei npartverts2);
+@@ -222,7 +222,7 @@ void fghDrawGeometrySolid(GLfloat *vertices, GLfloat *normals, GLfloat *textcs,
+     }
+ }
+
+-#ifndef GL_VERSION_1_1
++#if !(defined(GL_VERSION_1_1) || defined(GL_VERSION_ES_CM_1_0))
+ static void fghDrawGeometryWire10(GLfloat *varr, GLfloat *narr, GLushort *iarr,
+ 		GLsizei nparts, GLsizei npartverts, GLenum prim, GLushort *iarr2,
+ 		GLsizei nparts2, GLsizei npartverts2)
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake
@@ -4,7 +4,9 @@ vcpkg_from_github(
     REF "v${VERSION}"
     SHA512 4bb6d6c086bac7a9c0ec78062dce58987555785abe6375f462ee249f65210a964a28fb10ba7ee8a42d7fafb00eb8d196eb403d65d255f02f88467369c187228b
     HEAD_REF master
-    PATCHES 
+    PATCHES
+        android.patch
+        gles.patch # amends https://github.com/freeglut/freeglut/commit/093a5a46
         x11-dependencies-export.patch
         fix-debug-macro.patch
         no_x64_enforcement.patch

diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "freeglut",
   "version": "3.4.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library.",
   "homepage": "https://sourceforge.net/projects/freeglut/",
   "license": null,

diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
         install-layout.patch
         keep-dup-libs.patch
         windows-linkage.patch
+        winpr_strerror.patch
 )
 file(WRITE "${SOURCE_PATH}/.source_version" "${VERSION}-vcpkg")
 file(WRITE "${SOURCE_PATH}/CMakeCPack.cmake" "")

diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "freerdp",
   "version": "3.4.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A free implementation of the Remote Desktop Protocol (RDP)",
   "homepage": "https://github.com/FreeRDP/FreeRDP",
   "license": "Apache-2.0",

diff --git a/ports/freerdp/winpr_strerror.patch b/ports/freerdp/winpr_strerror.patch
@@ -0,0 +1,12 @@
+diff --git a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c
+index d43b588..854c93a 100644
+--- a/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c
++++ b/winpr/libwinpr/sysinfo/cpufeatures/cpu-features.c
+@@ -73,6 +73,7 @@
+ #include <sys/system_properties.h>
+ #include <unistd.h>
+ #include <winpr/wtypes.h>
++#include <winpr/debug.h>
+
+ static pthread_once_t g_once;
+ static int g_inited;
diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake
@@ -17,6 +17,7 @@ file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # C++17 does not allow 'register'
         -DCMAKE_DISABLE_FIND_PACKAGE_LAPACK=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_FFT=ON
         -DCMAKE_DISABLE_FIND_PACKAGE_BLAS=ON

diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "itpp",
   "version-semver": "4.3.1",
-  "port-version": 10,
+  "port-version": 11,
   "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.",
   "homepage": "http://itpp.sourceforge.net",
   "dependencies": [

diff --git a/ports/keccak-tiny/vcpkg.json b/ports/keccak-tiny/vcpkg.json
@@ -1,9 +1,11 @@
 {
   "name": "keccak-tiny",
   "version-date": "2014-09-08",
+  "port-version": 1,
   "description": "A tiny implementation of SHA-3, SHAKE, Keccak, and sha3sum",
   "homepage": "https://github.com/coruus/keccak-tiny",
   "license": "CC0-1.0",
+  "supports": "!android",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/ports/libcopp/portfile.cmake b/ports/libcopp/portfile.cmake
@@ -16,10 +16,20 @@ vcpkg_from_github(
   HEAD_REF main
   )
 
+vcpkg_list(SET options)
+if(VCPKG_TARGET_IS_ANDROID)
+    vcpkg_list(APPEND options
+        -DCMAKE_CXX_EXTENSIONS=OFF
+        -DCOMPILER_OPTION_CURRENT_MAX_CXX_STANDARD=20
+    )
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
-    OPTIONS "-DATFRAMEWORK_CMAKE_TOOLSET_DIR=${ATFRAMEWORK_CMAKE_TOOLSET}"
+    OPTIONS
+        ${options}
+        "-DATFRAMEWORK_CMAKE_TOOLSET_DIR=${ATFRAMEWORK_CMAKE_TOOLSET}"
 )
 
 vcpkg_cmake_install()

diff --git a/ports/libcopp/vcpkg.json b/ports/libcopp/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libcopp",
   "version": "2.2.0",
+  "port-version": 1,
   "maintainers": "owent <admin@owent.net>",
   "description": "A cross-platfrom coroutine library for C++",
   "homepage": "https://github.com/owent/libcopp",

diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake
@@ -17,10 +17,12 @@ vcpkg_from_github(
         005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61
 )
 
-set(EXTRA_OPTIONS)
+set(EXTRA_OPTIONS "")
 
 if(VCPKG_TARGET_IS_EMSCRIPTEN)
     list(APPEND EXTRA_OPTIONS "-DCMAKE_CXX_STANDARD=11")
+elseif(VCPKG_TARGET_IS_ANDROID)
+    list(APPEND EXTRA_OPTIONS "-DCMAKE_CXX_STANDARD=11")
 endif()
 
 vcpkg_cmake_configure(

diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libmodplug",
   "version": "0.8.9.0",
-  "port-version": 11,
+  "port-version": 12,
   "description": "The ModPlug mod file playing library.",
   "homepage": "https://github.com/Konstanty/libmodplug",
   "license": null,

diff --git a/ports/libodb-pgsql/CMakeLists.txt b/ports/libodb-pgsql/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(libodb-pgsql VERSION 2.4.0 LANGUAGES CXX)
+set(CMAKE_CXX_STANDARD 11) # 17 removes 'auto_ptr'
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
 find_package(PostgreSQL REQUIRED)
 configure_file(config.unix.h.in

diff --git a/ports/libodb-pgsql/vcpkg.json b/ports/libodb-pgsql/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libodb-pgsql",
   "version": "2.4.0",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Description: PostgreSQL support for the ODB ORM library",
   "homepage": "https://www.codesynthesis.com/products/odb/",
   "dependencies": [

diff --git a/ports/libodb-sqlite/CMakeLists.txt b/ports/libodb-sqlite/CMakeLists.txt
@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 project(libodb-sqlite VERSION 2.4.0 LANGUAGES CXX)
+set(CMAKE_CXX_STANDARD 11) # 17 removes 'auto_ptr'
 find_package(odb 2.4.0 REQUIRED COMPONENTS libodb)
 find_package(unofficial-sqlite3 CONFIG)
 configure_file(config.unix.h.in odb/sqlite/details/config.h COPYONLY)

diff --git a/ports/libodb-sqlite/vcpkg.json b/ports/libodb-sqlite/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libodb-sqlite",
   "version": "2.4.0",
-  "port-version": 11,
+  "port-version": 12,
   "description": "Sqlite support for the ODB ORM library",
   "homepage": "https://www.codesynthesis.com/products/odb/",
   "dependencies": [

diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake
@@ -22,6 +22,8 @@ file(COPY
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DCMAKE_CXX_STANDARD=11 # 17 removes 'auto_ptr'
     OPTIONS_DEBUG
         -DLIBODB_INSTALL_HEADERS=OFF
 )

diff --git a/ports/libodb/vcpkg.json b/ports/libodb/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libodb",
   "version": "2.4.0",
-  "port-version": 11,
+  "port-version": 12,
   "description": "ODB library, base runtime for the ODB ORM solution",
   "homepage": "https://www.codesynthesis.com/products/odb/",
   "dependencies": [