git: f5ff94e931d1 - main - x11-drivers/xorgxrdp{,-devel}: Refine glamor instructions

The branch main has been updated by meta:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f5ff94e931d1036686651c3390e86510ca2f356f

commit f5ff94e931d1036686651c3390e86510ca2f356f
Author:     Koichiro Iwao <meta@FreeBSD.org>
AuthorDate: 2024-07-31 07:19:19 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2024-07-31 07:25:18 +0000

    x11-drivers/xorgxrdp{,-devel}: Refine glamor instructions
    
    Sponsored by:   Cybertrust Japan
---
 x11-drivers/xorgxrdp-devel/files/pkg-message.in | 19 +++++++++----------
 x11-drivers/xorgxrdp/files/pkg-message.in       | 19 +++++++++----------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/x11-drivers/xorgxrdp-devel/files/pkg-message.in b/x11-drivers/xorgxrdp-devel/files/pkg-message.in
index cd504164f64a..85259667ce1f 100644
--- a/x11-drivers/xorgxrdp-devel/files/pkg-message.in
+++ b/x11-drivers/xorgxrdp-devel/files/pkg-message.in
@@ -9,12 +9,12 @@ To configure hardware acceleration, follow the following steps.
     # pkg install drm-kmod
 
 2. Configure to load kernel module (either one of the following)
-    # sysrc kld_list+="/boot/modules/i915kms.ko"
-    # sysrc kld_list+="/boot/modules/amdgpu.ko"
-    # sysrc kld_list+="/boot/modules/radeonkms.ko"
+    # sysrc kld_list+="i915kms"
+    # sysrc kld_list+="amdgpu"
+    # sysrc kld_list+="radeonkms"
 
 3. Ensure users who login via xrdp are members of the "video" group
-    # pw groupmod video -m username|| pw groupmod wheel -m username
+    # pw groupmod video -m username || pw groupmod wheel -m username
 
 4. Edit /etc/X11/xrdp/xorg.conf to fit your environment
    "/dev/dri/renderD128" might be different depending on your environment.
@@ -22,21 +22,20 @@ To configure hardware acceleration, follow the following steps.
    Find the following line and change it to the actual path.
     Option "DRMDevice" "/dev/dri/renderD128"
 
-   Change "0" to "1" of the following line.
+   Change "0" to "1" of the following line (defaults to 1 now).
     Option "DRI3" "0"
 
 5. Restart your system and login via xrdp
 
-See also the Wiki page for detailed instructions:
-  https://wiki.freebsd.org/Graphics#Hardware_Support
+See also handbook for detailed instructions:
+  https://docs.freebsd.org/en/books/handbook/x11/
 
 
 If hardware acceleration is properly configured, you will see logs like both
-of the following in ~/.local/share/xorg/Xorg.10.log. 10 can be replaced with
-display number.
+of the following in ~/.local/share/xorg/xorgxrdp.10.log. 10 will be replaced
+with display number.
 
     "glamor X acceleration enabled on Mesa DRI Intel(R) Ivybridge Desktop"
-    "rdpScreenInit: rdpDri3Init ok"
 
 EOM
 }
diff --git a/x11-drivers/xorgxrdp/files/pkg-message.in b/x11-drivers/xorgxrdp/files/pkg-message.in
index cd504164f64a..85259667ce1f 100644
--- a/x11-drivers/xorgxrdp/files/pkg-message.in
+++ b/x11-drivers/xorgxrdp/files/pkg-message.in
@@ -9,12 +9,12 @@ To configure hardware acceleration, follow the following steps.
     # pkg install drm-kmod
 
 2. Configure to load kernel module (either one of the following)
-    # sysrc kld_list+="/boot/modules/i915kms.ko"
-    # sysrc kld_list+="/boot/modules/amdgpu.ko"
-    # sysrc kld_list+="/boot/modules/radeonkms.ko"
+    # sysrc kld_list+="i915kms"
+    # sysrc kld_list+="amdgpu"
+    # sysrc kld_list+="radeonkms"
 
 3. Ensure users who login via xrdp are members of the "video" group
-    # pw groupmod video -m username|| pw groupmod wheel -m username
+    # pw groupmod video -m username || pw groupmod wheel -m username
 
 4. Edit /etc/X11/xrdp/xorg.conf to fit your environment
    "/dev/dri/renderD128" might be different depending on your environment.
@@ -22,21 +22,20 @@ To configure hardware acceleration, follow the following steps.
    Find the following line and change it to the actual path.
     Option "DRMDevice" "/dev/dri/renderD128"
 
-   Change "0" to "1" of the following line.
+   Change "0" to "1" of the following line (defaults to 1 now).
     Option "DRI3" "0"
 
 5. Restart your system and login via xrdp
 
-See also the Wiki page for detailed instructions:
-  https://wiki.freebsd.org/Graphics#Hardware_Support
+See also handbook for detailed instructions:
+  https://docs.freebsd.org/en/books/handbook/x11/
 
 
 If hardware acceleration is properly configured, you will see logs like both
-of the following in ~/.local/share/xorg/Xorg.10.log. 10 can be replaced with
-display number.
+of the following in ~/.local/share/xorg/xorgxrdp.10.log. 10 will be replaced
+with display number.
 
     "glamor X acceleration enabled on Mesa DRI Intel(R) Ivybridge Desktop"
-    "rdpScreenInit: rdpDri3Init ok"
 
 EOM
 }