Attachment 182747 Details for Bug 219406 – fix

[patch] fix

mesa.aarch64.diff (text/plain), 4.19 KB, created by Jan Beich on 2017-05-19 21:15:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-05-19 21:15:43 UTC

Size: 4.19 KB

patch

obsolete

>Index: graphics/mesa-dri/Makefile
>===================================================================
>--- graphics/mesa-dri/Makefile	(revision 441063)
>+++ graphics/mesa-dri/Makefile	(working copy)
>@@ -7,6 +7,7 @@ CATEGORIES=	graphics
> 
> COMMENT=	OpenGL hardware acceleration drivers for DRI2+
> 
>+BUILD_DEPENDS=	libdrm>=2.4.80_1,1:graphics/libdrm # libsync.h fix
> LIB_DEPENDS=	libdrm.so:graphics/libdrm \
> 		libexpat.so:textproc/expat2
> RUN_DEPENDS=	${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc
>Index: graphics/mesa-dri/Makefile.targets
>===================================================================
>--- graphics/mesa-dri/Makefile.targets	(revision 441063)
>+++ graphics/mesa-dri/Makefile.targets	(working copy)
>@@ -3,6 +3,8 @@
> # this file holds common targets
> 
> post-patch:
>+# Avoid USES=shebangfix triggering source regen
>+	@${FIND} ${WRKSRC} -name \*.py -exec ${TOUCH} -r ${WRKSRC}/VERSION {} +
> .if ${OPSYS} == FreeBSD
> 	@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure
> # Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"
>Index: graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
>===================================================================
>--- graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c	(nonexistent)
>+++ graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c	(working copy)
>@@ -0,0 +1,13 @@
>+--- 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
>
>Property changes on: graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: graphics/mesa-dri/pkg-plist
>===================================================================
>--- graphics/mesa-dri/pkg-plist	(revision 441063)
>+++ graphics/mesa-dri/pkg-plist	(working copy)
>@@ -25,7 +25,9 @@ include/GL/internal/dri_interface.h
> @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
>@@ -34,6 +36,7 @@ include/GL/internal/dri_interface.h
> %%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
>Index: graphics/libdrm/Makefile
>===================================================================
>--- graphics/libdrm/Makefile	(revision 441063)
>+++ graphics/libdrm/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	libdrm
> PORTVERSION=	2.4.80
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	graphics x11
> MASTER_SITES=	http://dri.freedesktop.org/libdrm/
>Index: graphics/libdrm/files/patch-libsync.h
>===================================================================
>--- graphics/libdrm/files/patch-libsync.h	(nonexistent)
>+++ graphics/libdrm/files/patch-libsync.h	(working copy)
>@@ -0,0 +1,14 @@
>+--- 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));
>
>Property changes on: graphics/libdrm/files/patch-libsync.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 219406: 182747