vcpkg: Bump third party dependencies

julianxhokaxhiu · Apr 18, 2022 · 8243efd · 8243efd
1 parent f572185
commit 8243efd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 46 deletions.
diff --git a/.vcpkg/ports/bgfx/portfile.cmake b/.vcpkg/ports/bgfx/portfile.cmake
@@ -20,8 +20,8 @@ vcpkg_from_github(OUT_SOURCE_PATH BIMG_SOURCE_DIR
 vcpkg_from_github(OUT_SOURCE_PATH SOURCE_DIR
     REPO "julianxhokaxhiu/bgfx"
     HEAD_REF master
-    REF b25e200ef025ef8997947051e049d326df22549f
-    SHA512 d5217e2bebf3e511eea260478b0c0513eb8abf3f9aee986f31c60b946b4934fea757a8db7e1aca6cd3910d3259a939a8fbf0d9a064eb5721a404994c6be02e21
+    REF 5f7ef50ff92c8f957abd957f30b154715d85b885
+    SHA512 d48cb4d6c2f8f7d5e9d1bd09329a272182b8d88a5911b5aff8cca1ab8b9d9b4184c3d8153b4b6bd1f67690295f3d8a0aee38565cb6e8ee7c4660fe153c46ed7d
 )
 
 # Move bx source inside bgfx source tree

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 76cd23f0550a8c7153c964d00fa11e48e0d80c5d
-    SHA512 cd0b28d65dc4a7aac37bd776d5812f87e1175c5c31f92dbd9ebbc4805c69d0b39c602ce0bb2821dd33aac3d579656918c355b1471dad2041d24ea601bf74308d
+    REF db307c7ef841c84c456949534be5e4b51919fbc0
+    SHA512 decd81ff2957142da8d803ad2011ef1ef34ea988bfe184a7071137b03a847f5199326067f2aec177b1d684eb1df2ac8fcf8cef6d5942e52f20a51e0b2a023565
 )
 
 # Set up GENie (custom project generator)

diff --git a/.vcpkg/ports/vgmstream/cmake.patch b/.vcpkg/ports/vgmstream/cmake.patch
@@ -54,43 +54,6 @@ index f09d3eed..02750d86 100644
 +	install( FILES ${CMAKE_CURRENT_SOURCE_DIR}/coding/nwa_decoder.h DESTINATION include/libvgmstream/coding )
 +endif()
 \ No newline at end of file
-diff --git a/src/coding/coding.h b/src/coding/coding.h
-index eac0cd88..e132f791 100644
---- a/src/coding/coding.h
-+++ b/src/coding/coding.h
-@@ -430,6 +430,15 @@ void seek_vorbis_custom(VGMSTREAM* vgmstream, int32_t num_sample);
- void free_vorbis_custom(vorbis_custom_codec_data* data);
- #endif
-
-+typedef struct {
-+    int version;
-+    int layer;
-+    int bit_rate;
-+    int sample_rate;
-+    int frame_samples;
-+    int frame_size; /* bytes */
-+    int channels;
-+} mpeg_frame_info;
-
- #ifdef VGM_USE_MPEG
- /* mpeg_decoder */
-@@ -482,16 +491,6 @@ void free_mpeg(mpeg_codec_data* data);
- int mpeg_get_sample_rate(mpeg_codec_data* data);
- long mpeg_bytes_to_samples(long bytes, const mpeg_codec_data* data);
-
--typedef struct {
--    int version;
--    int layer;
--    int bit_rate;
--    int sample_rate;
--    int frame_samples;
--    int frame_size; /* bytes */
--    int channels;
--} mpeg_frame_info;
--
- int mpeg_get_frame_info(STREAMFILE* sf, off_t offset, mpeg_frame_info* info);
- #endif
-
 diff --git a/src/streamfile.c b/src/streamfile.c
 index 0e6cb01e..d2d7b666 100644
 --- a/src/streamfile.c

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 0dddcfc7ea39b47f20d7e75afd31298f516f9341
-    SHA512 0126ab48188f0fabde15bbc9505d68d22cb97a2c005fd69721f88fe2fed816f72aa4de255e5b209770a5853b397d811aa707bd37e28c62613377a062b7959296
+    REF 9d47eded30c94ce6242b6e63c0624524fa637826
+    SHA512 9eff06cd8673b491b0881f95afecce0bef2a17c207c3fc94f5f56672b9600bf015faccbb20c19a53e09993eef6ccf0cc7c8db93d41c3131f05b4146ad8c8fc34
     PATCHES cmake.patch
 )
 
@@ -36,6 +36,7 @@ vcpkg_configure_cmake(
         -DUSE_FFMPEG=${USE_FFMPEG}
         -DAVCODEC_VERSION=57
         -DAVUTIL_VERSION=55
+        -DAVFORMAT_VERSION=57
         -DSWRESAMPLE_VERSION=2
         -DUSE_G719=OFF
         -DUSE_G7221=ON

diff --git a/vcpkg.json b/vcpkg.json
@@ -48,7 +48,7 @@
     {
       "name": "ffmpeg",
       "version": "4.4.1",
-      "port-version": 9
+      "port-version": 12
     },
     {
       "name": "imgui",
@@ -82,8 +82,8 @@
     },
     {
       "name": "tomlplusplus",
-      "version": "2.5.0",
-      "port-version": 3
+      "version": "3.0.1",
+      "port-version": 0
     },
     {
       "name": "vgmstream",