Date: Thu, 1 Feb 2024 09:32:27 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 26d6998276d1 - 2024Q1 - graphics/libdrm: Always enable manpages Message-ID: <202402010932.4119WRui073733@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=26d6998276d129329dbad0e3a3a901e60b2b0325 commit 26d6998276d129329dbad0e3a3a901e60b2b0325 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2024-01-27 18:09:19 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2024-02-01 09:31:35 +0000 graphics/libdrm: Always enable manpages No reason to not always include them. While here change a bit pkg-desc and COMMENT so it better reflects reality. Also split amd and radeon, no functional changed intended. Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 67c3a731efe73e079e402c435c8a93b5921d7971) --- graphics/libdrm/Makefile | 23 +++++++++++++---------- graphics/libdrm/pkg-descr | 12 +++++++++++- graphics/libdrm/pkg-plist | 26 +++++++++++++------------- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 2cdd870a51f8..4330c5031ce3 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -1,33 +1,28 @@ PORTNAME= libdrm PORTVERSION= 2.4.120 +PORTREVISION= 1 PORTEPOCH= 1 -CATEGORIES= graphics x11 +CATEGORIES= graphics MASTER_SITES= https://dri.freedesktop.org/libdrm/ MAINTAINER= x11@FreeBSD.org -COMMENT= Userspace interface to kernel Direct Rendering Module services +COMMENT= Direct Rendering Manager library and headers WWW= https://dri.freedesktop.org/ LICENSE= MIT +BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} LIB_DEPENDS= libpciaccess.so:devel/libpciaccess USES= gnome meson pkgconfig tar:xz USE_LDCONFIG= yes MESON_ARGS= -Dvalgrind=disabled -OPTIONS_DEFINE= MANPAGES TESTS +OPTIONS_DEFINE= TESTS OPTIONS_SUB= yes TESTS_DESC= Build and install test programs -.if defined(PACKAGE_BUILDING) -OPTIONS_DEFAULT+= MANPAGES -.endif - -MANPAGES_BUILD_DEPENDS= rst2man:textproc/py-docutils -MANPAGES_MESON_ENABLED= man-pages - TESTS_MESON_TRUE= install-test-programs # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo) @@ -42,6 +37,8 @@ MESON_ARGS+= -Domap=disabled \ -Detnaviv=disabled \ -Dnouveau=disabled +MESON_ARGS+= -Dman-pages=enabled + .include <bsd.port.options.mk> .if ${ARCH} == amd64 || ${ARCH} == i386 @@ -53,36 +50,42 @@ MESON_ARGS+= -Dvmwgfx=disabled \ .endif .if ${ARCH} == amd64 || ${ARCH} == i386 +PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="" PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="" .elif ${ARCH:Mpowerpc*} +PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH} == aarch64 +PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="" PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH:Marm*} +PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="" PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .elif ${ARCH} == riscv64 +PLIST_SUB+= AMD_DRIVERS="" PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " PLIST_SUB+= RADEON_DRIVERS="" PLIST_SUB+= VMWGFX_DRIVERS="@comment " .else +PLIST_SUB+= AMD_DRIVERS="@comment " PLIST_SUB+= ARM_DRIVERS="@comment " PLIST_SUB+= INTEL_DRIVER="@comment " PLIST_SUB+= NOUVEAU_DRIVER="@comment " diff --git a/graphics/libdrm/pkg-descr b/graphics/libdrm/pkg-descr index 6debfd879be7..e8d358fae1db 100644 --- a/graphics/libdrm/pkg-descr +++ b/graphics/libdrm/pkg-descr @@ -1 +1,11 @@ -Userspace interface to kernel DRM (Direct Rendering Module) services. +This is libdrm, a userspace library for accessing the DRM, direct rendering +manager, on Linux, BSD and other operating systems that support the +ioctl interface. +The library provides wrapper functions for the ioctls to avoid exposing the +kernel interface directly, and for chipsets with drm memory manager, +support for tracking relocations and buffers. +New functionality in the kernel DRM drivers typically requires a new libdrm, +but a new libdrm will always work with an older kernel. + +libdrm is a low-level library, typically used by graphics drivers such as +the Mesa drivers, the X drivers, libva and similar projects. diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index 0ab0f7a403ec..10f85f08d387 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -4,8 +4,8 @@ %%TESTS%%bin/modetest %%TESTS%%bin/proptest %%TESTS%%bin/vbltest -%%RADEON_DRIVERS%%include/libdrm/amdgpu.h -%%RADEON_DRIVERS%%include/libdrm/amdgpu_drm.h +%%AMD_DRIVERS%%include/libdrm/amdgpu.h +%%AMD_DRIVERS%%include/libdrm/amdgpu_drm.h include/libdrm/drm.h include/libdrm/drm_fourcc.h include/libdrm/drm_mode.h @@ -42,9 +42,9 @@ 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 +%%AMD_DRIVERS%%lib/libdrm_amdgpu.so +%%AMD_DRIVERS%%lib/libdrm_amdgpu.so.1 +%%AMD_DRIVERS%%lib/libdrm_amdgpu.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 @@ -52,13 +52,13 @@ lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1 libdata/pkgconfig/libdrm.pc -%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc +%%AMD_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc -%%MANPAGES%%man/man3/drmAvailable.3.gz -%%MANPAGES%%man/man3/drmHandleEvent.3.gz -%%MANPAGES%%man/man3/drmModeGetResources.3.gz -%%MANPAGES%%man/man7/drm-kms.7.gz -%%MANPAGES%%man/man7/drm-memory.7.gz -%%MANPAGES%%man/man7/drm.7.gz -%%RADEON_DRIVERS%%%%DATADIR%%/amdgpu.ids +share/man/man3/drmAvailable.3.gz +share/man/man3/drmHandleEvent.3.gz +share/man/man3/drmModeGetResources.3.gz +share/man/man7/drm-kms.7.gz +share/man/man7/drm-memory.7.gz +share/man/man7/drm.7.gz +%%AMD_DRIVERS%%%%DATADIR%%/amdgpu.ids
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402010932.4119WRui073733>