CVS commit: pkgsrc/x11/libdrm

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep  9 15:28:16 UTC 2022

Modified Files:
        pkgsrc/x11/libdrm: Makefile distinfo
        pkgsrc/x11/libdrm/patches: patch-meson.build

Log Message:
libdrm: update to 2.4.113.

Changes not found


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/x11/libdrm/Makefile
cvs rdiff -u -r1.102 -r1.103 pkgsrc/x11/libdrm/distinfo
cvs rdiff -u -r1.1 -r1.2 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.103 pkgsrc/x11/libdrm/Makefile:1.104
--- pkgsrc/x11/libdrm/Makefile:1.103    Mon Jul 11 20:56:27 2022
+++ pkgsrc/x11/libdrm/Makefile  Fri Sep  9 15:28:16 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2022/07/11 20:56:27 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2022/09/09 15:28:16 wiz Exp $
 
-DISTNAME=              libdrm-2.4.112
+DISTNAME=              libdrm-2.4.113
 CATEGORIES=            x11 graphics
 MASTER_SITES=          https://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=          .tar.xz
@@ -44,40 +44,40 @@ ATOMIC_OPS_CHECK=   1
 
 PLIST_VARS+=   intel arm
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-MESON_ARGS+=   -Dintel=true
-MESON_ARGS+=   -Dvmwgfx=true
+MESON_ARGS+=   -Dintel=enabled
+MESON_ARGS+=   -Dvmwgfx=enabled
 .include "../../sysutils/libpciaccess/buildlink3.mk"
 PLIST.intel=   yes
 .else
-MESON_ARGS+=   -Dintel=false
-MESON_ARGS+=   -Dvmwgfx=false
+MESON_ARGS+=   -Dintel=disabled
+MESON_ARGS+=   -Dvmwgfx=disabled
 .endif
 
-MESON_ARGS+=   -Dradeon=true
-MESON_ARGS+=   -Damdgpu=true
-MESON_ARGS+=   -Dnouveau=true
+MESON_ARGS+=   -Dradeon=enabled
+MESON_ARGS+=   -Damdgpu=enabled
+MESON_ARGS+=   -Dnouveau=enabled
 
 .if ${MACHINE_ARCH:Marm*} || \
       ${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
+MESON_ARGS+=   -Detnaviv=enabled
+MESON_ARGS+=   -Dexynos=enabled
+MESON_ARGS+=   -Dfreedreno=enabled
+MESON_ARGS+=   -Dvc4=enabled
+MESON_ARGS+=   -Domap=enabled
+MESON_ARGS+=   -Dtegra=enabled
 PLIST.arm=     yes
 .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
+MESON_ARGS+=   -Detnaviv=disabled
+MESON_ARGS+=   -Dexynos=disabled
+MESON_ARGS+=   -Dfreedreno=disabled
+MESON_ARGS+=   -Domap=disabled
+MESON_ARGS+=   -Dtegra=disabled
+MESON_ARGS+=   -Dvc4=disabled
 .endif
 
-MESON_ARGS+=   -Dman-pages=false
-MESON_ARGS+=   -Dvalgrind=false
+MESON_ARGS+=   -Dman-pages=disabled
+MESON_ARGS+=   -Dvalgrind=disabled
 
 LDFLAGS.NetBSD+=       -lpci
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__        # posix_memalign, ...

Index: pkgsrc/x11/libdrm/distinfo
diff -u pkgsrc/x11/libdrm/distinfo:1.102 pkgsrc/x11/libdrm/distinfo:1.103
--- pkgsrc/x11/libdrm/distinfo:1.102    Mon Jul 11 20:56:27 2022
+++ pkgsrc/x11/libdrm/distinfo  Fri Sep  9 15:28:16 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.102 2022/07/11 20:56:27 wiz Exp $
+$NetBSD: distinfo,v 1.103 2022/09/09 15:28:16 wiz Exp $
 
-BLAKE2s (libdrm-2.4.112.tar.xz) = fced8174255672a55f0bc72275c99aea094792a0094b22033edd1ded58ad18a2
-SHA512 (libdrm-2.4.112.tar.xz) = df8a207d9cce220ee2cf67877eda65394733fbfd0ff85fdbadb2b20ba9bacc41421b32452506c8caecddaf8361564ca68cd6c74d4faf3b1569ab30a3243e4340
-Size (libdrm-2.4.112.tar.xz) = 451872 bytes
+BLAKE2s (libdrm-2.4.113.tar.xz) = 46c8ed7c99419d99b969b261e0809440c885ddd3bc6aaaa03a0cce34f70a1293
+SHA512 (libdrm-2.4.113.tar.xz) = fca9834ce090f63ce6dc6d04491a2c5e86162fdddfc8ea70d55a6cdeb401be656388aae1577e58f463a78d8dc502be0a641908784819874e20bbec9a39a057e0
+Size (libdrm-2.4.113.tar.xz) = 457064 bytes
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-amdgpu_amdgpu__cs.c) = 125eca62cd3e00a6e039066152780174dcde0705
 SHA1 (patch-etnaviv_etnaviv__device.c) = 236b2df05a918c35c4decfee416ff5bfe9c073d4
@@ -10,7 +10,7 @@ SHA1 (patch-exynos_exynos__drm.c) = 3fa4
 SHA1 (patch-exynos_exynos__fimg2d.c) = 298438b128bdb4ff57a8c0d7d6a081485e64e49a
 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b
 SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3
-SHA1 (patch-meson.build) = b9ebb763a807da931f83f4d5c02925ab5498ef69
+SHA1 (patch-meson.build) = 525c18d9ecb35898c726f95defe1439eeef2ab9b
 SHA1 (patch-omap_omap__drm.c) = a23eefa9a57315d3ae77e528fd29de70ff9b2648
 SHA1 (patch-tests_exynos_exynos__fimg2d__test.c) = 9fc874ecc9a42db75327f736d04038f7cf8f00ff
 SHA1 (patch-tests_nouveau_threaded.c) = 82b566666e77898c209d66ce804c913b53e53a50

Index: pkgsrc/x11/libdrm/patches/patch-meson.build
diff -u pkgsrc/x11/libdrm/patches/patch-meson.build:1.1 pkgsrc/x11/libdrm/patches/patch-meson.build:1.2
--- pkgsrc/x11/libdrm/patches/patch-meson.build:1.1     Sun Mar 13 15:20:01 2022
+++ pkgsrc/x11/libdrm/patches/patch-meson.build Fri Sep  9 15:28:16 2022
@@ -1,12 +1,12 @@
-$NetBSD: patch-meson.build,v 1.1 2022/03/13 15:20:01 tnn Exp $
+$NetBSD: patch-meson.build,v 1.2 2022/09/09 15:28:16 wiz Exp $
 
 xxx how to deal with this properly?
 
---- meson.build.orig   2021-07-02 12:49:05.442438400 +0000
+--- meson.build.orig   2022-08-31 14:38:38.000000000 +0000
 +++ meson.build
-@@ -35,7 +35,7 @@ config.set10('UDEV', get_option('udev'))
- with_freedreno_kgsl = get_option('freedreno-kgsl')
+@@ -36,7 +36,7 @@ with_freedreno_kgsl = get_option('freedr
  with_install_tests = get_option('install-test-programs')
+ with_tests = get_option('tests')
  
 -if ['freebsd', 'dragonfly', 'netbsd'].contains(host_machine.system())
 +if ['freebsd', 'dragonfly'].contains(host_machine.system())