CVS commit: pkgsrc/x11/xf86-video-amdgpu

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Aug  8 11:28:15 UTC 2025

Modified Files:
        pkgsrc/x11/xf86-video-amdgpu: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/xf86-video-amdgpu/patches: patch-src_amdgpu__bo__helper.c
            patch-src_drmmode__display.c patch-src_drmmode__display.h
Removed Files:
        pkgsrc/x11/xf86-video-amdgpu/patches: patch-configure

Log Message:
xf86-video-amdgpu: update to 25.0.0.

2.5 years of development, switch to meson.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/xf86-video-amdgpu/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xf86-video-amdgpu/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xf86-video-amdgpu/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xf86-video-amdgpu/patches/patch-configure
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_amdgpu__bo__helper.c \
    pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_drmmode__display.c \
    pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_drmmode__display.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-video-amdgpu/Makefile
diff -u pkgsrc/x11/xf86-video-amdgpu/Makefile:1.27 pkgsrc/x11/xf86-video-amdgpu/Makefile:1.28
--- pkgsrc/x11/xf86-video-amdgpu/Makefile:1.27  Sun Nov 12 13:24:34 2023
+++ pkgsrc/x11/xf86-video-amdgpu/Makefile       Fri Aug  8 11:28:14 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2023/11/12 13:24:34 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2025/08/08 11:28:14 wiz Exp $
 
-DISTNAME=      xf86-video-amdgpu-23.0.0
-PKGREVISION=   1
+DISTNAME=      xf86-video-amdgpu-25.0.0
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.xz
@@ -11,13 +10,13 @@ HOMEPAGE=   https://xorg.freedesktop.org/
 COMMENT=       Modular Xorg ATI (Tonga, Carrizo, Iceland, Fiji, Stoney) driver
 LICENSE=       mit AND x11
 
-USE_LIBTOOL=   yes
-GNU_CONFIGURE= yes
-USE_TOOLS+=    gmake pkg-config
+USE_TOOLS+=    pkg-config
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
 X11_DRV_NAME=  amdgpu
+
+.include "../../devel/meson/build.mk"
 .include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"

Index: pkgsrc/x11/xf86-video-amdgpu/PLIST
diff -u pkgsrc/x11/xf86-video-amdgpu/PLIST:1.3 pkgsrc/x11/xf86-video-amdgpu/PLIST:1.4
--- pkgsrc/x11/xf86-video-amdgpu/PLIST:1.3      Fri Sep 16 10:35:38 2016
+++ pkgsrc/x11/xf86-video-amdgpu/PLIST  Fri Aug  8 11:28:14 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/09/16 10:35:38 wiz Exp $
-lib/xorg/modules/drivers/amdgpu_drv.la
+@comment $NetBSD: PLIST,v 1.4 2025/08/08 11:28:14 wiz Exp $
+lib/xorg/modules/drivers/amdgpu_drv.so
 man/man4/amdgpu.4
 share/X11/xorg.conf.d/10-amdgpu.conf

Index: pkgsrc/x11/xf86-video-amdgpu/distinfo
diff -u pkgsrc/x11/xf86-video-amdgpu/distinfo:1.21 pkgsrc/x11/xf86-video-amdgpu/distinfo:1.22
--- pkgsrc/x11/xf86-video-amdgpu/distinfo:1.21  Mon Feb 27 10:23:37 2023
+++ pkgsrc/x11/xf86-video-amdgpu/distinfo       Fri Aug  8 11:28:14 2025
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.21 2023/02/27 10:23:37 wiz Exp $
+$NetBSD: distinfo,v 1.22 2025/08/08 11:28:14 wiz Exp $
 
-BLAKE2s (xf86-video-amdgpu-23.0.0.tar.xz) = 97cf6ffb31f6202aa46ad8917ee6c652716a42d2c268da5d48c304d783afeb62
-SHA512 (xf86-video-amdgpu-23.0.0.tar.xz) = bf26f147629a34e84a0ae8435119e170b9c95edafcab1995b63bb8f55abef32f2efbf4536eb070e64b2ae1460424b1b27a4206cb9836d33ddc6dfbee404f718b
-Size (xf86-video-amdgpu-23.0.0.tar.xz) = 381268 bytes
-SHA1 (patch-configure) = 3989dfc22c4dd9096f588a023516f26a28739724
+BLAKE2s (xf86-video-amdgpu-25.0.0.tar.xz) = efd5ab5756fbb63f6fec60cec7e2f3af106adc0bc0f737ad1460edf1ec1f95c9
+SHA512 (xf86-video-amdgpu-25.0.0.tar.xz) = d143294fead7073c14100299ccab20d1f5eab8b7e36c1770b12aaade958211e1961f4353dc47123c3b9af9f7a911d913def71d25b83dab3dee1d289043869891
+Size (xf86-video-amdgpu-25.0.0.tar.xz) = 75000 bytes
+SHA1 (patch-src_amdgpu__bo__helper.c) = 9306e81c608b0ad8e79f204f5f458d7b51da7820
+SHA1 (patch-src_drmmode__display.c) = 64b8f0218521492a694f719af843b00593f2bdd4
+SHA1 (patch-src_drmmode__display.h) = cf4270d168a3d7c9cd14ae9d8c02fc24d77f20fb

Added files:

Index: pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_amdgpu__bo__helper.c
diff -u /dev/null pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_amdgpu__bo__helper.c:1.1
--- /dev/null   Fri Aug  8 11:28:15 2025
+++ pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_amdgpu__bo__helper.c Fri Aug  8 11:28:14 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_amdgpu__bo__helper.c,v 1.1 2025/08/08 11:28:14 wiz Exp $
+
+https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/84
+
+--- src/amdgpu_bo_helper.c.orig        2025-08-08 11:23:55.472359613 +0000
++++ src/amdgpu_bo_helper.c
+@@ -83,7 +83,7 @@ struct amdgpu_buffer *amdgpu_alloc_pixma
+               if (usage_hint & AMDGPU_CREATE_PIXMAP_SCANOUT)
+                       bo_use |= GBM_BO_USE_SCANOUT;
+ 
+-#ifdef HAVE_GBM_BO_USE_FRONT_RENDERING
++#if HAVE_GBM_BO_USE_FRONT_RENDERING
+               if (usage_hint & AMDGPU_CREATE_PIXMAP_FRONT)
+                       bo_use |= GBM_BO_USE_FRONT_RENDERING;
+ #endif
Index: pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_drmmode__display.c
diff -u /dev/null pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_drmmode__display.c:1.1
--- /dev/null   Fri Aug  8 11:28:15 2025
+++ pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_drmmode__display.c   Fri Aug  8 11:28:14 2025
@@ -0,0 +1,33 @@
+$NetBSD: patch-src_drmmode__display.c,v 1.1 2025/08/08 11:28:14 wiz Exp $
+
+https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/84
+
+--- src/drmmode_display.c.orig 2025-08-08 11:23:35.638093875 +0000
++++ src/drmmode_display.c
+@@ -3893,7 +3893,7 @@ out:
+       RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
+ }
+ 
+-#ifdef HAVE_LIBUDEV
++#if HAVE_LIBUDEV
+ static void drmmode_handle_uevents(int fd, void *closure)
+ {
+       drmmode_ptr drmmode = closure;
+@@ -3923,7 +3923,7 @@ static void drmmode_handle_uevents(int f
+ 
+ void drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
+ {
+-#ifdef HAVE_LIBUDEV
++#if HAVE_LIBUDEV
+       struct udev *u;
+       struct udev_monitor *mon;
+ 
+@@ -3955,7 +3955,7 @@ void drmmode_uevent_init(ScrnInfoPtr scr
+ 
+ void drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode)
+ {
+-#ifdef HAVE_LIBUDEV
++#if HAVE_LIBUDEV
+       if (drmmode->uevent_handler) {
+               struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
+               xf86RemoveGeneralHandler(drmmode->uevent_handler);
Index: pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_drmmode__display.h
diff -u /dev/null pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_drmmode__display.h:1.1
--- /dev/null   Fri Aug  8 11:28:15 2025
+++ pkgsrc/x11/xf86-video-amdgpu/patches/patch-src_drmmode__display.h   Fri Aug  8 11:28:14 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_drmmode__display.h,v 1.1 2025/08/08 11:28:14 wiz Exp $
+
+https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/issues/84
+
+--- src/drmmode_display.h.orig 2025-08-08 11:23:17.935590246 +0000
++++ src/drmmode_display.h
+@@ -28,7 +28,7 @@
+ #define DRMMODE_DISPLAY_H
+ 
+ #include "xf86drmMode.h"
+-#ifdef HAVE_LIBUDEV
++#if HAVE_LIBUDEV
+ #include "libudev.h"
+ #endif
+