Skip to content

Commit

Permalink
Common: Bump stack
Browse files Browse the repository at this point in the history
  • Loading branch information
julianxhokaxhiu committed Jan 5, 2025
1 parent 58f496d commit 89d2fe6
Show file tree
Hide file tree
Showing 32 changed files with 310 additions and 481 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/main-1.21.3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ env:
# GIT: Fix reporting from stderr to stdout
GIT_REDIRECT_STDERR: 2>&1
# Tools versions
_WINGET_CMAKE: 3.30.3
_WINGET_POWERSHELL: 7.4.5
_WINGET_VS2022: 17.11.1
_WINGET_CMAKE: 3.31.3
_WINGET_POWERSHELL: 7.4.6
_WINGET_VS2022: 17.12.3

jobs:
FFNx:
Expand Down
12 changes: 6 additions & 6 deletions .vcpkg/ports/bgfx/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
vcpkg_from_github(OUT_SOURCE_PATH BX_SOURCE_DIR
REPO "julianxhokaxhiu/bx"
HEAD_REF master
REF ba882e5864c94dcacf6ba623b8e71249a88448c6
SHA512 1d23a85520dcb1676799623d71a591a093d197f159791a544b6a8571c7fed1a1735545a5aab7679437daa4fa6d51ccdae59f3ea1cf8471296a0eebb93de5953e
REF 703ffd6242d476db42220053e495fdab140d95fa
SHA512 aad8930b9c823228366f3c0ca88abea7cbfbe0cf1197058fbc952a4737c0427b1ff950e2a5fe9989fa3e5af1dcd18d8e473c9976a5cc456285a2a2ab5309bb11
)

vcpkg_from_github(OUT_SOURCE_PATH BIMG_SOURCE_DIR
REPO "julianxhokaxhiu/bimg"
HEAD_REF master
REF aaf9125234e657393f504404a279289669d89fcb
SHA512 f7437227b84b3bcdc603d7ebe0831091a273061b7cd85b8b68c1ca4f94d6e5a9150e1386608e5d4a6304aad828b1f8439ac09316133a55d5545eeb3d24d3bc98
REF b7130927db997b6c25effe77d46e338084ba653d
SHA512 dcda84ee282f3618e2ea8ea52cf62b45c1505295e035170edab16f3c49c8961065369dd12068a2ca9490dddb628a0d826ba07df152a90354672a1a64f0058d2d
)

vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR
REPO "julianxhokaxhiu/bgfx"
HEAD_REF master
REF 7c58f2aa1e4af85c69d818cb166bd8a4e39361a5
SHA512 7887d21987d940be40fcce7508e81cde6b83f2316dfbfe4546c951bb014e9071b02199d87b7ec21f08f1888efb133ea1fe0adcc1e4ba91d6dac80fc90be184a5
REF 9d9572216b8a8da8921543693b2ed007726b8353
SHA512 c53cab51b4fbf24399b96e6dc5d5af24fabb79160ff48239fcff7d440f68c70dd772f9e257c33d218271f2928c82500e1792d777c45bee75e4c86f63c60dcc47
)

# Move bx source inside bgfx source tree
Expand Down
8 changes: 4 additions & 4 deletions .vcpkg/ports/bimg/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
vcpkg_from_github(OUT_SOURCE_PATH BX_SOURCE_DIR
REPO "julianxhokaxhiu/bx"
HEAD_REF master
REF ba882e5864c94dcacf6ba623b8e71249a88448c6
SHA512 1d23a85520dcb1676799623d71a591a093d197f159791a544b6a8571c7fed1a1735545a5aab7679437daa4fa6d51ccdae59f3ea1cf8471296a0eebb93de5953e
REF 703ffd6242d476db42220053e495fdab140d95fa
SHA512 aad8930b9c823228366f3c0ca88abea7cbfbe0cf1197058fbc952a4737c0427b1ff950e2a5fe9989fa3e5af1dcd18d8e473c9976a5cc456285a2a2ab5309bb11
)

vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR
REPO "julianxhokaxhiu/bimg"
HEAD_REF master
REF aaf9125234e657393f504404a279289669d89fcb
SHA512 f7437227b84b3bcdc603d7ebe0831091a273061b7cd85b8b68c1ca4f94d6e5a9150e1386608e5d4a6304aad828b1f8439ac09316133a55d5545eeb3d24d3bc98
REF b7130927db997b6c25effe77d46e338084ba653d
SHA512 dcda84ee282f3618e2ea8ea52cf62b45c1505295e035170edab16f3c49c8961065369dd12068a2ca9490dddb628a0d826ba07df152a90354672a1a64f0058d2d
)

# Move bx source inside bgfx source tree
Expand Down
4 changes: 2 additions & 2 deletions .vcpkg/ports/bx/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR
REPO "julianxhokaxhiu/bx"
HEAD_REF master
REF ba882e5864c94dcacf6ba623b8e71249a88448c6
SHA512 1d23a85520dcb1676799623d71a591a093d197f159791a544b6a8571c7fed1a1735545a5aab7679437daa4fa6d51ccdae59f3ea1cf8471296a0eebb93de5953e
REF 703ffd6242d476db42220053e495fdab140d95fa
SHA512 aad8930b9c823228366f3c0ca88abea7cbfbe0cf1197058fbc952a4737c0427b1ff950e2a5fe9989fa3e5af1dcd18d8e473c9976a5cc456285a2a2ab5309bb11
)

# Set up GENie (custom project generator)
Expand Down
32 changes: 0 additions & 32 deletions .vcpkg/ports/hwinfo/hwinfoConfig.cmake.in

This file was deleted.

19 changes: 9 additions & 10 deletions .vcpkg/ports/hwinfo/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lfreist/hwinfo
REF 3d234f4799f9eb7651f9853bd3fd17456b191a58
SHA512 f109449ffb678810383ee5f39d6ba098b96779ace538f0301833c5b2f168a119ca325a47df2353a783b1cdb47e0c282b18bb578587dd79568e7defe115b27350
REF 821a23ac6f61e8baa539c5b4b0aeb44da9cb93da
SHA512 4fef9029b54ec173bf147bd40ee38d27b7fb7844e746d9c416de2c5e28c2a1c79b11392a941696d9437c5d1edf006a8d709c0a3ea2baf1245918e12ab47e9866
)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DNO_OCL=TRUE # disable OpenCL usage
MAYBE_UNUSED_VARIABLES
NO_OCL
-DHWINFO_SHARED=OFF
-DHWINFO_STATIC=ON
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(
CONFIG_PATH lib/cmake/hwinfo
PACKAGE_NAME lfreist-hwinfo
)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

# Copy cmake configuration files
configure_file(${CMAKE_CURRENT_LIST_DIR}/hwinfoConfig.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/hwinfoConfig.cmake @ONLY)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
4 changes: 0 additions & 4 deletions .vcpkg/ports/hwinfo/usage

This file was deleted.

1 change: 1 addition & 0 deletions .vcpkg/ports/hwinfo/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"license": "MIT",
"supports": "(windows | linux) & !uwp",
"dependencies": [
"fmt",
{
"name": "vcpkg-cmake",
"host": true
Expand Down
4 changes: 2 additions & 2 deletions .vcpkg/ports/soloud/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR
REPO "julianxhokaxhiu/soloud"
HEAD_REF master
REF a95f563abfbf3f45f83927a322f5113ba99559bb
SHA512 05d6869de77c1bf578619c6c4a6523cd7afc1e2eeaa22934f32de0c7bff372dd5acde1b87a8cc50a2b8be37ac5a672060de5f5fc98e519b2f40736cbaa9868be
REF 49e897092e3b95a1f460f69bb525ec02f107527b
SHA512 82c50bb48df11199d3b4d18cecd5ed5da758aafa3e907afe2a2f145fea61143ae514e5e357e502e736fe2293a5eedf877e8d386e17c912cb068ca68772bcb480
)

# Set up GENie (custom project generator)
Expand Down
119 changes: 0 additions & 119 deletions .vcpkg/ports/stackwalker/FindSTACKWALKER.cmake.in

This file was deleted.

29 changes: 0 additions & 29 deletions .vcpkg/ports/stackwalker/portfile.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions .vcpkg/ports/stackwalker/usage

This file was deleted.

8 changes: 0 additions & 8 deletions .vcpkg/ports/stackwalker/vcpkg-cmake-wrapper.cmake

This file was deleted.

6 changes: 0 additions & 6 deletions .vcpkg/ports/stackwalker/vcpkg.json

This file was deleted.

20 changes: 0 additions & 20 deletions .vcpkg/ports/tomlplusplus/portfile.cmake

This file was deleted.

18 changes: 0 additions & 18 deletions .vcpkg/ports/tomlplusplus/vcpkg.json

This file was deleted.

Loading

0 comments on commit 89d2fe6

Please sign in to comment.