Author: rezny
Date: Wed Mar 29 16:57:53 2017
New Revision: 437215
URL: https://svnweb.freebsd.org/changeset/ports/437215
Log:
Update to 13.0.6
- Allow use of newer LLVM, i.e. llvm40, via MESA_LLVM_VER in make.conf [1]
- Disable use of LLVM on platforms where it's known not to be available [2]
PR: [1] 217016, [2] 216944
Reported by: [1] greenreaper at hotmail.com, [2] linimon
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D10183
Modified:
head/graphics/gbm/Makefile
head/graphics/libEGL/Makefile
head/graphics/libGL/Makefile.common
head/graphics/libGL/Makefile.targets
head/graphics/libGL/distinfo
head/graphics/libglapi/Makefile
Modified: head/graphics/gbm/Makefile
==============================================================================
--- head/graphics/gbm/Makefile Wed Mar 29 16:55:12 2017 (r437214)
+++ head/graphics/gbm/Makefile Wed Mar 29 16:57:53 2017 (r437215)
@@ -3,7 +3,7 @@
PORTNAME= gbm
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= gbm library
Modified: head/graphics/libEGL/Makefile
==============================================================================
--- head/graphics/libEGL/Makefile Wed Mar 29 16:55:12 2017 (r437214)
+++ head/graphics/libEGL/Makefile Wed Mar 29 16:57:53 2017 (r437215)
@@ -3,7 +3,7 @@
PORTNAME= libEGL
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= OpenEGL library
Modified: head/graphics/libGL/Makefile.common
==============================================================================
--- head/graphics/libGL/Makefile.common Wed Mar 29 16:55:12 2017 (r437214)
+++ head/graphics/libGL/Makefile.common Wed Mar 29 16:57:53 2017 (r437215)
@@ -18,11 +18,14 @@
MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-MESABASEVERSION= 13.0.5
+MESABASEVERSION= 13.0.6
# if there is a subversion, don't include the '-' between 7.11-rc2.
MESASUBVERSION=
-MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
+MASTER_SITES= https://mesa.freedesktop.org/archive/ \
+ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
+ ftp://ftp.freedesktop.org/pub/mesa/ \
+ ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX}
@@ -34,7 +37,6 @@ USES+= compiler:c++11-lib bison gettext
localbase pathfix pkgconfig python:2,build shebangfix tar:xz
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
PKGINSTALL= ${.CURDIR}/pkg-install
PKGDEINSTALL= ${.CURDIR}/pkg-deinstall
@@ -60,7 +62,10 @@ INSTALL_TARGET= install-strip
COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
-MESA_LLVM_VER=39
+.if (${ARCH} != sparc64 && ${ARCH} != ia64) # no working LLVM
+MESA_LLVM_VER?= 39
+LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
+.endif
CONFIGURE_ARGS+= --with-sha1=libcrypto
@@ -72,11 +77,15 @@ 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.
+.if (${MESA_LLVM_VER} != "")
CONFIGURE_ARGS+= --enable-egl --with-egl-platforms=x11,drm
+.else
+CONFIGURE_ARGS+= --disable-egl
+.endif
# we don't care about GLes v1
CONFIGURE_ARGS+= --disable-gles1 --enable-gles2
@@ -107,9 +116,10 @@ CONFIGURE_ARGS+= --enable-opencl --enabl
CONFIGURE_ARGS+= --disable-opencl
.endif
-CONFIGURE_ARGS+= --enable-osmesa
+CONFIGURE_ARGS+= --enable-osmesa --enable-xvmc
# gallium
+.if (${MESA_LLVM_VER} != "")
BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4: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}
@@ -117,8 +127,10 @@ RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.
CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
-CONFIGURE_ARGS+=--enable-gallium-llvm --enable-llvm-shared-libs \
- --enable-xvmc
+CONFIGURE_ARGS+= --enable-gallium-llvm --enable-llvm-shared-libs
+.else
+CONFIGURE_ARGS+= --disable-gallium-llvm
+.endif
.if ${PORT_OPTIONS:MTEXTURE}
CONFIGURE_ARGS+=--enable-texture-float
@@ -172,7 +184,9 @@ PLIST_SUB+= ${_gd}_GDRIVER="@comment "
. endif
.endfor
+.if (${MESA_LLVM_VER} != "")
CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
+.endif
.if ${OPSYS} == DragonFly
LIB_DEPENDS+= libelf.so:devel/libelf
Modified: head/graphics/libGL/Makefile.targets
==============================================================================
--- head/graphics/libGL/Makefile.targets Wed Mar 29 16:55:12 2017 (r437214)
+++ head/graphics/libGL/Makefile.targets Wed Mar 29 16:57:53 2017 (r437215)
@@ -4,7 +4,7 @@
post-patch:
.if ${OPSYS} == FreeBSD
- @${REINPLACE_CMD} -e 's|x86_64|amd64|' \
+ @${REINPLACE_CMD} -e 's|x86_64|amd64|' -e 's|\\S\*//|[:space:]* //|' \
${WRKSRC}/configure
# Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"
#
@@ -15,10 +15,11 @@ post-patch:
.if ${OSVERSION} < 1100000 && ${ARCH} == "i386"
@${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure
.endif
-.endif
-# Sed on 9.x and dragonfly don't support \< or \>
- @${REINPLACE_CMD} -e 's|\\>//|[[:>:]]//|' -e 's|\\S\*//|[:graph:]* //|' \
+.else # ${OPSYS} == DragonFly
+# Sed on dragonfly doesn't support \< or \>
+ @${REINPLACE_CMD} -e 's|\\>//|[[:>:]]//|' -e 's|\\S\*//|[:space:]* //|' \
${WRKSRC}/configure
+.endif # ${OPSYS}
@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
@${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${PYTHON_CMD}|g' \
Modified: head/graphics/libGL/distinfo
==============================================================================
--- head/graphics/libGL/distinfo Wed Mar 29 16:55:12 2017 (r437214)
+++ head/graphics/libGL/distinfo Wed Mar 29 16:57:53 2017 (r437215)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487852413
-SHA256 (mesa-13.0.5.tar.xz) = bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87
-SIZE (mesa-13.0.5.tar.xz) = 9171480
+TIMESTAMP = 1490202594
+SHA256 (mesa-13.0.6.tar.xz) = 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597
+SIZE (mesa-13.0.6.tar.xz) = 9179236
Modified: head/graphics/libglapi/Makefile
==============================================================================
--- head/graphics/libglapi/Makefile Wed Mar 29 16:55:12 2017 (r437214)
+++ head/graphics/libglapi/Makefile Wed Mar 29 16:57:53 2017 (r437215)
@@ -3,7 +3,7 @@
PORTNAME= libglapi
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= graphics
COMMENT= Common GL api library used by Mesa based ports