diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile index d9141924494e..2276bfb75bff 100644 --- a/devel/libclc/Makefile +++ b/devel/libclc/Makefile @@ -1,26 +1,26 @@ PORTNAME= libclc -DISTVERSION= 13.0.1 +DISTVERSION= 15.0.4 CATEGORIES= devel MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ DISTNAME= libclc-${DISTVERSION}.src MAINTAINER= x11@FreeBSD.org COMMENT= Required library functions for OpenCL C programming language WWW= https://libclc.llvm.org/ LICENSE= LLVM LICENSE_FILE= ${WRKSRC}/LICENSE.TXT LICENSE_NAME= Apache License 2.0 with LLVM Exceptions LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= llvm13>=13.0:devel/llvm13 \ - spirv-llvm-translator-llvm13>0:devel/spirv-llvm-translator@llvm13 \ +BUILD_DEPENDS= llvm15>=15.0:devel/llvm15 \ + spirv-llvm-translator-llvm15>0:devel/spirv-llvm-translator@llvm15 \ libedit>=0:devel/libedit USES= cmake compiler:c++11-lib python:3.6+,build tar:xz USE_LDCONFIG= yes BINARY_ALIAS= python=${PYTHON_CMD} -CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config13 +CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config15 .include diff --git a/devel/libclc/distinfo b/devel/libclc/distinfo index 6649e632ac42..aefd19a50653 100644 --- a/devel/libclc/distinfo +++ b/devel/libclc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666253590 -SHA256 (libclc-13.0.1.src.tar.xz) = 8f0213e52e2fcaca3dfcc438f05d0e15e9b3c96fd6b0994a802b267dc1047a1d -SIZE (libclc-13.0.1.src.tar.xz) = 125852 +TIMESTAMP = 1670152889 +SHA256 (libclc-15.0.4.src.tar.xz) = 00cc092947ef533999db42d18a4134f6ee1d74a60f5c84387ef28ca9e02e2a16 +SIZE (libclc-15.0.4.src.tar.xz) = 125840 diff --git a/devel/libclc/files/patch-CMakeLists.txt b/devel/libclc/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..0f80a7dc0993 --- /dev/null +++ b/devel/libclc/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2022-12-04 11:23:21 UTC ++++ CMakeLists.txt +@@ -186,7 +186,7 @@ configure_file( libclc.pc.in libclc.pc @ONLY ) + + # pkg-config file + configure_file( libclc.pc.in libclc.pc @ONLY ) +-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" ) ++install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig" ) + install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ) + + if( ENABLE_RUNTIME_SUBNORMAL ) diff --git a/devel/libclc/files/patch-libclc_CMakeLists.txt b/devel/libclc/files/patch-libclc_CMakeLists.txt deleted file mode 100644 index bf7c5f77e0e1..000000000000 --- a/devel/libclc/files/patch-libclc_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2020-10-16 16:09:32 UTC -+++ CMakeLists.txt -@@ -158,7 +158,7 @@ endif() - - # pkg-config file - configure_file( libclc.pc.in libclc.pc @ONLY ) --install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig ) -+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig ) - install( DIRECTORY generic/include/clc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) - - if( ENABLE_RUNTIME_SUBNORMAL ) diff --git a/devel/libclc/pkg-plist b/devel/libclc/pkg-plist index b7a73ae9389e..60121044550b 100644 --- a/devel/libclc/pkg-plist +++ b/devel/libclc/pkg-plist @@ -1,341 +1,342 @@ include/clc/as_type.h include/clc/async/async_work_group_copy.h include/clc/async/async_work_group_copy.inc include/clc/async/async_work_group_strided_copy.h include/clc/async/async_work_group_strided_copy.inc include/clc/async/gentype.inc include/clc/async/prefetch.h include/clc/async/prefetch.inc include/clc/async/wait_group_events.h include/clc/atom_decl_int32.inc include/clc/atom_decl_int64.inc include/clc/atomic/atomic_add.h include/clc/atomic/atomic_and.h include/clc/atomic/atomic_cmpxchg.h include/clc/atomic/atomic_dec.h include/clc/atomic/atomic_decl.inc include/clc/atomic/atomic_inc.h include/clc/atomic/atomic_max.h include/clc/atomic/atomic_min.h include/clc/atomic/atomic_or.h include/clc/atomic/atomic_sub.h include/clc/atomic/atomic_xchg.h include/clc/atomic/atomic_xor.h include/clc/cl_khr_global_int32_base_atomics/atom_add.h include/clc/cl_khr_global_int32_base_atomics/atom_cmpxchg.h include/clc/cl_khr_global_int32_base_atomics/atom_dec.h include/clc/cl_khr_global_int32_base_atomics/atom_inc.h include/clc/cl_khr_global_int32_base_atomics/atom_sub.h include/clc/cl_khr_global_int32_base_atomics/atom_xchg.h include/clc/cl_khr_global_int32_extended_atomics/atom_and.h include/clc/cl_khr_global_int32_extended_atomics/atom_max.h include/clc/cl_khr_global_int32_extended_atomics/atom_min.h include/clc/cl_khr_global_int32_extended_atomics/atom_or.h include/clc/cl_khr_global_int32_extended_atomics/atom_xor.h include/clc/cl_khr_int64_base_atomics/atom_add.h include/clc/cl_khr_int64_base_atomics/atom_cmpxchg.h include/clc/cl_khr_int64_base_atomics/atom_dec.h include/clc/cl_khr_int64_base_atomics/atom_inc.h include/clc/cl_khr_int64_base_atomics/atom_sub.h include/clc/cl_khr_int64_base_atomics/atom_xchg.h include/clc/cl_khr_int64_extended_atomics/atom_and.h include/clc/cl_khr_int64_extended_atomics/atom_max.h include/clc/cl_khr_int64_extended_atomics/atom_min.h include/clc/cl_khr_int64_extended_atomics/atom_or.h include/clc/cl_khr_int64_extended_atomics/atom_xor.h include/clc/cl_khr_local_int32_base_atomics/atom_add.h include/clc/cl_khr_local_int32_base_atomics/atom_cmpxchg.h include/clc/cl_khr_local_int32_base_atomics/atom_dec.h include/clc/cl_khr_local_int32_base_atomics/atom_inc.h include/clc/cl_khr_local_int32_base_atomics/atom_sub.h include/clc/cl_khr_local_int32_base_atomics/atom_xchg.h include/clc/cl_khr_local_int32_extended_atomics/atom_and.h include/clc/cl_khr_local_int32_extended_atomics/atom_max.h include/clc/cl_khr_local_int32_extended_atomics/atom_min.h include/clc/cl_khr_local_int32_extended_atomics/atom_or.h include/clc/cl_khr_local_int32_extended_atomics/atom_xor.h include/clc/clc.h include/clc/clcfunc.h include/clc/clcmacros.h include/clc/clctypes.h include/clc/common/degrees.h include/clc/common/degrees.inc include/clc/common/mix.h include/clc/common/mix.inc include/clc/common/radians.h include/clc/common/radians.inc include/clc/common/sign.h include/clc/common/smoothstep.h include/clc/common/smoothstep.inc include/clc/common/step.h include/clc/common/step.inc include/clc/convert.h include/clc/explicit_fence/explicit_memory_fence.h include/clc/float/definitions.h include/clc/geometric/cross.h include/clc/geometric/distance.h include/clc/geometric/distance.inc include/clc/geometric/dot.h include/clc/geometric/dot.inc include/clc/geometric/fast_distance.h include/clc/geometric/fast_distance.inc include/clc/geometric/fast_length.h include/clc/geometric/fast_length.inc include/clc/geometric/fast_normalize.h include/clc/geometric/fast_normalize.inc include/clc/geometric/floatn.inc include/clc/geometric/length.h include/clc/geometric/length.inc include/clc/geometric/normalize.h include/clc/geometric/normalize.inc include/clc/image/image.h include/clc/image/image_defines.h include/clc/integer/abs.h include/clc/integer/abs.inc include/clc/integer/abs_diff.h include/clc/integer/abs_diff.inc include/clc/integer/add_sat.h include/clc/integer/add_sat.inc include/clc/integer/clz.h include/clc/integer/clz.inc include/clc/integer/definitions.h include/clc/integer/gentype.inc include/clc/integer/hadd.h include/clc/integer/hadd.inc include/clc/integer/integer-gentype.inc include/clc/integer/mad24.h include/clc/integer/mad24.inc include/clc/integer/mad_hi.h include/clc/integer/mad_sat.h include/clc/integer/mad_sat.inc include/clc/integer/mul24.h include/clc/integer/mul24.inc include/clc/integer/mul_hi.h include/clc/integer/mul_hi.inc include/clc/integer/popcount.h include/clc/integer/rhadd.h include/clc/integer/rhadd.inc include/clc/integer/rotate.h include/clc/integer/rotate.inc include/clc/integer/sub_sat.h include/clc/integer/sub_sat.inc include/clc/integer/unary.inc include/clc/integer/upsample.h include/clc/math/acos.h include/clc/math/acosh.h include/clc/math/acospi.h include/clc/math/asin.h include/clc/math/asinh.h include/clc/math/asinpi.h include/clc/math/atan.h include/clc/math/atan2.h include/clc/math/atan2pi.h include/clc/math/atanh.h include/clc/math/atanpi.h include/clc/math/binary_decl.inc include/clc/math/binary_decl_tt.inc include/clc/math/cbrt.h include/clc/math/ceil.h include/clc/math/copysign.h include/clc/math/cos.h include/clc/math/cosh.h include/clc/math/cospi.h include/clc/math/erf.h include/clc/math/erfc.h include/clc/math/exp.h include/clc/math/exp10.h include/clc/math/exp2.h include/clc/math/expm1.h include/clc/math/fabs.h include/clc/math/fdim.h include/clc/math/floor.h include/clc/math/fma.h include/clc/math/fmax.h include/clc/math/fmin.h include/clc/math/fmod.h include/clc/math/fract.h include/clc/math/fract.inc include/clc/math/frexp.h include/clc/math/frexp.inc include/clc/math/gentype.inc include/clc/math/half_cos.h include/clc/math/half_divide.h include/clc/math/half_exp.h include/clc/math/half_exp10.h include/clc/math/half_exp2.h include/clc/math/half_log.h include/clc/math/half_log10.h include/clc/math/half_log2.h include/clc/math/half_powr.h include/clc/math/half_recip.h include/clc/math/half_rsqrt.h include/clc/math/half_sin.h include/clc/math/half_sqrt.h include/clc/math/half_tan.h include/clc/math/hypot.h include/clc/math/ilogb.h include/clc/math/ilogb.inc include/clc/math/ldexp.h include/clc/math/ldexp.inc include/clc/math/lgamma.h include/clc/math/lgamma_r.h include/clc/math/lgamma_r.inc include/clc/math/log.h include/clc/math/log10.h include/clc/math/log1p.h include/clc/math/log2.h include/clc/math/logb.h include/clc/math/mad.h include/clc/math/maxmag.h include/clc/math/minmag.h include/clc/math/modf.h include/clc/math/modf.inc include/clc/math/nan.h include/clc/math/nan.inc include/clc/math/native_cos.h include/clc/math/native_divide.h include/clc/math/native_exp.h include/clc/math/native_exp10.h include/clc/math/native_exp2.h include/clc/math/native_log.h include/clc/math/native_log10.h include/clc/math/native_log2.h include/clc/math/native_powr.h include/clc/math/native_recip.h include/clc/math/native_rsqrt.h include/clc/math/native_sin.h include/clc/math/native_sqrt.h include/clc/math/native_tan.h include/clc/math/nextafter.h include/clc/math/pow.h include/clc/math/pown.h include/clc/math/pown.inc include/clc/math/powr.h include/clc/math/remainder.h include/clc/math/remquo.h include/clc/math/remquo.inc include/clc/math/rint.h include/clc/math/rootn.h include/clc/math/rootn.inc include/clc/math/round.h include/clc/math/rsqrt.h include/clc/math/sin.h include/clc/math/sincos.h include/clc/math/sincos.inc include/clc/math/sinh.h include/clc/math/sinpi.h include/clc/math/sqrt.h include/clc/math/tan.h include/clc/math/tanh.h include/clc/math/tanpi.h include/clc/math/ternary_decl.inc include/clc/math/tgamma.h include/clc/math/trunc.h include/clc/math/unary_decl.inc include/clc/misc/shuffle.h include/clc/misc/shuffle2.h include/clc/relational/all.h include/clc/relational/any.h include/clc/relational/binary_decl.inc include/clc/relational/bitselect.h include/clc/relational/bitselect.inc include/clc/relational/floatn.inc include/clc/relational/isequal.h include/clc/relational/isfinite.h include/clc/relational/isgreater.h include/clc/relational/isgreaterequal.h include/clc/relational/isinf.h include/clc/relational/isless.h include/clc/relational/islessequal.h include/clc/relational/islessgreater.h include/clc/relational/isnan.h include/clc/relational/isnormal.h include/clc/relational/isnotequal.h include/clc/relational/isordered.h include/clc/relational/isunordered.h include/clc/relational/select.h include/clc/relational/select.inc include/clc/relational/signbit.h include/clc/relational/unary_decl.inc include/clc/shared/clamp.h include/clc/shared/clamp.inc include/clc/shared/max.h include/clc/shared/max.inc include/clc/shared/min.h include/clc/shared/min.inc include/clc/shared/vload.h include/clc/shared/vstore.h include/clc/synchronization/barrier.h include/clc/synchronization/cl_mem_fence_flags.h include/clc/workitem/get_global_id.h include/clc/workitem/get_global_offset.h include/clc/workitem/get_global_size.h include/clc/workitem/get_group_id.h include/clc/workitem/get_local_id.h include/clc/workitem/get_local_size.h include/clc/workitem/get_num_groups.h include/clc/workitem/get_work_dim.h libdata/pkgconfig/libclc.pc share/clc/amdgcn--amdhsa.bc share/clc/aruba-r600--.bc share/clc/barts-r600--.bc share/clc/bonaire-amdgcn--.bc share/clc/bonaire-amdgcn-mesa-mesa3d.bc share/clc/caicos-r600--.bc share/clc/carrizo-amdgcn--.bc share/clc/carrizo-amdgcn-mesa-mesa3d.bc share/clc/cayman-r600--.bc share/clc/cedar-r600--.bc share/clc/clspv--.bc +share/clc/clspv64--.bc share/clc/cypress-r600--.bc share/clc/fiji-amdgcn--.bc share/clc/fiji-amdgcn-mesa-mesa3d.bc share/clc/gfx900-amdgcn--.bc share/clc/gfx900-amdgcn-mesa-mesa3d.bc share/clc/gfx902-amdgcn--.bc share/clc/gfx902-amdgcn-mesa-mesa3d.bc share/clc/gfx904-amdgcn--.bc share/clc/gfx904-amdgcn-mesa-mesa3d.bc share/clc/gfx906-amdgcn--.bc share/clc/gfx906-amdgcn-mesa-mesa3d.bc share/clc/hainan-amdgcn--.bc share/clc/hainan-amdgcn-mesa-mesa3d.bc share/clc/hawaii-amdgcn--.bc share/clc/hawaii-amdgcn-mesa-mesa3d.bc share/clc/hemlock-r600--.bc share/clc/iceland-amdgcn--.bc share/clc/iceland-amdgcn-mesa-mesa3d.bc share/clc/juniper-r600--.bc share/clc/kabini-amdgcn--.bc share/clc/kabini-amdgcn-mesa-mesa3d.bc share/clc/kaveri-amdgcn--.bc share/clc/kaveri-amdgcn-mesa-mesa3d.bc share/clc/mullins-amdgcn--.bc share/clc/mullins-amdgcn-mesa-mesa3d.bc share/clc/nvptx--.bc share/clc/nvptx--nvidiacl.bc share/clc/nvptx64--.bc share/clc/nvptx64--nvidiacl.bc share/clc/oland-amdgcn--.bc share/clc/oland-amdgcn-mesa-mesa3d.bc share/clc/palm-r600--.bc share/clc/pitcairn-amdgcn--.bc share/clc/pitcairn-amdgcn-mesa-mesa3d.bc share/clc/polaris10-amdgcn--.bc share/clc/polaris10-amdgcn-mesa-mesa3d.bc share/clc/polaris11-amdgcn--.bc share/clc/polaris11-amdgcn-mesa-mesa3d.bc share/clc/redwood-r600--.bc share/clc/spirv-mesa3d-.spv share/clc/spirv64-mesa3d-.spv share/clc/stoney-amdgcn--.bc share/clc/stoney-amdgcn-mesa-mesa3d.bc share/clc/sumo-r600--.bc share/clc/sumo2-r600--.bc share/clc/tahiti-amdgcn--.bc share/clc/tahiti-amdgcn-mesa-mesa3d.bc share/clc/tonga-amdgcn--.bc share/clc/tonga-amdgcn-mesa-mesa3d.bc share/clc/turks-r600--.bc share/clc/verde-amdgcn--.bc share/clc/verde-amdgcn-mesa-mesa3d.bc diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile index eaab0ec8691b..8fad2587525f 100644 --- a/graphics/libosmesa/Makefile +++ b/graphics/libosmesa/Makefile @@ -1,45 +1,44 @@ PORTNAME= libosmesa PORTVERSION= ${MESAVERSION} CATEGORIES= graphics COMMENT= Off-Screen Mesa implementation of the OpenGL API WWW= https://www.mesa3d.org/ USES= xorg USE_XORG= xorgproto .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" # Disable some options MESON_ARGS+= -Ddri-drivers="" \ -Dgallium-drivers="swrast" \ -Dvulkan-drivers="" \ -Dplatforms="" \ -Dgallium-vdpau=disabled \ -Dgallium-omx=disabled \ -Dgallium-va=disabled \ -Dgallium-opencl=disabled \ -Dgallium-xa=disabled \ - -Dgallium-xvmc=disabled \ -Dgallium-nine=false \ -Dgles1=disabled \ -Dgles2=disabled \ -Dopengl=true \ -Dglx=disabled \ -Degl=disabled \ -Dgbm=disabled \ -Dtools="" \ -Dzstd=disabled LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dosmesa=true .include "${MASTERDIR}/Makefile.targets" post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/GL ${INSTALL_DATA} ${WRKSRC}/include/GL/osmesa.h \ ${STAGEDIR}${PREFIX}/include/GL .include diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index 0e6e0ae7a7f6..09fb7615be54 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -1,107 +1,103 @@ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ WWW= https://www.mesa3d.org/ OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_X11_DESC= Enable X11 support for GBM/EGL PLATFORM_WAYLAND_DESC= Enable Wayland support for GBM/EGL PLATFORM_WAYLAND_IMPLIES= WAYLAND OPTIONS_DEFINE= WAYLAND ZSTD OPTIONS_DEFAULT= WAYLAND PLATFORM_X11 PLATFORM_WAYLAND ZSTD OPTIONS_SUB= yes WAYLAND_DESC= Enable support for the Wayland platform in Vulkan drivers WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_IMPLIES= PLATFORM_WAYLAND ZSTD_DESC= Use ZSTD for shader cache ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MESON_ENABLED= zstd .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" ALL_GALLIUM_DRIVERS= CROCUS IRIS PANFROST R300 R600 RADEONSI SVGA SWRAST ZINK ALL_VULKAN_DRIVERS= INTEL AMD SWRAST GALLIUM_DRIVERS+= SWRAST \ ZINK VULKAN_DRIVERS+= SWRAST # lavapipe .if ${ARCH} == aarch64 GALLIUM_DRIVERS+= PANFROST .endif .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \ || ${ARCH:Mpowerpc*} || ${ARCH} == riscv64 GALLIUM_DRIVERS+= R300 R600 RADEONSI VULKAN_DRIVERS+= AMD BUILD_DEPENDS+= glslangValidator:graphics/glslang -. if ${PORT_OPTIONS:MPLATFORM_X11} -USE_XORG+= xv xvmc -MESON_ARGS+= -Dgallium-xvmc=enabled -. endif .endif .if ${ARCH} == amd64 || ${ARCH} == i386 GALLIUM_DRIVERS+= CROCUS IRIS SVGA VULKAN_DRIVERS+= INTEL .endif LDFLAGS_i386= -Wl,-znotext .if ${PORT_OPTIONS:MPLATFORM_X11} MESA_PLATFORMS+= x11 USE_XORG+= xorgproto x11 xdamage xext xfixes xshmfence xv .if defined(VULKAN_DRIVERS) USE_XORG+= xcb xrandr .endif .endif .if ${PORT_OPTIONS:MPLATFORM_WAYLAND} MESA_PLATFORMS+= wayland .endif MESON_ARGS+= -Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \ -Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}" \ -Dplatforms="${MESA_PLATFORMS:ts,:tl}" # Disable some options MESON_ARGS+= -Dgallium-xa=disabled \ -Dgallium-vdpau=disabled \ -Dgallium-va=disabled \ -Dgles1=disabled \ -Dgles2=disabled \ -Dglx=disabled \ -Dosmesa=false .for _gd in ${ALL_GALLIUM_DRIVERS} . if defined(GALLIUM_DRIVERS) && ${GALLIUM_DRIVERS:M${_gd}} PLIST_SUB+= ${_gd}_GDRIVER="" . else PLIST_SUB+= ${_gd}_GDRIVER="@comment " . endif .endfor PLIST_SUB += ARCH=${ARCH:S/amd/x86_/} .for _vd in ${ALL_VULKAN_DRIVERS} . if defined(VULKAN_DRIVERS) && ${VULKAN_DRIVERS:M${_vd}} PLIST_SUB+= ${_vd}_VDRIVER="" . else PLIST_SUB+= ${_vd}_VDRIVER="@comment " . endif .endfor .include "${MASTERDIR}/Makefile.targets" post-install: @${RM} -r ${STAGEDIR}/etc/OpenCL ${INSTALL_DATA} ${FILESDIR}/01-freebsd.conf \ ${STAGEDIR}${PREFIX}/share/drirc.d .include diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 15be0f6b8629..6f740b0dc964 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -1,99 +1,97 @@ # Makefile.common - shared code between MesaLib ports. # # !!! Here be dragons !!! (they seem to be everywhere these days) # # Remember to upgrade the following ports everytime you bump MESAVERSION: # # - graphics/libosmesa # - graphics/mesa-dri # - graphics/mesa-libs # - lang/clover MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 22.2.3 +MESABASEVERSION= 22.3.0 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= MASTER_SITES= https://mesa.freedesktop.org/archive/ \ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \ ftp://ftp.freedesktop.org/pub/mesa/ \ ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} MAINTAINER= x11@FreeBSD.org LICENSE= MIT LICENSE_FILE= ${WRKSRC}/docs/license.rst COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} LIB_DEPENDS+= libexpat.so:textproc/expat2 .if ${COMPONENT} != clover .if ${PORT_OPTIONS:MPLATFORM_X11} USES+= xorg .endif .endif .if ${COMPONENT} != osmesa LIB_DEPENDS+= libdrm.so:graphics/libdrm .endif .if ${COMPONENT} != libs LIB_DEPENDS+= libglapi.so:graphics/mesa-libs .endif .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${OPSYS} == DragonFly LIB_DEPENDS+= libelf.so:devel/libelf .endif USES+= compiler:c++11-lib bison meson pathfix pkgconfig \ python:3.6+,build shebangfix tar:xz USE_LDCONFIG= yes .if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # --build-id isn't supported by old GNU ld.bfd in base # Also ld.bfd have problems that seems related to --as-needed USE_BINUTILS= yes LDFLAGS+= -B${LOCALBASE}/bin .endif # only have one port to check with portscout. .if ${PORTNAME} != mesa-dri PORTSCOUT= ignore:1 .endif python_OLD_CMD= /usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space:]]python SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \ src/gallium/drivers/svga/svgadump/svga_dump.py \ src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \ src/mesa/main/get_*.py src/util/format_srgb.py \ src/amd/*/*.py src/intel/genxml/gen_pack_header.py MASTERDIR= ${.CURDIR:H:H}/graphics/mesa-dri PATCHDIR= ${MASTERDIR}/files WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist PKGHELP= ${.CURDIR}/pkg-help PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall .include BINARY_ALIAS+= python3=${PYTHON_VERSION} -LLVM_DEFAULT= 13 +LLVM_DEFAULT= 15 BUILD_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -.if ${COMPONENT} != libs RUN_DEPENDS+= llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -.endif 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/distinfo b/graphics/mesa-dri/distinfo index 14442e09ecf8..64177c59a02f 100644 --- a/graphics/mesa-dri/distinfo +++ b/graphics/mesa-dri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667925985 -SHA256 (mesa-22.2.3.tar.xz) = ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6 -SIZE (mesa-22.2.3.tar.xz) = 16464020 +TIMESTAMP = 1669895345 +SHA256 (mesa-22.3.0.tar.xz) = 644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746 +SIZE (mesa-22.3.0.tar.xz) = 16878600 diff --git a/graphics/mesa-dri/files/patch-meson.build b/graphics/mesa-dri/files/patch-meson.build deleted file mode 100644 index af9122cb85ff..000000000000 --- a/graphics/mesa-dri/files/patch-meson.build +++ /dev/null @@ -1,48 +0,0 @@ ---- meson.build.orig 2022-10-11 18:53:31 UTC -+++ meson.build -@@ -1436,7 +1436,6 @@ functions_to_detect = { - 'flock': '', - 'strtok_r': '', - 'getrandom': '', -- 'qsort_r': '', - 'qsort_s': '', - } - -@@ -1445,6 +1444,37 @@ endforeach - pre_args += '-DHAVE_@0@'.format(f.to_upper()) - endif - endforeach -+ -+if cpp.links(''' -+ #define _GNU_SOURCE -+ #include -+ -+ static int dcomp(const void *l, const void *r, void *t) { return 0; } -+ -+ int main(int ac, char **av) { -+ int arr[] = { 1 }; -+ void *t = NULL; -+ qsort_r((void*)&arr[0], 1, 1, dcomp, t); -+ return (0); -+ }''', -+ args : pre_args, -+ name : 'GNU qsort_r') -+ pre_args += '-DHAVE_GNU_QSORT_R' -+elif cpp.links(''' -+ #include -+ -+ static int dcomp(void *t, const void *l, const void *r) { return 0; } -+ -+ int main(int ac, char **av) { -+ int arr[] = { 1 }; -+ void *t = NULL; -+ qsort_r((void*)&arr[0], 1, 1, t, dcomp); -+ return (0); -+ }''', -+ args : pre_args, -+ name : 'BSD qsort_r') -+ pre_args += '-DHAVE_BSD_QSORT_R' -+endif - - if cc.has_header_symbol('time.h', 'struct timespec') - pre_args += '-DHAVE_STRUCT_TIMESPEC' diff --git a/graphics/mesa-dri/files/patch-src_util_u__memory.h b/graphics/mesa-dri/files/patch-src_util_u__memory.h new file mode 100644 index 000000000000..41d696f9d69b --- /dev/null +++ b/graphics/mesa-dri/files/patch-src_util_u__memory.h @@ -0,0 +1,13 @@ +--- src/util/u_memory.h.orig 2022-12-01 11:58:25 UTC ++++ src/util/u_memory.h +@@ -91,8 +91,8 @@ mem_dup(const void *src, size_t size) + + + /* Allocate a structure aligned to a cache line. (used to make atomic ops faster) */ +-#define MALLOC_STRUCT_CL(T) (struct T *)align_malloc(sizeof(struct T), CACHE_LINE_SIZE) +-#define CALLOC_STRUCT_CL(T) (struct T *)align_calloc(sizeof(struct T), CACHE_LINE_SIZE) ++#define MALLOC_STRUCT_CL(T) (struct T *)align_malloc(sizeof(struct T), MESA_CACHE_LINE_SIZE) ++#define CALLOC_STRUCT_CL(T) (struct T *)align_calloc(sizeof(struct T), MESA_CACHE_LINE_SIZE) + #define FREE_CL(ptr) align_free(ptr) + + #ifdef __cplusplus diff --git a/graphics/mesa-dri/files/patch-src_util_u__qsort.h b/graphics/mesa-dri/files/patch-src_util_u__qsort.h deleted file mode 100644 index f199fecd7b56..000000000000 --- a/graphics/mesa-dri/files/patch-src_util_u__qsort.h +++ /dev/null @@ -1,26 +0,0 @@ ---- src/util/u_qsort.h.orig 2022-03-18 19:26:47 UTC -+++ src/util/u_qsort.h -@@ -56,8 +56,10 @@ util_qsort_r(void *base, size_t nmemb, size_t size, - int (*compar)(const void *, const void *, void *), - void *arg) - { --#if HAVE_QSORT_R --# if DETECT_OS_APPLE || DETECT_OS_BSD -+#if HAVE_GNU_QSORT_R -+ /* GNU extension added in glibc 2.8 */ -+ qsort_r(base, nmemb, size, compar, arg); -+#elif HAVE_BSD_QSORT_R - /* BSD/macOS qsort_r takes "arg" before the comparison function and it - * pass the "arg" before the elements. - */ -@@ -66,10 +68,6 @@ util_qsort_r(void *base, size_t nmemb, size_t size, - arg - }; - qsort_r(base, nmemb, size, &data, util_qsort_adapter); --# else -- /* GNU extension added in glibc 2.8 */ -- qsort_r(base, nmemb, size, compar, arg); --# endif - #elif HAVE_QSORT_S - # ifdef _WIN32 - /* MSVC/MinGW qsort_s takes "arg" after the comparison function and it diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist index e94ec81ae316..69f6a5905f24 100644 --- a/graphics/mesa-dri/pkg-plist +++ b/graphics/mesa-dri/pkg-plist @@ -1,47 +1,44 @@ @comment include/EGL/egl.h +@comment include/EGL/eglext_angle.h @comment include/EGL/eglext.h @comment include/EGL/eglextchromium.h @comment include/EGL/eglmesaext.h @comment include/EGL/eglplatform.h include/GL/internal/dri_interface.h @comment include/GL/gl.h @comment include/GL/glcorearb.h @comment include/GL/glext.h @comment include/KHR/khrplatform.h @comment include/gbm.h %%CROCUS_GDRIVER%%lib/dri/crocus_dri.so %%IRIS_GDRIVER%%lib/dri/iris_dri.so %%PANFROST_GDRIVER%%lib/dri/panfrost_dri.so %%PANFROST_GDRIVER%%lib/dri/rockchip_dri.so %%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so %%R300_GDRIVER%%lib/dri/r300_dri.so %%R600_GDRIVER%%lib/dri/r600_dri.so %%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so %%SWRAST_GDRIVER%%lib/dri/swrast_dri.so %%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so %%ZINK_GDRIVER%%lib/dri/zink_dri.so -%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so -%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1 -%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1.0 -%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1.0.0 @comment lib/libEGL.so @comment lib/libEGL.so.1 @comment lib/libEGL.so.1.0.0 @comment lib/libgbm.so @comment lib/libgbm.so.1 @comment lib/libgbm.so.1.0.0 @comment lib/libglapi.so @comment lib/libglapi.so.0 @comment lib/libglapi.so.0.0.0 %%INTEL_VDRIVER%%lib/libvulkan_intel.so %%AMD_VDRIVER%%lib/libvulkan_radeon.so %%SWRAST_VDRIVER%%lib/libvulkan_lvp.so libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/egl.pc @comment libdata/pkgconfig/gbm.pc share/drirc.d/00-mesa-defaults.conf %%AMD_VDRIVER%%share/drirc.d/00-radv-defaults.conf share/drirc.d/01-freebsd.conf %%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json %%AMD_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json %%SWRAST_VDRIVER%%share/vulkan/icd.d/lvp_icd.%%ARCH%%.json diff --git a/graphics/mesa-gallium-va/Makefile b/graphics/mesa-gallium-va/Makefile index 7f2fb46e4916..9d32e46c2b55 100644 --- a/graphics/mesa-gallium-va/Makefile +++ b/graphics/mesa-gallium-va/Makefile @@ -1,54 +1,53 @@ PORTNAME= mesa-gallium-va PORTVERSION= ${MESAVERSION} CATEGORIES= graphics COMMENT= Mesa Gallium VAAPI drivers WWW= https://www.mesa3d.org/ LIB_DEPENDS= libva.so:multimedia/libva \ libzstd.so:archivers/zstd OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 X11_DESC= Enable X11 support X11_USES= xorg X11_USE= xorg=xorgproto,x11,xcb,xdamage,xext,xfixes,xshmfence,xxf86vm,xrandr .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" ONLY_FOR_ARCHS= i386 amd64 aarch64 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware MESON_ARGS+= -Ddri-drivers="" \ -Dvideo-codecs="vc1dec,h264dec,h264enc,h265dec,h265enc" \ -Dgallium-drivers="radeonsi,r600" \ -Dvulkan-drivers="" \ -Dgallium-vdpau=disabled \ -Dgallium-omx=disabled \ -Dgallium-xa=disabled \ -Dgallium-opencl=disabled \ - -Dgallium-xvmc=disabled \ -Dgallium-nine=false \ -Dgbm=disabled \ -Dgles1=disabled \ -Dgles2=disabled \ -Dosmesa=false \ -Dglx=disabled \ -Ddri3=disabled LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dgallium-va=enabled .if ${PORT_OPTIONS:MX11} MESON_ARGS+= -Dplatforms="x11" .else MESON_ARGS+= -Dglx=disabled \ -Degl=disabled \ -Dopengl=false \ -Dshared-glapi=disabled .endif .include "${MASTERDIR}/Makefile.targets" .include diff --git a/graphics/mesa-gallium-va/pkg-plist b/graphics/mesa-gallium-va/pkg-plist index 34763f0f943f..d0b0687974a8 100644 --- a/graphics/mesa-gallium-va/pkg-plist +++ b/graphics/mesa-gallium-va/pkg-plist @@ -1,23 +1,24 @@ @comment include/EGL/egl.h @comment include/EGL/eglext.h +@comment include/EGL/eglext_angle.h @comment include/EGL/eglextchromium.h @comment include/EGL/eglmesaext.h @comment include/EGL/eglplatform.h @comment include/GL/gl.h @comment include/GL/glcorearb.h @comment include/GL/glext.h @comment include/GL/internal/dri_interface.h @comment include/KHR/khrplatform.h @comment lib/dri/r600_dri.so lib/dri/r600_drv_video.so @comment lib/dri/radeonsi_dri.so lib/dri/radeonsi_drv_video.so @comment lib/libEGL.so @comment lib/libEGL.so.1 @comment lib/libEGL.so.1.0.0 @comment lib/libglapi.so @comment lib/libglapi.so.0 @comment lib/libglapi.so.0.0.0 @comment libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/egl.pc @comment share/drirc.d/00-mesa-defaults.conf diff --git a/graphics/mesa-gallium-vdpau/Makefile b/graphics/mesa-gallium-vdpau/Makefile index 19916a796b03..2a1c8a0a2688 100644 --- a/graphics/mesa-gallium-vdpau/Makefile +++ b/graphics/mesa-gallium-vdpau/Makefile @@ -1,54 +1,53 @@ PORTNAME= mesa-gallium-vdpau PORTVERSION= ${MESAVERSION} CATEGORIES= graphics COMMENT= Mesa Gallium VDPAU drivers WWW= https://www.mesa3d.org/ LIB_DEPENDS= libva.so:multimedia/libva \ libvdpau.so:multimedia/libvdpau \ libzstd.so:archivers/zstd OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 X11_DESC= Enable X11 support X11_USES= xorg X11_USE= xorg=xorgproto,x11,xcb,xdamage,xext,xfixes,xshmfence,xxf86vm,xrandr .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" ONLY_FOR_ARCHS= i386 amd64 aarch64 powerpc64 powerpc64le ONLY_FOR_ARCHS_REASON= used only by AMD/Radeon hardware MESON_ARGS+= -Ddri-drivers="" \ -Dgallium-drivers="r300,r600,radeonsi" \ -Dvulkan-drivers="" \ -Dgallium-va=disabled \ -Dgallium-omx=disabled \ -Dgallium-xa=disabled \ -Dgallium-opencl=disabled \ - -Dgallium-xvmc=disabled \ -Dgallium-nine=false \ -Dgbm=disabled \ -Dgles1=disabled \ -Dgles2=disabled \ -Dosmesa=false \ -Dglx=disabled \ -Ddri3=disabled LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dgallium-vdpau=enabled .if ${PORT_OPTIONS:MX11} MESON_ARGS+= -Dplatforms="x11" .else MESON_ARGS+= -Dglx=disabled \ -Degl=disabled \ -Dopengl=false \ -Dshared-glapi=disabled .endif .include "${MASTERDIR}/Makefile.targets" .include diff --git a/graphics/mesa-gallium-vdpau/pkg-plist b/graphics/mesa-gallium-vdpau/pkg-plist index 7b0d81e78957..4eeb6f6ae445 100644 --- a/graphics/mesa-gallium-vdpau/pkg-plist +++ b/graphics/mesa-gallium-vdpau/pkg-plist @@ -1,36 +1,37 @@ @comment include/EGL/egl.h @comment include/EGL/eglext.h +@comment include/EGL/eglext_angle.h @comment include/EGL/eglextchromium.h @comment include/EGL/eglmesaext.h @comment include/EGL/eglplatform.h @comment include/GL/gl.h @comment include/GL/glcorearb.h @comment include/GL/glext.h @comment include/GL/internal/dri_interface.h @comment include/KHR/khrplatform.h @comment lib/dri/r300_dri.so @comment lib/dri/r600_dri.so @comment lib/dri/r600_drv_video.so @comment lib/dri/radeonsi_dri.so @comment lib/dri/radeonsi_drv_video.so @comment lib/libEGL.so @comment lib/libEGL.so.1 @comment lib/libEGL.so.1.0.0 @comment lib/libglapi.so @comment lib/libglapi.so.0 @comment lib/libglapi.so.0.0.0 lib/vdpau/libvdpau_r300.so lib/vdpau/libvdpau_r300.so.1 lib/vdpau/libvdpau_r300.so.1.0 lib/vdpau/libvdpau_r300.so.1.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 @comment libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/egl.pc @comment share/drirc.d/00-mesa-defaults.conf diff --git a/graphics/mesa-gallium-xa/Makefile b/graphics/mesa-gallium-xa/Makefile index 943bb82efe7b..0b87ebe49f1a 100644 --- a/graphics/mesa-gallium-xa/Makefile +++ b/graphics/mesa-gallium-xa/Makefile @@ -1,41 +1,40 @@ PORTNAME= mesa-gallium-xa PORTVERSION= ${MESAVERSION} CATEGORIES= graphics COMMENT= Mesa Gallium XA state tracker WWW= https://www.mesa3d.org/ USES= xorg USE_XORG= xorgproto .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= used only by VMware supported architectures MESON_ARGS+= -Ddri-drivers="" \ -Dgallium-drivers="svga" \ -Dvulkan-drivers="" \ -Dplatforms="" \ -Dgallium-vdpau=disabled \ -Dgallium-omx=disabled \ -Dgallium-va=disabled \ -Dgallium-opencl=disabled \ - -Dgallium-xvmc=disabled \ -Dgallium-nine=false \ -Degl=disabled \ -Dgbm=disabled \ -Dgles1=disabled \ -Dgles2=disabled \ -Dglx=disabled \ -Dopengl=false \ -Dshared-glapi=disabled \ -Dosmesa=false LDFLAGS_i386= -Wl,-znotext MESON_ARGS+= -Dgallium-xa=enabled .include "${MASTERDIR}/Makefile.targets" .include diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile index d6d3ae324a2d..e009b3a6b86f 100644 --- a/graphics/mesa-libs/Makefile +++ b/graphics/mesa-libs/Makefile @@ -1,75 +1,74 @@ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients WWW= https://www.mesa3d.org/ LIB_DEPENDS= libOpenGL.so:graphics/libglvnd OPTIONS_GROUP= PLATFORM OPTIONS_GROUP_PLATFORM= PLATFORM_X11 PLATFORM_WAYLAND PLATFORM_X11_DESC= Enable X11 support for GBM/EGL PLATFORM_WAYLAND_DESC= Enable Wayland support for GBM/EGL PLATFORM_WAYLAND_IMPLIES= WAYLAND OPTIONS_DEFINE= WAYLAND ZSTD OPTIONS_DEFAULT=WAYLAND PLATFORM_X11 PLATFORM_WAYLAND ZSTD OPTIONS_SUB= yes WAYLAND_DESC= Enable support for the Wayland platform in EGL WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland WAYLAND_IMPLIES= PLATFORM_WAYLAND ZSTD_DESC= Use ZSTD for shader cache ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd ZSTD_MESON_ENABLED= zstd .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" MESON_ARGS+= -Dgallium-vdpau=disabled \ - -Dgallium-xvmc=disabled \ -Dgallium-omx=disabled \ -Dgallium-va=disabled \ -Dgallium-xa=disabled \ -Dgallium-nine=false \ -Dosmesa=false \ -Dtools="" \ -Degl=enabled \ -Dgbm=enabled \ -Dvulkan-drivers="" \ -Dglvnd=true # Building EGL and GBM requires a driver so add r300 MESON_ARGS+= -Dgallium-drivers="r300" .if ${PORT_OPTIONS:MPLATFORM_X11} MESA_PLATFORMS+= x11 USE_XORG+= xorgproto x11 xcb xdamage xext \ xfixes xshmfence xxf86vm xrandr PLIST_SUB+= GLX="" .else MESON_ARGS+= -Dglx=disabled PLIST_SUB+= GLX="@comment " .endif .if ${PORT_OPTIONS:MPLATFORM_WAYLAND} && ${PORT_OPTIONS:MWAYLAND} MESA_PLATFORMS+= wayland .endif MESON_ARGS+= -Dplatforms="${MESA_PLATFORMS:ts,:tl}" .if ${ARCH} == "i386" # PR230239 Fix the build for i386 when WITH_LLD_IS_LD is set LDFLAGS+=-Wl,-z,notext .endif .include "${MASTERDIR}/Makefile.targets" post-install: # Fallback if GLX_EXT_libglvnd is missing or vendor library doesn't exist @${ECHO_CMD} "libGLX_indirect.so.0 libGLX_mesa.so.0" \ >${STAGEDIR}${PREFIX}/etc/libmap.d/mesa.conf .include diff --git a/graphics/mesa-libs/pkg-plist b/graphics/mesa-libs/pkg-plist index 9389d77d5c8d..9d92766c8f37 100644 --- a/graphics/mesa-libs/pkg-plist +++ b/graphics/mesa-libs/pkg-plist @@ -1,23 +1,23 @@ etc/libmap.d/mesa.conf -include/EGL/eglextchromium.h +include/EGL/eglext_angle.h include/EGL/eglmesaext.h @comment include/GL/internal/dri_interface.h include/gbm.h @comment lib/dri/radeon_dri.so @comment lib/dri/r300_dri.so lib/libEGL_mesa.so lib/libEGL_mesa.so.0 lib/libEGL_mesa.so.0.0.0 %%GLX%%lib/libGLX_mesa.so %%GLX%%lib/libGLX_mesa.so.0 %%GLX%%lib/libGLX_mesa.so.0.0.0 lib/libgbm.so lib/libgbm.so.1 lib/libgbm.so.1.0.0 lib/libglapi.so lib/libglapi.so.0 lib/libglapi.so.0.0.0 @comment libdata/pkgconfig/dri.pc libdata/pkgconfig/gbm.pc @comment share/drirc.d/00-mesa-defaults.conf share/glvnd/egl_vendor.d/50_mesa.json diff --git a/lang/clover/Makefile b/lang/clover/Makefile index fda409aac5ae..eeea567161f8 100644 --- a/lang/clover/Makefile +++ b/lang/clover/Makefile @@ -1,52 +1,51 @@ PORTNAME= clover PORTVERSION= ${MESAVERSION} CATEGORIES= lang COMMENT= Mesa OpenCL implementation for AMD GPUs 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 \ libzstd.so:archivers/zstd RUN_DEPENDS= libclc>=0.3.0:devel/libclc \ opencl>=0:devel/opencl ONLY_FOR_ARCHS= i386 amd64 powerpc64le powerpc64 ONLY_FOR_ARCHS_REASON= needs a GPU supported by the Radeon KMS driver .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" MESON_ARGS+= -Ddri-drivers="" \ -Dplatforms="" \ -Dvulkan-drivers="" \ -Dgallium-nine=false \ -Dgallium-omx=disabled \ -Dgallium-opencl=disabled \ -Dgallium-va=disabled \ -Dgallium-vdpau=disabled \ -Dgallium-xa=disabled \ - -Dgallium-xvmc=disabled \ -Dgles1=disabled \ -Dgles2=disabled \ -Dopengl=false \ -Dglx=disabled \ -Degl=disabled \ -Dgbm=disabled \ -Dtools="" \ -Dgallium-opencl=icd \ -Dgallium-drivers=r600,radeonsi LDFLAGS_i386= -Wl,-znotext .include "${MASTERDIR}/Makefile.targets" pre-patch: @if [ -e ${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} ] && \ ! [ -e ${LOCALBASE}/bin/clang${LLVM_DEFAULT} ]; then \ ${ECHO_MSG} "Your llvm${LLVM_DEFAULT} is not built with clang support, which is required."; \ ${FALSE}; \ fi .include