From nobody Sat Jan 27 18:36:06 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TMjtt4pQ4z58hfc; Sat, 27 Jan 2024 18:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMjtt4JT6z4knV; Sat, 27 Jan 2024 18:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706380566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZimhPkvU8AjKfERZlRH1VnL6AbXtKrUqgJf1cj5/Vuw=; b=F1loaMS0Wji0m+so8BsWFpTd4TJeXnBxpM+vwZb2NZtXuEwH1UUOB8Eo8EAqL2T9solagK uPLKoQ0WZF0kxz8XyQm1zp6icgDY0zrSxs1Ccqnzb+yf8AwlZnqnz0xPSxS1DjAfJ1H8zr /o+9dr22SdtWUtEEU2jbiZV033A2XfYMEP1ir3jcKz8eBMAY37ubNc4VWPv3Q3zjJfZ7yN cX9Vl8EnbWniVoq+hSwfhWITgi9swW8sx2AWyQdgMMNoNZwiRL+nsAjZv0yMNse8/9MbCS 2FVA8RlZzVoHAdnW24rkF91lU6R/pdEIyXOQWLgMWN8lYPKwNKiYFGzql8sxbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706380566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZimhPkvU8AjKfERZlRH1VnL6AbXtKrUqgJf1cj5/Vuw=; b=BESo05OHziWD/5qVgwSB03UAArbgs+TMKgmnwvD9nfdnVjEt5KJ5gayvIM+aD3NOPflCch 7kP5oQID6d55SpUeh6ukfdL76MF/vxl0kbvBuA+5DHYV+OMr5mQ8qqSzbj6/R4VH/13xUJ noCi2agn4nh2nrIyCZ7QN8JAFw9wZ+PjqhCchkl4Pp+qh0KS4Xt+GRwyD6DyvNK4qQocUb Zs9cM420qjAWrQ7NCvfUiKhTP7EhT3n/4FwWvpOIWCH6MWYbGN66OaAm0FNJEeFwyXEWSi 8PJE9Xb2zizwTJrPiHEaBYlihlH90hqWnR9YHwXhHp1rsYTvt7XFyYxmSAyiMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706380566; a=rsa-sha256; cv=none; b=R02APkFZSBSOUyQ0r24QPQcnf2NAEMebQIAh5/YxXjxGM+RDhN0vKDm51gBk16VeK72tTk BxfNzH+fhuzlXv/+TJEp53eqQkRWGqCArY6ztPzfPuAOMQWftyf3HJUImcZgr13adxHi7u fFNUuFScPTfaO42pbxj9/yyUVplkYzaweeRaw6I6eeH7a3xVc54iMbFl2/cv+RN4yONH2l F/zuV/DU7MUy1EvevEfv33uDhCD6yOxieIZDCklSELV1BYOMpOkw2vCkLtAyuJyN+uWAjS Yc+xmaO4ODu2cWh1sCx31WUrkMatSNCz3brxJR1BQjqZX7LCUPyfQ541hS4SYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TMjtt3MjKzbMk; Sat, 27 Jan 2024 18:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40RIa6jp056925; Sat, 27 Jan 2024 18:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40RIa6KY056922; Sat, 27 Jan 2024 18:36:06 GMT (envelope-from git) Date: Sat, 27 Jan 2024 18:36:06 GMT Message-Id: <202401271836.40RIa6KY056922@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 67c3a731efe7 - main - graphics/libdrm: Always enable manpages List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67c3a731efe73e079e402c435c8a93b5921d7971 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=67c3a731efe73e079e402c435c8a93b5921d7971 commit 67c3a731efe73e079e402c435c8a93b5921d7971 Author: Emmanuel Vadot AuthorDate: 2024-01-27 18:09:19 +0000 Commit: Emmanuel Vadot CommitDate: 2024-01-27 18:36:01 +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 --- 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 .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 1a9bf2fbd14c..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%%share/man/man3/drmAvailable.3.gz -%%MANPAGES%%share/man/man3/drmHandleEvent.3.gz -%%MANPAGES%%share/man/man3/drmModeGetResources.3.gz -%%MANPAGES%%share/man/man7/drm-kms.7.gz -%%MANPAGES%%share/man/man7/drm-memory.7.gz -%%MANPAGES%%share/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