diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -473,6 +473,7 @@ libc.so.6:__fdelt_chk libc.so.6:__fprintf_chk libc.so.6:__isoc99_sscanf +libc.so.6:__libc_single_threaded libc.so.6:__libc_start_main libc.so.6:__memcpy_chk libc.so.6:__printf_chk @@ -524,6 +525,7 @@ libc.so.6:strcmp libc.so.6:strcpy libc.so.6:strlen +libc.so.6:strncmp libc.so.6:strncpy libc.so.6:strrchr libc.so.6:strstr @@ -643,6 +645,7 @@ libstdc++.so.6:_ZNSt8ios_baseD2Ev libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE4initEPSt15basic_streambufIcS1_E libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEE5clearESt12_Ios_Iostate +libstdc++.so.6:_ZNSt9basic_iosIcSt11char_traitsIcEEC2Ev libstdc++.so.6:_ZNSt9exceptionD2Ev libstdc++.so.6:_ZSt11_Hash_bytesPKvmm libstdc++.so.6:_ZSt16__ostream_insertIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_PKS3_l @@ -659,6 +662,7 @@ libstdc++.so.6:_ZSt24__throw_out_of_range_fmtPKcz libstdc++.so.6:_ZSt25__throw_bad_function_callv libstdc++.so.6:_ZSt28_Rb_tree_rebalance_for_erasePSt18_Rb_tree_node_baseRS_ +libstdc++.so.6:_ZSt28__throw_bad_array_new_lengthv libstdc++.so.6:_ZSt29_Rb_tree_insert_and_rebalancebPSt18_Rb_tree_node_baseS0_RS_ libstdc++.so.6:_ZSt4cout libstdc++.so.6:_ZSt7getlineIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RNSt7__cxx1112basic_stringIS4_S5_T1_EES4_ @@ -694,7 +698,6 @@ libstdc++.so.6:__cxa_guard_abort libstdc++.so.6:__cxa_guard_acquire libstdc++.so.6:__cxa_guard_release -libstdc++.so.6:__cxa_pure_virtual libstdc++.so.6:__cxa_rethrow libstdc++.so.6:__cxa_throw libstdc++.so.6:__cxa_throw_bad_array_new_length diff --git a/files/g502-detection-fix.patch b/files/g502-detection-fix.patch new file mode 100644 --- /dev/null +++ b/files/g502-detection-fix.patch @@ -0,0 +1,43 @@ +diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp +index fd25d98d2ab1751ef76771331e224b51922cad11..270841db18c70fd3d7757f9435cd562e438e1cf2 100644 +--- a/Controllers/LogitechController/LogitechControllerDetect.cpp ++++ b/Controllers/LogitechController/LogitechControllerDetect.cpp +@@ -441,6 +441,11 @@ void DetectLogitechMouseG403(hid_device_info* info, const std::string& name) + addLogitechLightsyncMouse2zone(info, name, 0xFF, 0x0E, 0x3A); + } + ++void DetectLogitechMouseG502PS(hid_device_info* info, const std::string& name) ++{ ++ addLogitechLightsyncMouse2zone(info, name, 0xFF, 0x02, 0x3A); ++} ++ + void DetectLogitechMouseGPRO(hid_device_info* info, const std::string& name) + { + addLogitechLightsyncMouse2zone(info, name, 0x01, 0x07, 0x3C); +@@ -486,6 +491,8 @@ REGISTER_HID_DETECTOR_IP ("Logitech G203 Prodigy", Dete + REGISTER_HID_DETECTOR_IPU("Logitech G203 Lightsync", DetectLogitechMouseG203L, LOGITECH_VID, LOGITECH_G203_LIGHTSYNC_PID, 1, 0xFF00, 2); + REGISTER_HID_DETECTOR_IP ("Logitech G303 Daedalus Apex", DetectLogitechMouseG303, LOGITECH_VID, LOGITECH_G303_PID, 1, 0xFF00); + REGISTER_HID_DETECTOR_IP ("Logitech G403 Hero", DetectLogitechMouseG403, LOGITECH_VID, LOGITECH_G403_HERO_PID, 1, 0xFF00); ++REGISTER_HID_DETECTOR_IP ("Logitech G502 Proteus Spectrum Gaming Mouse", DetectLogitechMouseG502PS, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00); ++REGISTER_HID_DETECTOR_IP ("Logitech G502 Hero Gaming Mouse", DetectLogitechMouseG502PS, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00); + REGISTER_HID_DETECTOR_IP ("Logitech G Pro Gaming Mouse", DetectLogitechMouseGPRO, LOGITECH_VID, LOGITECH_G_PRO_PID, 1, 0xFF00); + REGISTER_HID_DETECTOR_IP ("Logitech G Pro (HERO) Gaming Mouse", DetectLogitechMouseGPRO, LOGITECH_VID, LOGITECH_G_PRO_HERO_PID, 1, 0xFF00); + /*-------------------------------------------------------------------------------------------------------------------------------------------------*\ +@@ -596,8 +603,6 @@ REGISTER_HID_DETECTOR_IP("Logitech G Powerplay Mousepad", + | Lightspeed Wireless Devices (Windows Wired) | + \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ + REGISTER_HID_DETECTOR_IP("Logitech G403 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00); +-REGISTER_HID_DETECTOR_IP("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00); +-REGISTER_HID_DETECTOR_IP("Logitech G502 Hero Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00); + REGISTER_HID_DETECTOR_IP("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00); + REGISTER_HID_DETECTOR_IP("Logitech G703 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00); + REGISTER_HID_DETECTOR_IP("Logitech G900 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00); +@@ -657,8 +662,6 @@ REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse", + | Lightspeed Wireless Devices (Linux Wired) | + \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ + REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00, 2); +-REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_PROTEUS_SPECTRUM_PID, 1, 0xFF00, 2); +-REGISTER_HID_DETECTOR_IPU("Logitech G502 Hero Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00, 2); + REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00, 2); + REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00, 2); + REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00, 2); diff --git a/files/g502-pid-fix.patch b/files/g502-pid-fix.patch new file mode 100644 --- /dev/null +++ b/files/g502-pid-fix.patch @@ -0,0 +1,13 @@ +diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp +index 270841db18c70fd3d7757f9435cd562e438e1cf2..a254d8d843a1913e93b6d72d850c95120e95d6fb 100644 +--- a/Controllers/LogitechController/LogitechControllerDetect.cpp ++++ b/Controllers/LogitechController/LogitechControllerDetect.cpp +@@ -662,7 +662,7 @@ REGISTER_HID_DETECTOR_IPU("Logitech G Pro Wireless Gaming Mouse", + | Lightspeed Wireless Devices (Linux Wired) | + \*-------------------------------------------------------------------------------------------------------------------------------------------------*/ + REGISTER_HID_DETECTOR_IPU("Logitech G403 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G403_LIGHTSPEED_PID, 1, 0xFF00, 2); +-REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_HERO_PID, 1, 0xFF00, 2); ++REGISTER_HID_DETECTOR_IPU("Logitech G502 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G502_LIGHTSPEED_PID, 1, 0xFF00, 2); + REGISTER_HID_DETECTOR_IPU("Logitech G703 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G703_LIGHTSPEED_PID, 1, 0xFF00, 2); + REGISTER_HID_DETECTOR_IPU("Logitech G900 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G900_LIGHTSPEED_PID, 1, 0xFF00, 2); + REGISTER_HID_DETECTOR_IPU("Logitech G903 Wireless Gaming Mouse (wired)", DetectLogitechWired, LOGITECH_VID, LOGITECH_G903_LIGHTSPEED_PID, 1, 0xFF00, 2); diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : openrgb version : '0.6' -release : 3 +release : 4 source : - https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.6/OpenRGB-release_0.6.tar.gz : cfcec232550d0c4d00e87b91ba501ca248a07e3b50a07c50d0c0af37dc03dffa license : GPL-2.0-only @@ -14,6 +14,9 @@ - pkgconfig(hidapi-libusb) - pkgconfig(libusb-1.0) setup : | + %patch -p1 < $pkgfiles/g502-detection-fix.patch + %patch -p1 < $pkgfiles/g502-pid-fix.patch + %qmake OpenRGB.pro build : | %make diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -3,8 +3,8 @@ openrgb https://gitlab.com/CalcProgrammer1/OpenRGB/ - Martin Reboredo - yakoyoku@gmail.com + Campbell Jones + dev@serebit.com GPL-2.0-only system.utils @@ -29,12 +29,12 @@ - - 2021-07-23 + + 2021-10-23 0.6 Packaging update - Martin Reboredo - yakoyoku@gmail.com + Campbell Jones + dev@serebit.com \ No newline at end of file