Attachment 180574 Details for Bug 217016 – v0 (Mesa 17.0.0 + LLVM 4.0 by default but allow down to 3.6)

[patch] v0 (Mesa 17.0.0 + LLVM 4.0 by default but allow down to 3.6)

Mesa-17.0.0.diff (text/plain), 4.65 KB, created by Jan Beich on 2017-03-06 20:42:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-03-06 20:42:25 UTC

Size: 4.65 KB

patch

obsolete

>Index: graphics/libGL/Makefile.common
>===================================================================
>--- graphics/libGL/Makefile.common	(revision 435507)
>+++ graphics/libGL/Makefile.common	(working copy)
>@@ -18,7 +18,7 @@
> MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
> MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
> 
>-MESABASEVERSION=	13.0.5
>+MESABASEVERSION=	17.0.0
> # if there is a subversion, don't include the '-' between 7.11-rc2.
> MESASUBVERSION=
> 
>@@ -28,8 +28,6 @@ DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
> 
> 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
>@@ -60,7 +58,7 @@ INSTALL_TARGET=		install-strip
> 
> COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
> 
>-MESA_LLVM_VER=39
>+MESA_LLVM_VER?=		40
> 
> CONFIGURE_ARGS+=	--with-sha1=libcrypto
> 
>@@ -72,7 +70,7 @@ CONFIGURE_ARGS+=	--enable-gbm
> # 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+=	--enable-glx-tls
>+CONFIGURE_ARGS+=	--disable-glx-tls
> 
> # libEGL, dri and clover need gallium enabled.
> # the third option in --with-egl-platforms is wayland.
>@@ -110,9 +108,9 @@ CONFIGURE_ARGS+=	--disable-opencl
> CONFIGURE_ARGS+=	--enable-osmesa
> 
> # gallium
>-BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
>+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.9.0_4:devel/llvm${MESA_LLVM_VER}
>+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}
>Index: graphics/libGL/distinfo
>===================================================================
>--- graphics/libGL/distinfo	(revision 435507)
>+++ graphics/libGL/distinfo	(working copy)
>@@ -1,3 +1,3 @@
> TIMESTAMP = 1487852413
>-SHA256 (mesa-13.0.5.tar.xz) = bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87
>-SIZE (mesa-13.0.5.tar.xz) = 9171480
>+SHA256 (mesa-17.0.0.tar.xz) = 39db3d59700159add7f977307d12a7dfe016363e760ad82280ac4168ea668481
>+SIZE (mesa-17.0.0.tar.xz) = 9442580
>Index: graphics/libGL/files/patch-configure
>===================================================================
>--- graphics/libGL/files/patch-configure	(revision 435507)
>+++ graphics/libGL/files/patch-configure	(working copy)
>@@ -9,25 +9,15 @@
>      dri3_default=yes
>      ;;
>  *)
>-@@ -23968,6 +23968,18 @@ if test "x$enable_dri" = xyes; then
>-         ;;
>-     *freebsd* | dragonfly* | *netbsd* | openbsd*)
>-         DEFINES="$DEFINES -DHAVE_ALIAS"
>-+        if test "x$enable_dri3" = xyes; then
>-+            DEFINES="$DEFINES -DHAVE_DRI3"
>-+        fi
>-+
>-+        case "$host_cpu" in
>-+        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"
>+@@ -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
> @@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then
>          as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
>      fi
>@@ -48,13 +38,13 @@
>  
>      if test "x$have_libclc" = xno; then
>          as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
>-@@ -26670,9 +26692,6 @@ fi
>-                 CLANG_LIBDIR=${LLVM_LIBDIR}
>-             fi
>-             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
>--            if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
>+@@ -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
>-     else
>-         MESA_LLVM=0
>+ fi
>+  if test "x$enable_opencl" = xyes; then
>+   HAVE_CLOVER_TRUE=

Actions: View | Diff

Attachments on bug 217016: 179885 | 180574 | 180617 | 180618 | 181003 | 181302 | 181306 | 181391