From nobody Fri Jan 31 07:45:03 2025 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 4Yknww053Qz5lff6; Fri, 31 Jan 2025 07:45:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yknwv6gGfz3wfZ; Fri, 31 Jan 2025 07:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738309503; 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=VyUNmeyjf5QL6MGjCClp0enJGdtLSvb47O+ODZv/PAM=; b=furfs54ZIup8z7X84q8f83uoZO80qddgsQjZgR26tygkiv3b31VhAA+I9jyIQElBuCtAsN A68J67DayRS1saCRRX8DoJNmC1DJuTHG4iPzIq63vd0mAytItxiO49G+B+F7tvILkyXkem USX335JEtS4JnZ85/JNXMVJyaVI15Mg4eTo0LI534zeLkbUpYIWlB7GGAcUu+7612PiteH rpg8YNxiswLTaXv0UQqoi9daYmJJ5RoIu9IQNt6e+dawplog6P2ow7TcVjicUnGW4ekFpT i1QgolFv12AGG1KBHY4KlCfvOi+ckWMb5nj9ujRVh3qO/sam2XBwdxSQ9hKqKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738309503; 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=VyUNmeyjf5QL6MGjCClp0enJGdtLSvb47O+ODZv/PAM=; b=W35CnwlXyn6kCNCyt4XONG6hciCS1aulzXjlRyHHuEMOZPHZIt9GZm57NICHrIEw3GT63P 9PE5gYQFhCsvgPs4kMqPB0vByAHFZJdHHWDZMYo07zsSaxpnqdk7Jl3uZYzLpbphb1Z13E Tc78/ZrIK5rr5I2ZfyK9PQPk3fw/o+vUXzkmlL/tLHGx9lFb0fLkPPl0a7Rd1pHweFsKWz 3J4gMB9ezVtgxUu6ubfKUclll1WOEYIwZNLWsbPc/KHcfzAQeXz15xQ3xFIFKe+kXtIlGy Dh+gQMmbf0few7KyExgMXRgM+xX4BqOiHl9j1oPvs0y1REioJOTwGXarVKYR3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738309503; a=rsa-sha256; cv=none; b=nlHDcNFs1prWiT9cTrA6AGUI0daMYSTNaejfZn0jn/SVIf7g2vDqddE6u4irh24TuYMpNl 8tOsA1ugY9QctCYzn6BtDX14GW41naTuL59IeeLA9+cnfJPtG6OqrLfpiwxXBoxwXVhJJp 27YhliFJqccrGQuGU/XzmPTe0qwZmzcB7mlje7IUQcTTBZMl48+qopk0SbI5zzmZqF1N2g iJJqEvoqFXdNv/SWcw5qQnL+/A3W2Hluhe9ZmuyTwQQ445894La7SdtB+Ek8KevfSAxXGh 87uDl4zUNuHKlXbFYm1IdjxTRBxsrk2+46pZ+Qe3iUmf8SaHjao7HkstnOIO7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yknwv5kkHz1NHX; Fri, 31 Jan 2025 07:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50V7j3BT002720; Fri, 31 Jan 2025 07:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50V7j361002717; Fri, 31 Jan 2025 07:45:03 GMT (envelope-from git) Date: Fri, 31 Jan 2025 07:45:03 GMT Message-Id: <202501310745.50V7j361002717@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: 6bfc189110c7 - main - graphics/mesa-gallium-{va,vdpau}: Turn gallium drivers into options 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 6bfc189110c7430fe236a4444b823694dc528dc8 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6bfc189110c7430fe236a4444b823694dc528dc8 commit 6bfc189110c7430fe236a4444b823694dc528dc8 Author: Emmanuel Vadot AuthorDate: 2025-01-31 07:42:12 +0000 Commit: Emmanuel Vadot CommitDate: 2025-01-31 07:43:46 +0000 graphics/mesa-gallium-{va,vdpau}: Turn gallium drivers into options While here bring back i386 support but only for the r600 driver as amdgpu isn't supported on this arch. Requested by: danfe, jbeich Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/mesa-gallium-va/Makefile | 26 ++++++++++++++++++++++++-- graphics/mesa-gallium-va/pkg-plist | 4 ++-- graphics/mesa-gallium-vdpau/Makefile | 28 +++++++++++++++++++++++++--- graphics/mesa-gallium-vdpau/pkg-plist | 16 ++++++++-------- 4 files changed, 59 insertions(+), 15 deletions(-) diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile index efdfeebcd73e..84e1e1e22d9b 100644 --- a/graphics/mesa-gallium-va/Makefile +++ b/graphics/mesa-gallium-va/Makefile @@ -8,7 +8,7 @@ WWW= https://www.mesa3d.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/docs/license.rst -ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le +ONLY_FOR_ARCHS= aarch64 i386 amd64 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware BUILD_DEPENDS= libva>=0:multimedia/libva @@ -17,16 +17,30 @@ LIB_DEPENDS= libzstd.so:archivers/zstd USES= llvm:lib,noexport OPTIONS_DEFINE= X11 +OPTIONS_GROUP= GALLIUM OPTIONS_DEFAULT= X11 +OPTIONS_SUB= yes + X11_DESC= Enable X11 support X11_USES= xorg X11_USE= xorg=xorgproto,x11,xcb,xdamage,xext,xfixes,xshmfence,xxf86vm,xrandr +OPTIONS_GROUP_GALLIUM= radeonsi r600 +GALLIUM_DESC= Gallium Video Drivers +radeonsi_DESC= AMD/ATI Southern Islands and newer +r600_DESC= AMD/ATI R600, R700, Evergreen, Northern Islands +OPTIONS_EXCLUDE+= ${ARCH:Mi386:C/.+/radeonsi/} + +MESON_ARGS+= -Dgallium-drivers=${GALLIUM_DRIVERS:ts,} +. for _gd in ${OPTIONS_GROUP_GALLIUM} +OPTIONS_DEFAULT+= ${_gd} +${_gd}_VARS+= GALLIUM_DRIVERS+=${_gd} +. endfor + .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" MESON_ARGS+= -Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc,av1dec,av1enc,vp9dec" \ - -Dgallium-drivers="radeonsi,r600" \ -Dvulkan-drivers="" \ -Dandroid-libbacktrace=disabled \ -Dgallium-vdpau=disabled \ @@ -53,6 +67,14 @@ MESON_ARGS+= -Dgallium-va=enabled MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 .endif +.for _gd in ${OPTIONS_GROUP_GALLIUM} +. if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}} +PLIST_SUB+= ${_gd}="" +. else +PLIST_SUB+= ${_gd}="@comment " +. endif +.endfor + .if ${PORT_OPTIONS:MX11} MESON_ARGS+= -Dplatforms="x11" .else diff --git a/graphics/mesa-gallium-va/pkg-plist b/graphics/mesa-gallium-va/pkg-plist index f8a847c7bff0..1d4632cf7d73 100644 --- a/graphics/mesa-gallium-va/pkg-plist +++ b/graphics/mesa-gallium-va/pkg-plist @@ -9,9 +9,9 @@ @comment include/GL/internal/dri_interface.h @comment include/KHR/khrplatform.h @comment lib/dri/r600_dri.so -lib/dri/r600_drv_video.so +%%r600%%lib/dri/r600_drv_video.so @comment lib/dri/radeonsi_dri.so -lib/dri/radeonsi_drv_video.so +%%radeonsi%%lib/dri/radeonsi_drv_video.so @comment lib/libEGL.so @comment lib/libEGL.so.1 @comment lib/libEGL.so.1.0.0 diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile index 23dce3055494..a4d2f06c89db 100644 --- a/graphics/mesa-gallium-vdpau/Makefile +++ b/graphics/mesa-gallium-vdpau/Makefile @@ -8,7 +8,7 @@ WWW= https://www.mesa3d.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/docs/license.rst -ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le +ONLY_FOR_ARCHS= aarch64 i386 amd64 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware BUILD_DEPENDS= libvdpau>=0:multimedia/libvdpau @@ -18,11 +18,25 @@ USES= llvm:lib,noexport xorg USE_XORG= xorgproto x11 xcb xdamage xext xfixes xshmfence xxf86vm xrandr +OPTIONS_GROUP= GALLIUM +OPTIONS_SUB= yes + +OPTIONS_GROUP_GALLIUM= radeonsi r600 +GALLIUM_DESC= Gallium Video Drivers +radeonsi_DESC= AMD/ATI Southern Islands and newer +r600_DESC= AMD/ATI R600, R700, Evergreen, Northern Islands +OPTIONS_EXCLUDE+= ${ARCH:Mi386:C/.+/radeonsi/} + +MESON_ARGS+= -Dgallium-drivers=${GALLIUM_DRIVERS:ts,} +. for _gd in ${OPTIONS_GROUP_GALLIUM} +OPTIONS_DEFAULT+= ${_gd} +${_gd}_VARS+= GALLIUM_DRIVERS+=${_gd} +. endfor + .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" -MESON_ARGS+= -Dgallium-drivers="r600,radeonsi" \ - -Dvulkan-drivers="" \ +MESON_ARGS+= -Dvulkan-drivers="" \ -Dandroid-libbacktrace=disabled \ -Dgallium-va=disabled \ -Dgallium-omx=disabled \ @@ -49,4 +63,12 @@ MESON_ARGS+= -Dplatforms="x11" \ MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 .endif +.for _gd in ${OPTIONS_GROUP_GALLIUM} +. if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}} +PLIST_SUB+= ${_gd}="" +. else +PLIST_SUB+= ${_gd}="@comment " +. endif +.endfor + .include diff --git a/graphics/mesa-gallium-vdpau/pkg-plist b/graphics/mesa-gallium-vdpau/pkg-plist index 4d88ba1194b7..8d03b4978739 100644 --- a/graphics/mesa-gallium-vdpau/pkg-plist +++ b/graphics/mesa-gallium-vdpau/pkg-plist @@ -19,14 +19,14 @@ @comment lib/libglapi.so @comment lib/libglapi.so.0 @comment lib/libglapi.so.0.0.0 -lib/vdpau/libvdpau_r600.so -lib/vdpau/libvdpau_r600.so.1 -lib/vdpau/libvdpau_r600.so.1.0 -lib/vdpau/libvdpau_r600.so.1.0.0 -lib/vdpau/libvdpau_radeonsi.so -lib/vdpau/libvdpau_radeonsi.so.1 -lib/vdpau/libvdpau_radeonsi.so.1.0 -lib/vdpau/libvdpau_radeonsi.so.1.0.0 +%%r600%%lib/vdpau/libvdpau_r600.so +%%r600%%lib/vdpau/libvdpau_r600.so.1 +%%r600%%lib/vdpau/libvdpau_r600.so.1.0 +%%r600%%lib/vdpau/libvdpau_r600.so.1.0.0 +%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so +%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1 +%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1.0 +%%radeonsi%%lib/vdpau/libvdpau_radeonsi.so.1.0.0 @comment libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/egl.pc @comment share/drirc.d/00-mesa-defaults.conf