git: 2b01850e0e62 - main - x11-drivers/xlibre-xf86-video-amdgpu: Update to 25.0.1

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Sat, 27 Dec 2025 01:46:15 UTC
The branch main has been updated by acm:

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

commit 2b01850e0e62a2f3fb5a070707445c735a584a65
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-12-27 01:17:43 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-12-27 01:45:41 +0000

    x11-drivers/xlibre-xf86-video-amdgpu: Update to 25.0.1
    
    With hat:       xlibre
---
 x11-drivers/xlibre-xf86-video-amdgpu/Makefile      |  9 ++------
 x11-drivers/xlibre-xf86-video-amdgpu/distinfo      |  8 +++----
 .../files/patch-src_amdgpu__probe.c                | 27 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/x11-drivers/xlibre-xf86-video-amdgpu/Makefile b/x11-drivers/xlibre-xf86-video-amdgpu/Makefile
index 68c24005887a..d7acb5e043f0 100644
--- a/x11-drivers/xlibre-xf86-video-amdgpu/Makefile
+++ b/x11-drivers/xlibre-xf86-video-amdgpu/Makefile
@@ -1,10 +1,7 @@
 PORTNAME=	xlibre-xf86-video-amdgpu
-PORTVERSION=	23.0.0.5
+PORTVERSION=	25.0.1
 CATEGORIES=	x11-drivers
 
-PATCH_SITES=	https://gitlab.freedesktop.org/xorg/driver/${PORTNAME:C/xlibre-//}/-/commit/
-PATCHFILES+=	77b13493.patch:-p1 # https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/merge_requests/77
-
 MAINTAINER=	b-aazbsd@proton.me
 COMMENT=	XLibre amdgpu display driver
 WWW=		https://github.com/X11Libre/xf86-video-amdgpu/
@@ -12,8 +9,6 @@ WWW=		https://github.com/X11Libre/xf86-video-amdgpu/
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS_INSTALL=	xf86-video-amdgpu
-
 # No amdgpu kernel driver on non-x86 and PC98.
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64le
 ONLY_FOR_ARCHS_REASON=	KMS is required and currently only available on x86/arm64/powerpc64le
@@ -25,7 +20,7 @@ USE_GL=		gbm
 
 CONFIGURE_ARGS+=--disable-udev
 
-PLIST_FILES=	lib/xorg/modules/xlibre-25.0/drivers/amdgpu_drv.so \
+PLIST_FILES=	${MODULEDIR}/drivers/amdgpu_drv.so \
 		share/man/man4/amdgpu.4x.gz \
 		share/X11/xorg.conf.d/10-amdgpu.conf
 
diff --git a/x11-drivers/xlibre-xf86-video-amdgpu/distinfo b/x11-drivers/xlibre-xf86-video-amdgpu/distinfo
index 0e1f962adbd8..30c4485658ef 100644
--- a/x11-drivers/xlibre-xf86-video-amdgpu/distinfo
+++ b/x11-drivers/xlibre-xf86-video-amdgpu/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1760814301
-SHA256 (xlibre/driver/X11Libre-xf86-video-amdgpu-23.0.0.5-xlibre-xf86-video-amdgpu-23.0.0.5_GH0.tar.gz) = a255bf446272a87907ea0a13274536dcc65898c223fa42aa9afd52007ad23209
-SIZE (xlibre/driver/X11Libre-xf86-video-amdgpu-23.0.0.5-xlibre-xf86-video-amdgpu-23.0.0.5_GH0.tar.gz) = 98771
-SHA256 (xlibre/driver/77b13493.patch) = 1e76bb36f7fd69e0556ae6b5a7d2331a711367b6a7421adc221f2fcae1aff82b
-SIZE (xlibre/driver/77b13493.patch) = 1269
+TIMESTAMP = 1766521031
+SHA256 (xlibre/driver/X11Libre-xf86-video-amdgpu-25.0.1-xlibre-xf86-video-amdgpu-25.0.1_GH0.tar.gz) = d6c006a1efc389974b63e152e07338a4af87a8d0a692f4f2ce3c1484747e912f
+SIZE (xlibre/driver/X11Libre-xf86-video-amdgpu-25.0.1-xlibre-xf86-video-amdgpu-25.0.1_GH0.tar.gz) = 99446
diff --git a/x11-drivers/xlibre-xf86-video-amdgpu/files/patch-src_amdgpu__probe.c b/x11-drivers/xlibre-xf86-video-amdgpu/files/patch-src_amdgpu__probe.c
new file mode 100644
index 000000000000..47658158a686
--- /dev/null
+++ b/x11-drivers/xlibre-xf86-video-amdgpu/files/patch-src_amdgpu__probe.c
@@ -0,0 +1,27 @@
+--- src/amdgpu_probe.c.orig	2025-12-26 00:17:12 UTC
++++ src/amdgpu_probe.c
+@@ -86,24 +86,6 @@ static Bool amdgpu_kernel_mode_enabled(ScrnInfoPtr pSc
+ 
+ static Bool amdgpu_kernel_mode_enabled(ScrnInfoPtr pScrn)
+ {
+-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-	AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn);
+-	const char *busIdString = pAMDGPUEnt->busid;
+-	int ret = drmCheckModesettingSupported(busIdString);
+-
+-	if (ret) {
+-		if (xf86LoadKernelModule("amdgpukms"))
+-			ret = drmCheckModesettingSupported(busIdString);
+-	}
+-	if (ret) {
+-		xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+-			       "[KMS] drm report modesetting isn't supported.\n");
+-		return FALSE;
+-	}
+-
+-#endif
+-	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0,
+-		       "[KMS] Kernel modesetting enabled.\n");
+ 	return TRUE;
+ }
+