5 files changed, 2 insertions, 65 deletions

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 05f481011182..be65e261cfe0 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
@@ -30,7 +30,7 @@ WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 .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*}
@@ -54,11 +54,6 @@ GALLIUM_DRIVERS+=	SVGA
 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}
diff --git a/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in b/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
deleted file mode 100644
index 373a5dcf2a0b..000000000000
--- a/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
+++ /dev/null
@@ -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
diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c
deleted file mode 100644
index 2f35eb0307c8..000000000000
--- a/graphics/mesa-dri/files/patch-src_gallium_drivers_freedreno_freedreno__screen.c
+++ /dev/null
@@ -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 <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifdef __GLIBC__
- #include <sys/sysinfo.h>
-+#else
-+#include <unistd.h>
-+#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);
diff --git a/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c b/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
deleted file mode 100644
index d97fc81097c5..000000000000
--- a/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
+++ /dev/null
@@ -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 <fcntl.h>
- #include <xf86drm.h>
- #include <xf86drmMode.h>
-+#ifndef ETIME
-+#define ETIME ETIMEDOUT
-+#endif
- 
- #include "util/u_hash_table.h"
- #include "util/u_memory.h"
diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist
index 5461ae36ee8b..940cefa0a8e0 100644
--- a/graphics/mesa-dri/pkg-plist
+++ b/graphics/mesa-dri/pkg-plist
@@ -8,9 +8,7 @@ include/GL/internal/dri_interface.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
@@ -19,7 +17,6 @@ include/GL/internal/dri_interface.h
 %%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