Attachment 196406 Details for Bug 230789 – v1

[patch] v1

mesa.llvm7.diff (text/plain), 2.80 KB, created by Jan Beich on 2018-08-20 23:34:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-08-20 23:34:38 UTC

Size: 2.80 KB

patch

obsolete

>From ae1fa6d1f8308e1c8680607cbe14c418d1209e9f Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 20 Aug 2018 20:44:18 +0000
>Subject: [PATCH] graphics/mesa-dri: switch to llvm70
>
>PR:		230789
>Approved by:	maintainer timeout (2 weeks)
>---
> devel/libclc/Makefile             | 3 ++-
> graphics/mesa-dri/Makefile        | 1 +
> graphics/mesa-dri/Makefile.common | 2 +-
> lang/beignet/Makefile             | 4 ++--
> lang/clover/Makefile              | 1 +
> 5 files changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile
>index baa632db7038..a32809fc4c3b 100644
>--- a/devel/libclc/Makefile
>+++ b/devel/libclc/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	libclc
> DISTVERSION=	0.3.0.20180518
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	x11@FreeBSD.org
>@@ -24,7 +25,7 @@ USES=		gmake python:2.7,build gmake
> USE_LDCONFIG=	yes
> MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}
> 
>-LLVMVER=	${MESA_LLVM_VER:U60}
>+LLVMVER=	${MESA_LLVM_VER:U70}
> 
> ALL_TARGET=
> 
>diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
>index 7cd0f7fe7f97..6a912933e8d2 100644
>--- a/graphics/mesa-dri/Makefile
>+++ b/graphics/mesa-dri/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mesa-dri
> PORTVERSION=	${MESAVERSION}
>+PORTREVISION=	1
> CATEGORIES=	graphics
> 
> COMMENT=	OpenGL hardware acceleration drivers for DRI2+
>diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
>index 95e10b1196fb..c97fee441922 100644
>--- a/graphics/mesa-dri/Makefile.common
>+++ b/graphics/mesa-dri/Makefile.common
>@@ -77,7 +77,7 @@ INSTALL_TARGET=	install-strip
> # need LLVM for libEGL wherever possible, but mixing GCC and LLVM breaks Gallium
> .if ${CHOSEN_COMPILER_TYPE} == clang \
>  || (${COMPONENT} == libs && ${ARCH} != sparc64)	# no working LLVM
>-MESA_LLVM_VER?=	60
>+MESA_LLVM_VER?=	70
> .endif
> 
> .if "${MESA_LLVM_VER}" != ""
>diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile
>index 249d1cf4752f..886055bc87a6 100644
>--- a/lang/beignet/Makefile
>+++ b/lang/beignet/Makefile
>@@ -4,7 +4,7 @@
> PORTNAME=	beignet
> DISTVERSION=	1.3.2
> DISTVERSIONSUFFIX=	-source
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	lang
> MASTER_SITES=	https://01.org/sites/default/files/
> 
>@@ -32,7 +32,7 @@ USE_GL=		gl egl
> USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}
> SHEBANG_FILES=	src/git_sha1.sh backend/kernels/compile.sh
> ALL_TARGET=	all
>-LLVMVER=	${MESA_LLVM_VER:U60}
>+LLVMVER=	${MESA_LLVM_VER:U70}
> 
> CMAKE_ARGS=	-DCLANG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/clang${LLVMVER} \
> 		-DLLVM_AS_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-as${LLVMVER} \
>diff --git a/lang/clover/Makefile b/lang/clover/Makefile
>index f8adadacccbc..515b15440f4c 100644
>--- a/lang/clover/Makefile
>+++ b/lang/clover/Makefile
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	clover
> PORTVERSION=	${MESAVERSION}
>+PORTREVISION=	1
> CATEGORIES=	lang
> 
> COMMENT=	Mesa "Clover" OpenCL library

Actions: View | Diff

Attachments on bug 230789: 196405 | 196406 | 199665 | 201531