vcpkg: Bump stack

julianxhokaxhiu · Oct 3, 2023 · 1687b07 · 1687b07
1 parent 1c1438f
commit 1687b07
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 38 deletions.
diff --git a/.vcpkg/ports/bgfx/portfile.cmake b/.vcpkg/ports/bgfx/portfile.cmake
@@ -6,22 +6,22 @@
 vcpkg_from_github(OUT_SOURCE_PATH BX_SOURCE_DIR
     REPO "julianxhokaxhiu/bx"
     HEAD_REF master
-    REF 0e442f6f5945b27146ed9fa0acadb7d955dbedc2
-    SHA512 69f4d77a4b2ca1e8af35ef0322362435f962dbfa20a38198de70e09c886e019a53a6948838f7ea1c5d7c2e67fea3be78263e26a8f47dfede9191f3c5f178dd3e
+    REF afd1d16d32debfc996cd6b181d7688d0b24cea05
+    SHA512 680ebf950f621ec807082f1a7edc489cf4d4c35b6ee39b0dd3f15f6b93c78871b727a9450bee2ec065cc43e55aff09231e175f375eeaefd1244ee9574763f684
 )
 
 vcpkg_from_github(OUT_SOURCE_PATH BIMG_SOURCE_DIR
     REPO "julianxhokaxhiu/bimg"
     HEAD_REF master
-    REF ec02df824a763b2e2ae31e19c674ba0bc88c0695
-    SHA512 e0f26afae510244e85758ddaada83e3d6b48745b447e197bffcb972f1fd8f42269f2e9f3ee48a6d54ea99d0ad66062a6212a3604f7e61d616681b815fb8a6d8f
+    REF ab96ba9dda6c23273751be81509f3fe3086d7724
+    SHA512 1c86cc72224880760b63d67153c2843a4d71932e0a3d1150af1337f09c28598a638afe820b61c56d8cc172924111c7c8da8fbf0720e019307dba10450f3b04c8
 )
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR
     REPO "julianxhokaxhiu/bgfx"
     HEAD_REF master
-    REF 268a867db4142ddd91160d4ca69b656ea16352f2
-    SHA512 0d5df46c7ffc183eb7882ff935a0a038beb8a364d5e678ca886f78215564849ceb5ff8e62501b0cb35292231105fe5f8c86f30a0be2bc084f8cb6ff7f29735be
+    REF e3e5b1372b4ec63170770ce34862667e916bd491
+    SHA512 6f0d9a5b73b6b5f08a3c236ffb607b67641236c8d88ee06357e807eb5167757b894a1fa28aa3beb01416e8dbcb522183f56c9745b492cabd087e7cd27c62e72d
 )
 
 # Move bx source inside bgfx source tree

diff --git a/.vcpkg/ports/bimg/portfile.cmake b/.vcpkg/ports/bimg/portfile.cmake
@@ -6,15 +6,15 @@
 vcpkg_from_github(OUT_SOURCE_PATH BX_SOURCE_DIR
     REPO "julianxhokaxhiu/bx"
     HEAD_REF master
-    REF 0e442f6f5945b27146ed9fa0acadb7d955dbedc2
-    SHA512 69f4d77a4b2ca1e8af35ef0322362435f962dbfa20a38198de70e09c886e019a53a6948838f7ea1c5d7c2e67fea3be78263e26a8f47dfede9191f3c5f178dd3e
+    REF afd1d16d32debfc996cd6b181d7688d0b24cea05
+    SHA512 680ebf950f621ec807082f1a7edc489cf4d4c35b6ee39b0dd3f15f6b93c78871b727a9450bee2ec065cc43e55aff09231e175f375eeaefd1244ee9574763f684
 )
 
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR
     REPO "julianxhokaxhiu/bimg"
     HEAD_REF master
-    REF ec02df824a763b2e2ae31e19c674ba0bc88c0695
-    SHA512 e0f26afae510244e85758ddaada83e3d6b48745b447e197bffcb972f1fd8f42269f2e9f3ee48a6d54ea99d0ad66062a6212a3604f7e61d616681b815fb8a6d8f
+    REF ab96ba9dda6c23273751be81509f3fe3086d7724
+    SHA512 1c86cc72224880760b63d67153c2843a4d71932e0a3d1150af1337f09c28598a638afe820b61c56d8cc172924111c7c8da8fbf0720e019307dba10450f3b04c8
 )
 
 # Move bx source inside bgfx source tree

diff --git a/.vcpkg/ports/bx/portfile.cmake b/.vcpkg/ports/bx/portfile.cmake
@@ -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 0e442f6f5945b27146ed9fa0acadb7d955dbedc2
-    SHA512 69f4d77a4b2ca1e8af35ef0322362435f962dbfa20a38198de70e09c886e019a53a6948838f7ea1c5d7c2e67fea3be78263e26a8f47dfede9191f3c5f178dd3e
+    REF afd1d16d32debfc996cd6b181d7688d0b24cea05
+    SHA512 680ebf950f621ec807082f1a7edc489cf4d4c35b6ee39b0dd3f15f6b93c78871b727a9450bee2ec065cc43e55aff09231e175f375eeaefd1244ee9574763f684
 )
 
 # Set up GENie (custom project generator)

diff --git a/.vcpkg/ports/soloud/portfile.cmake b/.vcpkg/ports/soloud/portfile.cmake
@@ -5,8 +5,8 @@
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR
     REPO "julianxhokaxhiu/soloud"
     HEAD_REF master
-    REF b72ce0bded926c66b94b6a1ae5bef12a9dab164f
-    SHA512 da2574fd571a1b07644e9efc6744d96cad62f2ee0f604ed2f0cf99ed2d142b6ac72a048a2b21e837dc474104bee538a4f5d97d39c7fab98a2f813dc735f5ea46
+    REF 02e519d5f2df2e4f145f4758989cb8e2ec179dcc
+    SHA512 a5c93db178f5964f69ca8808e4c1c67beb0b1d3f67641a5aecc366f0ef6ffc0b1540ab5723b81e292dc988d7c172b4206fa7f30a3ff790bb538118cc43c326c8
 )
 
 # Set up GENie (custom project generator)

diff --git a/.vcpkg/ports/vgmstream/cmake.patch b/.vcpkg/ports/vgmstream/cmake.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9b60f21c..3b0ccc56 100644
+index f34fe127..539deb44 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -1,4 +1,5 @@
@@ -9,10 +9,10 @@ index 9b60f21c..3b0ccc56 100644
 
  if(CMAKE_SYSTEM_NAME MATCHES Darwin)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index cf324909..118c1588 100644
+index 675eb364..57a3a35e 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -76,3 +76,28 @@ if(NOT EMSCRIPTEN)
+@@ -84,3 +84,30 @@ if(NOT EMSCRIPTEN)
  		set_target_properties(libvgmstream_shared PROPERTIES LINK_FLAGS_RELEASE -s)
  	endif()
  endif()
@@ -32,20 +32,22 @@ index cf324909..118c1588 100644
 +if(NOT SKIP_INSTALL_HEADERS)
 +	# Install headers
 +	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/vgmstream.h DESTINATION include/libvgmstream )
-+	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/plugins.h DESTINATION include/libvgmstream )
-+	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util.h DESTINATION include/libvgmstream )
++	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/vgmstream_types.h DESTINATION include/libvgmstream )
++	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/base/plugins.h DESTINATION include/libvgmstream )
 +	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util.h DESTINATION include/libvgmstream )
 +	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util/log.h DESTINATION include/libvgmstream/util )
++	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util/reader_get.h DESTINATION include/libvgmstream/util )
++	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/util/reader_put.h DESTINATION include/libvgmstream/util )
 +	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/streamtypes.h DESTINATION include/libvgmstream )
 +	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/streamfile.h DESTINATION include/libvgmstream )
 +	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/coding/g72x_state.h DESTINATION include/libvgmstream/coding )
 +	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/coding/nwa_decoder.h DESTINATION include/libvgmstream/coding )
 +endif()
 diff --git a/src/streamfile.c b/src/streamfile.c
-index 0e6cb01e..d2d7b666 100644
+index 8566febf..8ceaa561 100644
 --- a/src/streamfile.c
 +++ b/src/streamfile.c
-@@ -263,8 +263,10 @@ static STREAMFILE* open_stdio_streamfile_buffer_by_file(FILE* infile, const char
+@@ -260,8 +260,10 @@ static STREAMFILE* open_stdio_streamfile_buffer_by_file(FILE* infile, const char
      this_sf->buf = buf;
 
      this_sf->name_len = strlen(filename);
@@ -57,7 +59,7 @@ index 0e6cb01e..d2d7b666 100644
      memcpy(this_sf->name, filename, this_sf->name_len);
      this_sf->name[this_sf->name_len] = '\0';
 
-@@ -304,6 +306,7 @@ static STREAMFILE* open_stdio_streamfile_buffer_by_file(FILE* infile, const char
+@@ -301,6 +303,7 @@ static STREAMFILE* open_stdio_streamfile_buffer_by_file(FILE* infile, const char
      return &this_sf->vt;
 
  fail:

diff --git a/.vcpkg/ports/vgmstream/portfile.cmake b/.vcpkg/ports/vgmstream/portfile.cmake
@@ -7,8 +7,8 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "vgmstream/vgmstream"
     HEAD_REF master
-    REF r1831
-    SHA512 11d8b426f2486e8de38d9d6792626fc3c97bd60b202e17b579b18a88fdd9a27ec3b36771b58772e03547e51cdbbf2504b7849bb2ce5e2d291d8e75c9d009be30
+    REF r1879
+    SHA512 900d48367d377862602e1ff11046f26ac537a2809530a880828531de429afc02b3b31611582145f89d50750a1d0d6758e10f49aab4bfb303256e8d4138ae9601
     PATCHES cmake.patch
 )
 

diff --git a/.vcpkg/ports/vgmstream/vcpkg.json b/.vcpkg/ports/vgmstream/vcpkg.json
@@ -4,7 +4,9 @@
   "description": "A library for playback of various streamed audio formats used in video games.",
   "homepage": "https://github.com/vgmstream/vgmstream",
   "default-features": [
-    "ffmpeg"
+    "ffmpeg",
+    "mpg123",
+    "vorbis"
   ],
   "features": {
     "ffmpeg": {

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,6 +67,7 @@ find_package(BX REQUIRED)
 find_package(BIMG REQUIRED)
 find_package(BGFX REQUIRED)
 find_package(FFMPEG REQUIRED)
+find_package(MPG123 REQUIRED)
 find_package(Vorbis CONFIG REQUIRED)
 find_package(VGMSTREAM REQUIRED)
 find_package(STACKWALKER REQUIRED)
@@ -143,6 +144,7 @@ target_link_libraries(
   xxHash::xxhash
   Vorbis::vorbisfile
   Vorbis::vorbis
+  MPG123::libmpg123
   ${BX_LIBRARIES}
   ${BIMG_LIBRARIES}
   ${BGFX_LIBRARIES}

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffnx",
   "version": "1.16.0",
-  "builtin-baseline": "9edb1b8e590cc086563301d735cae4b6e732d2d2",
+  "builtin-baseline": "ced4b6dbc1fcae4a30b39d004ba67242a79434a5",
   "dependencies": [
     "bgfx",
     {
@@ -48,14 +48,7 @@
     "soloud",
     "stackwalker",
     "tomlplusplus",
-    {
-      "name": "vgmstream",
-      "default-features": false,
-      "features": [
-        "ffmpeg",
-        "vorbis"
-      ]
-    },
+    "vgmstream",
     "steamworkssdk",
     "xxhash",
     {
@@ -75,12 +68,12 @@
     },
     {
       "name": "ffmpeg",
-      "version": "5.1.2",
-      "port-version": 7
+      "version": "6.0",
+      "port-version": 0
     },
     {
       "name": "imgui",
-      "version": "1.89.7",
+      "version": "1.89.9",
       "port-version": 0
     },
     {
@@ -136,7 +129,7 @@
     {
       "name": "cpuinfo",
       "version": "2022-07-19",
-      "port-version": 2
+      "port-version": 3
     },
     {
       "name": "cmakerc",