[pkgsrc/trunk]: pkgsrc/x11/libdrm libdrm: update to 2.4.100

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/libdrm libdrm: update to 2.4.100
From: tnn <tnn%pkgsrc.org@localhost>
Date: Sun, 13 Mar 2022 17:11:58 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5ce262158a4b
branches:  trunk
changeset: 375392:5ce262158a4b
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Mar 13 15:20:01 2022 +0000

description:
libdrm: update to 2.4.100

Changes build framework to meson.

[ANNOUNCE] libdrm 2.4.110
misc bug fixes
[ANNOUNCE] libdrm 2.4.109
misc bug fixes
[ANNOUNCE] libdrm 2.4.108
misc bug fixes, build fixes
[ANNOUNCE] libdrm 2.4.107
misc bug fixes, update AMD product names
[ANNOUNCE] libdrm 2.4.106
Some nouveau debug, amdgpu tests, and a regression fix from 105.
Releasing so 105 doesn't end up being used a lot with a regression.
[ANNOUNCE] libdrm 2.4.105
misc bug fixes, update AMD product names
[ANNOUNCE] libdrm 2.4.104
This release brings updated kernel headers and converts man pages to
reStructuredText.
[ANNOUNCE] libdrm 2.4.103
libdrm mostly for new hw and ame names.
[ANNOUNCE] libdrm 2.4.102
lots of FreeBSD and modetest stuff.
[ANNOUNCE] libdrm 2.4.101
misc bug fixes, update AMD product names

diffstat:

 x11/libdrm/Makefile                                          |  73 ++++++++---
 x11/libdrm/PLIST                                             |  57 +++++++-
 x11/libdrm/distinfo                                          |  21 ++-
 x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c                 |  17 ++
 x11/libdrm/patches/patch-etnaviv_etnaviv__device.c           |  17 ++
 x11/libdrm/patches/patch-exynos_exynos__drm.c                |  16 ++
 x11/libdrm/patches/patch-exynos_exynos__fimg2d.c             |  16 ++
 x11/libdrm/patches/patch-meson.build                         |  15 ++
 x11/libdrm/patches/patch-nouveau_private.h                   |  13 --
 x11/libdrm/patches/patch-omap_omap__drm.c                    |  17 ++
 x11/libdrm/patches/patch-tests_exynos_exynos__fimg2d__test.c |  16 ++
 x11/libdrm/patches/patch-tests_nouveau_threaded.c            |  13 ++
 x11/libdrm/patches/patch-xf86drm.c                           |  22 +-
 x11/libdrm/patches/patch-xf86drmMode.c                       |  47 +++----
 14 files changed, 273 insertions(+), 87 deletions(-)

diffs (truncated from 586 to 300 lines):

diff -r f23d9a825c87 -r 5ce262158a4b x11/libdrm/Makefile
--- a/x11/libdrm/Makefile       Sun Mar 13 15:18:15 2022 +0000
+++ b/x11/libdrm/Makefile       Sun Mar 13 15:20:01 2022 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.97 2021/12/01 13:01:15 nia Exp $
+# $NetBSD: Makefile,v 1.98 2022/03/13 15:20:01 tnn Exp $
 
-DISTNAME=              libdrm-2.4.100
+DISTNAME=              libdrm-2.4.110
 CATEGORIES=            x11 graphics
 MASTER_SITES=          https://dri.freedesktop.org/libdrm/
+EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            joerg%NetBSD.org@localhost
 HOMEPAGE=              https://dri.freedesktop.org/wiki/DRM
@@ -13,11 +14,20 @@
 ONLY_FOR_PLATFORM=     NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \
                        Linux-*-* SunOS-*-*
 
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake pkg-config
-USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config
+
+PKGCONFIG_OVERRIDE+=   amdgpu/libdrm_amdgpu.pc.in
+PKGCONFIG_OVERRIDE+=   etnaviv/libdrm_etnaviv.pc.in
+PKGCONFIG_OVERRIDE+=   exynos/libdrm_exynos.pc.in
+PKGCONFIG_OVERRIDE+=   freedreno/libdrm_freedreno.pc.in
+PKGCONFIG_OVERRIDE+=   intel/libdrm_intel.pc.in
+PKGCONFIG_OVERRIDE+=   libkms/libkms.pc.in
+PKGCONFIG_OVERRIDE+=   nouveau/libdrm_nouveau.pc.in
+PKGCONFIG_OVERRIDE+=   omap/libdrm_omap.pc.in
+PKGCONFIG_OVERRIDE+=   radeon/libdrm_radeon.pc.in
+PKGCONFIG_OVERRIDE+=   tegra/libdrm_tegra.pc.in
+PKGCONFIG_OVERRIDE+=   vc4/libdrm_vc4.pc.in
 PKGCONFIG_OVERRIDE+=   libdrm.pc.in
-GNU_CONFIGURE=         yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -32,34 +42,57 @@
 ATOMIC_OPS_CHECK=      1
 .else
 .  include "../../devel/libatomic_ops/buildlink3.mk"
-CONFIGURE_ENV+=                drm_cv_atomic_primitives=libatomic-ops
 .endif
 
-CONFIGURE_ARGS+=       PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
-                       PTHREADSTUBS_LIBS=-L${PREFIX}/lib
-CONFIGURE_ARGS+=       --disable-manpages
-CONFIGURE_ARGS+=       --disable-valgrind
+PLIST_VARS+=   intel arm kms
 
-LDFLAGS.NetBSD+=       -lpci
+.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD"
+MESON_ARGS+=   -Dlibkms=true
+PLIST.kms=     yes
+.else
+MESON_ARGS+=   -Dlibkms=false
+.endif
 
 PLIST_VARS+=   intel arm kms
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-# libpciaccess is needed to build support for the intel KMS API,
-# libdrm_intel.so.
+MESON_ARGS+=   -Dintel=true
+MESON_ARGS+=   -Dvmwgfx=true
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 PLIST.intel=   yes
-.elif !empty(MACHINE_ARCH:Marm*) || \
+.else
+MESON_ARGS+=   -Dintel=false
+MESON_ARGS+=   -Dvmwgfx=false
+.endif
+
+MESON_ARGS+=   -Dradeon=true
+MESON_ARGS+=   -Damdgpu=true
+MESON_ARGS+=   -Dnouveau=true
+
+.if !empty(MACHINE_ARCH:Marm*) || \
       !empty(MACHINE_ARCH:Mearm*) || \
       ${MACHINE_ARCH} == "aarch64"
+MESON_ARGS+=   -Detnaviv=true
+MESON_ARGS+=   -Dexynos=true
+MESON_ARGS+=   -Dfreedreno=true
+MESON_ARGS+=   -Dvc4=true
+MESON_ARGS+=   -Domap=true
+MESON_ARGS+=   -Dtegra=true
 PLIST.arm=     yes
-#.else
-#CONFIGURE_ARGS+=      --disable-intel
+.else
+MESON_ARGS+=   -Detnaviv=false
+MESON_ARGS+=   -Dexynos=false
+MESON_ARGS+=   -Dfreedreno=false
+MESON_ARGS+=   -Domap=false
+MESON_ARGS+=   -Dtegra=false
+MESON_ARGS+=   -Dvc4=false
 .endif
 
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux"
-PLIST.kms=     yes
-.endif
+MESON_ARGS+=   -Dman-pages=false
+MESON_ARGS+=   -Dvalgrind=false
+
+LDFLAGS.NetBSD+=       -lpci
 
 X11_BUILTIN_NAME?=             libdrm
 .include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"
+.include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f23d9a825c87 -r 5ce262158a4b x11/libdrm/PLIST
--- a/x11/libdrm/PLIST  Sun Mar 13 15:18:15 2022 +0000
+++ b/x11/libdrm/PLIST  Sun Mar 13 15:20:01 2022 +0000
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.22 2021/07/20 09:43:22 tnn Exp $
+@comment $NetBSD: PLIST,v 1.23 2022/03/13 15:20:01 tnn Exp $
+${PLIST.arm}include/exynos/exynos_drm.h
+${PLIST.arm}include/exynos/exynos_fimg2d.h
 ${PLIST.arm}include/freedreno/freedreno_drmif.h
 ${PLIST.arm}include/freedreno/freedreno_ringbuffer.h
 include/libdrm/amdgpu.h
@@ -7,6 +9,8 @@
 include/libdrm/drm_fourcc.h
 include/libdrm/drm_mode.h
 include/libdrm/drm_sarea.h
+${PLIST.arm}include/libdrm/etnaviv_drmif.h
+${PLIST.arm}include/libdrm/exynos_drmif.h
 include/libdrm/i915_drm.h
 ${PLIST.intel}include/libdrm/intel_aub.h
 ${PLIST.intel}include/libdrm/intel_bufmgr.h
@@ -23,6 +27,7 @@
 include/libdrm/nouveau/nvif/ioctl.h
 include/libdrm/nouveau/nvif/unpack.h
 include/libdrm/nouveau_drm.h
+${PLIST.arm}include/libdrm/omap_drmif.h
 include/libdrm/qxl_drm.h
 include/libdrm/r128_drm.h
 include/libdrm/r600_pci_ids.h
@@ -36,30 +41,62 @@
 include/libdrm/radeon_surface.h
 include/libdrm/savage_drm.h
 include/libdrm/sis_drm.h
+${PLIST.arm}include/libdrm/tegra.h
 include/libdrm/tegra_drm.h
 include/libdrm/vc4_drm.h
 ${PLIST.arm}include/libdrm/vc4_packet.h
 ${PLIST.arm}include/libdrm/vc4_qpu_defines.h
 include/libdrm/via_drm.h
 include/libdrm/virtgpu_drm.h
-include/libdrm/vmwgfx_drm.h
+${PLIST.intel}include/libdrm/vmwgfx_drm.h
 ${PLIST.kms}include/libkms/libkms.h
 include/libsync.h
+${PLIST.arm}include/omap/omap_drm.h
 include/xf86drm.h
 include/xf86drmMode.h
-lib/libdrm.la
-lib/libdrm_amdgpu.la
-${PLIST.arm}lib/libdrm_freedreno.la
-${PLIST.intel}lib/libdrm_intel.la
-lib/libdrm_nouveau.la
-lib/libdrm_radeon.la
-${PLIST.kms}lib/libkms.la
+lib/libdrm.so
+lib/libdrm.so.2
+lib/libdrm.so.2.4.0
+lib/libdrm_amdgpu.so
+lib/libdrm_amdgpu.so.1
+lib/libdrm_amdgpu.so.1.0.0
+${PLIST.arm}lib/libdrm_etnaviv.so
+${PLIST.arm}lib/libdrm_etnaviv.so.1
+${PLIST.arm}lib/libdrm_etnaviv.so.1.0.0
+${PLIST.arm}lib/libdrm_exynos.so
+${PLIST.arm}lib/libdrm_exynos.so.1
+${PLIST.arm}lib/libdrm_exynos.so.1.0.0
+${PLIST.arm}lib/libdrm_freedreno.so
+${PLIST.arm}lib/libdrm_freedreno.so.1
+${PLIST.arm}lib/libdrm_freedreno.so.1.0.0
+${PLIST.intel}lib/libdrm_intel.so
+${PLIST.intel}lib/libdrm_intel.so.1
+${PLIST.intel}lib/libdrm_intel.so.1.0.0
+lib/libdrm_nouveau.so
+lib/libdrm_nouveau.so.2
+lib/libdrm_nouveau.so.2.0.0
+${PLIST.arm}lib/libdrm_omap.so
+${PLIST.arm}lib/libdrm_omap.so.1
+${PLIST.arm}lib/libdrm_omap.so.1.0.0
+lib/libdrm_radeon.so
+lib/libdrm_radeon.so.1
+lib/libdrm_radeon.so.1.0.1
+${PLIST.arm}lib/libdrm_tegra.so
+${PLIST.arm}lib/libdrm_tegra.so.0
+${PLIST.arm}lib/libdrm_tegra.so.0.0.0
+${PLIST.kms}lib/libkms.so
+${PLIST.kms}lib/libkms.so.1
+${PLIST.kms}lib/libkms.so.1.0.0
 lib/pkgconfig/libdrm.pc
 lib/pkgconfig/libdrm_amdgpu.pc
+${PLIST.arm}lib/pkgconfig/libdrm_etnaviv.pc
+${PLIST.arm}lib/pkgconfig/libdrm_exynos.pc
 ${PLIST.arm}lib/pkgconfig/libdrm_freedreno.pc
 ${PLIST.intel}lib/pkgconfig/libdrm_intel.pc
 lib/pkgconfig/libdrm_nouveau.pc
+${PLIST.arm}lib/pkgconfig/libdrm_omap.pc
 lib/pkgconfig/libdrm_radeon.pc
+${PLIST.arm}lib/pkgconfig/libdrm_tegra.pc
+${PLIST.arm}lib/pkgconfig/libdrm_vc4.pc
 ${PLIST.kms}lib/pkgconfig/libkms.pc
-${PLIST.arm}lib/pkgconfig/libdrm_vc4.pc
 share/libdrm/amdgpu.ids
diff -r f23d9a825c87 -r 5ce262158a4b x11/libdrm/distinfo
--- a/x11/libdrm/distinfo       Sun Mar 13 15:18:15 2022 +0000
+++ b/x11/libdrm/distinfo       Sun Mar 13 15:20:01 2022 +0000
@@ -1,13 +1,20 @@
-$NetBSD: distinfo,v 1.99 2021/10/26 11:34:08 nia Exp $
+$NetBSD: distinfo,v 1.100 2022/03/13 15:20:01 tnn Exp $
 
-BLAKE2s (libdrm-2.4.100.tar.gz) = 1cfd02d9d2ec59d0a32ba5287908d7056aa262e45c186f35b5fc327e99afb69a
-SHA512 (libdrm-2.4.100.tar.gz) = b61835473c77691c4a8e67b32b9df420661e8bf8700507334b58bde5e6a402dee4aea2bec1e5b83343dd28fcb6cf9fd084064d437332f178df81c4780552595b
-Size (libdrm-2.4.100.tar.gz) = 1149132 bytes
+BLAKE2s (libdrm-2.4.110.tar.xz) = 3f45410c126cfb5ad5d8166270faa108751c1476c5f3926cc9b471b341147d0b
+SHA512 (libdrm-2.4.110.tar.xz) = 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
+Size (libdrm-2.4.110.tar.xz) = 436372 bytes
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
+SHA1 (patch-amdgpu_amdgpu__cs.c) = 125eca62cd3e00a6e039066152780174dcde0705
+SHA1 (patch-etnaviv_etnaviv__device.c) = 236b2df05a918c35c4decfee416ff5bfe9c073d4
+SHA1 (patch-exynos_exynos__drm.c) = 3fa4c8a592a5f4e0c4001eb6fa1bc7811e398605
+SHA1 (patch-exynos_exynos__fimg2d.c) = 298438b128bdb4ff57a8c0d7d6a081485e64e49a
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
 SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d
 SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3
-SHA1 (patch-nouveau_private.h) = fe347abfaed3b37ef8fee645a388e19ca1e97552
-SHA1 (patch-xf86drm.c) = 02ef5f5ec351b7f52a97ab80d3d469e854ac957a
-SHA1 (patch-xf86drmMode.c) = 5f66d45a63b0915f22d0abe115aace13c53823a8
+SHA1 (patch-meson.build) = b9ebb763a807da931f83f4d5c02925ab5498ef69
+SHA1 (patch-omap_omap__drm.c) = a23eefa9a57315d3ae77e528fd29de70ff9b2648
+SHA1 (patch-tests_exynos_exynos__fimg2d__test.c) = 9fc874ecc9a42db75327f736d04038f7cf8f00ff
+SHA1 (patch-tests_nouveau_threaded.c) = 82b566666e77898c209d66ce804c913b53e53a50
+SHA1 (patch-xf86drm.c) = 6e4b3ee406666b37cc0b923ad49b945055919c83
+SHA1 (patch-xf86drmMode.c) = 078b1ecaa4fedd74992d682433701245ee51785b
 SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2
diff -r f23d9a825c87 -r 5ce262158a4b x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libdrm/patches/patch-amdgpu_amdgpu__cs.c      Sun Mar 13 15:20:01 2022 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-amdgpu_amdgpu__cs.c,v 1.3 2022/03/13 15:20:01 tnn Exp $
+
+libc-supplied compat alloca(3) should not be used
+
+--- amdgpu/amdgpu_cs.c.orig    2022-02-16 10:00:13.000000000 +0000
++++ amdgpu/amdgpu_cs.c
+@@ -28,9 +28,7 @@
+ #include <pthread.h>
+ #include <sched.h>
+ #include <sys/ioctl.h>
+-#if HAVE_ALLOCA_H
+-# include <alloca.h>
+-#endif
++#define alloca(size) __builtin_alloca(size)
+ 
+ #include "xf86drm.h"
+ #include "amdgpu_drm.h"
diff -r f23d9a825c87 -r 5ce262158a4b x11/libdrm/patches/patch-etnaviv_etnaviv__device.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libdrm/patches/patch-etnaviv_etnaviv__device.c        Sun Mar 13 15:20:01 2022 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-etnaviv_etnaviv__device.c,v 1.1 2022/03/13 15:20:01 tnn Exp $
+
+Fix Linuxisms.
+
+--- etnaviv/etnaviv_device.c.orig      2021-07-02 12:49:05.425771700 +0000
++++ etnaviv/etnaviv_device.c
+@@ -25,8 +25,10 @@
+  */
+ 
+ #include <stdlib.h>
++#ifdef __linux__
+ #include <linux/stddef.h>
+ #include <linux/types.h>
++#endif
+ #include <errno.h>
+ #include <sys/mman.h>
+ #include <fcntl.h>
diff -r f23d9a825c87 -r 5ce262158a4b x11/libdrm/patches/patch-exynos_exynos__drm.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/libdrm/patches/patch-exynos_exynos__drm.c     Sun Mar 13 15:20:01 2022 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-exynos_exynos__drm.c,v 1.1 2022/03/13 15:20:01 tnn Exp $
+
+Fix Linuxisms.
+
+--- exynos/exynos_drm.c.orig   2022-02-16 10:00:13.000000000 +0000
++++ exynos/exynos_drm.c
+@@ -31,7 +31,9 @@
+ #include <unistd.h>
+ 
+ #include <sys/mman.h>
++#ifdef __linux__
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/unison net/unison: Rewrite patch comment
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: note update of ISC DHCP to 4.4.3
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/unison net/unison: Rewrite patch comment
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: note update of ISC DHCP to 4.4.3
Indexes:
Home | Main Index | Thread Index | Old Index