Tue Jul 20 09:43:23 2021 UTC ()
libdrm: remove duplicate PLISTs


(tnn)
diff -r1.95 -r1.96 pkgsrc/x11/libdrm/Makefile
diff -r1.21 -r1.22 pkgsrc/x11/libdrm/PLIST
diff -r1.1 -r0 pkgsrc/x11/libdrm/PLIST.DragonFly
diff -r1.1 -r0 pkgsrc/x11/libdrm/PLIST.FreeBSD
diff -r1.1 -r0 pkgsrc/x11/libdrm/PLIST.Linux
cvs diff -r1.95 -r1.96 pkgsrc/x11/libdrm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libdrm/Makefile 2019/10/18 09:04:16 1.95
+++ pkgsrc/x11/libdrm/Makefile 2021/07/20 09:43:22 1.96
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.95 2019/10/18 09:04:16 nia Exp $ 1# $NetBSD: Makefile,v 1.96 2021/07/20 09:43:22 tnn Exp $
2 2
3DISTNAME= libdrm-2.4.100 3DISTNAME= libdrm-2.4.100
4CATEGORIES= x11 graphics 4CATEGORIES= x11 graphics
5MASTER_SITES= https://dri.freedesktop.org/libdrm/ 5MASTER_SITES= https://dri.freedesktop.org/libdrm/
6 6
7MAINTAINER= joerg@NetBSD.org 7MAINTAINER= joerg@NetBSD.org
8HOMEPAGE= https://dri.freedesktop.org/wiki/DRM 8HOMEPAGE= https://dri.freedesktop.org/wiki/DRM
9COMMENT= Userspace interface to kernel DRM services 9COMMENT= Userspace interface to kernel DRM services
10LICENSE= mit 10LICENSE= mit
11 11
12# Platforms with kernel support for DRM 12# Platforms with kernel support for DRM
13ONLY_FOR_PLATFORM= NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \ 13ONLY_FOR_PLATFORM= NetBSD-*-* DragonFly-*-* FreeBSD-*-* OpenBSD-*-* \
14 Linux-*-* SunOS-*-* 14 Linux-*-* SunOS-*-*
@@ -32,27 +32,32 @@ ATOMIC_OPS_CHECK= 0 @@ -32,27 +32,32 @@ ATOMIC_OPS_CHECK= 0
32ATOMIC_OPS_CHECK= 1 32ATOMIC_OPS_CHECK= 1
33.else 33.else
34. include "../../devel/libatomic_ops/buildlink3.mk" 34. include "../../devel/libatomic_ops/buildlink3.mk"
35CONFIGURE_ENV+= drm_cv_atomic_primitives=libatomic-ops 35CONFIGURE_ENV+= drm_cv_atomic_primitives=libatomic-ops
36.endif 36.endif
37 37
38CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \ 38CONFIGURE_ARGS+= PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
39 PTHREADSTUBS_LIBS=-L${PREFIX}/lib 39 PTHREADSTUBS_LIBS=-L${PREFIX}/lib
40CONFIGURE_ARGS+= --disable-manpages 40CONFIGURE_ARGS+= --disable-manpages
41CONFIGURE_ARGS+= --disable-valgrind 41CONFIGURE_ARGS+= --disable-valgrind
42 42
43LDFLAGS.NetBSD+= -lpci 43LDFLAGS.NetBSD+= -lpci
44 44
45PLIST_VARS+= intel arm 45PLIST_VARS+= intel arm kms
46.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 46.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
47# libpciaccess is needed to build support for the intel KMS API, 47# libpciaccess is needed to build support for the intel KMS API,
48# libdrm_intel.so. 48# libdrm_intel.so.
49.include "../../sysutils/libpciaccess/buildlink3.mk" 49.include "../../sysutils/libpciaccess/buildlink3.mk"
50PLIST.intel= yes 50PLIST.intel= yes
51.elif !empty(MACHINE_ARCH:Marm*) || \ 51.elif !empty(MACHINE_ARCH:Marm*) || \
52 !empty(MACHINE_ARCH:Mearm*) || \ 52 !empty(MACHINE_ARCH:Mearm*) || \
53 ${MACHINE_ARCH} == "aarch64" 53 ${MACHINE_ARCH} == "aarch64"
54PLIST.arm= yes 54PLIST.arm= yes
55#.else 55#.else
56#CONFIGURE_ARGS+= --disable-intel 56#CONFIGURE_ARGS+= --disable-intel
57.endif 57.endif
 58
 59.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux"
 60PLIST.kms= yes
 61.endif
 62
58.include "../../mk/bsd.pkg.mk" 63.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/x11/libdrm/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/libdrm/PLIST 2018/09/02 08:34:34 1.21
+++ pkgsrc/x11/libdrm/PLIST 2021/07/20 09:43:22 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.21 2018/09/02 08:34:34 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.22 2021/07/20 09:43:22 tnn Exp $
2${PLIST.arm}include/freedreno/freedreno_drmif.h 2${PLIST.arm}include/freedreno/freedreno_drmif.h
3${PLIST.arm}include/freedreno/freedreno_ringbuffer.h 3${PLIST.arm}include/freedreno/freedreno_ringbuffer.h
4include/libdrm/amdgpu.h 4include/libdrm/amdgpu.h
5include/libdrm/amdgpu_drm.h 5include/libdrm/amdgpu_drm.h
6include/libdrm/drm.h 6include/libdrm/drm.h
7include/libdrm/drm_fourcc.h 7include/libdrm/drm_fourcc.h
8include/libdrm/drm_mode.h 8include/libdrm/drm_mode.h
9include/libdrm/drm_sarea.h 9include/libdrm/drm_sarea.h
10include/libdrm/i915_drm.h 10include/libdrm/i915_drm.h
11${PLIST.intel}include/libdrm/intel_aub.h 11${PLIST.intel}include/libdrm/intel_aub.h
12${PLIST.intel}include/libdrm/intel_bufmgr.h 12${PLIST.intel}include/libdrm/intel_bufmgr.h
13${PLIST.intel}include/libdrm/intel_debug.h 13${PLIST.intel}include/libdrm/intel_debug.h
14include/libdrm/mach64_drm.h 14include/libdrm/mach64_drm.h
@@ -33,30 +33,33 @@ include/libdrm/radeon_cs.h @@ -33,30 +33,33 @@ include/libdrm/radeon_cs.h
33include/libdrm/radeon_cs_gem.h 33include/libdrm/radeon_cs_gem.h
34include/libdrm/radeon_cs_int.h 34include/libdrm/radeon_cs_int.h
35include/libdrm/radeon_drm.h 35include/libdrm/radeon_drm.h
36include/libdrm/radeon_surface.h 36include/libdrm/radeon_surface.h
37include/libdrm/savage_drm.h 37include/libdrm/savage_drm.h
38include/libdrm/sis_drm.h 38include/libdrm/sis_drm.h
39include/libdrm/tegra_drm.h 39include/libdrm/tegra_drm.h
40include/libdrm/vc4_drm.h 40include/libdrm/vc4_drm.h
41${PLIST.arm}include/libdrm/vc4_packet.h 41${PLIST.arm}include/libdrm/vc4_packet.h
42${PLIST.arm}include/libdrm/vc4_qpu_defines.h 42${PLIST.arm}include/libdrm/vc4_qpu_defines.h
43include/libdrm/via_drm.h 43include/libdrm/via_drm.h
44include/libdrm/virtgpu_drm.h 44include/libdrm/virtgpu_drm.h
45include/libdrm/vmwgfx_drm.h 45include/libdrm/vmwgfx_drm.h
 46${PLIST.kms}include/libkms/libkms.h
46include/libsync.h 47include/libsync.h
47include/xf86drm.h 48include/xf86drm.h
48include/xf86drmMode.h 49include/xf86drmMode.h
49lib/libdrm.la 50lib/libdrm.la
50lib/libdrm_amdgpu.la 51lib/libdrm_amdgpu.la
51${PLIST.arm}lib/libdrm_freedreno.la 52${PLIST.arm}lib/libdrm_freedreno.la
52${PLIST.intel}lib/libdrm_intel.la 53${PLIST.intel}lib/libdrm_intel.la
53lib/libdrm_nouveau.la 54lib/libdrm_nouveau.la
54lib/libdrm_radeon.la 55lib/libdrm_radeon.la
 56${PLIST.kms}lib/libkms.la
55lib/pkgconfig/libdrm.pc 57lib/pkgconfig/libdrm.pc
56lib/pkgconfig/libdrm_amdgpu.pc 58lib/pkgconfig/libdrm_amdgpu.pc
57${PLIST.arm}lib/pkgconfig/libdrm_freedreno.pc 59${PLIST.arm}lib/pkgconfig/libdrm_freedreno.pc
58${PLIST.intel}lib/pkgconfig/libdrm_intel.pc 60${PLIST.intel}lib/pkgconfig/libdrm_intel.pc
59lib/pkgconfig/libdrm_nouveau.pc 61lib/pkgconfig/libdrm_nouveau.pc
60lib/pkgconfig/libdrm_radeon.pc 62lib/pkgconfig/libdrm_radeon.pc
 63${PLIST.kms}lib/pkgconfig/libkms.pc
61${PLIST.arm}lib/pkgconfig/libdrm_vc4.pc 64${PLIST.arm}lib/pkgconfig/libdrm_vc4.pc
62share/libdrm/amdgpu.ids 65share/libdrm/amdgpu.ids
File Deleted: pkgsrc/x11/libdrm/Attic/PLIST.DragonFly
File Deleted: pkgsrc/x11/libdrm/Attic/PLIST.FreeBSD
File Deleted: pkgsrc/x11/libdrm/Attic/PLIST.Linux