diff --git a/ports/bgfx/portfile.cmake b/ports/bgfx/portfile.cmake index a95a8c1030..67d6b14e2e 100644 --- a/ports/bgfx/portfile.cmake +++ b/ports/bgfx/portfile.cmake @@ -3,31 +3,31 @@ vcpkg_from_github( REPO "bkaradzic/bgfx.cmake" HEAD_REF master REF v${VERSION} - SHA512 b1f3c46d0f4985df3a09c74f627f1d0c426f204a8c680a91a65099c146cd41215e9af1c5cdf4a0a559d020f93455b71a6bc1412628cfd818467fd59996542377 + SHA512 5d19e3ba50db25c203d87b1f47e9151a21f2afced35a7306d33c4fd2fc44f4d56826a1920023bd6de5cebbed2301e39e152f4c17e63905e34f56b39e34b235d1 ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH_BX REPO "bkaradzic/bx" HEAD_REF master - REF fa1411e4aa111c8b004c97660ab31ba1a5287835 - SHA512 0c6bd7e41c6dd3263c01d761aefdd55d2ed527ca694b52f563c6ded3ba5569df1492c8d04e5f76de3b1bdf7c5ca2978b8ec394d48ea29593535979f204d3ad0c + REF 9b1805ea8bdc63552e4e32ff72842fce0238bb10 + SHA512 9032b160204faf939b33d46123b7220de441377b2fc95447b87714ce12d31f0c220ee9b53d9a7807f8ae3e807f7d2bea6dd255a4443bb66e4aa0679f10696e96 ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH_BIMG REPO "bkaradzic/bimg" HEAD_REF master - REF 7afa2419254fd466c013a51bdeb0bee3022619c4 - SHA512 514deed00f8bc4106f67b777dca72d0ed0accb1ae057ad37d22a21c83ad3a85ad23d220ac0cf40b6a8006d43c308b1acfad464b51e64075aa01598731a1557df + REF ec02df824a763b2e2ae31e19c674ba0bc88c0695 + SHA512 e0f26afae510244e85758ddaada83e3d6b48745b447e197bffcb972f1fd8f42269f2e9f3ee48a6d54ea99d0ad66062a6212a3604f7e61d616681b815fb8a6d8f ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH_BGFX REPO "bkaradzic/bgfx" HEAD_REF master - REF 6f36b4fb3a0d76090eb2727ecf11abac46eef8aa - SHA512 cb88fcba51184611ecf969e5ec391eabd43227d3e17071c70c75eed79e86da7fe9b3c07c01e88d2230a8245ec0c3d192b1694c289019bb4f9c1c4973b0b11314 + REF e2c5b1d3e1320145baebc405a3c894cd851f8dc1 + SHA512 5bde6c2b4f147c01c7949eff529b940b8981e06a3b72e8389e991b98e3052a83762e59a798b1b0eb3292c35889f8f3fb68f54613c270c4f3f0f942e11cc9f3e9 ) vcpkg_check_features( @@ -35,8 +35,8 @@ vcpkg_check_features( FEATURES tools BGFX_BUILD_TOOLS multithreaded BGFX_CONFIG_MULTITHREADED ) -if (BGFX_BUILD_TOOLS AND TARGET_TRIPLET MATCHES "(windows|uwp)") - # bgfx doesn't apply __declspec(dllexport) which prevents dynamic linking for tools +if (TARGET_TRIPLET MATCHES "(windows|uwp)") + # bgfx doesn't apply __declspec(dllexport) which prevents dynamic linking set(BGFX_LIBRARY_TYPE "STATIC") elseif (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(BGFX_LIBRARY_TYPE "SHARED") diff --git a/ports/bgfx/vcpkg.json b/ports/bgfx/vcpkg.json index b64a526c27..8db3f9e2f6 100644 --- a/ports/bgfx/vcpkg.json +++ b/ports/bgfx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bgfx", - "version": "1.118.8417-415", + "version": "1.121.8534-453", "maintainers": "Sandy Carter ", "description": "Cross-platform, graphics API agnostic, Bring Your Own Engine/Framework style rendering library.", "homepage": "https://bkaradzic.github.io/bgfx/overview.html", @@ -20,15 +20,30 @@ } ], "default-features": [ - "multithreaded" + "platform-default-features" ], "features": { "multithreaded": { - "description": "Encode and render on different threads" + "description": "Encode and render on different threads", + "supports": "!emscripten" + }, + "platform-default-features": { + "description": "Enables default features per platform", + "dependencies": [ + { + "$comment": "bgfx does not support multithreading on emscripten", + "name": "bgfx", + "features": [ + "multithreaded" + ], + "platform": "!emscripten" + } + ] }, "tools": { - "$comment": "Use '\"host\": true' in dependencies of vcpkg.json to prevent cross compiling the tools.", - "description": "Shader, Texture and Geometry compilers for bgfx." + "$comment": "Use '\"host\": true' in dependencies of vcpkg.json in manifest mode.", + "description": "Shader, Texture and Geometry compilers for bgfx.", + "supports": "native" } } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dce6b1bffc..8ae1fe0689 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -75,6 +75,7 @@ bento4:arm-neon-android=fail berkeleydb:arm-neon-android=fail berkeleydb:arm64-android=fail berkeleydb:x64-android=fail +bgfx:x64-osx=fail # MacOSX12.1.sdk doesn't define MTLGPUFamilyApple8 binlog:arm-neon-android=fail bitserializer:arm64-osx=fail blitz:x64-android=fail diff --git a/versions/b-/bgfx.json b/versions/b-/bgfx.json index 6773495130..0e26ee4e1a 100644 --- a/versions/b-/bgfx.json +++ b/versions/b-/bgfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11c8b127eab949129fb5adf3006c9655ab1bb525", + "version": "1.121.8534-453", + "port-version": 0 + }, { "git-tree": "583f89c30b68d43070737982e0b0f8748aa23199", "version": "1.118.8417-415", diff --git a/versions/baseline.json b/versions/baseline.json index 10741f3826..cdc2928f2b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -553,7 +553,7 @@ "port-version": 0 }, "bgfx": { - "baseline": "1.118.8417-415", + "baseline": "1.121.8534-453", "port-version": 0 }, "bigint": {