diff options
| author | martymac <martymac@FreeBSD.org> | 2015-10-27 04:36:30 +0800 |
|---|---|---|
| committer | martymac <martymac@FreeBSD.org> | 2015-10-27 04:36:30 +0800 |
| commit | 7310d7ae24259772ac71bf8663bd74cc78ababad (patch) | |
| tree | c0ea40a6a123488f5652488eb64edda5fca6a5e5 /emulators | |
| parent | 77a266672458d05055217b5eeaf6820932025805 (diff) | |
| download | freebsd-ports-gnome-7310d7ae24259772ac71bf8663bd74cc78ababad.tar.gz freebsd-ports-gnome-7310d7ae24259772ac71bf8663bd74cc78ababad.tar.zst freebsd-ports-gnome-7310d7ae24259772ac71bf8663bd74cc78ababad.zip | |
Clean-up patches
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake | 14 | ||||
| -rw-r--r-- | emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake b/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake index 823ca10e2e83..cc61dfeee42a 100644 --- a/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake +++ b/emulators/dolphin-emu/files/patch-CMakeTests-FindLibUSB.cmake @@ -1,19 +1,13 @@ Adapt libusb name for FreeBSD ---- CMakeTests/FindLibUSB.cmake.orig 2015-10-09 20:30:03.218968702 +0000 -+++ CMakeTests/FindLibUSB.cmake 2015-10-09 20:36:02.787944507 +0000 -@@ -23,7 +23,13 @@ +--- CMakeTests/FindLibUSB.cmake.orig 2015-07-31 10:04:05.000000000 +0000 ++++ CMakeTests/FindLibUSB.cmake 2015-10-25 12:51:34.455592341 +0000 +@@ -23,7 +23,7 @@ /usr/local/include ) - find_library(LIBUSB_LIBRARIES NAMES usb-1.0 -+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") -+ set(LIBUSB_LIBRARY "usb") -+ else() -+ set(LIBUSB_LIBRARY "usb-1.0") -+ endif() -+ -+ find_library(LIBUSB_LIBRARIES NAMES ${LIBUSB_LIBRARY} ++ find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb PATHS ${LIBUSB_PKG_LIBRARY_DIRS} /usr/lib diff --git a/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp b/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp index 3343cace267d..f9d3fe016af3 100644 --- a/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp +++ b/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp @@ -6,7 +6,7 @@ Disable hotplug support for FreeBSD static bool s_libusb_driver_not_supported = false; static libusb_context* s_libusb_context = nullptr; static bool s_libusb_hotplug_enabled = false; -+#if !defined(__FreeBSD__) ++#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 static libusb_hotplug_callback_handle s_hotplug_handle; +#endif @@ -16,7 +16,7 @@ Disable hotplug support for FreeBSD } } -+#if !defined(__FreeBSD__) ++#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 static int HotplugCallback(libusb_context* ctx, libusb_device* dev, libusb_hotplug_event event, void* user_data) { if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) @@ -31,7 +31,7 @@ Disable hotplug support for FreeBSD Common::SetCurrentThreadName("GC Adapter Scanning Thread"); NOTICE_LOG(SERIALINTERFACE, "GC Adapter scanning thread started"); -+#if !defined(__FreeBSD__) ++#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 s_libusb_hotplug_enabled = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) != 0; if (s_libusb_hotplug_enabled) { @@ -47,7 +47,7 @@ Disable hotplug support for FreeBSD void Shutdown() { StopScanThread(); -+#if !defined(__FreeBSD__) ++#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 if (s_libusb_hotplug_enabled) libusb_hotplug_deregister_callback(s_libusb_context, s_hotplug_handle); +#endif |