mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
186a9714a3
* 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
33 lines
933 B
Diff
33 lines
933 B
Diff
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);
|