Skip to content

Commit

Permalink
Update submodules
Browse files Browse the repository at this point in the history 
- Updates SDL to 2.30.0
- Updates curl to 8.6.0
- Updates libpng to 1.6.42
- Updates libusb to 1.0.27
- Updates zlib to 1.3.1
- Updates FAudio to 24.02
  • Loading branch information
@Megamouse
Megamouse committed Feb 5, 2024
1 parent 40c51a1 commit a76bd37
Show file tree
Hide file tree
Showing 11 changed files with 95 additions and 41 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/FAudio
Submodule FAudio updated 10 files
+1 −1 .github/workflows/ci.yml
+1 −0 .gitignore
+1 −1 CMakeLists.txt
+1 −1 README
+0 −80 Xcode-iOS/FAudio.xcodeproj/xcshareddata/xcschemes/FAudio.xcscheme
+347 −22 Xcode/FAudio.xcodeproj/project.pbxproj
+4 −4 Xcode/README
+1 −1 csharp/FAudio.cs
+1 −1 include/FAudio.h
+1 −1 src/FAudio_platform_sdl2.c
2 changes: 1 addition & 1 deletion 3rdparty/curl/curl
Submodule curl updated 1936 files
1 change: 0 additions & 1 deletion 3rdparty/libpng/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ if (NOT USE_SYSTEM_LIBPNG)
set(SKIP_INSTALL_ALL ON)
add_subdirectory(libpng EXCLUDE_FROM_ALL)
target_include_directories(png_static INTERFACE "${libpng_BINARY_DIR}" "${libpng_SOURCE_DIR}")
target_link_libraries(png_static 3rdparty::zlib)

set(LIBPNG_TARGET png_static PARENT_SCOPE)
else()
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libpng/libpng
Submodule libpng updated from f13577 to 35d9f5
2 changes: 1 addition & 1 deletion 3rdparty/libsdl-org/SDL
Submodule SDL updated 1208 files
22 changes: 21 additions & 1 deletion 3rdparty/libsdl-org/SDL.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
<ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c" />
<ClCompile Include="SDL\src\joystick\steam\SDL_steamcontroller.c" />
<ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.c" />
<ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.c" />
<ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_std.c" />
<ClInclude Include="SDL\include\begin_code.h" />
<ClInclude Include="SDL\include\close_code.h" />
<ClInclude Include="SDL\include\SDL.h" />
Expand Down Expand Up @@ -133,7 +139,9 @@
<ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h" />
<ClInclude Include="SDL\src\joystick\SDL_gamecontrollerdb.h" />
<ClInclude Include="SDL\src\joystick\SDL_joystick_c.h" />
<ClInclude Include="SDL\src\joystick\SDL_steam_virtual_gamepad.h" />
<ClInclude Include="SDL\src\joystick\SDL_sysjoystick.h" />
<ClInclude Include="SDL\src\joystick\steam\SDL_steamcontroller.h" />
<ClInclude Include="SDL\src\joystick\usb_ids.h" />
<ClInclude Include="SDL\src\joystick\virtual\SDL_virtualjoystick_c.h" />
<ClInclude Include="SDL\src\joystick\windows\SDL_dinputjoystick_c.h" />
Expand Down Expand Up @@ -188,6 +196,13 @@
<ClInclude Include="SDL\src\video\dummy\SDL_nullevents_c.h" />
<ClInclude Include="SDL\src\video\dummy\SDL_nullframebuffer_c.h" />
<ClInclude Include="SDL\src\video\dummy\SDL_nullvideo.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codecs_common.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std_decode.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std_encode.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std_decode.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std_encode.h" />
<ClInclude Include="SDL\src\video\khronos\vulkan\vk_icd.h" />
<ClInclude Include="SDL\src\video\khronos\vulkan\vk_layer.h" />
<ClInclude Include="SDL\src\video\khronos\vulkan\vk_platform.h" />
Expand Down Expand Up @@ -238,7 +253,13 @@
<ClInclude Include="SDL\src\video\windows\SDL_windowswindow.h" />
<ClInclude Include="SDL\src\video\windows\wmmsg.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_common.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_internal.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx_func.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse_func.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std_func.h" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -418,7 +439,6 @@
<ClCompile Include="SDL\src\video\windows\SDL_windowsvideo.c" />
<ClCompile Include="SDL\src\video\windows\SDL_windowsvulkan.c" />
<ClCompile Include="SDL\src\video\windows\SDL_windowswindow.c" />
<ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb.c" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}</ProjectGuid>
Expand Down
22 changes: 21 additions & 1 deletion 3rdparty/libsdl-org/SDL.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,15 @@
<ClCompile Include="SDL\src\video\windows\SDL_windowsvideo.c" />
<ClCompile Include="SDL\src\video\windows\SDL_windowsvulkan.c" />
<ClCompile Include="SDL\src\video\windows\SDL_windowswindow.c" />
<ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb.c" />
<ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
<ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
<ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
<ClCompile Include="SDL\src\joystick\steam\SDL_steamcontroller.c" />
<ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.c" />
<ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.c" />
<ClCompile Include="SDL\src\video\yuv2rgb\yuv_rgb_std.c" />
<ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
<ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="SDL\include\begin_code.h" />
Expand Down Expand Up @@ -409,5 +414,20 @@
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse_func.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std_func.h" />
<ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_nintendo.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_common.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_internal.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_lsx_func.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_sse.h" />
<ClInclude Include="SDL\src\video\yuv2rgb\yuv_rgb_std.h" />
<ClInclude Include="SDL\src\joystick\steam\SDL_steamcontroller.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std_decode.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h264std_encode.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std_decode.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codec_h265std_encode.h" />
<ClInclude Include="SDL\src\video\khronos\vk_video\vulkan_video_codecs_common.h" />
<ClInclude Include="SDL\src\joystick\SDL_steam_virtual_gamepad.h" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion 3rdparty/libusb/libusb
Submodule libusb updated 197 files
7 changes: 4 additions & 3 deletions 3rdparty/zlib/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
if (USE_SYSTEM_ZLIB)
message(STATUS "RPCS3: Using system ZLIB")
find_package(ZLIB QUIET)
find_package(ZLIB GLOBAL QUIET REQUIRED)

add_library(3rdparty_zlib INTERFACE)
target_link_libraries(3rdparty_zlib INTERFACE ${ZLIB_LIBRARIES})
target_link_libraries(3rdparty_zlib INTERFACE ZLIB::ZLIB)
target_include_directories(3rdparty_zlib INTERFACE ${ZLIB_INCLUDE_DIRS})
target_compile_definitions(3rdparty_zlib INTERFACE -DZLIB_CONST=1)
else()
Expand All @@ -15,4 +14,6 @@ else()
target_link_libraries(3rdparty_zlib INTERFACE zlibstatic)
target_include_directories(3rdparty_zlib INTERFACE zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib)
target_compile_definitions(3rdparty_zlib INTERFACE -DZLIB_CONST=1)

add_library(ZLIB::ZLIB ALIAS 3rdparty_zlib)
endif()
2 changes: 1 addition & 1 deletion 3rdparty/zlib/zlib
Submodule zlib updated 73 files
+11 −1 .gitignore
+24 −19 CMakeLists.txt
+10 −0 ChangeLog
+1 −2 FAQ
+8 −8 Makefile.in
+3 −3 README
+5 −4 configure
+1 −1 contrib/delphi/ZLib.pas
+1 −1 contrib/dotzlib/DotZLib/ChecksumImpl.cs
+1 −1 contrib/dotzlib/DotZLib/UnitTests.cs
+3 −3 contrib/infback9/inftree9.c
+2 −2 contrib/infback9/inftree9.h
+2 −2 contrib/iostream3/zfstream.h
+1 −1 contrib/minizip/Makefile
+1 −1 contrib/minizip/configure.ac
+1 −1 contrib/minizip/ioapi.h
+16 −2 contrib/minizip/miniunz.c
+4 −4 contrib/minizip/unzip.c
+1 −1 contrib/minizip/unzip.h
+16 −5 contrib/minizip/zip.c
+2 −2 contrib/minizip/zip.h
+43 −0 contrib/nuget/nuget.csproj
+22 −0 contrib/nuget/nuget.sln
+1 −1 contrib/pascal/zlibpas.pas
+4 −4 contrib/puff/puff.c
+81 −75 contrib/vstudio/readme.txt
+4 −4 contrib/vstudio/vc10/zlib.rc
+1 −1 contrib/vstudio/vc10/zlibvc.def
+4 −4 contrib/vstudio/vc11/zlib.rc
+1 −1 contrib/vstudio/vc11/zlibvc.def
+4 −4 contrib/vstudio/vc12/zlib.rc
+1 −1 contrib/vstudio/vc12/zlibvc.def
+4 −4 contrib/vstudio/vc14/zlib.rc
+1 −1 contrib/vstudio/vc14/zlibvc.def
+409 −0 contrib/vstudio/vc17/miniunz.vcxproj
+405 −0 contrib/vstudio/vc17/minizip.vcxproj
+473 −0 contrib/vstudio/vc17/testzlib.vcxproj
+409 −0 contrib/vstudio/vc17/testzlibdll.vcxproj
+32 −0 contrib/vstudio/vc17/zlib.rc
+602 −0 contrib/vstudio/vc17/zlibstat.vcxproj
+158 −0 contrib/vstudio/vc17/zlibvc.def
+179 −0 contrib/vstudio/vc17/zlibvc.sln
+875 −0 contrib/vstudio/vc17/zlibvc.vcxproj
+4 −4 contrib/vstudio/vc9/zlib.rc
+1 −1 contrib/vstudio/vc9/zlibvc.def
+36 −11 deflate.c
+33 −2 deflate.h
+1 −1 doc/algorithm.txt
+2 −2 examples/gzlog.c
+1 −1 examples/zran.c
+2 −6 gzguts.h
+6 −6 gzlib.c
+1 −1 inflate.c
+3 −3 inftrees.c
+2 −2 inftrees.h
+1 −1 old/visual-basic.txt
+1 −1 os400/README400
+3 −3 os400/zlib.inc
+5 −5 qnx/package.qpg
+13 −12 test/example.c
+16 −16 test/minigzip.c
+2 −2 treebuild.xml
+17 −3 trees.c
+2 −18 win32/DLL_FAQ.txt
+4 −4 win32/README-WIN32.txt
+1 −9 zconf.h
+1 −9 zconf.h.cmakein
+1 −9 zconf.h.in
+3 −3 zlib.3
+ − zlib.3.pdf
+11 −11 zlib.h
+100 −100 zlib.map
+3 −24 zutil.h
72 changes: 43 additions & 29 deletions rpcs3/Emu/Cell/lv2/sys_usbd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,42 +158,56 @@ void LIBUSB_CALL callback_transfer(struct libusb_transfer* transfer)
usbh.transfer_complete(transfer);
}

usb_handler_thread::usb_handler_thread()
static void LIBUSB_CALL log_cb(libusb_context *ctx, enum libusb_log_level level, const char *str)
{
if (int res = libusb_init(&ctx); res < 0)
{
sys_usbd.error("Failed to initialize sys_usbd: %s", libusb_error_name(res));
if (!str)
return;
}

#if LIBUSB_API_VERSION >= 0x01000107
// Set LIBUSB_DEBUG env variable to receive log messages
libusb_set_log_cb(ctx, [](libusb_context* /* ctx */, libusb_log_level level, const char* str)
const std::string msg = fmt::trim(str, " \t\n");

switch (level)
{
if (!str)
return;
case LIBUSB_LOG_LEVEL_ERROR:
sys_usbd.error("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_WARNING:
sys_usbd.warning("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_INFO:
sys_usbd.notice("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_DEBUG:
sys_usbd.trace("libusb log: %s", msg);
break;
default:
break;
}
}

const std::string msg = fmt::trim(str, " \t\n");
usb_handler_thread::usb_handler_thread()
{
#if LIBUSB_API_VERSION >= 0x0100010A
libusb_init_option log_lv_opt{};
log_lv_opt.option = LIBUSB_OPTION_LOG_LEVEL;
log_lv_opt.value.ival = LIBUSB_LOG_LEVEL_WARNING;// You can also set the LIBUSB_DEBUG env variable instead

libusb_init_option log_cb_opt{};
log_cb_opt.option = LIBUSB_OPTION_LOG_CB;
log_cb_opt.value.log_cbval = &log_cb;

std::vector<libusb_init_option> options = {
std::move(log_lv_opt),
std::move(log_cb_opt)
};

switch (level)
{
case LIBUSB_LOG_LEVEL_ERROR:
sys_usbd.error("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_WARNING:
sys_usbd.warning("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_INFO:
sys_usbd.notice("libusb log: %s", msg);
break;
case LIBUSB_LOG_LEVEL_DEBUG:
sys_usbd.trace("libusb log: %s", msg);
break;
default:
break;
}
}, LIBUSB_LOG_CB_CONTEXT);
if (int res = libusb_init_context(&ctx, options.data(), static_cast<int>(options.size())); res < 0)
#else
if (int res = libusb_init(&ctx); res < 0)
#endif
{
sys_usbd.error("Failed to initialize sys_usbd: %s", libusb_error_name(res));
return;
}

for (u32 index = 0; index < MAX_SYS_USBD_TRANSFERS; index++)
{
Expand Down

0 comments on commit a76bd37

Please sign in to comment.