Index: devel/libclc/Makefile =================================================================== --- devel/libclc/Makefile (revision 409769) +++ devel/libclc/Makefile (working copy) @@ -2,18 +2,18 @@ # $FreeBSD$ PORTNAME= libclc -DISTVERSION= 0.1.0.20150710 +DISTVERSION= 0.2.0.20151006 CATEGORIES= devel MAINTAINER= kwm@FreeBSD.org COMMENT= Required library functions for OpenCL C programming language -BUILD_DEPENDS= clang${LLVMVER}:${PORTSDIR}/lang/clang${LLVMVER} \ +BUILD_DEPENDS= clang${LLVMVER}:${PORTSDIR}/devel/llvm${LLVMVER} \ libedit>=0:${PORTSDIR}/devel/libedit USE_GITHUB= yes GH_ACCOUNT= llvm-mirror -GH_TAGNAME= eed524f2a9 +GH_TAGNAME= 6d78407 GNU_CONFIGURE= yes USES= gmake python:2,build ninja @@ -20,7 +20,7 @@ USE_LDCONFIG= yes MAKE_ENV= MAKE=${GMAKE} DESTDIR=${STAGEDIR} -LLVMVER= 36 +LLVMVER= 37 ALL_TARGET= Index: devel/libclc/distinfo =================================================================== --- devel/libclc/distinfo (revision 409769) +++ devel/libclc/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (llvm-mirror-libclc-0.1.0.20150710-eed524f2a9_GH0.tar.gz) = 12cfa6c2530dd2308fa11ec43d450d1aa0f94cb9b05bbb80daa78b4dfa05d691 -SIZE (llvm-mirror-libclc-0.1.0.20150710-eed524f2a9_GH0.tar.gz) = 94347 +SHA256 (llvm-mirror-libclc-0.2.0.20151006-6d78407_GH0.tar.gz) = 1a1d5d0b00560cf5d4784110f22ef8ade121c4a703a3622e0be85989eca3e4ba +SIZE (llvm-mirror-libclc-0.2.0.20151006-6d78407_GH0.tar.gz) = 102996 Index: devel/libclc/pkg-plist =================================================================== --- devel/libclc/pkg-plist (revision 409769) +++ devel/libclc/pkg-plist (working copy) @@ -74,6 +74,8 @@ include/clc/geometric/length.inc include/clc/geometric/normalize.h include/clc/geometric/normalize.inc +include/clc/image/image.h +include/clc/image/image_defines.h include/clc/integer/abs.h include/clc/integer/abs.inc include/clc/integer/abs_diff.h @@ -157,10 +159,12 @@ include/clc/math/ldexp.h include/clc/math/ldexp.inc include/clc/math/log.h +include/clc/math/log.inc include/clc/math/log10.h include/clc/math/log1p.h include/clc/math/log1p.inc include/clc/math/log2.h +include/clc/math/log2.inc include/clc/math/mad.h include/clc/math/mad.inc include/clc/math/native_cos.h @@ -169,7 +173,9 @@ include/clc/math/native_exp10.h include/clc/math/native_exp2.h include/clc/math/native_log.h +include/clc/math/native_log.inc include/clc/math/native_log2.h +include/clc/math/native_log2.inc include/clc/math/native_powr.h include/clc/math/native_sin.h include/clc/math/native_sqrt.h @@ -186,8 +192,11 @@ include/clc/math/sinpi.h include/clc/math/sinpi.inc include/clc/math/sqrt.h +include/clc/math/sqrt.inc include/clc/math/tan.h include/clc/math/tan.inc +include/clc/math/tanh.h +include/clc/math/tanh.inc include/clc/math/ternary_intrin.inc include/clc/math/trunc.h include/clc/math/unary_decl.inc Index: graphics/libGL/Makefile.common =================================================================== --- graphics/libGL/Makefile.common (revision 409769) +++ graphics/libGL/Makefile.common (working copy) @@ -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,8 +67,11 @@ COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} -MESA_LLVM_VER=36 +MESA_LLVM_VER=37 +# sha1 +CONFIGURE_ARGS+= --with-sha1=libcrypto + # DRI3 needs PRIME support in the kernel to work CONFIGURE_ARGS+= --disable-dri3 @@ -92,7 +95,10 @@ # 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} +. if exists(${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}) && \ + !exists(${LOCALBASE}/bin/clang${MESA_LLVM_VER}) +BROKEN= Your llvm${MESA_LLVM_VER} is not build with clang support, which is required +. endif .endif CONFIGURE_ARGS+= --enable-opencl \ Index: graphics/libGL/distinfo =================================================================== --- graphics/libGL/distinfo (revision 409769) +++ graphics/libGL/distinfo (working copy) @@ -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 Index: graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c =================================================================== --- graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c (revision 409769) +++ graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c (nonexistent) @@ -1,11 +0,0 @@ ---- src/gallium/auxiliary/util/u_cpu_detect.c.orig 2014-09-19 18:23:33 UTC -+++ src/gallium/auxiliary/util/u_cpu_detect.c -@@ -52,7 +52,7 @@ - #include - #endif - --#if defined(PIPE_OS_FREEBSD) -+#if defined(PIPE_OS_FREEBSD) || defined(PIPE_OS_DRAGONFLY) - #include - #include - #endif Property changes on: graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c =================================================================== --- graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c (revision 409769) +++ graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c (nonexistent) @@ -1,24 +0,0 @@ ---- ./src/gallium/drivers/r300/r300_chipset.c.orig 2014-01-06 22:15:40.000000000 +0100 -+++ ./src/gallium/drivers/r300/r300_chipset.c 2014-02-23 22:01:50.000000000 +0100 -@@ -53,6 +53,21 @@ - if (!os_get_process_name(proc_name, sizeof(proc_name))) - return; - -+#if defined(__DragonFly__) || \ -+ defined(__FreeBSD__) || \ -+ defined(__NetBSD__) || \ -+ defined(__OpenBSD__) -+ const char *progname, *program_invocation_short_name; -+ -+ progname = getprogname(); -+ program_invocation_short_name = strrchr(progname, '/'); -+ if (program_invocation_short_name) { -+ program_invocation_short_name++; -+ } else { -+ program_invocation_short_name = progname; -+ } -+#endif -+ - for (i = 0; i < Elements(list); i++) { - if (strcmp(list[i], proc_name) == 0) { - caps->zmask_ram = 0; Property changes on: graphics/libGL/files/patch-src__gallium__drivers__r300__r300_chipset.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: graphics/libGL/files/patch-src__loader__Makefile.in =================================================================== --- graphics/libGL/files/patch-src__loader__Makefile.in (revision 409769) +++ graphics/libGL/files/patch-src__loader__Makefile.in (working copy) @@ -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 = \