summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2025-07-24 15:11:34 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2025-08-01 11:47:41 +0900
commit186a9714a3ab6d6d4342d8a85873ad071f7b3617 (patch)
tree2252ab5ff2d6046f20a458c0837632f8ff0df7dd /gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch
parent9d1f9a867dc4f8c714bcb2642ecf7dc5ec5028bc (diff)
gnu: dolphin-emu: Update to 2506-0.79a3af2.
* gnu/packages/emulators.scm (dolphin-emu): Update to 2506-0.79a3af2. [source] {patches}: Update patches. (dolphin-rcheevos-submodule): New variable. [source]: Refine and update snippet. [#:phases] {remove-unittests-target-post-build-command}: Delete. {generate-fonts&hardcode-libvulkan-path}: Fix typo in phase name. Remove obsolete cstdint patching. {post-check}: Delete. [#:configure-flags]: Streamline. Add -DUSE_DISCORD_PRESENCE=OFF. [native-inputs]: Add googletest [inputs]: Replace ffmpeg-4 with ffmpeg. Replace fmt-7 with fmt-11. Replace gtk+-2 with gtk+ and minizip-ng-compat with minizip-ng. Add lz4, mgba-for-dolphin, qtsvg, spirv-cross, spng, tinygltf, vulkan-headers, vulkan-memory-allocator and watcher. Replace qtbase-5 with qtbase. Replace sdl2 with sdl3. Replace sfml-2 with sfml. Remove soundtouch-1/integer-samples. (libretro-dolphin-emu): Update to 5.0-1.a09f78f. [source]: Break inheritance with dolphin-emu, adjusting snippet for its older code base. [patches]: Apply libretro-dolphin-emu-libusb-assert.patch and libretro-dolphin-emu-vulkan-headers.patch. [#:phases] {link-unittest-to-gtest}: New phase. [inputs]: Do not inherit from dolphin-emu. Replace fmt-7 with fmt. Replace minizip-ng with minizip-ng-compat. googletest, vulkan-headers. * gnu/packages/patches/dolphin-emu-data.patch: Delete file. * gnu/packages/patches/dolphin-emu-unbundle-tinygltf.patch * gnu/packages/patches/dolphin-emu-unbundle-watcher.patch * gnu/packages/patches/libretro-dolphin-emu-gc-font-tool.patch * gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch * gnu/packages/patches/libretro-dolphin-emu-vulkan-headers.patch: New files. * gnu/local.mk (dist_patch_DATA): Update accordingly. Fixes: #1327 Change-Id: I5a870a5e29c1ca243fb1d5e049ee06c5e254a04f
Diffstat (limited to 'gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch')
-rw-r--r--gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch b/gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch
new file mode 100644
index 0000000000..ae07987602
--- /dev/null
+++ b/gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch
@@ -0,0 +1,33 @@
+This patch is already merged in dolphin.
+
+It'll appear in libretro-dolphin whenever it is rebased on top of current
+dolphin source.
+
+diff --git a/Source/Core/Core/LibusbUtils.cpp b/Source/Core/Core/LibusbUtils.cpp
+index a4083e2d06..1ef9777e71 100644
+--- a/Source/Core/Core/LibusbUtils.cpp
++++ b/Source/Core/Core/LibusbUtils.cpp
+@@ -9,8 +9,8 @@
+ #include <libusb.h>
+ #endif
+
+-#include "Common/Assert.h"
+ #include "Common/Flag.h"
++#include "Common/Logging/Log.h"
+ #include "Common/Thread.h"
+ #include "Core/LibusbUtils.h"
+
+@@ -23,9 +23,12 @@ public:
+ Impl()
+ {
+ const int ret = libusb_init(&m_context);
+- ASSERT_MSG(IOS_USB, ret == LIBUSB_SUCCESS, "Failed to init libusb: %s", libusb_error_name(ret));
+ if (ret != LIBUSB_SUCCESS)
++ {
++ ERROR_LOG(IOS_USB, "Failed to init libusb: %s", libusb_error_name(ret));
+ return;
++ }
++
+
+ #ifdef _WIN32
+ libusb_set_option(m_context, LIBUSB_OPTION_USE_USBDK);