From nobody Thu Aug 22 08:33:25 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 4WqGgT4QnWz5SQh2; Thu, 22 Aug 2024 08:33:25 +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 4WqGgT3r12z45xK; Thu, 22 Aug 2024 08:33:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724315605; 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=qPEObZ2qjVhnhuMt7w1oKt9qLlDUn+ZTGSoXQJiHkS8=; b=xvb555oi8Hef4dGi9WH4NUjricfE+dRHBuAbbL4hrE0h7jZHFjrTaXpC+fHKKZ2hwqpjCW nslNLRMlwxWbkOqCgc3A+R6jHNb1vECLclUut8fpvSbCTv56Vx6L2tsMy0m5O+MLiJ0k4r iLbRtoMrBuvKAQ8IBQWxtovT/XMeB8TaBcwa/gjJcNTok8jFNefA0ecLHt/i+CHlPjkwBc hzNxcPpk14brWleo2KrzlrWDhF691GO5XXnOxCfLH4r0JbSLXIKfmvcC6PV+Jxcw+WLsDB 3TSL5SxTpuL5N59qYvwgTZfscvtDCYs/tZ7mErLkX1XLpp+A3AecDE5nx9wBzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724315605; a=rsa-sha256; cv=none; b=FXNho4xdJOGMKldX4K0QCo/aTJCAkzPQ06Bt7ehRZRKJ2DiNH1V5t3UfwXxjznErr5xQ8K kENf5lqv1gtKr7GG3Q4ibU1n1FPEoQAzquSabD45DN7eNiksugYHYVg0B+VPn7NDa7v5c6 UhEDz15xEuNIL6Oi6PwbpM3RYHSQJNv59cWH7+EveehZsudKZVJRZKz/lMVu8EchrQj6hy gXMz+wgVrqWkKMMX0mOA7OxesQv9E0gTUdy/aVx1Je65ViRd1N/lIyaPMHMSHzhkT7qQSt MhPuEFWAs8lKi3uU45MaNLzhfhomonoALP5P7PLZJEolzhtswIRQh+lyFafplg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724315605; 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=qPEObZ2qjVhnhuMt7w1oKt9qLlDUn+ZTGSoXQJiHkS8=; b=TVDoeae4lalSGoVGr7sSHEVv8sVAfxaSRB0Rw1l08lqUzbRrSTLJEfqiqEdIvuXkN0Vjlt vm24dgWY32crM1sfQm0mubinRoR//F3KXlWJhvimn7wNXNFAmRq0mRc5ooa9Xosy1oIkjq SCZkcreydkNOD/eYY48I3kUtsM74XszFeIMcttnpLOcFUTw8um+J2+9ZwE0hH9LKaRR6/F /STr4bB6P/UkW0oaeziup8NkHxzFvCarN31UsFc8zH9JA+UMLPZnbJB0RyI8oCP8prXJWI cJT1oHbJoFr9ebCDM9ht91RBXOABBJ/hpbnjrkNkKnGkxD8YfSyV/QRYjHFSHQ== 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 4WqGgT3KhbzLJk; Thu, 22 Aug 2024 08:33:25 +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 47M8XP14015773; Thu, 22 Aug 2024 08:33:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47M8XPZi015770; Thu, 22 Aug 2024 08:33:25 GMT (envelope-from git) Date: Thu, 22 Aug 2024 08:33:25 GMT Message-Id: <202408220833.47M8XPZi015770@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: e313acaea33b - main - graphics/mesa: Unbreak on !amd64 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: e313acaea33b7ad94efcc4455d17d9284968cb68 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e313acaea33b7ad94efcc4455d17d9284968cb68 commit e313acaea33b7ad94efcc4455d17d9284968cb68 Author: Emmanuel Vadot AuthorDate: 2024-08-22 07:40:14 +0000 Commit: Emmanuel Vadot CommitDate: 2024-08-22 08:33:24 +0000 graphics/mesa: Unbreak on !amd64 Disable intel-rt for all arches except amd64 as it's only supported there. PR: 280979 Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/libosmesa/Makefile | 4 ++++ graphics/mesa-dri/Makefile | 1 + graphics/mesa-gallium-va/Makefile | 4 ++++ graphics/mesa-gallium-vdpau/Makefile | 4 ++++ graphics/mesa-gallium-xa/Makefile | 4 ++++ graphics/mesa-libs/Makefile | 4 ++++ lang/clover/Makefile | 4 ++++ 7 files changed, 25 insertions(+) diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile index 6b1f54b3efc0..21a6cd84ebd3 100644 --- a/graphics/libosmesa/Makefile +++ b/graphics/libosmesa/Makefile @@ -45,6 +45,10 @@ LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dosmesa=true +.if ${ARCH} != amd64 +MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 +.endif + post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/GL ${INSTALL_DATA} ${WRKSRC}/include/GL/osmesa.h \ diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index 415780f9d683..20f3b32d5fe5 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -65,6 +65,7 @@ anv_BUILD_DEPENDS= glslangValidator:graphics/glslang \ anv_RUN_DEPENDS= spirv-tools>0:graphics/spirv-tools \ spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T} anv_CONFIGURE_ENV= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig" +anv_MESON_ON= ${"${ARCH:Mamd64}":?:-Dintel-rt=disabled} # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 radv_DESC= AMD/ATI Southern Islands and newer Vulkan support radv_BUILD_DEPENDS= glslangValidator:graphics/glslang swrast_vk_DESC= Software Rasterizer Vulkan support diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile index af651b16f606..2c00d8195f86 100644 --- a/graphics/mesa-gallium-va/Makefile +++ b/graphics/mesa-gallium-va/Makefile @@ -49,6 +49,10 @@ LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dgallium-va=enabled +.if ${ARCH} != amd64 +MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 +.endif + .if ${PORT_OPTIONS:MX11} MESON_ARGS+= -Dplatforms="x11" .else diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile index fd7b0930a1d0..8ad6ca75cfb5 100644 --- a/graphics/mesa-gallium-vdpau/Makefile +++ b/graphics/mesa-gallium-vdpau/Makefile @@ -48,6 +48,10 @@ LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dgallium-vdpau=enabled +.if ${ARCH} != amd64 +MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 +.endif + .if ${PORT_OPTIONS:MX11} MESON_ARGS+= -Dplatforms="x11" .else diff --git a/graphics/mesa-gallium-xa/Makefile b/graphics/mesa-gallium-xa/Makefile index 59c61d00add7..3d09f7ab433a 100644 --- a/graphics/mesa-gallium-xa/Makefile +++ b/graphics/mesa-gallium-xa/Makefile @@ -44,4 +44,8 @@ LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dgallium-xa=enabled +.if ${ARCH} != amd64 +MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 +.endif + .include diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile index 79d721335f8f..1ac08aefc48b 100644 --- a/graphics/mesa-libs/Makefile +++ b/graphics/mesa-libs/Makefile @@ -66,6 +66,10 @@ MESA_PLATFORMS+= wayland MESON_ARGS+= -Dplatforms="${MESA_PLATFORMS:ts,:tl}" +.if ${ARCH} != amd64 +MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 +.endif + .if ${ARCH} == "i386" # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set LDFLAGS+=-Wl,-z,notext diff --git a/lang/clover/Makefile b/lang/clover/Makefile index ac29c174dbed..fd68336056f7 100644 --- a/lang/clover/Makefile +++ b/lang/clover/Makefile @@ -53,6 +53,10 @@ LDFLAGS_i386= -Wl,-znotext CONFIGURE_ENV+= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig" +.if ${ARCH} != amd64 +MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629 +.endif + pre-patch: @if [ -e ${LOCALBASE}/bin/llvm-config${LLVM_VERSION} ] && \ ! [ -e ${LOCALBASE}/bin/clang${LLVM_VERSION} ]; then \