Date: Tue, 10 Oct 2017 06:47:01 +0000 (UTC) From: Matthew Rezny <rezny@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451657 - in head/graphics: mesa-dri mesa-dri/files mesa-libs Message-ID: <201710100647.v9A6l1tY025000@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rezny Date: Tue Oct 10 06:47:01 2017 New Revision: 451657 URL: https://svnweb.freebsd.org/changeset/ports/451657 Log: Update the Mesa ports to 17.2.2 Mesa supports both llvm40 and llvm50. The former remains the default as it's what the OpenCL ports currently require and it's available on more platforms. Modified: head/graphics/mesa-dri/Makefile.common head/graphics/mesa-dri/Makefile.targets head/graphics/mesa-dri/distinfo head/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in head/graphics/mesa-dri/files/patch-configure head/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c head/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h head/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c head/graphics/mesa-libs/Makefile Modified: head/graphics/mesa-dri/Makefile.common ============================================================================== --- head/graphics/mesa-dri/Makefile.common Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/Makefile.common Tue Oct 10 06:47:01 2017 (r451657) @@ -14,7 +14,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 17.1.10 +MESABASEVERSION= 17.2.2 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= Modified: head/graphics/mesa-dri/Makefile.targets ============================================================================== --- head/graphics/mesa-dri/Makefile.targets Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/Makefile.targets Tue Oct 10 06:47:01 2017 (r451657) @@ -12,9 +12,9 @@ post-patch: # Clang in 10.3 fails with cannot compile this atomic library call yet 'p_atomic_add' # Clang in 11.0 fails with undefined reference to `__atomic_fetch_add_8` . if ${ARCH} == "i386" - @${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|GCC_ATOMIC_BUILTINS_SUPPORTED||' ${WRKSRC}/configure . if ${COMPONENT} == osmesa - @${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure.ac + @${REINPLACE_CMD} -e 's|GCC_ATOMIC_BUILTINS_SUPPORTED||' ${WRKSRC}/configure.ac . endif . endif .endif Modified: head/graphics/mesa-dri/distinfo ============================================================================== --- head/graphics/mesa-dri/distinfo Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/distinfo Tue Oct 10 06:47:01 2017 (r451657) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506763439 -SHA256 (mesa-17.1.10.tar.xz) = cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb -SIZE (mesa-17.1.10.tar.xz) = 9872168 +TIMESTAMP = 1507459266 +SHA256 (mesa-17.2.2.tar.xz) = cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782 +SIZE (mesa-17.2.2.tar.xz) = 10359156 Modified: head/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in ============================================================================== --- head/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in Tue Oct 10 06:47:01 2017 (r451657) @@ -1,13 +1,11 @@ -# enable NEON instructions in the compiler when building the NEON codepath -# ---- src/gallium/drivers/vc4/Makefile.in.orig 2017-05-16 13:55:49 UTC +--- src/gallium/drivers/vc4/Makefile.in.orig 2017-10-02 15:49:15 UTC +++ src/gallium/drivers/vc4/Makefile.in -@@ -669,7 +669,7 @@ libvc4_la_SOURCES = $(C_SOURCES) - libvc4_la_LIBADD = $(SIM_LIB) $(VC4_LIBS) libvc4_neon.la +@@ -677,7 +677,7 @@ noinst_LTLIBRARIES = libvc4.la $(am__app + libvc4_la_SOURCES = $(C_SOURCES) + libvc4_la_LIBADD = $(SIM_LIB) $(am__append_5) + @HAVE_ARM_ASM_TRUE@libvc4_neon_la_SOURCES = $(NEON_C_SOURCES) +-@HAVE_ARM_ASM_TRUE@libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -mfpu=neon ++@HAVE_ARM_ASM_TRUE@libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -march=armv7-a -mfpu=neon libvc4_la_LDFLAGS = $(SIM_LDFLAGS) - libvc4_neon_la_SOURCES = vc4_tiling_lt.c --libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON -+libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON -march=armv7-a -mfpu=neon EXTRA_DIST = kernel/README all: all-am - Modified: head/graphics/mesa-dri/files/patch-configure ============================================================================== --- head/graphics/mesa-dri/files/patch-configure Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/files/patch-configure Tue Oct 10 06:47:01 2017 (r451657) @@ -1,6 +1,6 @@ ---- configure.orig 2017-05-10 14:14:06 UTC +--- configure.orig 2017-10-02 15:49:13 UTC +++ configure -@@ -22709,7 +22709,7 @@ fi +@@ -22846,7 +22846,7 @@ fi case "$host_os" in @@ -9,7 +9,7 @@ dri3_default=yes ;; *) -@@ -25972,9 +25972,19 @@ if test "x$enable_opencl" = xyes; then +@@ -26399,9 +26399,19 @@ if test "x$enable_opencl" = xyes; then as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5 fi @@ -29,7 +29,7 @@ if test "x$have_libclc" = xno; then as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover. -@@ -26037,9 +26047,6 @@ rm -f core conftest.err conftest.$ac_obj +@@ -26464,9 +26474,6 @@ rm -f core conftest.err conftest.$ac_obj CLANG_LIBDIR=${LLVM_LIBDIR} fi CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} 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 Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c Tue Oct 10 06:47:01 2017 (r451657) @@ -1,8 +1,8 @@ # work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627 # ---- src/egl/drivers/dri2/platform_x11.c.orig 2017-05-10 14:13:57 UTC +--- src/egl/drivers/dri2/platform_x11.c.orig 2017-10-02 15:49:02 UTC +++ src/egl/drivers/dri2/platform_x11.c -@@ -1509,7 +1509,11 @@ dri2_initialize_x11(_EGLDriver *drv, _EG +@@ -1490,7 +1490,11 @@ dri2_initialize_x11(_EGLDriver *drv, _EG if (!getenv("LIBGL_ALWAYS_SOFTWARE")) { #ifdef HAVE_DRI3 Modified: head/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c ============================================================================== --- head/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c Tue Oct 10 06:47:01 2017 (r451657) @@ -25,9 +25,9 @@ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Francisco Jerez <currojerez@riseup.net> ---- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig 2017-05-10 14:13:57 UTC +--- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig 2017-10-02 15:49:02 UTC +++ src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c -@@ -209,6 +209,14 @@ pipe_loader_drm_probe_fd(struct pipe_loa +@@ -214,6 +214,14 @@ pipe_loader_drm_probe_fd(struct pipe_loa } static int @@ -42,7 +42,7 @@ Reviewed-by: Francisco Jerez <currojerez@riseup.net> open_drm_render_node_minor(int minor) { char path[PATH_MAX]; -@@ -220,8 +228,15 @@ open_drm_render_node_minor(int minor) +@@ -225,8 +233,15 @@ open_drm_render_node_minor(int minor) int pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev) { @@ -59,7 +59,7 @@ Reviewed-by: Francisco Jerez <currojerez@riseup.net> for (i = DRM_RENDER_NODE_MIN_MINOR, j = 0; i <= DRM_RENDER_NODE_MAX_MINOR; i++) { struct pipe_loader_device *dev; -@@ -235,6 +250,9 @@ pipe_loader_drm_probe(struct pipe_loader +@@ -240,6 +255,9 @@ pipe_loader_drm_probe(struct pipe_loader continue; } @@ -69,7 +69,7 @@ Reviewed-by: Francisco Jerez <currojerez@riseup.net> if (j < ndev) { devs[j] = dev; } else { -@@ -244,6 +262,46 @@ pipe_loader_drm_probe(struct pipe_loader +@@ -249,6 +267,46 @@ pipe_loader_drm_probe(struct pipe_loader j++; } Modified: head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h ============================================================================== --- head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h Tue Oct 10 06:47:01 2017 (r451657) @@ -1,6 +1,6 @@ ---- src/gallium/include/pipe/p_config.h.orig 2016-11-10 22:05:17 UTC +--- src/gallium/include/pipe/p_config.h.orig 2017-10-02 15:49:02 UTC +++ src/gallium/include/pipe/p_config.h -@@ -76,6 +76,13 @@ +@@ -77,6 +77,13 @@ #define PIPE_CC_ICL #endif @@ -14,7 +14,7 @@ /* * Processor architecture -@@ -130,7 +137,7 @@ +@@ -131,7 +138,7 @@ #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64) #define PIPE_ARCH_LITTLE_ENDIAN @@ -23,7 +23,7 @@ #define PIPE_ARCH_BIG_ENDIAN #endif -@@ -159,6 +166,12 @@ +@@ -160,6 +167,12 @@ #define PIPE_OS_ANDROID #endif Modified: head/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c ============================================================================== --- head/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c Tue Oct 10 06:47:01 2017 (r451657) @@ -1,9 +1,9 @@ # We don't have MAP_NORESERVE so use MAP_NOSYNC | MAP_NOCORE and # hope for the best (this alloc is too big but it's only a test) # ---- src/intel/tools/aubinator.c.orig 2017-05-10 14:13:57 UTC +--- src/intel/tools/aubinator.c.orig 2017-10-02 15:49:02 UTC +++ src/intel/tools/aubinator.c -@@ -1221,7 +1221,7 @@ int main(int argc, char *argv[]) +@@ -1237,7 +1237,7 @@ int main(int argc, char *argv[]) /* mmap a terabyte for our gtt space. */ gtt_size = 1ull << 40; gtt = mmap(NULL, gtt_size, PROT_READ | PROT_WRITE, Modified: head/graphics/mesa-libs/Makefile ============================================================================== --- head/graphics/mesa-libs/Makefile Tue Oct 10 06:25:11 2017 (r451656) +++ head/graphics/mesa-libs/Makefile Tue Oct 10 06:47:01 2017 (r451657) @@ -14,6 +14,7 @@ OPTIONS_DEFINE= WAYLAND OPTIONS_SUB= yes WAYLAND_DESC= Enable support for the Wayland platform in EGL +WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.8:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libwayland-server.so:graphics/wayland @@ -42,7 +43,7 @@ MESA_BUILD_WRKSRC= src/mapi MESA_INSTALL_WRKSRC= src/mapi .if ${PORT_OPTIONS:MWAYLAND} -MESA_BUILD_WRKSRC+= src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl +MESA_BUILD_WRKSRC+= src/util src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710100647.v9A6l1tY025000>