Skip to content

Commit 184abe3

Browse files
Neumann-ANeumann-A
authored
Merge branch 'microsoft:master' into fix_cpp_osx_and_others
2 parents 96b5807 + 5f82fa4 commit 184abe3

56 files changed

Lines changed: 310 additions & 131 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ports/angelscript/portfile.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
vcpkg_download_distfile(ARCHIVE
2-
URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.35.1.zip"
3-
FILENAME "angelscript_2.35.1.zip"
4-
SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa
2+
URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.36.0.zip"
3+
FILENAME "angelscript_2.36.0.zip"
4+
SHA512 afd2b9096d0b62bc3d182d684fe34ddc8e9520af7734eea1f1a5c7d3439a28a1be7502faf692080cb0c4591799b7fea09fc8c4ccf25b8ec63a3d306e678682ff
55
)
66

77
vcpkg_extract_source_archive_ex(

‎ports/angelscript/vcpkg.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "angelscript",
3-
"version": "2.35.1",
4-
"port-version": 1,
3+
"version": "2.36.0",
54
"description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.",
65
"homepage": "https://angelcode.com/angelscript",
76
"license": "Zlib",

‎ports/boost-fiber/vcpkg.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
22
"name": "boost-fiber",
33
"version": "1.80.0",
4+
"port-version": 1,
45
"description": "Boost fiber module",
56
"homepage": "https://github.com/boostorg/fiber",
67
"license": "BSL-1.0",
7-
"supports": "!osx & !uwp & !arm & !emscripten",
8+
"supports": "!uwp & !arm & !emscripten",
89
"dependencies": [
910
"boost-algorithm",
1011
"boost-assert",

‎ports/dpp/portfile.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
vcpkg_from_github(
22
OUT_SOURCE_PATH SOURCE_PATH
33
REPO brainboxdotcc/DPP
4-
REF 6832533388ae7437aca481420a40ef1a9b157b89
5-
SHA512 472ec3379a4c33972dd47624ee492cc144c9c8638c6150bf0fa1e5992ae787a830bb84e41a16134ea3d59ca4f6cdab3b99113e22903287997aafe808bb676c90
4+
REF d7f92689381e66decf7ec7e247570690534206a4
5+
SHA512 994d5ea58b7d95aa28f831864017018dacfeb0f52fd86ab2fc58a913ac041b0097dbef04d4c62ba4a4726c8b7a24e3360c06300fae5d5a79a8f2ab855e701b72
66
HEAD_REF master
77
PATCHES
88
make-pkgconfig-required.patch

‎ports/dpp/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dpp",
3-
"version": "10.0.18",
3+
"version": "10.0.19",
44
"description": "D++ Extremely Lightweight C++ Discord Library.",
55
"homepage": "https://dpp.dev/",
66
"license": "Apache-2.0",

‎ports/embree3/portfile.cmake‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,19 @@ Only set feature avx automaticlly.
4747
endif()
4848
endif()
4949

50-
vcpkg_configure_cmake(
51-
SOURCE_PATH ${SOURCE_PATH}
50+
vcpkg_cmake_configure(
51+
SOURCE_PATH "${SOURCE_PATH}"
5252
DISABLE_PARALLEL_CONFIGURE
53-
PREFER_NINJA
5453
OPTIONS ${FEATURE_OPTIONS}
5554
-DEMBREE_ISPC_SUPPORT=OFF
5655
-DEMBREE_TUTORIALS=OFF
5756
-DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME}
5857
-DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB}
5958
)
6059

61-
vcpkg_install_cmake()
60+
vcpkg_cmake_install()
6261
vcpkg_copy_pdbs()
63-
vcpkg_fixup_cmake_targets(CONFIG_PATH share/embree TARGET_PATH share/embree)
62+
vcpkg_cmake_config_fixup(PACKAGE_NAME embree)
6463

6564
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
6665
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
@@ -74,4 +73,4 @@ endif()
7473
file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
7574

7675
file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
77-
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
76+
file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

‎ports/embree3/vcpkg.json‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
{
22
"name": "embree3",
33
"version-semver": "3.12.2",
4-
"port-version": 2,
4+
"port-version": 3,
55
"description": "High Performance Ray Tracing Kernels.",
66
"homepage": "https://github.com/embree/embree",
7+
"license": "Apache-2.0",
8+
"supports": "!arm",
79
"dependencies": [
8-
"tbb"
10+
"tbb",
11+
{
12+
"name": "vcpkg-cmake",
13+
"host": true
14+
},
15+
{
16+
"name": "vcpkg-cmake-config",
17+
"host": true
18+
}
919
],
1020
"default-features": [
1121
"avx",

‎ports/ffmpeg/portfile.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,10 @@ if (VCPKG_TARGET_IS_OSX)
460460
set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX
461461
endif()
462462

463+
if(VCPKG_TARGET_IS_IOS)
464+
set(OPTIONS "${OPTIONS} --disable-audiotoolbox") # disable AudioToolbox on iOS
465+
endif()
466+
463467
set(OPTIONS_CROSS " --enable-cross-compile")
464468

465469
# ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling.

‎ports/ffmpeg/vcpkg.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ffmpeg",
33
"version": "4.4.1",
4-
"port-version": 18,
4+
"port-version": 19,
55
"description": [
66
"a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
77
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."

‎ports/jsonnet/portfile.cmake‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,8 @@ else()
3232
)
3333
endif()
3434

35-
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
36-
set(BUILD_SHARED ON)
37-
set(BUILD_STATIC OFF)
38-
else()
39-
set(BUILD_SHARED OFF)
40-
set(BUILD_STATIC ON)
41-
endif()
35+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
36+
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
4237

4338
vcpkg_cmake_configure(
4439
SOURCE_PATH "${SOURCE_PATH}"

0 commit comments

Comments
 (0)