Attachment #199665 for bug #230789





PORTNAME=	libclc
DISTVERSION=	0.3.0.20180518
PORTREVISION=	1
CATEGORIES=	devel

MAINTAINER=	x11@FreeBSD.org

LICENSE_COMB=	dual
LICENSE_FILE=	${WRKSRC}/LICENSE.TXT

BUILD_DEPENDS=	llvm${LLVM_DEFAULT}>=4.0:devel/llvm${LLVM_DEFAULT} \
		libedit>=0:devel/libedit

USE_GITHUB=	yes

USES=		gmake python:2.7,build gmake
USE_LDCONFIG=	yes
MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}

LLVMVER=	${MESA_LLVM_VER:U60}

ALL_TARGET=

post-patch:


do-configure:
	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g make \
		--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \
		--pkgconfigdir=${PREFIX}/libdata/pkgconfig \
		--prefix=${PREFIX}


Lines 17-23 CONFIGURE_ARGS+= --disable-dri --disable-egl --disable-gbm \ Link Here

(-)b/graphics/libosmesa/Makefile (-1 / +1 lines)
17	MESA_BUILD_WRKSRC= src/util src/compiler src/mapi src/mesa	17	MESA_BUILD_WRKSRC= src/util src/compiler src/mapi src/mesa
18	LDFLAGS_i386= -Wl,-znotext	18	LDFLAGS_i386= -Wl,-znotext
19		19
20	.if "${MESA_LLVM_VER}" != ""	20	.if ${ARCH} == aarch64 \|\| ${ARCH} == amd64 \|\| ${ARCH:Marm} \|\| ${ARCH} == i386 \|\| ${ARCH:Mpowerpc}
21	CONFIGURE_ARGS+= --enable-osmesa-gallium	21	CONFIGURE_ARGS+= --enable-osmesa-gallium
22	MESA_BUILD_WRKSRC+= src/gallium	22	MESA_BUILD_WRKSRC+= src/gallium
23	MESA_INSTALL_WRKSRC= src/gallium/state_trackers/osmesa src/gallium/targets/osmesa	23	MESA_INSTALL_WRKSRC= src/gallium/state_trackers/osmesa src/gallium/targets/osmesa





PORTNAME=	mesa-dri
PORTVERSION=	${MESAVERSION}
PORTREVISION=	3
CATEGORIES=	graphics

COMMENT=	OpenGL hardware acceleration drivers for DRI2+

ALL_VULKAN_DRIVERS=	INTEL RADEON

DRI_DRIVERS=		SWRAST	# classic swrast
.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mpowerpc*}
GALLIUM_DRIVERS=	SWRAST	# llvmpipe
.else
GALLIUM_DRIVERS=	""

.if ${ARCH} == amd64 || ${ARCH} == i386 \
 || ${ARCH} == powerpc || ${ARCH} == powerpc64
DRI_DRIVERS+=		RADEON R200
GALLIUM_DRIVERS+=	R300 R600 RADEONSI
. if "${MESA_LLVM_VER}" != "" && (${ARCH} == amd64 || ${ARCH} == i386)
# https://cgit.freedesktop.org/mesa/mesa/commit/?id=58952675f6d4
GALLIUM_DRIVERS+=	R300
. endif
. if "${MESA_LLVM_VER}" != ""	# until PPC gets LLVM in base
GALLIUM_DRIVERS+=	RADEONSI
VULKAN_DRIVERS+=	RADEON
. endif
.endif
.if ${ARCH} == amd64 || ${ARCH} == i386
DRI_DRIVERS+=		I915 I965





.include <bsd.port.pre.mk>

.if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH:Marm*} || ${ARCH} == i386 || ${ARCH:Mpowerpc*}
BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
 || (${COMPONENT} == libs && ${ARCH} != sparc64)	# no working LLVM
MESA_LLVM_VER?=	60
.endif

.if "${MESA_LLVM_VER}" != ""
BUILD_DEPENDS+=	llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
.if ${COMPONENT} != libs
RUN_DEPENDS+=	llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
.endif
CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
CONFIGURE_ARGS+=	--enable-llvm
.else
CONFIGURE_ARGS+=	--disable-llvm




PORTNAME=	beignet
DISTVERSION=	1.3.2
DISTVERSIONSUFFIX=	-source
PORTREVISION=	5
CATEGORIES=	lang
MASTER_SITES=	https://01.org/sites/default/files/


LICENSE=	LGPL21+
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
		opencl>=0:devel/opencl
LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd \
		libdrm.so:graphics/libdrm
RUN_DEPENDS=	opencl>=0:devel/opencl \
		clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}

WRKSRC=		${WRKDIR}/Beignet-${DISTVERSION}-Source


USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}
SHEBANG_FILES=	src/git_sha1.sh backend/kernels/compile.sh
ALL_TARGET=	all
LLVMVER=	${MESA_LLVM_VER:U60}

CMAKE_ARGS=	-DCLANG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
		-DLLVM_AS_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-as${LLVM_DEFAULT} \
		-DLLVM_CONFIG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \
		-DLLVM_LINK_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-link${LLVM_DEFAULT}

ONLY_FOR_ARCHS=	i386 amd64
ONLY_FOR_ARCHS_REASON=	Beignet needs a graphics driver supported by the Intel KMS driver

TEST_ALL_TARGET=	flat_address_space utest_run

post-patch:
	@${REINPLACE_CMD} -e 's|llvm-dis|llvm-dis${LLVM_DEFAULT}|g; \
		s|clang |clang${LLVM_DEFAULT} |g' \
		${WRKSRC}/backend/kernels/compile.sh

# XXX bug 213732: compiler_device_enqueue() Interrupt signal (SIGSEGV) received.





PORTNAME=	clover
PORTVERSION=	${MESAVERSION}
PORTREVISION=	1
CATEGORIES=	lang

COMMENT=	Mesa "Clover" OpenCL library

.include "${MASTERDIR}/Makefile.targets"

pre-configure:
	@if [ -e ${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} ] && \
		! [ -e ${LOCALBASE}/bin/clang${LLVM_DEFAULT} ]; then \
		${ECHO_MSG} "Your llvm${LLVM_DEFAULT} is not built with clang support, which is required."; \
		${FALSE}; \
	fi


Return to bug 230789

Lines 3-8 Link Here

(-)b/devel/libclc/Makefile (-5 / +3 lines)
3		3
4	PORTNAME= libclc	4	PORTNAME= libclc
5	DISTVERSION= 0.3.0.20180518	5	DISTVERSION= 0.3.0.20180518
		6	PORTREVISION= 1
6	CATEGORIES= devel	7	CATEGORIES= devel
7		8
8	MAINTAINER= x11@FreeBSD.org	9	MAINTAINER= x11@FreeBSD.org
Lines 12-18 LICENSE= BSD3CLAUSE MIT Link Here
12	LICENSE_COMB= dual	13	LICENSE_COMB= dual
13	LICENSE_FILE= ${WRKSRC}/LICENSE.TXT	14	LICENSE_FILE= ${WRKSRC}/LICENSE.TXT
14		15
15	BUILD_DEPENDS= llvm${LLVMVER}>=4.0:devel/llvm${LLVMVER} \	16	BUILD_DEPENDS= llvm${LLVM_DEFAULT}>=4.0:devel/llvm${LLVM_DEFAULT} \
16	libedit>=0:devel/libedit	17	libedit>=0:devel/libedit
17		18
18	USE_GITHUB= yes	19	USE_GITHUB= yes
Lines 23-31 GH_TAGNAME= a2118d5 Link Here
23	USES= gmake python:2.7,build gmake	24	USES= gmake python:2.7,build gmake
24	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
25	MAKE_ENV= MAKE=${GMAKE} DESTDIR=${STAGEDIR}	26	MAKE_ENV= MAKE=${GMAKE} DESTDIR=${STAGEDIR}
26
27	LLVMVER= ${MESA_LLVM_VER:U60}
28
29	ALL_TARGET=	27	ALL_TARGET=
30		28
31	post-patch:	29	post-patch:
Lines 36-42 post-patch: Link Here
36		34
37	do-configure:	35	do-configure:
38	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g make \	36	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g make \
39	--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVMVER} \	37	--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \
40	--pkgconfigdir=${PREFIX}/libdata/pkgconfig \	38	--pkgconfigdir=${PREFIX}/libdata/pkgconfig \
41	--prefix=${PREFIX}	39	--prefix=${PREFIX}
42		40

Lines 3-9 Link Here

(-)b/graphics/mesa-dri/Makefile (-10 / +3 lines)
3		3
4	PORTNAME= mesa-dri	4	PORTNAME= mesa-dri
5	PORTVERSION= ${MESAVERSION}	5	PORTVERSION= ${MESAVERSION}
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8		8
9	COMMENT= OpenGL hardware acceleration drivers for DRI2+	9	COMMENT= OpenGL hardware acceleration drivers for DRI2+
Lines 36-42 ALL_GALLIUM_DRIVERS= FREEDRENO R300 R600 RADEONSI SVGA SWRAST VC4 Link Here
36	ALL_VULKAN_DRIVERS= INTEL RADEON	36	ALL_VULKAN_DRIVERS= INTEL RADEON
37		37
38	DRI_DRIVERS= SWRAST # classic swrast	38	DRI_DRIVERS= SWRAST # classic swrast
39	.if "${MESA_LLVM_VER}" != ""	39	.if ${ARCH} == aarch64 \|\| ${ARCH} == amd64 \|\| ${ARCH:Marm} \|\| ${ARCH} == i386 \|\| ${ARCH:Mpowerpc}
40	GALLIUM_DRIVERS= SWRAST # llvmpipe	40	GALLIUM_DRIVERS= SWRAST # llvmpipe
41	.else	41	.else
42	GALLIUM_DRIVERS= ""	42	GALLIUM_DRIVERS= ""
Lines 46-60 VULKAN_DRIVERS= # Link Here
46	.if ${ARCH} == amd64 \|\| ${ARCH} == i386 \	46	.if ${ARCH} == amd64 \|\| ${ARCH} == i386 \
47	\|\| ${ARCH} == powerpc \|\| ${ARCH} == powerpc64	47	\|\| ${ARCH} == powerpc \|\| ${ARCH} == powerpc64
48	DRI_DRIVERS+= RADEON R200	48	DRI_DRIVERS+= RADEON R200
49	GALLIUM_DRIVERS+= R600	49	GALLIUM_DRIVERS+= R300 R600 RADEONSI
50	. if "${MESA_LLVM_VER}" != "" && (${ARCH} == amd64 \|\| ${ARCH} == i386)
51	# https://cgit.freedesktop.org/mesa/mesa/commit/?id=58952675f6d4
52	GALLIUM_DRIVERS+= R300
53	. endif
54	. if "${MESA_LLVM_VER}" != "" # until PPC gets LLVM in base
55	GALLIUM_DRIVERS+= RADEONSI
56	VULKAN_DRIVERS+= RADEON	50	VULKAN_DRIVERS+= RADEON
57	. endif
58	.endif	51	.endif
59	.if ${ARCH} == amd64 \|\| ${ARCH} == i386	52	.if ${ARCH} == amd64 \|\| ${ARCH} == i386
60	DRI_DRIVERS+= I915 I965	53	DRI_DRIVERS+= I915 I965

Lines 74-92 INSTALL_TARGET= install-strip Link Here

(-)b/graphics/mesa-dri/Makefile.common (-11 / +5 lines)
74		74
75	.include <bsd.port.pre.mk>	75	.include <bsd.port.pre.mk>
76		76
77	# need LLVM for libEGL wherever possible, but mixing GCC and LLVM breaks Gallium	77	.if ${ARCH} == aarch64 \|\| ${ARCH} == amd64 \|\| ${ARCH:Marm} \|\| ${ARCH} == i386 \|\| ${ARCH:Mpowerpc}
78	.if ${CHOSEN_COMPILER_TYPE} == clang \	78	BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
79	\|\| (${COMPONENT} == libs && ${ARCH} != sparc64) # no working LLVM
80	MESA_LLVM_VER?= 60
81	.endif
82
83	.if "${MESA_LLVM_VER}" != ""
84	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
85	.if ${COMPONENT} != libs	79	.if ${COMPONENT} != libs
86	RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}	80	RUN_DEPENDS+= llvm${LLVM_DEFAULT}>=3.9.0_4:devel/llvm${LLVM_DEFAULT}
87	.endif	81	.endif
88	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}	82	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
89	LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib	83	LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
90	CONFIGURE_ARGS+= --enable-llvm	84	CONFIGURE_ARGS+= --enable-llvm
91	.else	85	.else
92	CONFIGURE_ARGS+= --disable-llvm	86	CONFIGURE_ARGS+= --disable-llvm

Lines 4-10 Link Here

(-)b/lang/beignet/Makefile (-10 / +9 lines)
4	PORTNAME= beignet	4	PORTNAME= beignet
5	DISTVERSION= 1.3.2	5	DISTVERSION= 1.3.2
6	DISTVERSIONSUFFIX= -source	6	DISTVERSIONSUFFIX= -source
7	PORTREVISION= 4	7	PORTREVISION= 5
8	CATEGORIES= lang	8	CATEGORIES= lang
9	MASTER_SITES= https://01.org/sites/default/files/	9	MASTER_SITES= https://01.org/sites/default/files/
10		10
Lines 14-25 COMMENT= OpenCL library for Intel GPUs Link Here
14	LICENSE= LGPL21+	14	LICENSE= LGPL21+
15	LICENSE_FILE= ${WRKSRC}/COPYING	15	LICENSE_FILE= ${WRKSRC}/COPYING
16		16
17	BUILD_DEPENDS= clang${LLVMVER}:devel/llvm${LLVMVER} \	17	BUILD_DEPENDS= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} \
18	opencl>=0:devel/opencl	18	opencl>=0:devel/opencl
19	LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \	19	LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \
20	libdrm.so:graphics/libdrm	20	libdrm.so:graphics/libdrm
21	RUN_DEPENDS= opencl>=0:devel/opencl \	21	RUN_DEPENDS= opencl>=0:devel/opencl \
22	clang${LLVMVER}:devel/llvm${LLVMVER}	22	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
23		23
24	WRKSRC= ${WRKDIR}/Beignet-${DISTVERSION}-Source	24	WRKSRC= ${WRKDIR}/Beignet-${DISTVERSION}-Source
25		25
Lines 29-40 USE_GL= gl egl Link Here
29	USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}	29	USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
30	SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh	30	SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh
31	ALL_TARGET= all	31	ALL_TARGET= all
32	LLVMVER= ${MESA_LLVM_VER:U60}
33		32
34	CMAKE_ARGS= -DCLANG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/clang${LLVMVER} \	33	CMAKE_ARGS= -DCLANG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
35	-DLLVM_AS_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-as${LLVMVER} \	34	-DLLVM_AS_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-as${LLVM_DEFAULT} \
36	-DLLVM_CONFIG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-config${LLVMVER} \	35	-DLLVM_CONFIG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \
37	-DLLVM_LINK_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-link${LLVMVER}	36	-DLLVM_LINK_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-link${LLVM_DEFAULT}
38		37
39	ONLY_FOR_ARCHS= i386 amd64	38	ONLY_FOR_ARCHS= i386 amd64
40	ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver	39	ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver
Lines 53-60 OCL20_CMAKE_BOOL= ENABLE_OPENCL_20 Link Here
53	TEST_ALL_TARGET= flat_address_space utest_run	52	TEST_ALL_TARGET= flat_address_space utest_run
54		53
55	post-patch:	54	post-patch:
56	@${REINPLACE_CMD} -e 's\|llvm-dis\|llvm-dis${LLVMVER}\|g; \	55	@${REINPLACE_CMD} -e 's\|llvm-dis\|llvm-dis${LLVM_DEFAULT}\|g; \
57	s\|clang \|clang${LLVMVER} \|g' \	56	s\|clang \|clang${LLVM_DEFAULT} \|g' \
58	${WRKSRC}/backend/kernels/compile.sh	57	${WRKSRC}/backend/kernels/compile.sh
59		58
60	# XXX bug 213732: compiler_device_enqueue() Interrupt signal (SIGSEGV) received.	59	# XXX bug 213732: compiler_device_enqueue() Interrupt signal (SIGSEGV) received.

Lines 2-7 Link Here

(-)b/lang/clover/Makefile (-3 / +4 lines)
2		2
3	PORTNAME= clover	3	PORTNAME= clover
4	PORTVERSION= ${MESAVERSION}	4	PORTVERSION= ${MESAVERSION}
		5	PORTREVISION= 1
5	CATEGORIES= lang	6	CATEGORIES= lang
6		7
7	COMMENT= Mesa "Clover" OpenCL library	8	COMMENT= Mesa "Clover" OpenCL library
Lines 30-38 MESA_INSTALL_WRKSRC= src/gallium/targets/opencl src/gallium/targets/pipe-loader Link Here
30	.include "${MASTERDIR}/Makefile.targets"	31	.include "${MASTERDIR}/Makefile.targets"
31		32
32	pre-configure:	33	pre-configure:
33	@if [ -e ${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} ] && \	34	@if [ -e ${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} ] && \
34	! [ -e ${LOCALBASE}/bin/clang${MESA_LLVM_VER} ]; then \	35	! [ -e ${LOCALBASE}/bin/clang${LLVM_DEFAULT} ]; then \
35	${ECHO_MSG} "Your llvm${MESA_LLVM_VER} is not built with clang support, which is required."; \	36	${ECHO_MSG} "Your llvm${LLVM_DEFAULT} is not built with clang support, which is required."; \
36	${FALSE}; \	37	${FALSE}; \
37	fi	38	fi
38		39