Date: Mon, 1 Jun 2020 23:25:43 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537515 - in head/graphics/mesa-devel: . files Message-ID: <202006012325.051NPhBe059566@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Jun 1 23:25:43 2020 New Revision: 537515 URL: https://svnweb.freebsd.org/changeset/ports/537515 Log: graphics/mesa-devel: allow users to disable drivers - DragonFly cannot use anv without futex (Linux, OpenBSD) or _umtx_op (FreeBSD) - DragonFly doesn't install libelf from ELF Tool Chain - powerpc64 cannot use LIBUNWIND as it yet to be ported - powerpc64 on FreeBSD < 13 cannot use -fuse-ld=lld - anv, i965, iris only support Intel GPUs on x86 - anv, i965, iris work fine without LLVM support PR: 246913 Modified: head/graphics/mesa-devel/Makefile (contents, props changed) head/graphics/mesa-devel/files/libmap.conf.in (contents, props changed) head/graphics/mesa-devel/pkg-plist (contents, props changed) Modified: head/graphics/mesa-devel/Makefile ============================================================================== --- head/graphics/mesa-devel/Makefile Mon Jun 1 23:25:34 2020 (r537514) +++ head/graphics/mesa-devel/Makefile Mon Jun 1 23:25:43 2020 (r537515) @@ -30,57 +30,92 @@ COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) LICENSE= MIT -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 ONLY_FOR_ARCHS_REASON= Limited scope: no old drivers and no software rendering. \ See also https://mesamatrix.net/ -BROKEN_DragonFly= requires making Vulkan support conditional -BUILD_DEPENDS= glslangValidator:devel/glslang \ - ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} -LIB_DEPENDS= libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/:S/-devel/11/}.so:devel/llvm${LLVM_DEFAULT} \ - libdrm.so:graphics/libdrm \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} +LIB_DEPENDS= libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 +.if !exists(/usr/lib/libelf.so) +# DragonFly doesn't install it yet +LIB_DEPENDS+= libelf.so:devel/libelf +.endif USES= bison compiler:c++11-lib meson pkgconfig python:3.6+,build shebangfix USE_GITHUB= yes GH_ACCOUNT= mesa3d USE_LDCONFIG= yes -BINARY_ALIAS= llvm-config=llvm-config${LLVM_DEFAULT} python=${PYTHON_CMD} +BINARY_ALIAS= python=${PYTHON_CMD} SHEBANG_FILES= src/vulkan/overlay-layer/${PORTNAME}-overlay-control.py PLATFORMS= ${PORT_OPTIONS:MX11:tl} ${PORT_OPTIONS:MWAYLAND:tl} drm surfaceless -MESON_ARGS= -Ddri-drivers=i965 \ - -Dgallium-drivers=iris,r600,radeonsi \ - -Dgallium-omx=disabled \ +MESON_ARGS= -Dgallium-omx=disabled \ -Dgallium-opencl=disabled \ -Dgallium-xa=false \ -Dgallium-xvmc=false \ -Dplatforms=${PLATFORMS:ts,} \ - -Dvulkan-device-select-layer=true \ - -Dvulkan-overlay-layer=true \ ${PKGNAMESUFFIX:S/^/-Degl-lib-suffix=/} \ ${NULL} SUB_FILES= libmap.conf SUB_LIST= PKGNAMESUFFIX=${PKGNAMESUFFIX} PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} PKGNAMESUFFIX=${PKGNAMESUFFIX} -.if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld +.if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld # --build-id isn't supported by old GNU ld.bfd in base LDFLAGS+= -fuse-ld=lld .endif -OPTIONS_DEFINE= LIBUNWIND VAAPI VDPAU WAYLAND X11 ZSTD -OPTIONS_DEFAULT= LIBUNWIND VAAPI VDPAU WAYLAND X11 ZSTD +OPTIONS_DEFINE= ${OPTIONS_MULTI} LIBUNWIND LLVM VAAPI VDPAU WAYLAND X11 ZSTD +OPTIONS_DEFAULT= ${OPTIONS_MULTI} LIBUNWIND LLVM VAAPI VDPAU WAYLAND X11 ZSTD +OPTIONS_MULTI= DRI GALLIUM VULKAN +OPTIONS_MULTI_DRI= i965 +OPTIONS_MULTI_GALLIUM= iris r600 radeonsi +OPTIONS_MULTI_VULKAN= anv radv +OPTIONS_EXCLUDE_DragonFly= LIBUNWIND anv +OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:C/.+/anv i965 iris/} +OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:C/.+/LIBUNWIND/} OPTIONS_SUB= yes +# Convert options to -D<type>-drivers=<driver1,driver2,etc> +.for i in ${OPTIONS_MULTI} +MESON_ARGS+= -D${i:tl}-drivers=${${i}_DRIVERS:ts,} +. for j in ${OPTIONS_MULTI_${i}} +OPTIONS_DEFAULT+= ${j} +${j}_VARS+= ${i}_DRIVERS+=${j:S/anv/intel/:S/radv/amd/} +. endfor +.endfor + +DRI_DESC= Classic OpenGL drivers +i965_DESC= GMA 3000 (Gen4) and newer + +GALLIUM_DESC= Unified OpenGL drivers +iris_DESC= Broadwell and newer +r600_DESC= R600, R700, Evergreen, Northern Islands +radeonsi_DESC= Southern Islands and newer + LIBUNWIND_DESC= Use libunwind for stacktraces LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind LIBUNWIND_MESON_TRUE= libunwind +LLVM_DESC= Build with LLVM support +LLVM_LIB_DEPENDS= libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/:S/-devel/11/}.so:devel/llvm${LLVM_DEFAULT} +LLVM_MESON_TRUE= llvm +LLVM_BINARY_ALIAS= llvm-config=llvm-config${LLVM_DEFAULT} +.for i in r600 radeonsi radv +${i}_IMPLIES+= LLVM +.endfor + VAAPI_BUILD_DEPENDS= libva>0:multimedia/libva VAAPI_MESON_TRUE= gallium-va VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau VDPAU_MESON_TRUE= gallium-vdpau + +VULKAN_DESC= Vulkan drivers and layers +VULKAN_BUILD_DEPENDS= glslangValidator:devel/glslang +VULKAN_MESON_TRUE= vulkan-device-select-layer vulkan-overlay-layer +anv_DESC= Haswell and newer +radv_DESC= Southern Islands and newer WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-server.so:graphics/wayland Modified: head/graphics/mesa-devel/files/libmap.conf.in ============================================================================== --- head/graphics/mesa-devel/files/libmap.conf.in Mon Jun 1 23:25:34 2020 (r537514) +++ head/graphics/mesa-devel/files/libmap.conf.in Mon Jun 1 23:25:43 2020 (r537515) @@ -15,12 +15,11 @@ libGLX_indirect.so.0 libGLX_mesa%%PKGNAMESUFFIX%%.so.0 # GBM clients like eglkms and wlroots fail otherwise libgbm.so.1 libgbm%%PKGNAMESUFFIX%%.so.1 -# Avoid different versions of the same driver showing up as multiple GPUs -%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%PKGNAMESUFFIX%%.so -%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%PKGNAMESUFFIX%%.so +%%VULKAN%%# Avoid different versions of the same driver showing up as multiple GPUs +%%anv%%%%PREFIX%%/lib/libvulkan_intel.so libvulkan_intel%%PKGNAMESUFFIX%%.so +%%radv%%%%PREFIX%%/lib/libvulkan_radeon.so libvulkan_radeon%%PKGNAMESUFFIX%%.so -# VAAPI/VDPAU -%%PREFIX%%/lib/dri/r600_drv_video.so %%PREFIX%%/lib/dri%%PKGNAMESUFFIX%%/r600_drv_video.so -%%PREFIX%%/lib/dri/radeonsi_drv_video.so %%PREFIX%%/lib/dri%%PKGNAMESUFFIX%%/radeonsi_drv_video.so -%%PREFIX%%/lib/vdpau/libvdpau_r600.so.1 %%PREFIX%%/lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1 -%%PREFIX%%/lib/vdpau/libvdpau_radeonsi.so.1 %%PREFIX%%/lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1 +%%VAAPI%%%%r600%%%%PREFIX%%/lib/dri/r600_drv_video.so %%PREFIX%%/lib/dri%%PKGNAMESUFFIX%%/r600_drv_video.so +%%VAAPI%%%%radeonsi%%%%PREFIX%%/lib/dri/radeonsi_drv_video.so %%PREFIX%%/lib/dri%%PKGNAMESUFFIX%%/radeonsi_drv_video.so +%%VDPAU%%%%r600%%%%PREFIX%%/lib/vdpau/libvdpau_r600.so.1 %%PREFIX%%/lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1 +%%VDPAU%%%%radeonsi%%%%PREFIX%%/lib/vdpau/libvdpau_radeonsi.so.1 %%PREFIX%%/lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1 Modified: head/graphics/mesa-devel/pkg-plist ============================================================================== --- head/graphics/mesa-devel/pkg-plist Mon Jun 1 23:25:34 2020 (r537514) +++ head/graphics/mesa-devel/pkg-plist Mon Jun 1 23:25:43 2020 (r537515) @@ -1,4 +1,4 @@ -bin/mesa-overlay-control.py +%%VULKAN%%bin/mesa-overlay-control.py @sample etc/libmap.d/mesa%%PKGNAMESUFFIX%%.conf.sample @comment include/EGL/egl.h @comment include/EGL/eglext.h @@ -25,13 +25,13 @@ bin/mesa-overlay-control.py @comment include/GLES3/gl3platform.h @comment include/KHR/khrplatform.h @comment include/gbm.h -@comment include/vulkan/vulkan_intel.h -lib/dri%%PKGNAMESUFFIX%%/i965_dri.so -lib/dri%%PKGNAMESUFFIX%%/iris_dri.so -lib/dri%%PKGNAMESUFFIX%%/r600_dri.so -lib/dri%%PKGNAMESUFFIX%%/radeonsi_dri.so -%%VAAPI%%lib/dri%%PKGNAMESUFFIX%%/r600_drv_video.so -%%VAAPI%%lib/dri%%PKGNAMESUFFIX%%/radeonsi_drv_video.so +%%anv%%@comment include/vulkan/vulkan_intel.h +%%i965%%lib/dri%%PKGNAMESUFFIX%%/i965_dri.so +%%iris%%lib/dri%%PKGNAMESUFFIX%%/iris_dri.so +%%r600%%lib/dri%%PKGNAMESUFFIX%%/r600_dri.so +%%radeonsi%%lib/dri%%PKGNAMESUFFIX%%/radeonsi_dri.so +%%VAAPI%%%%r600%%lib/dri%%PKGNAMESUFFIX%%/r600_drv_video.so +%%VAAPI%%%%radeonsi%%lib/dri%%PKGNAMESUFFIX%%/radeonsi_drv_video.so @comment lib/libEGL%%PKGNAMESUFFIX%%.so lib/libEGL%%PKGNAMESUFFIX%%.so.1 lib/libEGL%%PKGNAMESUFFIX%%.so.1.0.0 @@ -44,24 +44,24 @@ lib/libGLESv1_CM%%PKGNAMESUFFIX%%.so.1.1.0 @comment lib/libGLESv2%%PKGNAMESUFFIX%%.so lib/libGLESv2%%PKGNAMESUFFIX%%.so.2 lib/libGLESv2%%PKGNAMESUFFIX%%.so.2.0.0 -lib/libVkLayer_MESA_device_select.so -lib/libVkLayer_MESA_overlay.so +%%VULKAN%%lib/libVkLayer_MESA_device_select.so +%%VULKAN%%lib/libVkLayer_MESA_overlay.so @comment lib/libgbm%%PKGNAMESUFFIX%%.so lib/libgbm%%PKGNAMESUFFIX%%.so.1 lib/libgbm%%PKGNAMESUFFIX%%.so.1.0.0 @comment lib/libglapi%%PKGNAMESUFFIX%%.so lib/libglapi%%PKGNAMESUFFIX%%.so.0 lib/libglapi%%PKGNAMESUFFIX%%.so.0.0.0 -lib/libvulkan_intel%%PKGNAMESUFFIX%%.so -lib/libvulkan_radeon%%PKGNAMESUFFIX%%.so -%%VDPAU%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so -%%VDPAU%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1 -%%VDPAU%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1.0 -%%VDPAU%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1.0.0 -%%VDPAU%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so -%%VDPAU%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1 -%%VDPAU%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1.0 -%%VDPAU%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1.0.0 +%%anv%%lib/libvulkan_intel%%PKGNAMESUFFIX%%.so +%%radv%%lib/libvulkan_radeon%%PKGNAMESUFFIX%%.so +%%VDPAU%%%%r600%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so +%%VDPAU%%%%r600%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1 +%%VDPAU%%%%r600%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1.0 +%%VDPAU%%%%r600%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_r600.so.1.0.0 +%%VDPAU%%%%radeonsi%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so +%%VDPAU%%%%radeonsi%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1 +%%VDPAU%%%%radeonsi%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1.0 +%%VDPAU%%%%radeonsi%%lib/vdpau%%PKGNAMESUFFIX%%/libvdpau_radeonsi.so.1.0.0 @comment libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/egl.pc @comment libdata/pkgconfig/gbm.pc @@ -69,7 +69,7 @@ lib/libvulkan_radeon%%PKGNAMESUFFIX%%.so @comment libdata/pkgconfig/glesv1_cm.pc @comment libdata/pkgconfig/glesv2.pc share/drirc.d/00-mesa%%PKGNAMESUFFIX%%-defaults.conf -share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json -@comment share/vulkan/icd.d/intel_icd.%%ARCH%%.json -@comment share/vulkan/icd.d/radeon_icd.%%ARCH%%.json -share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json +%%VULKAN%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json +%%anv%%@comment share/vulkan/icd.d/intel_icd.%%ARCH%%.json +%%radv%%@comment share/vulkan/icd.d/radeon_icd.%%ARCH%%.json +%%VULKAN%%share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006012325.051NPhBe059566>