Index: head/graphics/mesa-dri/Makefile =================================================================== --- head/graphics/mesa-dri/Makefile (revision 538045) +++ head/graphics/mesa-dri/Makefile (revision 538046) @@ -1,119 +1,114 @@ # Created by: Eric Anholt # $FreeBSD$ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ USES= xorg USE_XORG= xorgproto x11 xdamage xext xfixes xshmfence xv xvmc OPTIONS_DEFINE= VAAPI VDPAU WAYLAND OPTIONS_DEFAULT=WAYLAND OPTIONS_SUB= yes VAAPI_MESON_ON= -Dgallium-va=true VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_USE= XORG=xcb VDPAU_MESON_ON= -Dgallium-vdpau=true VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau 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 .include .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common" ALL_DRI_DRIVERS= I915 I965 R100 R200 SWRAST -ALL_GALLIUM_DRIVERS= FREEDRENO R300 R600 RADEONSI SVGA SWRAST VC4 +ALL_GALLIUM_DRIVERS= R300 R600 RADEONSI SVGA SWRAST ALL_VULKAN_DRIVERS= INTEL AMD .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} GALLIUM_DRIVERS= SWRAST # llvmpipe .else GALLIUM_DRIVERS= "" .endif VULKAN_DRIVERS= # .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 \ || ${ARCH} == powerpc || ${ARCH} == powerpc64 DRI_DRIVERS+= R100 R200 GALLIUM_DRIVERS+= R300 R600 RADEONSI VULKAN_DRIVERS+= AMD MESON_ARGS+= -Dgallium-xvmc=true .endif .if ${ARCH} == amd64 || ${ARCH} == i386 DRI_DRIVERS+= I915 I965 GALLIUM_DRIVERS+= SVGA . if ${OPSYS} == FreeBSD EXTRA_PATCHES+= ${PATCHDIR}/extra-src_mesa_drivers_dri_i965_intel__screen.c . endif VULKAN_DRIVERS+= INTEL -.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 -GALLIUM_DRIVERS+= FREEDRENO VC4 -. if ${ARCH} == armv6 || ${ARCH} == armv7 -EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in -. endif .endif .if ${VULKAN_DRIVERS} BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} USE_XORG+= xcb xrandr .endif LDFLAGS_i386= -Wl,-znotext # enables VK_KHR_wayland_surface in Vulkan drivers .if ${PORT_OPTIONS:MWAYLAND} && !empty(VULKAN_DRIVERS) MESON_ARGS+= -Dplatforms=x11,surfaceless,drm,wayland .endif MESON_ARGS+= -Ddri-drivers="${DRI_DRIVERS:ts,:tl}" \ -Dgallium-drivers="${GALLIUM_DRIVERS:ts,:tl}" \ -Dvulkan-drivers="${VULKAN_DRIVERS:ts,:tl}" # Disable some options MESON_ARGS+= -Dgallium-xa=false \ -Dgles1=false \ -Dgles2=false \ -Dglx=disabled \ -Degl=false \ -Dosmesa=none \ -Dtools="" .for _d in ${ALL_DRI_DRIVERS} . if ${DRI_DRIVERS:M${_d}} PLIST_SUB+= ${_d}_DRIVER="" . else PLIST_SUB+= ${_d}_DRIVER="@comment " . endif .endfor .for _gd in ${ALL_GALLIUM_DRIVERS} . if ${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 ${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 .include Index: head/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in =================================================================== --- head/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in (revision 538045) +++ head/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in (nonexistent) @@ -1,11 +0,0 @@ ---- src/gallium/drivers/vc4/Makefile.in.orig 2017-10-02 15:49:15 UTC -+++ src/gallium/drivers/vc4/Makefile.in -@@ -677,7 +677,7 @@ noinst_LTLIBRARIES = libvc4.la $(am__app - libvc4_la_SOURCES = $(C_SOURCES) - libvc4_la_LIBADD = $(SIM_LIB) $(am__append_5) - @HAVE_ARM_ASM_TRUE@libvc4_neon_la_SOURCES = $(NEON_C_SOURCES) --@HAVE_ARM_ASM_TRUE@libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -mfpu=neon -+@HAVE_ARM_ASM_TRUE@libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -march=armv7-a -mfpu=neon - libvc4_la_LDFLAGS = $(SIM_LDFLAGS) - EXTRA_DIST = kernel/README - all: all-am Property changes on: head/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c =================================================================== --- head/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c (revision 538045) +++ head/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c (nonexistent) @@ -1,14 +0,0 @@ -# define ETIME as ETIMEOUT same as in intel driver -# ---- src/gallium/drivers/vc4/vc4_bufmgr.c.orig 2017-05-10 14:13:57 UTC -+++ src/gallium/drivers/vc4/vc4_bufmgr.c -@@ -27,6 +27,9 @@ - #include - #include - #include -+#ifndef ETIME -+#define ETIME ETIMEDOUT -+#endif - - #include "util/u_hash_table.h" - #include "util/u_memory.h" Property changes on: head/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c =================================================================== --- head/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c (revision 538045) +++ head/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c (nonexistent) @@ -1,30 +0,0 @@ -- Without sysinfo() fall back to sysconf() - ---- src/gallium/drivers/freedreno/freedreno_screen.c.orig 2018-04-21 05:48:24 UTC -+++ src/gallium/drivers/freedreno/freedreno_screen.c -@@ -43,7 +43,11 @@ - #include - #include - #include -+#ifdef __GLIBC__ - #include -+#else -+#include -+#endif - - #include "freedreno_screen.h" - #include "freedreno_resource.h" -@@ -837,9 +841,13 @@ fd_screen_create(struct fd_device *dev) - screen->priority_mask = (1 << val) - 1; - } - -+#ifdef __GLIBC__ - struct sysinfo si; - sysinfo(&si); - screen->ram_size = si.totalram; -+#else -+ screen->ram_size = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGE_SIZE); -+#endif - - DBG("Pipe Info:"); - DBG(" GPU-id: %d", screen->gpu_id); Property changes on: head/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/mesa-dri/pkg-plist =================================================================== --- head/graphics/mesa-dri/pkg-plist (revision 538045) +++ head/graphics/mesa-dri/pkg-plist (revision 538046) @@ -1,52 +1,49 @@ @comment include/GL/gl.h @comment include/GL/gl_mangle.h @comment include/GL/glcorearb.h @comment include/GL/glext.h include/GL/internal/dri_interface.h @comment include/KHR/khrplatform.h @comment include/gbm.h %%INTEL_VDRIVER%%include/vulkan/vulkan_intel.h %%I915_DRIVER%%lib/dri/i915_dri.so %%I965_DRIVER%%lib/dri/i965_dri.so -%%FREEDRENO_GDRIVER%%lib/dri/kgsl_dri.so %%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so -%%FREEDRENO_GDRIVER%%lib/dri/msm_dri.so %%R200_DRIVER%%lib/dri/r200_dri.so %%R300_GDRIVER%%lib/dri/r300_dri.so %%R600_GDRIVER%%lib/dri/r600_dri.so %%VAAPI%%%%R600_GDRIVER%%lib/dri/r600_drv_video.so %%R100_DRIVER%%lib/dri/radeon_dri.so %%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so %%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so %%SWRAST_GDRIVER%%lib/dri/swrast_dri.so -%%VC4_GDRIVER%%lib/dri/vc4_dri.so %%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so %%R600_GDRIVER%%lib/libXvMCr600.so %%R600_GDRIVER%%lib/libXvMCr600.so.1 %%R600_GDRIVER%%lib/libXvMCr600.so.1.0 %%R600_GDRIVER%%lib/libXvMCr600.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 %%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so %%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1 %%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1.0 %%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1.0.0 %%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so %%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1 %%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1.0 %%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1.0.0 %%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so %%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1 %%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0 %%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0.0 %%INTEL_VDRIVER%%lib/libvulkan_intel.so %%AMD_VDRIVER%%lib/libvulkan_radeon.so libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/gbm.pc share/drirc.d/00-mesa-defaults.conf %%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json %%AMD_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json