eden-emu
/
eden
mirror of https://git.eden-emu.dev/eden-emu/eden.git
1
0
Fork 0
Code Releases Wiki Activity
Browse Source

cpm fixes, update deps 

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3126/head
crueter 4 weeks ago
parent
08f2f4354d
commit
4b2f6a53ca
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
5 changed files with 46 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      CMakeLists.txt
  2. 8
      cpmfile.json
  3. 18
      externals/cpmfile.json
  4. 26
      tools/cpm/check-updates.sh
  5. 14
      tools/cpm/download.sh

6
CMakeLists.txt
View File

@ -16,6 +16,7 @@ include(DefaultConfig)
include(DownloadExternals) include(DownloadExternals)
include(CMakeDependentOption) include(CMakeDependentOption)
include(CTest) include(CTest)
include(CPMUtil)
DetectArchitecture() DetectArchitecture()
@ -374,8 +375,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
# System imported libraries # System imported libraries
# ======================================================================= # =======================================================================
include(CPMUtil)
# openssl funniness # openssl funniness
if (ENABLE_OPENSSL) if (ENABLE_OPENSSL)
if (YUZU_USE_BUNDLED_OPENSSL) if (YUZU_USE_BUNDLED_OPENSSL)
@ -532,7 +531,8 @@ endfunction()
if (APPLE) if (APPLE)
# Umbrella framework for everything GUI-related # Umbrella framework for everything GUI-related
find_library(COCOA_LIBRARY Cocoa)
find_library(COCOA_LIBRARY Cocoa REQUIRED)
find_library(IOKIT_LIBRARY IOKit REQUIRED)
set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY}) set(PLATFORM_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY} ${COREVIDEO_LIBRARY})
elseif (WIN32) elseif (WIN32)
# Target Windows 10 # Target Windows 10

8
cpmfile.json
View File

@ -25,9 +25,9 @@
"fmt": { "fmt": {
"repo": "fmtlib/fmt", "repo": "fmtlib/fmt",
"tag": "%VERSION%", "tag": "%VERSION%",
"hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
"hash": "f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2",
"version": "8", "version": "8",
"git_version": "12.0.0"
"git_version": "12.1.0"
}, },
"lz4": { "lz4": {
"name": "lz4", "name": "lz4",
@ -96,8 +96,8 @@
"package": "VVL", "package": "VVL",
"repo": "KhronosGroup/Vulkan-ValidationLayers", "repo": "KhronosGroup/Vulkan-ValidationLayers",
"tag": "vulkan-sdk-%VERSION%", "tag": "vulkan-sdk-%VERSION%",
"git_version": "1.4.328.0",
"git_version": "1.4.328.1",
"artifact": "android-binaries-%VERSION%.zip", "artifact": "android-binaries-%VERSION%.zip",
"hash": "e45a7975f87b3d6105eae570e73660a693869a8f7ed512f158e056513e48784344f80a8e8da5d50393e532a05e2539a8c294e2632ff151e1861a2ac77254bd0a"
"hash": "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e"
} }
} }

18
externals/cpmfile.json
View File

@ -28,8 +28,8 @@
"httplib": { "httplib": {
"repo": "yhirose/cpp-httplib", "repo": "yhirose/cpp-httplib",
"tag": "v%VERSION%", "tag": "v%VERSION%",
"hash": "b364500f76e2ecb0fe21b032d831272e3f1dfeea71af74e325f8fc4ce9dcdb3c941b97a5b422bdeafb9facd058597b90f8bfc284fb9afe3c33fefa15dd5a010b",
"git_version": "0.26.0",
"hash": "e7a8877d489c97669a8ee536e1498575be921e558ed947253013fe6b67a49d4569eedd01f543caa70183b92d8ac0e8687d662a70d880954412e387317008a239",
"git_version": "0.28.0",
"find_args": "MODULE GLOBAL", "find_args": "MODULE GLOBAL",
"patches": [ "patches": [
"0001-mingw.patch" "0001-mingw.patch"
@ -89,9 +89,9 @@
"package": "unordered_dense", "package": "unordered_dense",
"repo": "martinus/unordered_dense", "repo": "martinus/unordered_dense",
"tag": "v%VERSION%", "tag": "v%VERSION%",
"hash": "f9c819e28e1c1a387acfee09277d6af5e366597a0d39acf1c687acf0608a941ba966af8aaebdb8fba0126c7360269c4a51754ef4cab17c35c01a30215f953368",
"hash": "b98b5d4d96f8e0081b184d6c4c1181fae4e41723b54bed4296717d7f417348b48fad0bbcc664cac142b8c8a47e95aa57c1eb1cf6caa855fd782fad3e3ab99e5e",
"find_args": "CONFIG", "find_args": "CONFIG",
"git_version": "4.5.0"
"git_version": "4.8.1"
}, },
"mbedtls": { "mbedtls": {
"package": "MbedTLS", "package": "MbedTLS",
@ -188,9 +188,9 @@
"package": "SimpleIni", "package": "SimpleIni",
"repo": "brofield/simpleini", "repo": "brofield/simpleini",
"tag": "v%VERSION%", "tag": "v%VERSION%",
"hash": "6c198636816a0018adbf7f735d402c64245c6fcd540b7360d4388d46f007f3a520686cdaec4705cb8cb31401b2cb4797a80b42ea5d08a6a5807c0848386f7ca1",
"hash": "b937c18a7b6277d77ca7ebfb216af4984810f77af4c32d101b7685369a4bd5eb61406223f82698e167e6311a728d07415ab59639fdf19eff71ad6dc2abfda989",
"find_args": "MODULE", "find_args": "MODULE",
"git_version": "4.22"
"git_version": "4.25"
}, },
"sdl2_generic": { "sdl2_generic": {
"package": "SDL2", "package": "SDL2",
@ -210,12 +210,12 @@
"key": "steamdeck", "key": "steamdeck",
"bundled": true, "bundled": true,
"skip_updates": "true" "skip_updates": "true"
},
},
"moltenvk": { "moltenvk": {
"repo": "KhronosGroup/MoltenVK", "repo": "KhronosGroup/MoltenVK",
"tag": "v%VERSION%", "tag": "v%VERSION%",
"git_version": "1.4.0",
"git_version": "1.4.1",
"artifact": "MoltenVK-macOS.tar", "artifact": "MoltenVK-macOS.tar",
"hash": "63721377503bbfaa9c8df79e7ebc3dc43577d38fa0f4a986c50a56a3904f9629b4cf9001d9c95c184228b574cd06608ff29ab89c14549cb6be8a7fb9cbe1e95a"
"hash": "a394329f390a11d1052d2efeef5f7f33860465eea4d7e9e1faf808e616d533a283b9c55074fb833ef95ef40067fc319470eab07dc72ac63e6464dc26cbe34905"
} }
} }

26
tools/cpm/check-updates.sh
View File

@ -8,10 +8,14 @@
RETURN=0 RETURN=0
filter() {
filter_out() {
TAGS=$(echo "$TAGS" | jq "[.[] | select(.name | test(\"$1\"; \"i\") | not)]") TAGS=$(echo "$TAGS" | jq "[.[] | select(.name | test(\"$1\"; \"i\") | not)]")
} }
filter_in() {
TAGS=$(echo "$TAGS" | jq "[.[] | select(.name | test(\"$1\"; \"i\"))]")
}
usage() { usage() {
cat << EOF cat << EOF
Usage: $0 [uf] [PACKAGE]... Usage: $0 [uf] [PACKAGE]...
@ -83,19 +87,27 @@ while true; do
# filter out some commonly known annoyances # filter out some commonly known annoyances
# TODO add more # TODO add more
filter vulkan-sdk # vulkan
filter yotta # mbedtls
if [ "$PACKAGE" = "vulkan-validation-layers" ]; then
filter_in vulkan-sdk
else
filter_out vulkan-sdk
fi
[ "$CI" = "true" ] && filter_in "-"
filter_out yotta # mbedtls
# ignore betas/alphas (remove if needed) # ignore betas/alphas (remove if needed)
filter alpha
filter beta
filter rc
filter_out alpha
filter_out beta
filter_out rc
# Add package-specific overrides here, e.g. here for fmt: # Add package-specific overrides here, e.g. here for fmt:
[ "$PACKAGE" = fmt ] && filter v0.11
[ "$PACKAGE" = fmt ] && filter_out v0.11
LATEST=$(echo "$TAGS" | jq -r '.[0].name') LATEST=$(echo "$TAGS" | jq -r '.[0].name')
[ "$LATEST" = "null" ] && echo "-- * Up-to-date" && continue
[ "$LATEST" = "$TAG" ] && [ "$FORCE" != "true" ] && echo "-- * Up-to-date" && continue [ "$LATEST" = "$TAG" ] && [ "$FORCE" != "true" ] && echo "-- * Up-to-date" && continue
RETURN=1 RETURN=1

14
tools/cpm/download.sh
View File

@ -20,10 +20,13 @@ download_package() {
ACTUAL_HASH=$("${HASH_ALGO}"sum "$OUTFILE" | cut -d" " -f1) ACTUAL_HASH=$("${HASH_ALGO}"sum "$OUTFILE" | cut -d" " -f1)
[ "$ACTUAL_HASH" != "$HASH" ] && echo "!! $FILENAME did not match expected hash; expected $HASH but got $ACTUAL_HASH" && exit 1 [ "$ACTUAL_HASH" != "$HASH" ] && echo "!! $FILENAME did not match expected hash; expected $HASH but got $ACTUAL_HASH" && exit 1
TMPDIR="$TMP/extracted"
mkdir -p "$OUTDIR" mkdir -p "$OUTDIR"
mkdir -p "$TMPDIR"
PREVDIR="$PWD" PREVDIR="$PWD"
cd "$OUTDIR"
mkdir -p "$TMPDIR"
cd "$TMPDIR"
case "$FILENAME" in case "$FILENAME" in
(*.7z) (*.7z)
@ -44,11 +47,16 @@ download_package() {
# thanks gnu # thanks gnu
if [ "$(echo "$DIRS" | wc -l)" -eq 2 ]; then if [ "$(echo "$DIRS" | wc -l)" -eq 2 ]; then
SUBDIR=$(find . -maxdepth 1 -type d -not -name ".") SUBDIR=$(find . -maxdepth 1 -type d -not -name ".")
mv "$SUBDIR"/* .
mv "$SUBDIR"/.* . 2>/dev/null || true
mv "$SUBDIR"/* "$OUTDIR"
mv "$SUBDIR"/.* "$OUTDIR" 2>/dev/null || true
rmdir "$SUBDIR" rmdir "$SUBDIR"
else
mv ./* "$OUTDIR"
mv ./.* "$OUTDIR" 2>/dev/null || true
fi fi
cd "$OUTDIR"
if echo "$JSON" | grep -e "patches" > /dev/null; then if echo "$JSON" | grep -e "patches" > /dev/null; then
PATCHES=$(echo "$JSON" | jq -r '.patches | join(" ")') PATCHES=$(echo "$JSON" | jq -r '.patches | join(" ")')
for patch in $PATCHES; do for patch in $PATCHES; do

Write Preview
Loading…
Cancel
Save