This commit is contained in:
2025-03-17 14:52:18 +01:00
parent 3f4ae21918
commit cdc3b11bb1
17 changed files with 307 additions and 1 deletions

View File

@ -0,0 +1,15 @@
Don't install udev rules
This is handled by udev eclass instead
--- a/OpenRGB.pro
+++ b/OpenRGB.pro
@@ -1246,7 +1246,5 @@ unix:!macx {
icon.files+=qt/OpenRGB.png
metainfo.path=$$PREFIX/share/metainfo/
metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml
- rules.path=$$PREFIX/lib/udev/rules.d/
- rules.files+=60-openrgb.rules
INSTALLS += target desktop icon metainfo rules
}
GitLab

View File

@ -0,0 +1,12 @@
--- a/OpenRGB.pro
+++ b/OpenRGB.pro
@@ -46,9 +46,6 @@ TEMPLATE = app
#-----------------------------------------------------------------------------------------------#
win32:BUILDDATE = $$system(date /t)
unix:BUILDDATE = $$system(date -R -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}")
-GIT_COMMIT_ID = $$system(git log -n 1 --pretty=format:"%H")
-GIT_COMMIT_DATE = $$system(git log -n 1 --pretty=format:"%ci")
-GIT_BRANCH = $$system(git branch --show-current)
DEFINES += \
VERSION_STRING=\\"\"\"$$VERSION\\"\"\" \

View File

@ -0,0 +1,33 @@
diff --git a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp
index 84a81bd5..f9733c0c 100644
--- a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp
+++ b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp
@@ -74,6 +74,7 @@
#define STEELSERIES_QCK_PRISM_CLOTH_XL_PID 0x150D
#define STEELSERIES_QCK_PRISM_CLOTH_XL_DESTINY_PID 0x151E
#define STEELSERIES_QCK_PRISM_CLOTH_XL_CSGO_NEON_RIDER_PID 0x1514
+#define STEELSERIES_QCK_PRISM_CLOTH_NEO_NOIR_EDITION 0x151C
#define STEELSERIES_QCK_PRISM_CLOTH_3XL_PID 0x1516
#define STEELSERIES_QCK_PRISM_CLOTH_4XL_PID 0x1518
/*-----------------------------------------------------*\
@@ -341,6 +342,7 @@ REGISTER_HID_DETECTOR_I("SteelSeries QCK Prism Cloth Medium",
REGISTER_HID_DETECTOR_I("SteelSeries QCK Prism Cloth XL", DetectSteelSeriesMousemat, STEELSERIES_VID, STEELSERIES_QCK_PRISM_CLOTH_XL_PID, 0 );
REGISTER_HID_DETECTOR_I("SteelSeries QCK Prism Cloth XL Destiny Ed.", DetectSteelSeriesMousemat, STEELSERIES_VID, STEELSERIES_QCK_PRISM_CLOTH_XL_DESTINY_PID, 0 );
REGISTER_HID_DETECTOR_I("SteelSeries QCK Prism Cloth XL CS:GO Neon Rider Ed.", DetectSteelSeriesMousemat, STEELSERIES_VID, STEELSERIES_QCK_PRISM_CLOTH_XL_CSGO_NEON_RIDER_PID, 0 );
+REGISTER_HID_DETECTOR_I("SteelSeries QCK Prism Cloth Neo Noir Edition", DetectSteelSeriesMousemat, STEELSERIES_VID, STEELSERIES_QCK_PRISM_CLOTH_NEO_NOIR_EDITION, 0 );
REGISTER_HID_DETECTOR_I("SteelSeries QCK Prism Cloth 3XL", DetectSteelSeriesMousemat, STEELSERIES_VID, STEELSERIES_QCK_PRISM_CLOTH_3XL_PID, 0 );
REGISTER_HID_DETECTOR_I("SteelSeries QCK Prism Cloth 4XL", DetectSteelSeriesMousemat, STEELSERIES_VID, STEELSERIES_QCK_PRISM_CLOTH_4XL_PID, 0 );
/*-------------------------------------------------------------------------------------------------------------------------------------------------------------------------*\
diff --git a/scripts/build-udev-rules.sh b/scripts/build-udev-rules.sh
index 07fae703..8c1c6a97 100755
--- a/scripts/build-udev-rules.sh
+++ b/scripts/build-udev-rules.sh
@@ -101,7 +101,7 @@ do
pid=${pid/0x/}
device_name=${device_name//[^[:alnum:][:blank:]]/}
- udev_line=$(printf 'SUBSYSTEMS=="%s|hidraw", ATTRS{idVendor}=="%s", ATTRS{idProduct}=="%s", TAG+="uaccess", TAG+="%s"\n' ${type,,} ${vid,,} ${pid,,} ${device_name// /_})
+ udev_line=$(printf 'SUBSYSTEMS=="%s|hidraw", ATTRS{idVendor}=="%s", ATTRS{idProduct}=="%s", TAG+="uaccess", GROUP="plugdev", TAG+="%s"\n' ${type,,} ${vid,,} ${pid,,} ${device_name// /_})
#Check to ensure that the vid and pid are not blank
if [[ $vid = "" || $pid = "" ]]; then

View File

@ -0,0 +1,12 @@
We install udev to /lib/udev instead, which it doesn't check
--- a/ResourceManager.cpp
+++ b/ResourceManager.cpp
@@ -895,7 +895,6 @@ void ResourceManager::DetectDevicesThreadFunction()
{
if(access("/usr/lib/udev/rules.d/60-openrgb.rules", F_OK) != 0)
{
- udev_not_exist = true;
}
}
else