From nobody Thu Dec 08 19:01:33 2022 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 4NSk5p11jrz4k9wB; Thu, 8 Dec 2022 19:01:34 +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 4NSk5p0YyDz4KDM; Thu, 8 Dec 2022 19:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670526094; 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=Qb/UeVgrbSSIRYn5JuS3X3UaO5SBcACSr/m6KDBCw0Q=; b=YRZtGnVs6StMTok2CCvxUyDK2irr/2IKHeqsriHzec5HB0C2/K/VGTCPco/6ShTcf3P8i/ wmkYsb3ZOyv+CJA5GXrN+s2/gn1lj0GDBv04diXkmmy4LAHQwrGe3JLCzSSdSSUiyddtrP 47IeBX78wXeCi9ITELmWkkId0o2ZZpWpkRW/vs86SKqwP9lC8JKnFlUC0LS6yDa6Xalt4L 6U+XDkWUuboJn/sfWJc/EQwE/1EFF56nYiwlakdiMPFpLmJbxs4CgBfZLi70eVxEKJI4Vt qhJWnbz2dh3Zo9KoxhYRmswdyMNfyBmRWx2FdzTxECgSJZgYfTNYKZ32Wy9xcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670526094; 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=Qb/UeVgrbSSIRYn5JuS3X3UaO5SBcACSr/m6KDBCw0Q=; b=n0ixQwr6lduV1n+Bo3zuzKQ0IXTlFq3cpIG4slsrX7WyZWIsyiVaf1BkgM1PVbKaoi7s2j Q5zagqE50RtnPVin72ohQBGZD1EItDsZA68/CaPw4Mb/1A526h+R1cMAPgUMACIP5nr9hR O9oAUWnzUUikPU+cG6UJv9Y/27c6WWSmrCDYDufBNj+HuHbmN7wABxULvNkUJ5XbalN2Ta VKmsOil4RYfnU5SnixHf/pqF+9lJFg6aGmemsx0nfufyVoz/PvnKjUFYm48OosZV2dXZ2n 0V+Haiyrin2RH6GHSVdIL75qLNs1z830ai94uKBLw2vs0aVLjHCFjEfrLq0rAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670526094; a=rsa-sha256; cv=none; b=LBdPI4w2xfRNrxvHzVJ4RE2xhS1A2z9Jq74rmQQSuLEVq5ay9yVpOucEUp0sRH60Frhzwh NH+ZCX0kMszIM6ESQ0ZDfj+S4lRuSGHfV0pRW9GWVyUhNW582OPZyMY1a8HBUcG2tQCd6Z PbGjiTqkDTK+PKl2sAWrRyySx3n2IXoantuBsYqsdJP8873vFP+J2JCFB6TvNj9uuQilpu upv3uXkmqgtq7HXA+o4rJ8moeXfCnXpc7LuOBdSmzi6hJfi2ITjhxv0eF0teL+ZyZSQQbb UKDVi6uaEEhquxZjMmUsZcpO9Y8SbXsHQAWOHqvbfvAEEF+KUanZQGqD2xvW3A== 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 4NSk5n6l9Wz15tV; Thu, 8 Dec 2022 19:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B8J1XDP012270; Thu, 8 Dec 2022 19:01:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B8J1XCU012269; Thu, 8 Dec 2022 19:01:33 GMT (envelope-from git) Date: Thu, 8 Dec 2022 19:01:33 GMT Message-Id: <202212081901.2B8J1XCU012269@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: e70ff172c205 - main - graphics/mesa*: Stop using meson native-file 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: e70ff172c20525bf5ec27c7b904a8e2760947add Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e70ff172c20525bf5ec27c7b904a8e2760947add commit e70ff172c20525bf5ec27c7b904a8e2760947add Author: Emmanuel Vadot AuthorDate: 2022-12-08 15:40:41 +0000 Commit: Emmanuel Vadot CommitDate: 2022-12-08 19:00:28 +0000 graphics/mesa*: Stop using meson native-file Use BINARY_ALIAS instead, this is cleaner. While here directly record the deps on libLLVM for packages that needs it. Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/libosmesa/Makefile | 2 ++ graphics/mesa-dri/Makefile | 2 ++ graphics/mesa-dri/Makefile.common | 3 +-- graphics/mesa-dri/Makefile.targets | 5 ----- graphics/mesa-gallium-va/Makefile | 1 + graphics/mesa-gallium-vdpau/Makefile | 1 + graphics/mesa-gallium-xa/Makefile | 2 ++ graphics/mesa-libs/Makefile | 1 + lang/clover/Makefile | 1 + 9 files changed, 11 insertions(+), 7 deletions(-) diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile index 8fad2587525f..7d68addb1703 100644 --- a/graphics/libosmesa/Makefile +++ b/graphics/libosmesa/Makefile @@ -5,6 +5,8 @@ CATEGORIES= graphics COMMENT= Off-Screen Mesa implementation of the OpenGL API WWW= https://www.mesa3d.org/ +LIB_DEPENDS+= libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} + USES= xorg USE_XORG= xorgproto diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index 09fb7615be54..ac87f4cef889 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -5,6 +5,8 @@ CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ WWW= https://www.mesa3d.org/ +LIB_DEPENDS+= libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} + OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_X11_DESC= Enable X11 support for GBM/EGL diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 6f740b0dc964..913e78c73650 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -90,8 +90,7 @@ BINARY_ALIAS+= python3=${PYTHON_VERSION} LLVM_DEFAULT= 15 BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -RUN_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +BINARY_ALIAS+= llvm-config=llvm-config${LLVM_DEFAULT} -MESON_ARGS+= --native-file="${WRKSRC}/llvm.ini" LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib MESON_ARGS+= -Dllvm=enabled diff --git a/graphics/mesa-dri/Makefile.targets b/graphics/mesa-dri/Makefile.targets index 64e483ccbbd6..b7e891579ab7 100644 --- a/graphics/mesa-dri/Makefile.targets +++ b/graphics/mesa-dri/Makefile.targets @@ -1,10 +1,5 @@ # this file holds common targets -pre-configure: - ${PRINTF} "[binaries]\nllvm-config = '${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}'" \ - > ${WRKSRC}/llvm.ini - - post-patch: ${REINPLACE_CMD} -e '/SYSCONFDIR/ s|/etc|${PREFIX}/etc|g' \ -e '/DATADIR/ s|/usr/share|${PREFIX}/share|g' \ diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile index 9d32e46c2b55..58ae8a8a06b1 100644 --- a/graphics/mesa-gallium-va/Makefile +++ b/graphics/mesa-gallium-va/Makefile @@ -6,6 +6,7 @@ COMMENT= Mesa Gallium VAAPI drivers WWW= https://www.mesa3d.org/ LIB_DEPENDS= libva.so:multimedia/libva \ + libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \ libzstd.so:archivers/zstd OPTIONS_DEFINE= X11 diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile index 2a1c8a0a2688..2ee31ea8913c 100644 --- a/graphics/mesa-gallium-vdpau/Makefile +++ b/graphics/mesa-gallium-vdpau/Makefile @@ -6,6 +6,7 @@ COMMENT= Mesa Gallium VDPAU drivers WWW= https://www.mesa3d.org/ LIB_DEPENDS= libva.so:multimedia/libva \ + libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \ libvdpau.so:multimedia/libvdpau \ libzstd.so:archivers/zstd diff --git a/graphics/mesa-gallium-xa/Makefile b/graphics/mesa-gallium-xa/Makefile index 0b87ebe49f1a..07026c764bbe 100644 --- a/graphics/mesa-gallium-xa/Makefile +++ b/graphics/mesa-gallium-xa/Makefile @@ -5,6 +5,8 @@ CATEGORIES= graphics COMMENT= Mesa Gallium XA state tracker WWW= https://www.mesa3d.org/ +LIB_DEPENDS= libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} + USES= xorg USE_XORG= xorgproto diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile index e009b3a6b86f..d161b86654e7 100644 --- a/graphics/mesa-libs/Makefile +++ b/graphics/mesa-libs/Makefile @@ -1,5 +1,6 @@ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients diff --git a/lang/clover/Makefile b/lang/clover/Makefile index eeea567161f8..50c5fcc201a8 100644 --- a/lang/clover/Makefile +++ b/lang/clover/Makefile @@ -8,6 +8,7 @@ WWW= https://dri.freedesktop.org/wiki/GalliumCompute/ BUILD_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ + libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT} \ libzstd.so:archivers/zstd RUN_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl