Attachment #180574 for bug #217016




MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}

MESABASEVERSION=	17.0.0
# if there is a subversion, don't include the '-' between 7.11-rc2.
MESASUBVERSION=



MAINTAINER=	x11@FreeBSD.org

BUILD_DEPENDS+=	makedepend:devel/makedepend

USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
		localbase pathfix pkgconfig python:2,build shebangfix tar:xz
USE_LDCONFIG=	yes


COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}

MESA_LLVM_VER?=		40

CONFIGURE_ARGS+=	--with-sha1=libcrypto


# pthread_setspecific which it uses now by default. But since this
# configure switch is going away ...
# https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html
CONFIGURE_ARGS+=	--disable-glx-tls

# libEGL, dri and clover need gallium enabled.
# the third option in --with-egl-platforms is wayland.

CONFIGURE_ARGS+=	--enable-osmesa

# gallium
BUILD_DEPENDS+=	llvm${MESA_LLVM_VER}>=3.6:devel/llvm${MESA_LLVM_VER}
.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
RUN_DEPENDS+=	llvm${MESA_LLVM_VER}>=3.6:devel/llvm${MESA_LLVM_VER}
.endif

CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}

Lines 1-3 Link Here

(-)graphics/libGL/distinfo (-2 / +2 lines)
1	TIMESTAMP = 1487852413	1	TIMESTAMP = 1487852413
2	SHA256 (mesa-13.0.5.tar.xz) = bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87	2	SHA256 (mesa-17.0.0.tar.xz) = 39db3d59700159add7f977307d12a7dfe016363e760ad82280ac4168ea668481
3	SIZE (mesa-13.0.5.tar.xz) = 9171480	3	SIZE (mesa-17.0.0.tar.xz) = 9442580




     dri3_default=yes
     ;;
 *)
@@ -24064,7 +24064,7 @@ fi
 if test "x$enable_dri" = xyes; then
     # Platform specific settings and drivers to build
     case "$host_os" in
-    linux*)
+    linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*)
         if test "x$enable_dri3" = xyes; then
             DEFINES="$DEFINES -DHAVE_DRI3"
         fi
+        powerpc* | sparc*)
+            # Build only the drivers for cards that exist on PowerPC/sparc
+            if test "x$with_dri_drivers" = "xyes"; then
+                with_dri_drivers="r200 radeon swrast"
+            fi
+            ;;
+        esac
         ;;
     gnu*)
         DEFINES="$DEFINES -DHAVE_ALIAS"
@@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then
         as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
     fi

 
     if test "x$have_libclc" = xno; then
         as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
@@ -25860,9 +25870,6 @@ if test "x$enable_opencl" = xyes; then
         CLANG_LIBDIR=${LLVM_LIBDIR}
     fi
     CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
-    if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
-  as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
-fi
 fi
  if test "x$enable_opencl" = xyes; then
   HAVE_CLOVER_TRUE=

Return to bug 217016

Lines 18-24 Link Here

(-)graphics/libGL/Makefile.common (-7 / +5 lines)
18	MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}	18	MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
19	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}	19	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
20		20
21	MESABASEVERSION= 13.0.5	21	MESABASEVERSION= 17.0.0
22	# if there is a subversion, don't include the '-' between 7.11-rc2.	22	# if there is a subversion, don't include the '-' between 7.11-rc2.
23	MESASUBVERSION=	23	MESASUBVERSION=
24		24
Lines 28-35 DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX} Link Here
28		28
29	MAINTAINER= x11@FreeBSD.org	29	MAINTAINER= x11@FreeBSD.org
30		30
31	BUILD_DEPENDS+= makedepend:devel/makedepend
32
33	USES+= compiler:c++11-lib bison gettext-tools gmake libtool \	31	USES+= compiler:c++11-lib bison gettext-tools gmake libtool \
34	localbase pathfix pkgconfig python:2,build shebangfix tar:xz	32	localbase pathfix pkgconfig python:2,build shebangfix tar:xz
35	USE_LDCONFIG= yes	33	USE_LDCONFIG= yes
Lines 60-66 INSTALL_TARGET= install-strip Link Here
60		58
61	COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}	59	COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
62		60
63	MESA_LLVM_VER=39	61	MESA_LLVM_VER?= 40
64		62
65	CONFIGURE_ARGS+= --with-sha1=libcrypto	63	CONFIGURE_ARGS+= --with-sha1=libcrypto
66		64
Lines 72-78 CONFIGURE_ARGS+= --enable-gbm Link Here
72	# pthread_setspecific which it uses now by default. But since this	70	# pthread_setspecific which it uses now by default. But since this
73	# configure switch is going away ...	71	# configure switch is going away ...
74	# https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html	72	# https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html
75	#CONFIGURE_ARGS+= --enable-glx-tls	73	CONFIGURE_ARGS+= --disable-glx-tls
76		74
77	# libEGL, dri and clover need gallium enabled.	75	# libEGL, dri and clover need gallium enabled.
78	# the third option in --with-egl-platforms is wayland.	76	# the third option in --with-egl-platforms is wayland.
Lines 110-118 CONFIGURE_ARGS+= --disable-opencl Link Here
110	CONFIGURE_ARGS+= --enable-osmesa	108	CONFIGURE_ARGS+= --enable-osmesa
111		109
112	# gallium	110	# gallium
113	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}	111	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.6:devel/llvm${MESA_LLVM_VER}
114	.if ${COMPONENT:Mdri} != "" \|\| ${COMPONENT:Mclover} != "" \|\| ${COMPONENT:Megl} != ""	112	.if ${COMPONENT:Mdri} != "" \|\| ${COMPONENT:Mclover} != "" \|\| ${COMPONENT:Megl} != ""
115	RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}	113	RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.6:devel/llvm${MESA_LLVM_VER}
116	.endif	114	.endif
117		115
118	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}	116	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}

Lines 9-33 Link Here

(-)graphics/libGL/files/patch-configure (-27 / +17 lines)
9	dri3_default=yes	9	dri3_default=yes
10	;;	10	;;
11	*)	11	*)
12	@@ -23968,6 +23968,18 @@ if test "x$enable_dri" = xyes; then	12	@@ -24064,7 +24064,7 @@ fi
13	;;	13	if test "x$enable_dri" = xyes; then
14	freebsd \| dragonfly* \| netbsd \| openbsd*)	14	# Platform specific settings and drivers to build
15	DEFINES="$DEFINES -DHAVE_ALIAS"	15	case "$host_os" in
16	+ if test "x$enable_dri3" = xyes; then	16	- linux*)
17	+ DEFINES="$DEFINES -DHAVE_DRI3"	17	+ linux* \| freebsd \| dragonfly* \| netbsd \| openbsd*)
18	+ fi	18	if test "x$enable_dri3" = xyes; then
19	+	19	DEFINES="$DEFINES -DHAVE_DRI3"
20	+ case "$host_cpu" in	20	fi
21	+ powerpc* \| sparc*)
22	+ # Build only the drivers for cards that exist on PowerPC/sparc
23	+ if test "x$with_dri_drivers" = "xyes"; then
24	+ with_dri_drivers="r200 radeon swrast"
25	+ fi
26	+ ;;
27	+ esac
28	;;
29	gnu*)
30	DEFINES="$DEFINES -DHAVE_ALIAS"
31	@@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then	21	@@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then
32	as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5	22	as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
33	fi	23	fi
Lines 48-60 Link Here
48		38
49	if test "x$have_libclc" = xno; then	39	if test "x$have_libclc" = xno; then
50	as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.	40	as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
51	@@ -26670,9 +26692,6 @@ fi	41	@@ -25860,9 +25870,6 @@ if test "x$enable_opencl" = xyes; then
52	CLANG_LIBDIR=${LLVM_LIBDIR}	42	CLANG_LIBDIR=${LLVM_LIBDIR}
53	fi	43	fi
54	CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}	44	CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
55	- if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :	45	- if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
56	- as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5	46	- as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
57	-fi	47	-fi
58	fi	48	fi
59	else	49	if test "x$enable_opencl" = xyes; then
60	MESA_LLVM=0	50	HAVE_CLOVER_TRUE=