Attachment #182747 for bug #219406

View | Details | Raw Unified | Return to bug 219406
Collapse All | Expand All

Lines 7-12 CATEGORIES= graphics Link Here

(-)graphics/mesa-dri/Makefile (+1 lines)
7		7
8	COMMENT= OpenGL hardware acceleration drivers for DRI2+	8	COMMENT= OpenGL hardware acceleration drivers for DRI2+
9		9
		10	BUILD_DEPENDS= libdrm>=2.4.80_1,1:graphics/libdrm # libsync.h fix
10	LIB_DEPENDS= libdrm.so:graphics/libdrm \	11	LIB_DEPENDS= libdrm.so:graphics/libdrm \
11	libexpat.so:textproc/expat2	12	libexpat.so:textproc/expat2
12	RUN_DEPENDS= ${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc	13	RUN_DEPENDS= ${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc

Lines 3-8 Link Here

(-)graphics/mesa-dri/Makefile.targets (+2 lines)
3	# this file holds common targets	3	# this file holds common targets
4		4
5	post-patch:	5	post-patch:
		6	# Avoid USES=shebangfix triggering source regen
		7	@${FIND} ${WRKSRC} -name \*.py -exec ${TOUCH} -r ${WRKSRC}/VERSION {} +
6	.if ${OPSYS} == FreeBSD	8	.if ${OPSYS} == FreeBSD
7	@${REINPLACE_CMD} -e 's\|x86_64\|amd64\|' ${WRKSRC}/configure	9	@${REINPLACE_CMD} -e 's\|x86_64\|amd64\|' ${WRKSRC}/configure
8	# Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"	10	# Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"




--- src/gallium/drivers/vc4/vc4_bufmgr.c.orig	2017-05-10 14:13:57 UTC
+++ src/gallium/drivers/vc4/vc4_bufmgr.c
@@ -43,6 +43,10 @@
 #define VG(x)
 #endif
 
+#ifndef ETIME
+#define ETIME ETIMEDOUT
+#endif
+
 static bool dump_stats = false;
 
 static void




@comment include/gbm.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

%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
%%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so
%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
%%VC4_GDRIVER%%lib/dri/vc4_dri.so
%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
@comment lib/gallium-pipe/pipe_r300.so
@comment lib/gallium-pipe/pipe_r600.so

Lines 3-8 Link Here

(-)graphics/libdrm/Makefile (+1 lines)
3		3
4	PORTNAME= libdrm	4	PORTNAME= libdrm
5	PORTVERSION= 2.4.80	5	PORTVERSION= 2.4.80
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= graphics x11	8	CATEGORIES= graphics x11
8	MASTER_SITES= http://dri.freedesktop.org/libdrm/	9	MASTER_SITES= http://dri.freedesktop.org/libdrm/




--- libsync.h.orig	2017-04-14 23:29:46 UTC
+++ libsync.h
@@ -75,7 +75,11 @@ static inline int sync_wait(int fd, int timeout)
 			}
 			return 0;
 		} else if (ret == 0) {
+#ifdef ETIME
 			errno = ETIME;
+#else
+			errno = ETIMEDOUT;
+#endif
 			return -1;
 		}
 	} while (ret == -1 && (errno == EINTR || errno == EAGAIN));

Return to bug 219406

Line 0 Link Here

(-)graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c (+13 lines)
	1	--- src/gallium/drivers/vc4/vc4_bufmgr.c.orig 2017-05-10 14:13:57 UTC
	2	+++ src/gallium/drivers/vc4/vc4_bufmgr.c
	3	@@ -43,6 +43,10 @@
	4	#define VG(x)
	5	#endif
	6
	7	+#ifndef ETIME
	8	+#define ETIME ETIMEDOUT
	9	+#endif
	10	+
	11	static bool dump_stats = false;
	12
	13	static void

Lines 25-31 include/GL/internal/dri_interface.h Link Here

(-)graphics/mesa-dri/pkg-plist (+3 lines)
25	@comment include/gbm.h	25	@comment include/gbm.h
26	%%I915_DRIVER%%lib/dri/i915_dri.so	26	%%I915_DRIVER%%lib/dri/i915_dri.so
27	%%I965_DRIVER%%lib/dri/i965_dri.so	27	%%I965_DRIVER%%lib/dri/i965_dri.so
		28	%%FREEDRENO_GDRIVER%%lib/dri/kgsl_dri.so
28	%%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so	29	%%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
		30	%%FREEDRENO_GDRIVER%%lib/dri/msm_dri.so
29	%%R200_DRIVER%%lib/dri/r200_dri.so	31	%%R200_DRIVER%%lib/dri/r200_dri.so
30	%%R300_GDRIVER%%lib/dri/r300_dri.so	32	%%R300_GDRIVER%%lib/dri/r300_dri.so
31	%%R600_GDRIVER%%lib/dri/r600_dri.so	33	%%R600_GDRIVER%%lib/dri/r600_dri.so
Lines 34-39 include/GL/internal/dri_interface.h Link Here
34	%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so	36	%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
35	%%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so	37	%%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so
36	%%SWRAST_DRIVER%%lib/dri/swrast_dri.so	38	%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
		39	%%VC4_GDRIVER%%lib/dri/vc4_dri.so
37	%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so	40	%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
38	@comment lib/gallium-pipe/pipe_r300.so	41	@comment lib/gallium-pipe/pipe_r300.so
39	@comment lib/gallium-pipe/pipe_r600.so	42	@comment lib/gallium-pipe/pipe_r600.so

Line 0 Link Here

(-)graphics/libdrm/files/patch-libsync.h (+14 lines)
	1	--- libsync.h.orig 2017-04-14 23:29:46 UTC
	2	+++ libsync.h
	3	@@ -75,7 +75,11 @@ static inline int sync_wait(int fd, int timeout)
	4	}
	5	return 0;
	6	} else if (ret == 0) {
	7	+#ifdef ETIME
	8	errno = ETIME;
	9	+#else
	10	+ errno = ETIMEDOUT;
	11	+#endif
	12	return -1;
	13	}
	14	} while (ret == -1 && (errno == EINTR \|\| errno == EAGAIN));