CVS commit: pkgsrc/x11/libdrm

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Thu Nov  3 20:52:29 UTC 2022

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

Log Message:
libdrm: Fix building on FreeBSD

pkgsrc changes:
---------------
  * Remove dependency on pthread-stubs for FreeBSD.
  * Bum revision.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/x11/libdrm/Makefile
cvs rdiff -u -r1.104 -r1.105 pkgsrc/x11/libdrm/distinfo
cvs rdiff -u -r1.2 -r1.3 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.105 pkgsrc/x11/libdrm/Makefile:1.106
--- pkgsrc/x11/libdrm/Makefile:1.105    Thu Nov  3 08:43:27 2022
+++ pkgsrc/x11/libdrm/Makefile  Thu Nov  3 20:52:29 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.105 2022/11/03 08:43:27 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2022/11/03 20:52:29 triaxx Exp $
 
 DISTNAME=              libdrm-2.4.114
+PKGREVISION=           1
 CATEGORIES=            x11 graphics
 MASTER_SITES=          https://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=          .tar.xz

Index: pkgsrc/x11/libdrm/distinfo
diff -u pkgsrc/x11/libdrm/distinfo:1.104 pkgsrc/x11/libdrm/distinfo:1.105
--- pkgsrc/x11/libdrm/distinfo:1.104    Thu Nov  3 08:43:27 2022
+++ pkgsrc/x11/libdrm/distinfo  Thu Nov  3 20:52:29 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.104 2022/11/03 08:43:27 wiz Exp $
+$NetBSD: distinfo,v 1.105 2022/11/03 20:52:29 triaxx Exp $
 
 BLAKE2s (libdrm-2.4.114.tar.xz) = 3d6b42ff266c0805897a7e7e51c6dcb87f6aef45506eff12a44e87cf68c2cff3
 SHA512 (libdrm-2.4.114.tar.xz) = 8dcd4be5674e3ea2ab4394fa8f461914e5aa7f4f57a2f448c5216d84ee6682e16b45eafabf97b7d9f5c062183d9a6bf3f0c97499d4cb01c19807a51209a0f644
@@ -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) = 525c18d9ecb35898c726f95defe1439eeef2ab9b
+SHA1 (patch-meson.build) = e8f0081074c04034c3eb80dbba2422356e91c9f0
 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.2 pkgsrc/x11/libdrm/patches/patch-meson.build:1.3
--- pkgsrc/x11/libdrm/patches/patch-meson.build:1.2     Fri Sep  9 15:28:16 2022
+++ pkgsrc/x11/libdrm/patches/patch-meson.build Thu Nov  3 20:52:29 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-meson.build,v 1.2 2022/09/09 15:28:16 wiz Exp $
+$NetBSD: patch-meson.build,v 1.3 2022/11/03 20:52:29 triaxx Exp $
 
 xxx how to deal with this properly?
 
 --- meson.build.orig   2022-08-31 14:38:38.000000000 +0000
 +++ meson.build
-@@ -36,7 +36,7 @@ with_freedreno_kgsl = get_option('freedr
+@@ -36,7 +36,7 @@ with_freedreno_kgsl = get_option('freedreno-kgsl')
  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())
++if ['dragonfly'].contains(host_machine.system())
    dep_pthread_stubs = dependency('pthread-stubs', version : '>= 0.4')
  else
    dep_pthread_stubs = []