svn commit: r456530 - in head: graphics/mesa-dri graphics/mesa-dri/files graphics/mesa-libs lang/clover
Niclas Zeising
zeising at FreeBSD.org
Sun Dec 17 13:07:39 UTC 2017
Author: zeising
Date: Sun Dec 17 13:07:37 2017
New Revision: 456530
URL: https://svnweb.freebsd.org/changeset/ports/456530
Log:
Update mesa ports to 17.3.0
Add missing dependencies on xcb and xxf86vm.
Changelog for mesa: https://www.mesa3d.org/relnotes/17.3.0.html
PR: 223195
Submitted by: jbeich
Tested by: Greg V, cpm
Added:
head/graphics/mesa-dri/files/patch-src_intel_Makefile.in (contents, props changed)
Modified:
head/graphics/mesa-dri/Makefile
head/graphics/mesa-dri/Makefile.common
head/graphics/mesa-dri/Makefile.targets
head/graphics/mesa-dri/distinfo
head/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c
head/graphics/mesa-dri/files/patch-src_glx_glxext.c
head/graphics/mesa-libs/Makefile
head/graphics/mesa-libs/pkg-plist
head/lang/clover/Makefile
Modified: head/graphics/mesa-dri/Makefile
==============================================================================
--- head/graphics/mesa-dri/Makefile Sun Dec 17 13:02:50 2017 (r456529)
+++ head/graphics/mesa-dri/Makefile Sun Dec 17 13:07:37 2017 (r456530)
@@ -3,16 +3,13 @@
PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for DRI2+
-RUN_DEPENDS= ${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc
+USE_XORG= dri2proto dri3proto glproto presentproto x11 xcb xdamage xext \
+ xfixes xshmfence xv xvmc xxf86vm
-USE_XORG= dri2proto dri3proto glproto presentproto x11 xdamage xext \
- xfixes xshmfence xv xvmc
-
OPTIONS_DEFINE= TEXTURE VAAPI VDPAU
OPTIONS_DEFAULT=TEXTURE
OPTIONS_SUB= yes
@@ -22,7 +19,6 @@ TEXTURE_CONFIGURE_ENABLE= texture-float
VAAPI_CONFIGURE_ENABLE= va
VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
-VAAPI_USE= XORG=xcb
VDPAU_CONFIGURE_ENABLE= vdpau
VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
Modified: head/graphics/mesa-dri/Makefile.common
==============================================================================
--- head/graphics/mesa-dri/Makefile.common Sun Dec 17 13:02:50 2017 (r456529)
+++ head/graphics/mesa-dri/Makefile.common Sun Dec 17 13:07:37 2017 (r456530)
@@ -14,7 +14,7 @@
MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-MESABASEVERSION= 17.2.4
+MESABASEVERSION= 17.3.0
# if there is a subversion, don't include the '-' between 7.11-rc2.
MESASUBVERSION=
@@ -58,7 +58,7 @@ python_OLD_CMD= /usr/bin/env[[:space:]]python2 /usr/bi
SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
src/gallium/drivers/svga/svgadump/svga_dump.py \
src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \
- src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
+ src/util/xmlpool/gen_xmlpool.py \
src/mesa/main/get_*.py src/util/format_srgb.py \
src/amd/*/*.py src/intel/genxml/gen_pack_header.py
Modified: head/graphics/mesa-dri/Makefile.targets
==============================================================================
--- head/graphics/mesa-dri/Makefile.targets Sun Dec 17 13:02:50 2017 (r456529)
+++ head/graphics/mesa-dri/Makefile.targets Sun Dec 17 13:07:37 2017 (r456530)
@@ -3,6 +3,11 @@
# this file holds common targets
post-patch:
+# Use --link-static until ports/223191 is fixed
+ @${REINPLACE_CMD} -e '/$$LLVM_VERSION_MAJOR -ge 4/s|test |false |' ${WRKSRC}/configure
+. if ${COMPONENT} == osmesa
+ @${REINPLACE_CMD} -e '/$$LLVM_VERSION_MAJOR -ge 4/s|test |false |' ${WRKSRC}/configure.ac
+. endif
.if ${OPSYS} == FreeBSD
@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure
. if ${COMPONENT} == osmesa
@@ -19,7 +24,7 @@ post-patch:
. endif
.endif
@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
- ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
+ ${WRKSRC}/src/util/xmlconfig.c
pre-build: mesa-pre-build
Modified: head/graphics/mesa-dri/distinfo
==============================================================================
--- head/graphics/mesa-dri/distinfo Sun Dec 17 13:02:50 2017 (r456529)
+++ head/graphics/mesa-dri/distinfo Sun Dec 17 13:07:37 2017 (r456530)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509517641
-SHA256 (mesa-17.2.4.tar.xz) = 5ba408fecd6e1132e5490eec1a2f04466214e4c65c8b89b331be844768c2e550
-SIZE (mesa-17.2.4.tar.xz) = 10381984
+TIMESTAMP = 1512740951
+SHA256 (mesa-17.3.0.tar.xz) = 29a0a3a6c39990d491a1a58ed5c692e596b3bfc6c01d0b45e0b787116c50c6d9
+SIZE (mesa-17.3.0.tar.xz) = 10667896
Modified: head/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c
==============================================================================
--- head/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c Sun Dec 17 13:02:50 2017 (r456529)
+++ head/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c Sun Dec 17 13:07:37 2017 (r456530)
@@ -1,16 +1,14 @@
# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
#
---- src/egl/drivers/dri2/platform_x11.c.orig 2017-10-02 15:49:02 UTC
+--- src/egl/drivers/dri2/platform_x11.c.orig 2017-10-23 13:21:18 UTC
+++ src/egl/drivers/dri2/platform_x11.c
-@@ -1490,7 +1490,11 @@ dri2_initialize_x11(_EGLDriver *drv, _EG
+@@ -1462,6 +1462,9 @@ dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp
- if (!getenv("LIBGL_ALWAYS_SOFTWARE")) {
+ if (!disp->Options.UseFallback) {
#ifdef HAVE_DRI3
-+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined (__DRM_NEXT__)
-+ if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))
-+#else
- if (!getenv("LIBGL_DRI3_DISABLE"))
++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)
++ if (env_var_as_boolean("LIBGL_DRI3_ENABLE", false))
+#endif
+ if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
initialized = dri2_initialize_x11_dri3(drv, disp);
#endif
-
Modified: head/graphics/mesa-dri/files/patch-src_glx_glxext.c
==============================================================================
--- head/graphics/mesa-dri/files/patch-src_glx_glxext.c Sun Dec 17 13:02:50 2017 (r456529)
+++ head/graphics/mesa-dri/files/patch-src_glx_glxext.c Sun Dec 17 13:07:37 2017 (r456530)
@@ -1,16 +1,14 @@
# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
#
---- src/glx/glxext.c.orig 2017-04-01 15:33:37 UTC
+--- src/glx/glxext.c.orig 2017-10-23 13:21:18 UTC
+++ src/glx/glxext.c
-@@ -906,7 +906,11 @@ __glXInitialize(Display * dpy)
+@@ -920,6 +920,9 @@ __glXInitialize(Display * dpy)
#if defined(GLX_USE_DRM)
if (glx_direct && glx_accel) {
#if defined(HAVE_DRI3)
-+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined (__DRM_NEXT__)
-+ if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))
-+#else
- if (!getenv("LIBGL_DRI3_DISABLE"))
++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)
++ if (env_var_as_boolean("LIBGL_DRI3_ENABLE", false))
+#endif
+ if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
dpyPriv->dri3Display = dri3_create_display(dpy);
#endif /* HAVE_DRI3 */
- dpyPriv->dri2Display = dri2CreateDisplay(dpy);
Added: head/graphics/mesa-dri/files/patch-src_intel_Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/mesa-dri/files/patch-src_intel_Makefile.in Sun Dec 17 13:07:37 2017 (r456530)
@@ -0,0 +1,18 @@
+../../src/util/.libs/libmesautil.a(libmesautil_la-half_float.o): In function `_mesa_float_to_half':
+half_float.c:(.text+0x94): undefined reference to `lrintf'
+half_float.c:(.text+0xbf): undefined reference to `lrintf'
+cc: error: linker command failed with exit code 1 (use -v to see invocation)
+gmake[5]: *** [Makefile:2706: tools/aubinator_error_decode] Error 1
+
+--- src/intel/Makefile.in.orig 2017-10-23 13:21:32 UTC
++++ src/intel/Makefile.in
+@@ -1975,7 +1975,8 @@ tools_aubinator_error_decode_LDADD = \
+ compiler/libintel_compiler.la \
+ $(top_builddir)/src/util/libmesautil.la \
+ $(PTHREAD_LIBS) \
+- $(ZLIB_LIBS)
++ $(ZLIB_LIBS) \
++ -lm
+
+ tools_aubinator_error_decode_CFLAGS = \
+ $(AM_CFLAGS) \
Modified: head/graphics/mesa-libs/Makefile
==============================================================================
--- head/graphics/mesa-libs/Makefile Sun Dec 17 13:02:50 2017 (r456529)
+++ head/graphics/mesa-libs/Makefile Sun Dec 17 13:07:37 2017 (r456530)
@@ -39,11 +39,11 @@ IGNORE= option WAYLAND is only valid on platforms with
.endif
.endif
-MESA_BUILD_WRKSRC= src/mapi
+MESA_BUILD_WRKSRC= src/mapi src/util
MESA_INSTALL_WRKSRC= src/mapi
.if ${PORT_OPTIONS:MWAYLAND}
-MESA_BUILD_WRKSRC+= src/util src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
+MESA_BUILD_WRKSRC+= src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl
.endif
Modified: head/graphics/mesa-libs/pkg-plist
==============================================================================
--- head/graphics/mesa-libs/pkg-plist Sun Dec 17 13:02:50 2017 (r456529)
+++ head/graphics/mesa-libs/pkg-plist Sun Dec 17 13:07:37 2017 (r456530)
@@ -1,3 +1,4 @@
+ at comment etc/drirc
%%EGL%%include/EGL/egl.h
%%EGL%%include/EGL/eglext.h
%%EGL%%include/EGL/eglextchromium.h
Modified: head/lang/clover/Makefile
==============================================================================
--- head/lang/clover/Makefile Sun Dec 17 13:02:50 2017 (r456529)
+++ head/lang/clover/Makefile Sun Dec 17 13:07:37 2017 (r456530)
@@ -34,7 +34,4 @@ pre-configure:
${FALSE}; \
fi
-post-install:
- @${MV} ${STAGEDIR}/etc/OpenCL ${STAGEDIR}${PREFIX}/etc/
-
.include <bsd.port.post.mk>
More information about the svn-ports-head
mailing list