Merge branch 'github/fork/mkopec/device-separator' into 'master'

Change the WLR_DRM_DEVICES separator to a comma

See merge request wlroots/wlroots!2752
This commit is contained in:
Simon Ser 2026-03-04 02:21:04 +00:00
commit 3d2e8ccf37
2 changed files with 3 additions and 3 deletions

View file

@ -425,7 +425,7 @@ static ssize_t explicit_find_gpus(struct wlr_session *session,
size_t i = 0;
char *save;
char *ptr = strtok_r(gpus, ":", &save);
char *ptr = strtok_r(gpus, ",", &save);
do {
if (i >= ret_len) {
break;
@ -437,7 +437,7 @@ static ssize_t explicit_find_gpus(struct wlr_session *session,
} else {
++i;
}
} while ((ptr = strtok_r(NULL, ":", &save)));
} while ((ptr = strtok_r(NULL, ",", &save)));
free(gpus);
return i;

View file

@ -21,7 +21,7 @@ wlroots reads these environment variables
## DRM backend
* *WLR_DRM_DEVICES*: specifies the DRM devices (as a colon separated list)
* *WLR_DRM_DEVICES*: specifies the DRM devices (as a comma separated list)
instead of auto probing them. The first existing device in this list is
considered the primary DRM device.
* *WLR_DRM_NO_ATOMIC*: set to 1 to use legacy DRM interface instead of atomic