sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/mesa: Unbreak on !amd64

Browse source 
Disable intel-rt for all arches except amd64 as it's only supported there.

PR:		 280979
Sponsored by:	Beckhoff Automation GmbH & Co. KG
This commit is contained in:
Emmanuel Vadot 2024-08-22 09:40:14 +02:00
parent 860ccda68e
commit e313acaea3
7 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
graphics/libosmesa/Makefile
View file

@ -45,6 +45,10 @@ LDFLAGS_i386= -Wl,-znotext
MESON_ARGS+= -Dosmesa=true MESON_ARGS+= -Dosmesa=true
.if ${ARCH} != amd64
MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
.endif
post-install: post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/include/GL @${MKDIR} ${STAGEDIR}${PREFIX}/include/GL
${INSTALL_DATA} ${WRKSRC}/include/GL/osmesa.h \ ${INSTALL_DATA} ${WRKSRC}/include/GL/osmesa.h \

1
graphics/mesa-dri/Makefile
View file

@ -65,6 +65,7 @@ anv_BUILD_DEPENDS= glslangValidator:graphics/glslang \
anv_RUN_DEPENDS= spirv-tools>0:graphics/spirv-tools \ anv_RUN_DEPENDS= spirv-tools>0:graphics/spirv-tools \
spirv-llvm-translator-${LLVM_PORT:T}>0:devel/spirv-llvm-translator@${LLVM_PORT:T} 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_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_DESC= AMD/ATI Southern Islands and newer Vulkan support
radv_BUILD_DEPENDS= glslangValidator:graphics/glslang radv_BUILD_DEPENDS= glslangValidator:graphics/glslang
swrast_vk_DESC= Software Rasterizer Vulkan support swrast_vk_DESC= Software Rasterizer Vulkan support

4
graphics/mesa-gallium-va/Makefile
View file

@ -49,6 +49,10 @@ LDFLAGS_i386= -Wl,-znotext
MESON_ARGS+= -Dgallium-va=enabled 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} .if ${PORT_OPTIONS:MX11}
MESON_ARGS+= -Dplatforms="x11" MESON_ARGS+= -Dplatforms="x11"
.else .else

4
graphics/mesa-gallium-vdpau/Makefile
View file

@ -48,6 +48,10 @@ LDFLAGS_i386= -Wl,-znotext
MESON_ARGS+= -Dgallium-vdpau=enabled 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} .if ${PORT_OPTIONS:MX11}
MESON_ARGS+= -Dplatforms="x11" MESON_ARGS+= -Dplatforms="x11"
.else .else

4
graphics/mesa-gallium-xa/Makefile
View file

@ -44,4 +44,8 @@ LDFLAGS_i386= -Wl,-znotext
MESON_ARGS+= -Dgallium-xa=enabled MESON_ARGS+= -Dgallium-xa=enabled
.if ${ARCH} != amd64
MESON_ARGS+= -Dintel-rt=disabled # https://gitlab.freedesktop.org/mesa/mesa/-/issues/10629
.endif
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

4
graphics/mesa-libs/Makefile
View file

@ -66,6 +66,10 @@ MESA_PLATFORMS+= wayland
MESON_ARGS+= -Dplatforms="${MESA_PLATFORMS:ts,:tl}" 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" .if ${ARCH} == "i386"
# PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set
LDFLAGS+=-Wl,-z,notext LDFLAGS+=-Wl,-z,notext

4
lang/clover/Makefile
View file

@ -53,6 +53,10 @@ LDFLAGS_i386= -Wl,-znotext
CONFIGURE_ENV+= PKG_CONFIG_PATH="${LLVM_PREFIX}/libdata/pkgconfig" 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: pre-patch:
@if [ -e ${LOCALBASE}/bin/llvm-config${LLVM_VERSION} ] && \ @if [ -e ${LOCALBASE}/bin/llvm-config${LLVM_VERSION} ] && \
! [ -e ${LOCALBASE}/bin/clang${LLVM_VERSION} ]; then \ ! [ -e ${LOCALBASE}/bin/clang${LLVM_VERSION} ]; then \