Added patches for G502 PID and detection issue 1459 upstream

4 files changed, 68 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2de5a365be70..2c118d0af48f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openrgb
 	pkgdesc = Open source RGB lighting control that doesn't depend on manufacturer software.
 	pkgver = 0.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.com/CalcProgrammer1/OpenRGB
 	arch = x86_64
 	license = GPL2
@@ -14,10 +14,13 @@ pkgbase = openrgb
 	source = openrgb.conf
 	source = openrgb.service
 	source = openrgb.desktop
+	source = 09e5243-g502detectionfix.patch
+	source = ae88771-g502pidfix.patch
 	sha256sums = cfcec232550d0c4d00e87b91ba501ca248a07e3b50a07c50d0c0af37dc03dffa
 	sha256sums = b5a53d747422f8b594e3e9615e238457d696732efce94050cdd72182a8645ef2
-	sha256sums = 97445ee2e0824441dbebab14a10c2ea6983e14ab8f7177b977ee6b8bdc3398f9
+	sha256sums = d5e61b52d8f753a0500ed2cb951362fee637611a9cae8d59f06f1bf72bc9999f
 	sha256sums = 2f96f6bcb381490dae7132b9533045dd46db8a0fc9f9ab5d00d952545800c6fc
+	sha256sums = 7dc3f07409ff52efdf836d277be9d8bd68093980f0f6f14bed6f1718c31224cf
+	sha256sums = 80baad74c9f5f6109ec6e1179737e85ef93395b8647e2e7efeb29671c26e2701
 
 pkgname = openrgb
-
diff --git a/09e5243-g502detectionfix.patch b/09e5243-g502detectionfix.patch
new file mode 100644
index 000000000000..b3dc84e24e5e
--- /dev/null
+++ b/09e5243-g502detectionfix.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/PKGBUILD b/PKGBUILD
index 3a508e06e543..50ffc381d200 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Paul Davis <paul@dangersalad.com>
 pkgname=openrgb
 pkgver=0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source RGB lighting control that doesn't depend on manufacturer software."
 arch=("x86_64")
 url="https://gitlab.com/CalcProgrammer1/OpenRGB"
@@ -15,12 +15,16 @@ source=(
    openrgb.conf
    openrgb.service
    openrgb.desktop
+   09e5243-g502detectionfix.patch
+   ae88771-g502pidfix.patch
 )
 sha256sums=(
    'cfcec232550d0c4d00e87b91ba501ca248a07e3b50a07c50d0c0af37dc03dffa'
    'b5a53d747422f8b594e3e9615e238457d696732efce94050cdd72182a8645ef2'
-   '97445ee2e0824441dbebab14a10c2ea6983e14ab8f7177b977ee6b8bdc3398f9'
+   'd5e61b52d8f753a0500ed2cb951362fee637611a9cae8d59f06f1bf72bc9999f'
    '2f96f6bcb381490dae7132b9533045dd46db8a0fc9f9ab5d00d952545800c6fc'
+   '7dc3f07409ff52efdf836d277be9d8bd68093980f0f6f14bed6f1718c31224cf'
+   '80baad74c9f5f6109ec6e1179737e85ef93395b8647e2e7efeb29671c26e2701'
 )
 
 prepare() {
diff --git a/ae88771-g502pidfix.patch b/ae88771-g502pidfix.patch
new file mode 100644
index 000000000000..27378dceb98d
--- /dev/null
+++ b/ae88771-g502pidfix.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);