@@ -, +, @@ - Only install i915, nouveau and radeon _drm.h if it was requested based on the arch. - Add LEGACY option for old DRM drivers There is no point of installing headers for legacy drm drivers. Those drivers are still "available" in FreeBSD 12 but are totally untested. - Only install tegra and vc4 headers for ARM* system - Only install vmware and virtgpu driver on i386/amd64 --- graphics/libdrm/Makefile | 16 +++++++++++++++- graphics/libdrm/pkg-plist | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 16 deletions(-) --- b/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -1,74 +1,88 @@ # Created by: lesi@FreeBSD.org # $FreeBSD$ PORTNAME= libdrm PORTVERSION= 2.4.99 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= graphics x11 MASTER_SITES= https://dri.freedesktop.org/libdrm/ MAINTAINER= x11@FreeBSD.org COMMENT= Userspace interface to kernel Direct Rendering Module services LICENSE= MIT BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs LIB_DEPENDS= libpciaccess.so:devel/libpciaccess USES= gnome meson pkgconfig tar:bzip2 USE_LDCONFIG= yes -OPTIONS_DEFINE= MANPAGES TESTS +OPTIONS_DEFINE= MANPAGES TESTS LEGACY OPTIONS_SUB= yes TESTS_DESC= Install test programs (which are always built) +LEGACY_DESC= Install legacy drivers headers .if defined(PACKAGE_BUILDING) OPTIONS_DEFAULT+= MANPAGES .endif +OPTIONS_DEFAULT+= LEGACY + MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl MANPAGES_USE= GNOME=libxslt:build MANPAGES_MESON_TRUE= man-pages TESTS_MESON_TRUE= install-test-programs # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo) CONFIGURE_ARGS+= -Dcairo-tests=false .include .if ${ARCH} == amd64 || ${ARCH} == i386 PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" +PLIST_SUB+= VIRTGPU_DRIVER="" +PLIST_SUB+= VMWGFX_DRIVER="" .elif ${ARCH:Mpowerpc*} PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" +PLIST_SUB+= VIRTGPU_DRIVER="@comment " +PLIST_SUB+= VMWGFX_DRIVER="@comment " .elif ${ARCH} == aarch64 PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" +PLIST_SUB+= VIRTGPU_DRIVER="@comment " +PLIST_SUB+= VMWGFX_DRIVER="@comment " .elif ${ARCH:Marm*} PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " +PLIST_SUB+= VIRTGPU_DRIVER="@comment " +PLIST_SUB+= VMWGFX_DRIVER="@comment " .else PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="@comment " +PLIST_SUB+= VIRTGPU_DRIVER="@comment " +PLIST_SUB+= VMWGFX_DRIVER="@comment " .endif # This variable is not for users. So use a non-default name, intended for # people working on DRM kernel module development. .if ${OPSYS} == FreeBSD && !defined(LIBDRM_SKIP_RETURN_PATCH) EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drm.c .endif .include --- b/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -1,94 +1,94 @@ %%TESTS%%bin/kms-steal-crtc %%TESTS%%bin/kms-universal-planes %%TESTS%%bin/kmstest %%TESTS%%bin/modeprint %%TESTS%%bin/modetest %%TESTS%%bin/proptest %%TESTS%%bin/vbltest %%ARM_DRIVERS%%include/freedreno/freedreno_drmif.h %%ARM_DRIVERS%%include/freedreno/freedreno_ringbuffer.h %%RADEON_DRIVERS%%include/libdrm/amdgpu.h %%RADEON_DRIVERS%%include/libdrm/amdgpu_drm.h include/libdrm/drm.h include/libdrm/drm_fourcc.h include/libdrm/drm_mode.h include/libdrm/drm_sarea.h -include/libdrm/i915_drm.h +%%INTEL_DRIVER%%include/libdrm/i915_drm.h %%INTEL_DRIVER%%include/libdrm/intel_aub.h %%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h %%INTEL_DRIVER%%include/libdrm/intel_debug.h -include/libdrm/mach64_drm.h -include/libdrm/mga_drm.h -include/libdrm/msm_drm.h +%%LEGACY%%include/libdrm/mach64_drm.h +%%LEGACY%%include/libdrm/mga_drm.h +%%LEGACY%%include/libdrm/msm_drm.h %%NOUVEAU_DRIVER%%include/libdrm/nouveau/nouveau.h %%NOUVEAU_DRIVER%%include/libdrm/nouveau/nvif/cl0080.h %%NOUVEAU_DRIVER%%include/libdrm/nouveau/nvif/cl9097.h %%NOUVEAU_DRIVER%%include/libdrm/nouveau/nvif/class.h %%NOUVEAU_DRIVER%%include/libdrm/nouveau/nvif/if0002.h %%NOUVEAU_DRIVER%%include/libdrm/nouveau/nvif/if0003.h %%NOUVEAU_DRIVER%%include/libdrm/nouveau/nvif/ioctl.h %%NOUVEAU_DRIVER%%include/libdrm/nouveau/nvif/unpack.h -include/libdrm/nouveau_drm.h -include/libdrm/qxl_drm.h -include/libdrm/r128_drm.h +%%NOUVEAU_DRIVER%%include/libdrm/nouveau_drm.h +%%LEGACY%%include/libdrm/qxl_drm.h +%%LEGACY%%include/libdrm/r128_drm.h %%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo_gem.h %%RADEON_DRIVERS%%include/libdrm/radeon_bo_int.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs_gem.h %%RADEON_DRIVERS%%include/libdrm/radeon_cs_int.h -include/libdrm/radeon_drm.h +%%RADEON_DRIVERS%%include/libdrm/radeon_drm.h %%RADEON_DRIVERS%%include/libdrm/radeon_surface.h -include/libdrm/savage_drm.h -include/libdrm/sis_drm.h -include/libdrm/tegra_drm.h -include/libdrm/vc4_drm.h +%%LEGACY%%include/libdrm/savage_drm.h +%%LEGACY%%include/libdrm/sis_drm.h +%%ARM_DRIVERS%%include/libdrm/tegra_drm.h +%%ARM_DRIVERS%%include/libdrm/vc4_drm.h %%ARM_DRIVERS%%include/libdrm/vc4_packet.h %%ARM_DRIVERS%%include/libdrm/vc4_qpu_defines.h -include/libdrm/via_drm.h -include/libdrm/virtgpu_drm.h -include/libdrm/vmwgfx_drm.h +%%LEGACY%%include/libdrm/via_drm.h +%%VIRTGPU_DRIVER%%include/libdrm/virtgpu_drm.h +%%VMWGFX_DRIVER%%include/libdrm/vmwgfx_drm.h include/libkms/libkms.h include/libsync.h include/xf86drm.h include/xf86drmMode.h lib/libdrm.so lib/libdrm.so.2 lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1 %%RADEON_DRIVERS%%lib/libdrm_amdgpu.so.1.0.0 %%ARM_DRIVERS%%lib/libdrm_freedreno.so %%ARM_DRIVERS%%lib/libdrm_freedreno.so.1 %%ARM_DRIVERS%%lib/libdrm_freedreno.so.1.0.0 %%INTEL_DRIVER%%lib/libdrm_intel.so %%INTEL_DRIVER%%lib/libdrm_intel.so.1 %%INTEL_DRIVER%%lib/libdrm_intel.so.1.0.0 %%NOUVEAU_DRIVER%%lib/libdrm_nouveau.so %%NOUVEAU_DRIVER%%lib/libdrm_nouveau.so.2 %%NOUVEAU_DRIVER%%lib/libdrm_nouveau.so.2.0.0 %%RADEON_DRIVERS%%lib/libdrm_radeon.so %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1 lib/libkms.so lib/libkms.so.1 lib/libkms.so.1.0.0 libdata/pkgconfig/libdrm.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc %%ARM_DRIVERS%%libdata/pkgconfig/libdrm_freedreno.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%NOUVEAU_DRIVER%%libdata/pkgconfig/libdrm_nouveau.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%ARM_DRIVERS%%libdata/pkgconfig/libdrm_vc4.pc libdata/pkgconfig/libkms.pc %%MANPAGES%%man/man3/drmAvailable.3.gz %%MANPAGES%%man/man3/drmHandleEvent.3.gz %%MANPAGES%%man/man3/drmModeGetResources.3.gz %%MANPAGES%%man/man7/drm-gem.7.gz %%MANPAGES%%man/man7/drm-kms.7.gz %%MANPAGES%%man/man7/drm-memory.7.gz %%MANPAGES%%man/man7/drm-mm.7.gz %%MANPAGES%%man/man7/drm-ttm.7.gz %%MANPAGES%%man/man7/drm.7.gz %%RADEON_DRIVERS%%%%DATADIR%%/amdgpu.ids --