Date: Fri, 25 Mar 2016 14:06:09 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411841 - in head/graphics/libGL: . files Message-ID: <201603251406.u2PE69YQ063384@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Fri Mar 25 14:06:09 2016 New Revision: 411841 URL: https://svnweb.freebsd.org/changeset/ports/411841 Log: Update Mesa to 11.1.2. Switch to using llvm 3.7. Obtained from: graphics team development repo Deleted: head/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c head/graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c Modified: head/graphics/libGL/Makefile.common head/graphics/libGL/distinfo head/graphics/libGL/files/patch-src__loader__Makefile.in Modified: head/graphics/libGL/Makefile.common ============================================================================== --- head/graphics/libGL/Makefile.common Fri Mar 25 13:32:49 2016 (r411840) +++ head/graphics/libGL/Makefile.common Fri Mar 25 14:06:09 2016 (r411841) @@ -18,7 +18,7 @@ MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/} MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/} -MESABASEVERSION= 11.0.8 +MESABASEVERSION= 11.1.2 # if there is a subversion, don't include the '-' between 7.11-rc2. MESASUBVERSION= @@ -67,7 +67,9 @@ INSTALL_TARGET= install-strip COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} -MESA_LLVM_VER=36 +MESA_LLVM_VER=37 + +CONFIGURE_ARGS+= --with-sha1=libcrypto # DRI3 needs PRIME support in the kernel to work CONFIGURE_ARGS+= --disable-dri3 @@ -92,7 +94,15 @@ BUILD_DEPENDS+= libclc>=0.0.r222830:${PO # We need the clang port too even if it is not used to compile because # Clover needs some of the clang includes to build. .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Mosmesa} != "" -BUILD_DEPENDS+= clang${MESA_LLVM_VER}>=0:${PORTSDIR}/lang/clang${MESA_LLVM_VER} +_USES_pre_configure+= 290:clover-pre-configure + +# .if !exists() evaluates too early before cairo has a chance to be installed +clover-pre-configure: + @if [ -e ${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} ] && \ + ! [ -e ${LOCALBASE}/bin/clang${MESA_LLVM_VER} ]; then \ + ${ECHO_MSG} "Your llvm${MESA_LLVM_VER} is not build with clang support, which is required."; \ + ${FALSE}; \ + fi .endif CONFIGURE_ARGS+= --enable-opencl \ Modified: head/graphics/libGL/distinfo ============================================================================== --- head/graphics/libGL/distinfo Fri Mar 25 13:32:49 2016 (r411840) +++ head/graphics/libGL/distinfo Fri Mar 25 14:06:09 2016 (r411841) @@ -1,2 +1,2 @@ -SHA256 (mesa-11.0.8.tar.xz) = 5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75 -SIZE (mesa-11.0.8.tar.xz) = 7282812 +SHA256 (mesa-11.1.2.tar.xz) = 8f72aead896b340ba0f7a4a474bfaf71681f5d675592aec1cb7ba698e319148b +SIZE (mesa-11.1.2.tar.xz) = 7561920 Modified: head/graphics/libGL/files/patch-src__loader__Makefile.in ============================================================================== --- head/graphics/libGL/files/patch-src__loader__Makefile.in Fri Mar 25 13:32:49 2016 (r411840) +++ head/graphics/libGL/files/patch-src__loader__Makefile.in Fri Mar 25 14:06:09 2016 (r411841) @@ -1,11 +1,11 @@ ---- src/loader/Makefile.in.orig 2015-08-24 10:41:51.309456000 +0200 -+++ src/loader/Makefile.in 2015-08-24 10:42:39.452059000 +0200 -@@ -505,7 +505,7 @@ - noinst_LTLIBRARIES = libloader.la - libloader_la_CPPFLAGS = $(DEFINES) -I$(top_srcdir)/include \ - -I$(top_srcdir)/src $(VISIBILITY_CFLAGS) $(LIBUDEV_CFLAGS) \ -- $(am__append_1) $(am__append_3) -+ $(LIBDEVQ_CFLAGS) $(am__append_1) $(am__append_3) +--- src/loader/Makefile.in.orig 2015-12-04 10:21:50.951759000 +0100 ++++ src/loader/Makefile.in 2015-12-04 10:27:14.391665000 +0100 +@@ -531,7 +531,7 @@ + $(LIBDRM_CFLAGS) \ + $(LIBUDEV_CFLAGS) + +-libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) ++libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDEVQ_CFLAGS) $(am__append_1) libloader_la_SOURCES = $(LOADER_C_FILES) - libloader_la_LIBADD = $(am__append_2) $(am__append_4) - all: all-am + libloader_la_LIBADD = $(am__append_2) $(am__append_3) + @HAVE_DRI3_TRUE@libloader_dri3_helper_la_SOURCES = \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603251406.u2PE69YQ063384>