CVS commit: pkgsrc/x11/libdrm

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Dec  9 11:41:36 UTC 2025

Modified Files:
        pkgsrc/x11/libdrm: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/libdrm/patches: patch-amdgpu_amdgpu__asic__id.c
            patch-meson.build

Log Message:
libdrm: update to 2.4.130.

Add upstream patch to fix build on non-Linux.

Andrew Davis (1):
      omap: fix omap_bo_size for tiled buffers

Sergio Costas Rodriguez (3):
      amdgpu: add env support for amdgpu.ids path
      Support multiple paths in AMDGPU_ASIC_ID_TABLE_PATH envar
      amdgpu: Fix envar name in documentation

Simon Ser (2):
      Sync headers with drm-next
      build: bump version to 2.4.130

Val Packett (1):
      headers: drm: Sync virtgpu_drm.h with Linux v6.16


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/x11/libdrm/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/libdrm/PLIST
cvs rdiff -u -r1.124 -r1.125 pkgsrc/x11/libdrm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__asic__id.c
cvs rdiff -u -r0 -r1.5 pkgsrc/x11/libdrm/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/x11/libdrm/Makefile
diff -u pkgsrc/x11/libdrm/Makefile:1.123 pkgsrc/x11/libdrm/Makefile:1.124
--- pkgsrc/x11/libdrm/Makefile:1.123    Mon Nov 17 15:28:55 2025
+++ pkgsrc/x11/libdrm/Makefile  Tue Dec  9 11:41:35 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.123 2025/11/17 15:28:55 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2025/12/09 11:41:35 wiz Exp $
 
-DISTNAME=              libdrm-2.4.129
+DISTNAME=              libdrm-2.4.130
 CATEGORIES=            x11 graphics
 MASTER_SITES=          https://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/x11/libdrm/PLIST
diff -u pkgsrc/x11/libdrm/PLIST:1.32 pkgsrc/x11/libdrm/PLIST:1.33
--- pkgsrc/x11/libdrm/PLIST:1.32        Mon Nov 17 15:28:55 2025
+++ pkgsrc/x11/libdrm/PLIST     Tue Dec  9 11:41:35 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2025/11/17 15:28:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.33 2025/12/09 11:41:35 wiz Exp $
 ${PLIST.arm}include/exynos/exynos_drm.h
 ${PLIST.arm}include/exynos/exynos_fimg2d.h
 ${PLIST.arm}include/freedreno/freedreno_drmif.h
@@ -55,34 +55,34 @@ include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.so
 lib/libdrm.so.2
-lib/libdrm.so.2.129.0
+lib/libdrm.so.2.130.0
 lib/libdrm_amdgpu.so
 lib/libdrm_amdgpu.so.1
-lib/libdrm_amdgpu.so.1.129.0
+lib/libdrm_amdgpu.so.1.130.0
 ${PLIST.arm}lib/libdrm_etnaviv.so
 ${PLIST.arm}lib/libdrm_etnaviv.so.1
-${PLIST.arm}lib/libdrm_etnaviv.so.1.129.0
+${PLIST.arm}lib/libdrm_etnaviv.so.1.130.0
 ${PLIST.arm}lib/libdrm_exynos.so
 ${PLIST.arm}lib/libdrm_exynos.so.1
-${PLIST.arm}lib/libdrm_exynos.so.1.129.0
+${PLIST.arm}lib/libdrm_exynos.so.1.130.0
 ${PLIST.arm}lib/libdrm_freedreno.so
 ${PLIST.arm}lib/libdrm_freedreno.so.1
-${PLIST.arm}lib/libdrm_freedreno.so.1.129.0
+${PLIST.arm}lib/libdrm_freedreno.so.1.130.0
 ${PLIST.intel}lib/libdrm_intel.so
 ${PLIST.intel}lib/libdrm_intel.so.1
-${PLIST.intel}lib/libdrm_intel.so.1.129.0
+${PLIST.intel}lib/libdrm_intel.so.1.130.0
 lib/libdrm_nouveau.so
 lib/libdrm_nouveau.so.2
-lib/libdrm_nouveau.so.2.129.0
+lib/libdrm_nouveau.so.2.130.0
 ${PLIST.arm}lib/libdrm_omap.so
 ${PLIST.arm}lib/libdrm_omap.so.1
-${PLIST.arm}lib/libdrm_omap.so.1.129.0
+${PLIST.arm}lib/libdrm_omap.so.1.130.0
 lib/libdrm_radeon.so
 lib/libdrm_radeon.so.1
-lib/libdrm_radeon.so.1.129.0
+lib/libdrm_radeon.so.1.130.0
 ${PLIST.arm}lib/libdrm_tegra.so
 ${PLIST.arm}lib/libdrm_tegra.so.0
-${PLIST.arm}lib/libdrm_tegra.so.0.129.0
+${PLIST.arm}lib/libdrm_tegra.so.0.130.0
 lib/pkgconfig/libdrm.pc
 lib/pkgconfig/libdrm_amdgpu.pc
 ${PLIST.arm}lib/pkgconfig/libdrm_etnaviv.pc

Index: pkgsrc/x11/libdrm/distinfo
diff -u pkgsrc/x11/libdrm/distinfo:1.124 pkgsrc/x11/libdrm/distinfo:1.125
--- pkgsrc/x11/libdrm/distinfo:1.124    Mon Nov 17 15:28:55 2025
+++ pkgsrc/x11/libdrm/distinfo  Tue Dec  9 11:41:35 2025
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.124 2025/11/17 15:28:55 wiz Exp $
+$NetBSD: distinfo,v 1.125 2025/12/09 11:41:35 wiz Exp $
 
-BLAKE2s (libdrm-2.4.129.tar.xz) = d1e7174f04c6453d7e72cc85efe69cec316c5b0e25d8cbee39bb90660e267728
-SHA512 (libdrm-2.4.129.tar.xz) = 3ee702cc4a578e9ab231caf8a84700e4dff6f3da70731610121ac2c3390f42e42ad144ea61c53582e3a8adfb1d6bf8254993c5c6eaf85a51421e26d51d341cd4
-Size (libdrm-2.4.129.tar.xz) = 433392 bytes
+BLAKE2s (libdrm-2.4.130.tar.xz) = 9bce2b8afcf5de614d8c483842776135827fe2df11c33fdf9babe25de70bc5b0
+SHA512 (libdrm-2.4.130.tar.xz) = 1346df2d25552346ceea526ac7b1f0c3c9e4815ac246ba4ca61f54b9e27a5938d0e8041f22348eadce267cd8f6fd27d8ec2b0630f39451c3ec61ff2254896341
+Size (libdrm-2.4.130.tar.xz) = 435716 bytes
 SHA1 (patch-ac) = 8c5ca991174e3673e17cd67aa8d1e58c2f8907d8
+SHA1 (patch-amdgpu_amdgpu__asic__id.c) = a0d0f1e8a493327e22eb67e218ba30e97c1aea29
 SHA1 (patch-amdgpu_amdgpu__cs.c) = b48780dd51d1386e194c8142702605380ceefb7d
 SHA1 (patch-include_drm_drm.h) = fb28cb7fee68f773275c8b5572c3bd231cbb88d9
 SHA1 (patch-libsync.h) = a7d2f4757ce4c26db1b689c8746829ccb522337e
+SHA1 (patch-meson.build) = 04f98e1bf49d0d81b895e5fe17dc2c8575ebdfca
 SHA1 (patch-omap_omap__drm.c) = 2fee4863c4304bc2144356581766efbbddb3486a
 SHA1 (patch-tests_nouveau_threaded.c) = 8ebef22d66308f55b4b018c21568a41a8e62d147
 SHA1 (patch-xf86drm.c) = f5bb9a1c468470bd5101ff7481f1d67bc0d5aac1

Added files:

Index: pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__asic__id.c
diff -u /dev/null pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__asic__id.c:1.1
--- /dev/null   Tue Dec  9 11:41:36 2025
+++ pkgsrc/x11/libdrm/patches/patch-amdgpu_amdgpu__asic__id.c   Tue Dec  9 11:41:35 2025
@@ -0,0 +1,53 @@
+$NetBSD: patch-amdgpu_amdgpu__asic__id.c,v 1.1 2025/12/09 11:41:35 wiz Exp $
+
+Fix build on NetBSD.
+https://gitlab.freedesktop.org/mesa/libdrm/-/merge_requests/444
+
+--- amdgpu/amdgpu_asic_id.c.orig       2025-12-08 13:15:17.000000000 +0000
++++ amdgpu/amdgpu_asic_id.c
+@@ -23,9 +23,11 @@
+  */
+ 
+ // secure_getenv requires _GNU_SOURCE
++#if HAVE_SECURE_GETENV
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
++#endif
+ 
+ #include <ctype.h>
+ #include <stdio.h>
+@@ -165,6 +167,7 @@ static void amdgpu_parse_proc_cpuinfo(st
+       fclose(fp);
+ }
+ 
++#if HAVE_SECURE_GETENV
+ static char *join_path(const char *dir, const char *file) {
+       size_t dir_len = strlen(dir);
+       size_t file_len = strlen(file);
+@@ -268,6 +271,7 @@ static char *find_asic_id_table(void)
+       split_env_var_free(paths);
+       return found_path;
+ }
++#endif
+ 
+ void amdgpu_parse_asic_ids(struct amdgpu_device *dev)
+ {
+@@ -278,11 +282,17 @@ void amdgpu_parse_asic_ids(struct amdgpu
+       int line_num = 1;
+       int r = 0;
+ 
++#if HAVE_SECURE_GETENV
+       char *amdgpu_asic_id_table_path = find_asic_id_table();
+ 
+       // if not found, use the default AMDGPU_ASIC_ID_TABLE path
+       if (!amdgpu_asic_id_table_path)
+               amdgpu_asic_id_table_path = strdup(AMDGPU_ASIC_ID_TABLE);
++#else
++      // if this system lacks secure_getenv(), don't allow extra paths
++      // for security reasons.
++      char *amdgpu_asic_id_table_path = strdup(AMDGPU_ASIC_ID_TABLE);
++#endif
+ 
+       fp = fopen(amdgpu_asic_id_table_path, "r");
+       if (!fp) {

Index: pkgsrc/x11/libdrm/patches/patch-meson.build
diff -u /dev/null pkgsrc/x11/libdrm/patches/patch-meson.build:1.5
--- /dev/null   Tue Dec  9 11:41:36 2025
+++ pkgsrc/x11/libdrm/patches/patch-meson.build Tue Dec  9 11:41:36 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson.build,v 1.5 2025/12/09 11:41:36 wiz Exp $
+
+Fix build on NetBSD.
+https://gitlab.freedesktop.org/mesa/libdrm/-/merge_requests/444
+
+--- meson.build.orig   2025-12-08 13:15:17.000000000 +0000
++++ meson.build
+@@ -51,6 +51,8 @@ dep_threads = dependency('threads')
+ 
+ cc = meson.get_compiler('c')
+ 
++config.set10('HAVE_SECURE_GETENV', cc.has_function('secure_getenv'))
++
+ android = cc.compiles('''int func() { return __ANDROID__; }''')
+ 
+ # Solaris / Illumos