Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

Revert "Merge branch 'master' of https://github.com/erdogan61/vcpkg" 

This reverts commit 789c93e81a, reversing
changes made to c87a8183bd.
This commit is contained in:
dtmen 2022-12-03 11:28:45 +01:00
parent 789c93e81a
commit a97bdb05f4
65 changed files with 226 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/examples/packaging-github-repos.md
View File

@ -27,7 +27,7 @@ vcpkg_from_github(
)
```
The important parts to update are `REPO` for the GitHub repository path, `REF` for a stable tag/commit to use, and `SHA512` with the checksum of the downloaded file (you can get this easily by setting it to `0`, trying to install the package, and copying the checksum).
The important parts to update are `REPO` for the GitHub repository path, `REF` for a stable tag/commit to use, and `SHA512` with the checksum of the downloaded zipfile (you can get this easily by setting it to `0`, trying to install the package, and copying the checksum).
Finally, we configure the project with CMake, install the package, and copy over the license file:

2
docs/users/binarycaching.md
View File

@ -47,7 +47,7 @@ By default, zip-based archives will be cached at the first valid location of:
| form | description
|-----------------------------|---------------
| `clear` | Disable read all previous sources (including the default)
| `clear` | Removes all previous sources (including the default)
| `default[,<rw>]` | Adds the default file-based location
| `files,<absolute path>[,<rw>]` | Adds a custom file-based location
| `nuget,<uri>[,<rw>]` | Adds a NuGet-based source; equivalent to the `-Source` parameter of the NuGet CLI

5
docs/users/buildsystems/cmake-integration.md
View File

@ -224,8 +224,3 @@ Defaults to `OFF`.
This variable can be set to a list of feature flags to pass to the vcpkg tool during automatic installation to opt-in to experimental behavior.
See the `--feature-flags=` command line option for more information.
### `VCPKG_TRACE_FIND_PACKAGE`
When this option is turned on, every call to `find_package` is printed.
Nested calls (e.g. via `find_dependency`) are indented according to nesting depth.

13
ports/alsa/fix-plugin-dir.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/dlmisc.c b/src/dlmisc.c
index 1dd91356..19ee9cfa 100644
--- a/src/dlmisc.c
+++ b/src/dlmisc.c
@@ -95,7 +95,7 @@ int snd_dlpath(char *path, size_t path_len, const char *name)
if (env) {
snd_plugin_dir = strdup(env);
} else {
- snd_dlinfo_origin(path, path_len);
+ snd_plugin_dir = strdup(ALSA_PLUGIN_DIR);
}
snd_plugin_dir_set = 1;
}

18
ports/alsa/portfile.cmake
View File

@ -14,8 +14,6 @@ vcpkg_from_github(
REF v1.2.6.1
SHA512 d1de9112ec0d600db6e5a20b558811a7a9f34d00a9b1dfb5332669b73732c1c1b8ddda57368edc199e255eba8bcb8a6767b4d9325c9860ade02d84dcaac6eb47
HEAD_REF master
PATCHES
"fix-plugin-dir.patch"
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@ -24,26 +22,12 @@ else()
set(BUILD_OPTS --enable-shared=no --enable-static=yes)
endif()
set(ARCH64 "x64;arm64")
set(ARCH32 "x86;arm")
if( (VCPKG_TARGET_ARCHITECTURE IN_LIST ARCH64) AND (EXISTS "/usr/lib64/alsa-lib") )
set(ALSA_PLUGIN_DIR "/usr/lib64/alsa-lib")
elseif( (VCPKG_TARGET_ARCHITECTURE IN_LIST ARCH32) AND (EXISTS "/usr/lib32/alsa-lib") )
set(ALSA_PLUGIN_DIR "/usr/lib32/alsa-lib")
else()
set(ALSA_PLUGIN_DIR "/usr/lib/alsa-lib")
endif()
set(ALSA_CONFIG_DIR "/usr/share/alsa")
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}"
AUTOCONFIG
OPTIONS
${BUILD_OPTS}
--disable-python
"--with-configdir=${ALSA_CONFIG_DIR}"
"--with-plugindir=${ALSA_PLUGIN_DIR}"
)
vcpkg_install_make()
@ -54,5 +38,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools/alsa/debug")
configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

5
ports/alsa/usage
View File

@ -1,5 +0,0 @@
CMake provides the module target:
find_package("ALSA" MODULE REQUIRED)
target_link_libraries("main" PRIVATE "ALSA::ALSA")

1
ports/alsa/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "alsa",
"version": "1.2.6.1",
"port-version": 1,
"description": "The Advanced Linux Sound Architecture (ALSA) - library",
"homepage": "https://www.alsa-project.org/",
"license": "LGPL-2.1-or-later",

21
ports/asyncplusplus/portfile.cmake
View File

@ -8,14 +8,23 @@ vcpkg_from_github(
HEAD_REF master
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_cmake_install()
vcpkg_install_cmake()
vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME async++)
file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/Async++.cmake ${CURRENT_PACKAGES_DIR}/cmake/Async++Targets.cmake)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/async++)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/async++/Async++Targets.cmake ${CURRENT_PACKAGES_DIR}/share/async++/Async++.cmake)
file(READ ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake _contents)
file(WRITE ${CURRENT_PACKAGES_DIR}/share/async++/Async++Config.cmake "include(CMakeFindDependencyMacro)\n${_contents}")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/asyncplusplus)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/asyncplusplus/copyright)

17
ports/asyncplusplus/vcpkg.json
View File

@ -1,18 +1,7 @@
{
"name": "asyncplusplus",
"version": "1.1",
"port-version": 2,
"version-string": "1.1",
"port-version": 1,
"description": "Async++ is a lightweight concurrency framework for C++11",
"license": "MIT",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
"supports": "!uwp"
}

12
ports/brotli/fix-ios.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcd9024..a717b87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,6 +225,7 @@ if(NOT BROTLI_BUNDLED_MODE)
install(
TARGETS brotli
RUNTIME DESTINATION tools/brotli
+ BUNDLE DESTINATION tools/brotli
CONFIGURATIONS Release
)

5
ports/brotli/install.patch
View File

@ -18,13 +18,12 @@ index 4ff3401..46492d0 100644
endforeach()
if(NOT BROTLI_EMSCRIPTEN)
@@ -223,27 +222,36 @@ if(NOT BROTLI_EMSCRIPTEN)
@@ -223,27 +222,35 @@ if(NOT BROTLI_EMSCRIPTEN)
if(NOT BROTLI_BUNDLED_MODE)
install(
TARGETS brotli
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+ RUNTIME DESTINATION tools/brotli
+ BUNDLE DESTINATION tools/brotli
+ CONFIGURATIONS Release
)
@ -53,7 +52,7 @@ index 4ff3401..46492d0 100644
+ CONFIGURATIONS Release
)
+
+ install(EXPORT brotli FILE unofficial-brotli-targets.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
+ install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli)
endif() # BROTLI_BUNDLED_MODE
endif() # BROTLI_EMSCRIPTEN

74
ports/brotli/pkgconfig.patch
View File

@ -1,18 +1,74 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cdb73b..33a80a7 100644
index b1c654b..fcd9024 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,6 +406,13 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
@@ -390,7 +390,7 @@ function(generate_pkg_config_path outvar path)
set("${outvar}" "${${outvar}}" PARENT_SCOPE)
endfunction(generate_pkg_config_path)
-function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
+function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION SHARED_TARGET STATIC_TARGET)
file(READ ${INPUT_FILE} TEXT)
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
@@ -404,15 +404,22 @@ function(transform_pc_file INPUT_FILE OUTPUT_FILE VERSION)
string(REGEX REPLACE "@includedir@" "${INCLUDEDIR}" TEXT ${TEXT})
string(REGEX REPLACE "@PACKAGE_VERSION@" "${VERSION}" TEXT ${TEXT})
+ string(REPLACE [[ -R${libdir}]] "" TEXT ${TEXT})
+ if(NOT BUILD_SHARED_LIBS)
+ string(REGEX REPLACE [[( -lbrotli[a-z]*)]] [[\1-static]] TEXT ${TEXT})
+ if(LIBM_LIBRARY)
+ string(REPLACE " -lbrotlicommon-static" " -lbrotlicommon-static -l${LIBM_LIBRARY}" TEXT ${TEXT})
+ endif()
+
+ if(BUILD_SHARED_LIBS)
+ set(LIB_NAME "${SHARED_TARGET}")
+ else()
+ set(LIB_NAME "${STATIC_TARGET}")
+ endif()
+ string(REGEX REPLACE "@lib_name@" "${LIB_NAME}" TEXT ${TEXT})
file(WRITE ${OUTPUT_FILE} ${TEXT})
endfunction()
-transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}")
+transform_pc_file("scripts/libbrotlicommon.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc" "${BROTLI_VERSION}" brotlicommon brotlicommon-static)
-transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}")
+transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlidec.pc" "${BROTLI_VERSION}" brotlidec brotlidec-static)
-transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}")
+transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}" brotlienc brotlienc-static)
if(NOT BROTLI_EMSCRIPTEN)
if(NOT BROTLI_BUNDLED_MODE)
diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
index 10ca969..7736344 100644
--- a/scripts/libbrotlicommon.pc.in
+++ b/scripts/libbrotlicommon.pc.in
@@ -7,5 +7,5 @@ Name: libbrotlicommon
URL: https://github.com/google/brotli
Description: Brotli common dictionary library
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -R${libdir} -lbrotlicommon
+Libs: -L${libdir} -l@lib_name@
Cflags: -I${includedir}
diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
index e7c3124..a7dc8ce 100644
--- a/scripts/libbrotlidec.pc.in
+++ b/scripts/libbrotlidec.pc.in
@@ -7,6 +7,6 @@ Name: libbrotlidec
URL: https://github.com/google/brotli
Description: Brotli decoder library
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -R${libdir} -lbrotlidec
+Libs: -L${libdir} -l@lib_name@
Requires.private: libbrotlicommon >= 1.0.2
Cflags: -I${includedir}
diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
index 4dd0811..eb2712e 100644
--- a/scripts/libbrotlienc.pc.in
+++ b/scripts/libbrotlienc.pc.in
@@ -7,6 +7,6 @@ Name: libbrotlienc
URL: https://github.com/google/brotli
Description: Brotli encoder library
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -R${libdir} -lbrotlienc
+Libs: -L${libdir} -l@lib_name@
Requires.private: libbrotlicommon >= 1.0.2
Cflags: -I${includedir}

12
ports/brotli/portfile.cmake
View File

@ -8,6 +8,7 @@ vcpkg_from_github(
install.patch
fix-arm-uwp.patch
pkgconfig.patch
fix-ios.patch
)
vcpkg_cmake_configure(
@ -15,15 +16,16 @@ vcpkg_cmake_configure(
OPTIONS
-DBROTLI_DISABLE_TESTS=ON
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/brotli")
vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli)
vcpkg_fixup_pkgconfig()
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-brotli-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-brotli")
vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/brotli")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-brotli")
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

11
ports/brotli/unofficial-brotli-config.cmake
View File

@ -1,11 +0,0 @@
include("${CMAKE_CURRENT_LIST_DIR}/unofficial-brotli-targets.cmake")
foreach(target IN ITEMS brotlicommon brotlidec brotlienc)
if(TARGET unofficial::brotli::${target} AND NOT TARGET unofficial::brotli::${target}-static)
_add_library(unofficial::brotli::${target}-static INTERFACE IMPORTED)
set_target_properties(unofficial::brotli::${target}-static PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${target}")
endif()
if(NOT TARGET unofficial::brotli::${target} AND TARGET unofficial::brotli::${target}-static)
_add_library(unofficial::brotli::${target} INTERFACE IMPORTED)
set_target_properties(unofficial::brotli::${target} PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${target}-static")
endif()
endforeach()

7
ports/brotli/usage
View File

@ -1,7 +0,0 @@
brotli provides CMake targets:
find_package(unofficial-brotli CONFIG REQUIRED)
# Brotli decoder library
target_link_libraries(main PRIVATE unofficial::brotli::brotlidec)
# Brotli encoder library
target_link_libraries(main PRIVATE unofficial::brotli::brotlienc)

11
ports/brotli/vcpkg-cmake-wrapper.cmake Normal file
View File

@ -0,0 +1,11 @@
_find_package(${ARGS})
foreach(T brotlicommon brotlidec brotlienc)
if(TARGET unofficial::brotli::${T} AND NOT TARGET unofficial::brotli::${T}-static)
_add_library(unofficial::brotli::${T}-static INTERFACE IMPORTED)
set_target_properties(unofficial::brotli::${T}-static PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}")
endif()
if(NOT TARGET unofficial::brotli::${T} AND TARGET unofficial::brotli::${T}-static)
_add_library(unofficial::brotli::${T} INTERFACE IMPORTED)
set_target_properties(unofficial::brotli::${T} PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}-static")
endif()
endforeach()

2
ports/brotli/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "brotli",
"version": "1.0.9",
"port-version": 4,
"port-version": 3,
"description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.",
"homepage": "https://github.com/google/brotli",
"license": "MIT",

17
ports/g3log/portfile.cmake
View File

@ -1,17 +1,20 @@
vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KjellKod/g3log
REF 6f6da0ed2a8b42b8a5d1a416fe1646fe45e45c99
SHA512 65d966e0cb35ae6903619349520f12abf473c98ce6c9ffcb9b196b0be5d2b75ee5b716eeec8285ddc909f65049d8feab9389347c28be376b46cdb0d9246ffbbd
REF 2fca06ff6da5c67465b591f4d45e8fd14d531142 #v1.3.4
SHA512 8dba89e5a08e44d585478470725e25e37486685d8fe4d3cb5e97c81013389c95d96bdde658244e425008169bc8a9fc2d34a065b83b110c62e73d3ccab9b2b9e1
HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" G3_SHARED_LIB)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" G3_SHARED_RUNTIME)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
# https://github.com/KjellKod/g3log#prerequisites
set(VERSION "1.3.4")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DG3_SHARED_LIB=${G3_SHARED_LIB} # Options.cmake
-DG3_SHARED_RUNTIME=${G3_SHARED_RUNTIME} # Options.cmake
@ -21,11 +24,11 @@ vcpkg_cmake_configure(
-DVERSION=${VERSION}
)
vcpkg_cmake_install()
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/g3log)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/g3log)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

16
ports/g3log/vcpkg.json
View File

@ -1,18 +1,8 @@
{
"name": "g3log",
"version": "2.1",
"version": "1.3.4",
"port-version": 2,
"description": "Asynchronous logger with Dynamic Sinks",
"homepage": "https://github.com/KjellKod/g3log",
"license": "Unlicense",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
"supports": "!(arm | uwp)"
}

4
ports/glog/fix_cplusplus_macro.patch
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d145517..e8e1c90 100644
index d145517..681b791 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,6 +669,10 @@ if (CYGWIN OR WIN32)
@ -7,7 +7,7 @@ index d145517..e8e1c90 100644
endif (CYGWIN OR WIN32)
+if ((MSVC) AND (MSVC_VERSION GREATER_EQUAL 1914))
+ target_compile_options(glog INTERFACE "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/Zc:__cplusplus>")
+ target_compile_options(glog INTERFACE "/Zc:__cplusplus")
+endif()
+
if (WITH_CUSTOM_PREFIX)

8
ports/glog/portfile.cmake
View File

@ -11,11 +11,9 @@ vcpkg_from_github(
fix_cplusplus_macro.patch
)
vcpkg_check_features(
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
unwind WITH_UNWIND
customprefix WITH_CUSTOM_PREFIX
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
unwind WITH_UNWIND
customprefix WITH_CUSTOM_PREFIX
)
file(REMOVE "${SOURCE_PATH}/glog-modules.cmake.in")

2
ports/glog/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "glog",
"version": "0.6.0",
"port-version": 2,
"port-version": 1,
"description": "C++ implementation of the Google logging module",
"homepage": "https://github.com/google/glog",
"license": "BSD-3-Clause",

38
ports/glslang/install-to-datadir.patch
View File

@ -1,38 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b581c84..a011686 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -375,13 +375,13 @@ if(ENABLE_GLSLANG_INSTALL)
include("@PACKAGE_PATH_EXPORT_TARGETS@")
]=])
- set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake")
+ set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/glslang-targets.cmake")
configure_package_config_file(
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
PATH_VARS
PATH_EXPORT_TARGETS
- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
)
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
@@ -392,7 +392,7 @@ if(ENABLE_GLSLANG_INSTALL)
install(
EXPORT glslang-targets
NAMESPACE "glslang::"
- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+ DESTINATION "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"
)
install(
@@ -400,6 +400,6 @@ if(ENABLE_GLSLANG_INSTALL)
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/glslang-config-version.cmake"
DESTINATION
- "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+ "${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}"
)
endif()
\ No newline at end of file

5
ports/glslang/portfile.cmake
View File

@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/glslang
REF 11.12.0
SHA512 fd955f9912551668056dfe52835eef11e5dc0bf0d25b2d961a31f684adbd63bc6380759944c1921cfd63d359a58c7cc3a4a4d5eea69fa1b050f58960e5101271
REF 11.11.0
SHA512 c018271d499efff03540e4572a9c2f1f752c81c87efe7f2e63c2631ac47cecfedffdcfee68eddaf9187603eaae8ccd9a3e5640a022ba9fd7d05950f7827bf8cd
HEAD_REF master
PATCHES
ignore-crt.patch
install-to-datadir.patch
)
vcpkg_find_acquire_program(PYTHON3)

3
ports/glslang/vcpkg.json
View File

@ -1,10 +1,9 @@
{
"name": "glslang",
"version": "11.12.0",
"version": "11.11.0",
"port-version": 1,
"description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator",
"homepage": "https://github.com/KhronosGroup/glslang",
"license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",
"dependencies": [
{
"name": "vcpkg-cmake",

4
ports/google-cloud-cpp/portfile.cmake
View File

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO googleapis/google-cloud-cpp
REF v2.5.0
SHA512 e4ead5aa91d542a81ac6405597726f2ee0c96278db2a974784110d1fb3ab4574ae3d5ae42e46a91e25f4b25bddc42395876db3406beb8ce40a9dd17e9647e7d5
REF v2.4.0
SHA512 a432a7987c7a5fd0486ece3402acd1f7b2f8f239d10571edf6a036dc9eb73be30ca3f5ca63ac31bdef6ee95b9fff0be32af81fb3ba3ec9cb7faf59e3a17e9925
HEAD_REF main
PATCHES
support_absl_cxx17.patch

26
ports/google-cloud-cpp/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "google-cloud-cpp",
"version": "2.5.0",
"version": "2.4.0",
"description": "C++ Client Libraries for Google Cloud Platform APIs.",
"homepage": "https://github.com/googleapis/google-cloud-cpp",
"license": "Apache-2.0",
@ -270,18 +270,6 @@
}
]
},
"connectors": {
"description": "Connectors API C++ Client Library",
"dependencies": [
{
"name": "google-cloud-cpp",
"default-features": false,
"features": [
"grpc-common"
]
}
]
},
"contactcenterinsights": {
"description": "Contact Center AI Insights API C++ Client Library",
"dependencies": [
@ -1152,18 +1140,6 @@
}
]
},
"vmwareengine": {
"description": "VMware Engine API C++ Client Library",
"dependencies": [
{
"name": "google-cloud-cpp",
"default-features": false,
"features": [
"grpc-common"
]
}
]
},
"vpcaccess": {
"description": "Serverless VPC Access API C++ Client Library",
"dependencies": [

4
ports/ismrmrd/portfile.cmake
View File

@ -5,8 +5,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ismrmrd/ismrmrd
REF v1.13.0
SHA512 4654c416f7acc4e2da2616216706ff3dc98a9b8afbdf38c990a792ad681ce0e95eab8e3b382ad266d67f7b808fb86cc32f2f7b3d950e10e1a1473de38acb8104
REF v1.5.0
SHA512 96e24be75ecde8e56001d805ffaf4502d39c87e2c4fe01c84c90cb01d8bd49268c48440728de2ffb4c3efa75a029b3ffc0101b5841893685f82b4fafec9b1c73
HEAD_REF master
PATCHES
${WIN32_INCLUDE_STDDEF_PATCH}

5
ports/ismrmrd/vcpkg.json
View File

@ -1,10 +1,9 @@
{
"name": "ismrmrd",
"version": "1.13.0",
"version": "1.5.0",
"port-version": 2,
"description": "ISMRM Raw Data Format",
"homepage": "https://github.com/ismrmrd/ismrmrd",
"license": "BSD-3-Clause",
"supports": "!(x86 | arm | wasm32)",
"dependencies": [
"boost",
"fftw3",

4
ports/kubernetes/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO kubernetes-client/c
REF 39a4dab2504c9c26d3577d11a335027f8d782457
SHA512 3bdbf12e26d0808818bcb3c28b398650656cabaf3bb364095b277d07f6e35afc6d3aaea9357e6a888dd92edfc0f88d655b59d186150f5b779e7511a924d713bd
REF 5eab1ef0a855d1707b3ef01adb2c4b545a01f36d
SHA512 a45ff221cfdddd8add0d8a04d75906e369e84b192cb7d0611a22f28ac81e0bb0c29cb71faa2bc352100aadacd7467fc2700c25f074654b7a9d75c80d86b71296
HEAD_REF master
PATCHES
001-fix-destination.patch

4
ports/kubernetes/vcpkg.json
View File

@ -1,9 +1,9 @@
{
"name": "kubernetes",
"version-date": "2022-11-09",
"version-date": "2022-01-19",
"port-version": 1,
"description": "Kubernetes C client",
"homepage": "https://github.com/kubernetes-client/c/",
"license": "Apache-2.0",
"supports": "!uwp",
"dependencies": [
"curl",

22
ports/libhv/fix-include_header.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59e9b41..f0a162e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,7 @@ list_source_directories(LIBHV_SRCS ${LIBHV_SRCDIRS})
if(BUILD_SHARED)
add_library(hv SHARED ${LIBHV_SRCS})
target_compile_definitions(hv PRIVATE HV_DYNAMICLIB)
- target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS})
+ target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS} INTERFACE $<INSTALL_INTERFACE:include>)
target_link_libraries(hv ${LIBS})
install(TARGETS hv
EXPORT libhvConfig
@@ -228,7 +228,7 @@ endif()
if(BUILD_STATIC)
add_library(hv_static STATIC ${LIBHV_SRCS})
target_compile_definitions(hv_static PRIVATE HV_STATICLIB)
- target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS})
+ target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS} INTERFACE $<INSTALL_INTERFACE:include>)
target_link_libraries(hv_static ${LIBS})
install(TARGETS hv_static
EXPORT libhvConfig

6
ports/libhv/portfile.cmake
View File

@ -1,9 +1,11 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ithewei/libhv
REF 3a67fe506a291ee94ed80bbdd73553fcb6a6b1ef #v1.3.0
SHA512 3aa341a94950b0d4f3351a6f62a4c34947b481bb59f1954dd8d031313e73d9c6add1017cf386c507b231b114d80cfc0739a50bed179bdbc31052c86e2f1321a3
REF 8d14d1a6cd4accbda9e081716a59395b523303f6 #v1.2.6
SHA512 d40063f2b2f8191965fd4434b80a17f505819a20fd63aefa63c08663d0acc82d086338f0382ab70289dff0417a8ec922f993d36c4007a1a13c7ce34d71018f83
HEAD_REF master
PATCHES
fix-include_header.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)

2
ports/libhv/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "libhv",
"version": "1.3.0",
"version": "1.2.6",
"description": "Libhv is a C/C++ network library similar to libevent/libuv.",
"homepage": "https://github.com/ithewei/libhv",
"license": "BSD-3-Clause",

30
ports/libwebsockets/export-include-path.patch
View File

@ -1,35 +1,37 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt (revision b0a749c8e7a8294b68581ce4feac0e55045eb00b)
+++ b/CMakeLists.txt (date 1669850632899)
@@ -1071,8 +1071,8 @@
index f9b5557..ebc624b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1045,8 +1045,8 @@ file(RELATIVE_PATH
"${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}"
"${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir.
-if (DEFINED REL_INCLUDE_DIR)
- set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}")
+if (1)
+ set(LWS__INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../include")
+ set(LWS__INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../include")
endif()
if (DEFINED OPENSSL_INCLUDE_DIRS)
set(LWS__INCLUDE_DIRS "${LWS__INCLUDE_DIRS};${OPENSSL_INCLUDE_DIRS}")
configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
--- a/lib/CMakeLists.txt (revision b0a749c8e7a8294b68581ce4feac0e55045eb00b)
+++ b/lib/CMakeLists.txt (date 1669850782017)
@@ -174,7 +174,7 @@
index 85b43d5..724f0b7 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -164,7 +164,7 @@ if (LWS_WITH_STATIC)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
)
- target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
+ target_include_directories(websockets PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC)
target_include_directories(websockets PUBLIC ${LWS_PUBLIC_INCLUDES})
set(LWS_PUBLIC_INCLUDES ${LWS_PUBLIC_INCLUDES} PARENT_SCOPE)
@@ -202,7 +202,7 @@
if (WIN32)
@@ -190,7 +190,7 @@ if (LWS_WITH_SHARED)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>
)
- target_include_directories(websockets_shared PRIVATE ${LWS_LIB_BUILD_INC_PATHS})
+ target_include_directories(websockets_shared PRIVATE $<BUILD_INTERFACE:${LWS_LIB_BUILD_INC_PATHS}> PUBLIC $<INSTALL_INTERFACE:include>)
target_compile_definitions(websockets_shared PRIVATE LWS_BUILDING_SHARED)
target_include_directories(websockets_shared PUBLIC ${LWS_PUBLIC_INCLUDES})
set(LWS_PUBLIC_INCLUDES ${LWS_PUBLIC_INCLUDES} PARENT_SCOPE)
# We want the shared lib to be named "libwebsockets"

15
ports/libwebsockets/fix-build-error.patch
View File

@ -1,7 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt (revision b0a749c8e7a8294b68581ce4feac0e55045eb00b)
+++ b/CMakeLists.txt (date 1669850509296)
@@ -494,6 +494,11 @@
index 1e737e5..75534c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -422,6 +422,11 @@ set(LWS_LIBMOUNT_LIBRARIES CACHE PATH "Path to the libmount library")
set(LWS_EXT_PTHREAD_INCLUDE_DIR CACHE PATH "Path to an external pthreads include directory")
set(LWS_EXT_PTHREAD_LIBRARIES CACHE PATH "Path to an external pthreads library")
@ -13,12 +14,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
if (LWS_WITH_HTTP_STREAM_COMPRESSION)
set(LWS_WITH_ZLIB 1)
@@ -850,7 +855,7 @@
@@ -728,7 +733,7 @@ if (MSVC)
# Turn off pointless microsoft security warnings.
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
# Fail the build if any warnings
- add_compile_options(/W3 /WX)
+ add_compile_options(/W3 /WX /wd4142 /wd4267 /wd4996)
# Unbreak MSVC broken preprocessor __VA_ARGS__ behaviour
if (MSVC_VERSION GREATER 1925)
add_compile_options(/Zc:preprocessor /wd5105)
endif(MSVC)
if (MINGW)

4
ports/libwebsockets/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO warmcat/libwebsockets
REF b0a749c8e7a8294b68581ce4feac0e55045eb00b # v4.3.2
SHA512 48c1d59cfdbe6cc043a51e950a614273bd2f9bbfd0ab8436e4ba30bf119cfdbc3e691c02608e8c169356ec79ca96472340d98d17659b66ee60bb998f3695d3c4
REF a5aae049b2a386712e1be3b417915c0d44c7e675 # v4.3.0
SHA512 ab72201880360a3b0136497c1c1729656c3c07043f38cceec136f5671be15ab55c80136ec7480841175d3add711593ddde23cefd39ea9cb729ec0842950602dd
HEAD_REF master
PATCHES
fix-dependency-libuv.patch

3
ports/libwebsockets/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "libwebsockets",
"version-semver": "4.3.2",
"version-semver": "4.3.0",
"port-version": 3,
"description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.",
"homepage": "https://github.com/warmcat/libwebsockets",
"supports": "!uwp",

49
ports/ngtcp2/export-unofficical-target.patch
View File

@ -1,49 +0,0 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index d98747f..2bc20d0 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -80,12 +80,15 @@ if(ENABLE_SHARED_LIB)
C_VISIBILITY_PRESET hidden
POSITION_INDEPENDENT_CODE ON
)
- target_include_directories(ngtcp2 PUBLIC ${ngtcp2_INCLUDE_DIRS})
-
- install(TARGETS ngtcp2
+ target_include_directories(ngtcp2 PRIVATE ${ngtcp2_INCLUDE_DIRS})
+ install(TARGETS ngtcp2 EXPORT unofficial-ngtcp2-config
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+ install(
+ EXPORT unofficial-ngtcp2-config
+ NAMESPACE unofficial::ngtcp2::
+ DESTINATION share/unofficial-ngtcp2)
endif()
if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
@@ -97,10 +100,14 @@ if(HAVE_CUNIT OR ENABLE_STATIC_LIB)
C_VISIBILITY_PRESET hidden
)
target_compile_definitions(ngtcp2_static PUBLIC "-DNGTCP2_STATICLIB")
- target_include_directories(ngtcp2_static PUBLIC ${ngtcp2_INCLUDE_DIRS})
+ target_include_directories(ngtcp2_static PRIVATE ${ngtcp2_INCLUDE_DIRS})
if(ENABLE_STATIC_LIB)
- install(TARGETS ngtcp2_static
+ install(TARGETS ngtcp2_static EXPORT unofficial-ngtcp2_static-config
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ install(
+ EXPORT unofficial-ngtcp2_static-config
+ NAMESPACE unofficial::ngtcp2_static::
+ DESTINATION share/unofficial-ngtcp2)
endif()
endif()
diff --git a/lib/includes/CMakeLists.txt b/lib/includes/CMakeLists.txt
index 5eabf73..78bb715 100644
--- a/lib/includes/CMakeLists.txt
+++ b/lib/includes/CMakeLists.txt
@@ -1,3 +1,4 @@
+configure_file("${CMAKE_CURRENT_LIST_DIR}/ngtcp2/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/ngtcp2/version.h")
install(FILES
ngtcp2/ngtcp2.h
"${CMAKE_CURRENT_BINARY_DIR}/ngtcp2/version.h"

36
ports/ngtcp2/portfile.cmake
View File

@ -1,36 +0,0 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ngtcp2/ngtcp2
REF v0.11.0
SHA512 e15296c7ffd85e85c32db3bcd109fb473ca6af9b0c03b0d0559ae29c0938da59163ad45968a27cc020f56929732edbb42755c9bc83a2b1c5bdb396b69650d936
HEAD_REF master
PATCHES
export-unofficical-target.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIB)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIB)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
"-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}"
"-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}"
)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig()
vcpkg_cmake_config_fixup(CONFIG_PATH "share/unofficial-ngtcp2")
# Clean
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
#License
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

18
ports/ngtcp2/vcpkg.json
View File

@ -1,18 +0,0 @@
{
"name": "ngtcp2",
"version": "0.11.0",
"description": "ngtcp2 project is an effort to implement RFC9000 QUIC protocol.",
"homepage": "https://github.com/ngtcp2/ngtcp2",
"license": "MIT",
"supports": "!(arm & uwp)",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

1
ports/sdl2-net/portfile.cmake
View File

@ -25,7 +25,6 @@ vcpkg_copy_pdbs()
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/lib/pkgconfig"
)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

1
ports/sdl2-net/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "sdl2-net",
"version": "2.2.0",
"port-version": 1,
"description": "Networking library for SDL",
"homepage": "https://github.com/libsdl-org/SDL_net",
"license": "Zlib",

2
ports/sdl2/portfile.cmake
View File

@ -3,7 +3,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libsdl-org/SDL
REF release-${VERSION}
SHA512 c4cffa32d4d43de64cc47ada80a657a9db53f4c60da3684f96a036527fdc12b0e459e9e638cab6c7eb796de29fd60ee5a8c73b56bccd8483024e225c81469961
SHA512 34088a7ceea7823941fc3d16d6c5add85500d0cc30519f0fadb739939a6a87f2509f2305564a4e35a3a533db41fdb8fab95cb51143240f5fb888535e36130b82
HEAD_REF main
)

2
ports/sdl2/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "sdl2",
"version": "2.26.1",
"version": "2.26.0",
"description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
"homepage": "https://www.libsdl.org/download-2.0.php",
"license": "Zlib",

20
ports/shaderc/fix-tbuiltinresource-for-glslang-11-12.patch
View File

@ -1,20 +0,0 @@
diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc
index d64e47f..6c662d3 100644
--- a/libshaderc_util/src/resources.cc
+++ b/libshaderc_util/src/resources.cc
@@ -125,6 +125,15 @@ const TBuiltInResource kDefaultTBuiltInResource = {
/* .maxTaskWorkGroupSizeY_NV = */ 1,
/* .maxTaskWorkGroupSizeZ_NV = */ 1,
/* .maxMeshViewCountNV = */ 4,
+ /* .maxMeshOutputVerticesEXT = */ 256,
+ /* .maxMeshOutputPrimitivesEXT = */ 256,
+ /* .maxMeshWorkGroupSizeX_EXT = */ 128,
+ /* .maxMeshWorkGroupSizeY_EXT = */ 128,
+ /* .maxMeshWorkGroupSizeZ_EXT = */ 128,
+ /* .maxTaskWorkGroupSizeX_EXT = */ 128,
+ /* .maxTaskWorkGroupSizeY_EXT = */ 128,
+ /* .maxTaskWorkGroupSizeZ_EXT = */ 128,
+ /* .maxMeshViewCountEXT = */ 4,
/* .maxDualSourceDrawBuffersEXT = */ 1,
// This is the glslang TLimits structure.
// It defines whether or not the following features are enabled.

2
ports/shaderc/portfile.cmake
View File

@ -12,8 +12,6 @@ vcpkg_from_github(
fix-build-type.patch
fix-install-shaderc_util.patch
fix-export-cmakefiles.patch
# NOTE: This should be removed when shaderc gets updated to use glslang 11.12.0
fix-tbuiltinresource-for-glslang-11-12.patch
)
file(COPY "${CMAKE_CURRENT_LIST_DIR}/build-version.inc" DESTINATION "${SOURCE_PATH}/glslc/src")

9
scripts/buildsystems/vcpkg.cmake
View File

@ -746,7 +746,6 @@ if(X_VCPKG_APPLOCAL_DEPS_INSTALL)
endfunction()
endif()
option(VCPKG_TRACE_FIND_PACKAGE "Trace calls to find_package()" OFF)
if(NOT DEFINED VCPKG_OVERRIDE_FIND_PACKAGE_NAME)
set(VCPKG_OVERRIDE_FIND_PACKAGE_NAME find_package)
endif()
@ -755,14 +754,6 @@ endif()
# so perfect forwarding is not important
set(z_vcpkg_find_package_backup_id "0")
macro("${VCPKG_OVERRIDE_FIND_PACKAGE_NAME}" z_vcpkg_find_package_package_name)
if(VCPKG_TRACE_FIND_PACKAGE)
string(REPEAT " " "${z_vcpkg_find_package_backup_id}" z_vcpkg_find_package_indent)
string(JOIN " " z_vcpkg_find_package_argn ${ARGN})
message(STATUS "${z_vcpkg_find_package_indent}find_package(${z_vcpkg_find_package_package_name} ${z_vcpkg_find_package_argn})")
unset(z_vcpkg_find_package_argn)
unset(z_vcpkg_find_package_indent)
endif()
math(EXPR z_vcpkg_find_package_backup_id "${z_vcpkg_find_package_backup_id} + 1")
set(z_vcpkg_find_package_package_name "${z_vcpkg_find_package_package_name}")
set(z_vcpkg_find_package_${z_vcpkg_find_package_backup_id}_ARGN "${ARGN}")

1
scripts/ci.baseline.txt
View File

@ -371,7 +371,6 @@ intel-mkl:x86-windows=fail
irrlicht:arm64-windows=fail
irrlicht:arm-uwp=fail
irrlicht:x64-uwp=fail
ismrmrd:x86-windows=fail
jemalloc:arm64-windows=fail
jemalloc:arm-uwp=fail
jemalloc:x64-uwp=fail

5
versions/a-/alsa.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "66750ac0b1a786a2fec12e88ca0e110b3f41d75e",
"version": "1.2.6.1",
"port-version": 1
},
{
"git-tree": "1ce0c3410e25de5357b707dc0f800cf7c3a7f213",
"version": "1.2.6.1",

5
versions/a-/asyncplusplus.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "454f29e635dba103d5d48a5b1e9ba9842fb4864e",
"version": "1.1",
"port-version": 2
},
{
"git-tree": "15a66956fc29d87d60f48bfc7aa3ca823554734e",
"version-string": "1.1",

5
versions/b-/brotli.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "e6838ab1a2b10d47924875dd1f71c47d45c01bb6",
"version": "1.0.9",
"port-version": 4
},
{
"git-tree": "7b182b3e0615d6f3538b5eeac680f7eb8af5abd0",
"version": "1.0.9",

38
versions/baseline.json
View File

@ -78,7 +78,7 @@
},
"alsa": {
"baseline": "1.2.6.1",
"port-version": 1
"port-version": 0
},
"ampl-asl": {
"baseline": "2020-11-11",
@ -222,7 +222,7 @@
},
"asyncplusplus": {
"baseline": "1.1",
"port-version": 2
"port-version": 1
},
"at-spi2-atk": {
"baseline": "2.38.0",
@ -1186,7 +1186,7 @@
},
"brotli": {
"baseline": "1.0.9",
"port-version": 4
"port-version": 3
},
"brpc": {
"baseline": "1.2.0",
@ -2509,8 +2509,8 @@
"port-version": 2
},
"g3log": {
"baseline": "2.1",
"port-version": 0
"baseline": "1.3.4",
"port-version": 2
},
"gainput": {
"baseline": "1.0.0",
@ -2674,14 +2674,14 @@
},
"glog": {
"baseline": "0.6.0",
"port-version": 2
"port-version": 1
},
"gloo": {
"baseline": "20201203",
"port-version": 0
},
"glslang": {
"baseline": "11.12.0",
"baseline": "11.11.0",
"port-version": 1
},
"glui": {
@ -2709,7 +2709,7 @@
"port-version": 1
},
"google-cloud-cpp": {
"baseline": "2.5.0",
"baseline": "2.4.0",
"port-version": 0
},
"google-cloud-cpp-common": {
@ -3149,8 +3149,8 @@
"port-version": 0
},
"ismrmrd": {
"baseline": "1.13.0",
"port-version": 0
"baseline": "1.5.0",
"port-version": 2
},
"itk": {
"baseline": "5.2.1",
@ -3469,8 +3469,8 @@
"port-version": 0
},
"kubernetes": {
"baseline": "2022-11-09",
"port-version": 0
"baseline": "2022-01-19",
"port-version": 1
},
"kuku": {
"baseline": "2.1",
@ -3833,7 +3833,7 @@
"port-version": 0
},
"libhv": {
"baseline": "1.3.0",
"baseline": "1.2.6",
"port-version": 0
},
"libhydrogen": {
@ -4389,8 +4389,8 @@
"port-version": 0
},
"libwebsockets": {
"baseline": "4.3.2",
"port-version": 0
"baseline": "4.3.0",
"port-version": 3
},
"libx11": {
"baseline": "1.8.1",
@ -5208,10 +5208,6 @@
"baseline": "37",
"port-version": 0
},
"ngtcp2": {
"baseline": "0.11.0",
"port-version": 0
},
"nifly": {
"baseline": "1.0.0",
"port-version": 0
@ -6817,7 +6813,7 @@
"port-version": 4
},
"sdl2": {
"baseline": "2.26.1",
"baseline": "2.26.0",
"port-version": 0
},
"sdl2-gfx": {
@ -6834,7 +6830,7 @@
},
"sdl2-net": {
"baseline": "2.2.0",
"port-version": 1
"port-version": 0
},
"sdl2-ttf": {
"baseline": "2.20.0",

5
versions/g-/g3log.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "ce2eee87993ff26684fad107624adebc23e64737",
"version": "2.1",
"port-version": 0
},
{
"git-tree": "b97c6fdba216caec4a83323a693a871cb57968fd",
"version": "1.3.4",

5
versions/g-/glog.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "cce45164ee522a505686c1794e7c228e44f52d76",
"version": "0.6.0",
"port-version": 2
},
{
"git-tree": "1fceaa6733361ea635af35ec1ce9b3caf47e0ffc",
"version": "0.6.0",

5
versions/g-/glslang.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "64952d0b82498ceb8357b5fdf80abf86ec477718",
"version": "11.12.0",
"port-version": 1
},
{
"git-tree": "b468ee3d588ae97ba2d03a4723751cac81c80443",
"version": "11.11.0",

5
versions/g-/google-cloud-cpp.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "ca9ad64f3cb29e1d51281a0e2679d0da3468f5c8",
"version": "2.5.0",
"port-version": 0
},
{
"git-tree": "f3ada0142b3cd88fbafd2cb8d2d9323c0da62dcb",
"version": "2.4.0",

5
versions/i-/ismrmrd.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "c19bcebf0417091d459a15d14506b10905e5db8c",
"version": "1.13.0",
"port-version": 0
},
{
"git-tree": "1754617a629b83fa0cec28903f26187b62b0d4fd",
"version": "1.5.0",

5
versions/k-/kubernetes.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "c6f9cc3e4fcf2a43e2dc3c41b9aa103b7cc1a54c",
"version-date": "2022-11-09",
"port-version": 0
},
{
"git-tree": "81d419c292d699e92444e7629e01b1d1cf0ba762",
"version-date": "2022-01-19",

5
versions/l-/libhv.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "4a1197a59a8b7adec8ce11a66ece9d7f72cf0ee8",
"version": "1.3.0",
"port-version": 0
},
{
"git-tree": "e382c63e132653ac3e2062b4fa0d182242c4da3a",
"version": "1.2.6",

5
versions/l-/libwebsockets.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "c8e1982ef72a330a813aafd1734c728a662701b1",
"version-semver": "4.3.2",
"port-version": 0
},
{
"git-tree": "52c31e301f0eaa969b7850c20be357ec3f845994",
"version-semver": "4.3.0",

9
versions/n-/ngtcp2.json
View File

@ -1,9 +0,0 @@
{
"versions": [
{
"git-tree": "84ab1e937c8536276a0dbd41ef161818f3227a27",
"version": "0.11.0",
"port-version": 0
}
]
}

5
versions/s-/sdl2-net.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "b34dc64f26f414003d909391145491128bdcf636",
"version": "2.2.0",
"port-version": 1
},
{
"git-tree": "42bbc8fde95dbe42390656e720cf852e08b31b77",
"version": "2.2.0",

5
versions/s-/sdl2.json
View File

@ -1,10 +1,5 @@
{
"versions": [
{
"git-tree": "323de63997d074a6076426bcc5f90fb2a183d534",
"version": "2.26.1",
"port-version": 0
},
{
"git-tree": "522729509f8704c8e4dfe59434b0b02071b34315",
"version": "2.26.0",

2
versions/s-/shaderc.json
View File

@ -1,7 +1,7 @@
{
"versions": [
{
"git-tree": "b33d795ee7bc7bb9a02f904dc4d8e08e5f5f4900",
"git-tree": "d93e78fd464f2f378c8faf94e40e16410e1c41e0",
"version": "2021.1",
"port-version": 3
},