From nobody Thu Feb 1 09:32:27 2024 X-Original-To: dev-commits-ports-branches@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 4TQYbH5Rlyz58G9D; Thu, 1 Feb 2024 09:32:27 +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 4TQYbH3GQwz43Hh; Thu, 1 Feb 2024 09:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706779947; 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=c7JKtDMpXhzoVWg6Z23M8epQPvn9ZFUj0BPbGAqM8s8=; b=d+2bXfsQVHw28neoX/g5TfeyoOvbBxOnNSPYZXv/gYJ/cukbQTZgYQKbiBkjZQt+NgKmeo 0UTaihhqrGKEbyfPi4tCbunPqZQFISvzPvzg9F5y16+n7qWHykHkwZMgi0lH7Y23qrdUkC hgAXSCi4tDsT/RU7QYXYgFKKy7WcX4J508VDid4iHkUQeWVcKsObydVX0I6sRqmdz3IV6K LrHIRm9FiyULDBlTecSupAuBrVlz08Fq0BrCal16p9m6uT24Y/eWxDy6zvQJx/3xWF0l64 qJtICnmsWeQGyQWILRXvcsCr7iJyXwEs0rB40q+dqNfyibYj4huKIqT+cSRsyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706779947; 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=c7JKtDMpXhzoVWg6Z23M8epQPvn9ZFUj0BPbGAqM8s8=; b=vK5sEB3J+Y9TSxqS1q8/p3dOXYa+5rl42XAesMLM2cafl0RLNh4cWZNY2KGDyffC3JuS+3 FqFBGrK3+Cn8ZpmGDizPzVTKUX2YPZu4XnxYfd/MJ6Ot0dbACJ7mCKx46ZpDZHneSgyyOf AZd5r4ioPDod/BQEJs+8cfQLe0LW/heKQ8RqPTrjqVmtAdCZlEwVBUaoEnNf08Az/1bLK2 CoGqYQFsvfGtL3WdCvISO9vBYO4j/p7bvtBmM7UI5+1AZA9X+qt7+kRO9+lb2X040EBNJy Kyyu3Joh+w6I2WXUlipS6wYR7fVoOQGN8yZjDjUAZFta+5Id0FxOrE/VJOJqIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706779947; a=rsa-sha256; cv=none; b=OBBrVYKGlUUsMUpfm1Ldn5a1+vVsO46TgKgn1Rqjb/e4R+0XNSzyNzPaStDsrEuD7BEh+A WdDN5gCEzUsfj2/Ji4SAXxMXubp85Dxi81n2Md2kUOpsoEjp5GJGyfT3/YkytqR/gyT4rM Jkbw9LsR08g2wat5Z5nV0RTG2cP/W4NKqSc4WcOha0B1WQlA2o+gVvQ3AGs0E8oRgSpfdt PzriwUjxrE8Qt85z1/gzkGwtBFeh8tGTw2Aome85CwCij2cebJfEvp6rJA8Gg8A0zXvfyq +Dh/lh3UwYxfszsYFw5Z1QLsoYXk3P2+GM4H9c8z8E8uV5nIenFaiu8Zt9Cz6A== 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 4TQYbH2MRkzxR7; Thu, 1 Feb 2024 09:32:27 +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 4119WRRf073736; Thu, 1 Feb 2024 09:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4119WRui073733; Thu, 1 Feb 2024 09:32:27 GMT (envelope-from git) Date: Thu, 1 Feb 2024 09:32:27 GMT Message-Id: <202402010932.4119WRui073733@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 26d6998276d1 - 2024Q1 - graphics/libdrm: Always enable manpages List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 26d6998276d129329dbad0e3a3a901e60b2b0325 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=26d6998276d129329dbad0e3a3a901e60b2b0325 commit 26d6998276d129329dbad0e3a3a901e60b2b0325 Author: Emmanuel Vadot AuthorDate: 2024-01-27 18:09:19 +0000 Commit: Emmanuel Vadot 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 .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