Sync with trunk.

git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/experimental@1534 058c260c-8361-11dd-a0ac-aa2bafec7d09

18 files changed, 107 insertions, 44 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index d677f69..2dc5bf8 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -1,5 +1,5 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/graphics/dri/Makefile 342087 2014-01-31 22:21:43Z kwm $
+# $FreeBSD$
 
 PORTNAME=	dri
 PORTVERSION=	${MESAVERSION}
@@ -24,21 +24,20 @@ OPTIONS_DEFAULT_amd64=	GALLIUM VDPAU
 
 GALLIUM_DESC=	Gallium (llvm backed) dri drivers
 TEXTURE_DESC=	Enable texture-float support (patent encumbered)
+VDPAU_DESC=	VDPAU (GPU video acceleration) support (needs Gallium)
 
 PKGHELP=	${.CURDIR}/pkg-help
 
 .include <bsd.port.options.mk>
 
 # gcc from base can't handle some code in mesa 9.1+
-# We only care for 9.x and 8.x, not for old pre-clang default current.
+# We only care for 9.x and 8.x. clang in 10.x is new enough.
 # This is for 0b0000 binary which gcc 4.3+ understands and is in the i965 driver.
-. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000) \
-		&& ${ARCH} == amd64
+. if (${OSVERSION} >= 901500 && ${OSVERSION} < 1000000)
 CC=clang
 CXX=clang++
 CPP=clang-cpp
-# i386 triggers clang bug 19778. This happens with clang 3.4.1 and older.
-. elif ${OSVERSION} < 901500 || ${ARCH} == i386
+. elif ${OSVERSION} < 901500
 USE_GCC=yes
 . endif
 
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 46e4737..83562b2 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -55,7 +55,3 @@ include/GL/internal/dri_interface.h
 libdata/pkgconfig/dri.pc
 @comment libdata/pkgconfig/gbm.pc
 @comment libdata/pkgconfig/gl.pc
-%%VDPAU%%@dirrm lib/vdpau
-@dirrm lib/dri
-@dirrmtry include/GL/internal
-@dirrmtry include/GL
diff --git a/graphics/dri/pkg-plist-old b/graphics/dri/pkg-plist-old
index 8393ec2..6ccab8b 100644
--- a/graphics/dri/pkg-plist-old
+++ b/graphics/dri/pkg-plist-old
@@ -48,24 +48,20 @@ lib/libdricore9.1.7.so.1.0.0
 @comment lib/libglapi.so
 @comment lib/libglapi.so.0
 @comment lib/libglapi.so.0.0.0
-lib/libllvmradeon%%VERSION%%.so
-%%VDPAU%%lib/vdpau/libvdpau_r300.so
-%%VDPAU%%lib/vdpau/libvdpau_r300.so.1
-%%VDPAU%%lib/vdpau/libvdpau_r300.so.1.0.0
-%%VDPAU%%lib/vdpau/libvdpau_r600.so
-%%VDPAU%%lib/vdpau/libvdpau_r600.so.1
-%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0.0
-%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so
-%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1
-%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
-%%VDPAU%%lib/vdpau/libvdpau_softpipe.so
-%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1
-%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1.0.0
+%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r300.so.1.0.0
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_r600.so.1.0.0
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1
+%%GALLIUM%%%%VDPAU%%lib/vdpau/libvdpau_softpipe.so.1.0.0
 libdata/pkgconfig/dri.pc
 @comment libdata/pkgconfig/egl.pc
 @comment libdata/pkgconfig/gbm.pc
 @comment libdata/pkgconfig/gl.pc
-%%VDPAU%%@dirrm lib/vdpau
-@dirrm lib/dri
-@dirrmtry include/GL/internal
-@dirrmtry include/GL
diff --git a/graphics/libEGL/pkg-plist b/graphics/libEGL/pkg-plist
index af23bb9..fb478a8 100644
--- a/graphics/libEGL/pkg-plist
+++ b/graphics/libEGL/pkg-plist
@@ -8,5 +8,3 @@ lib/libEGL.so
 lib/libEGL.so.1
 lib/libEGL.so.1.0.0
 libdata/pkgconfig/egl.pc
-@dirrmtry include/KHR
-@dirrmtry include/EGL
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index eb3855e..8d67b6b 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -1,5 +1,5 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
-# $FreeBSD: head/graphics/libGL/Makefile 347435 2014-03-08 00:08:21Z miwi $
+# $FreeBSD: head/graphics/libGL/Makefile 371035 2014-10-17 09:53:13Z kwm $
 
 PORTNAME=	libGL
 PORTVERSION=	${MESAVERSION}
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index fd01de1..56ded87 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -11,7 +11,7 @@
 #    - graphics/libglapi
 #    - grahpics/libglesv2
 #
-# $FreeBSD$
+# $FreeBSD: head/graphics/libGL/bsd.mesalib.mk 371035 2014-10-17 09:53:13Z kwm $
 
 # hw context support in the i915kms driver
 .if ${OPSYS} == FreeBSD && \
diff --git a/graphics/libGL/files-old/patch-src__gallium__state_trackers__xvmc__tests__xvmc_bench.c b/graphics/libGL/files-old/patch-src__gallium__state_trackers__xvmc__tests__xvmc_bench.c
index 5d4f2dc..367424c 100644
--- a/graphics/libGL/files-old/patch-src__gallium__state_trackers__xvmc__tests__xvmc_bench.c
+++ b/graphics/libGL/files-old/patch-src__gallium__state_trackers__xvmc__tests__xvmc_bench.c
@@ -1,8 +1,10 @@
---- src/gallium/state_trackers/xvmc/tests/xvmc_bench.c.orig	2013-10-05 05:59:22.000000000 +0200
-+++ src/gallium/state_trackers/xvmc/tests/xvmc_bench.c	2014-03-02 13:21:35.000000000 +0100
-@@ -28,8 +28,8 @@
+--- src/gallium/state_trackers/xvmc/tests/xvmc_bench.c.orig	2013-10-05 03:59:22.000000000 +0000
++++ src/gallium/state_trackers/xvmc/tests/xvmc_bench.c	2014-10-16 13:46:30.000000000 +0000
+@@ -27,9 +27,10 @@
+ 
  #include <assert.h>
  #include <stdio.h>
++#include <stdlib.h>
  #include <string.h>
 -#include <error.h>
  #include <sys/time.h>
@@ -10,7 +12,7 @@
  #include "testlib.h"
  
  #define MACROBLOCK_WIDTH		16
-@@ -144,23 +144,10 @@
+@@ -144,23 +145,10 @@
  	}
  
  	if (fail)
@@ -38,7 +40,7 @@
  
  	if (config->output_width == 0)
  		config->output_width = config->input_width;
-@@ -214,7 +201,8 @@
+@@ -214,7 +202,8 @@
  	))
  	{
  		XCloseDisplay(display);
diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h
new file mode 100644
index 0000000..13c245e
--- /dev/null
+++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86-64_tls.h
@@ -0,0 +1,13 @@
+--- src/mapi/mapi/entry_x86-64_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/mapi/mapi/entry_x86-64_tls.h	2014-07-29 20:28:05.000000000 +0200
+@@ -63,8 +63,8 @@ entry_patch_public(void)
+ {
+ }
+ 
+-static char
+-x86_64_entry_start[];
++extern char
++x86_64_entry_start[] __attribute__((visibility("hidden")));
+ 
+ mapi_func
+ entry_get_public(int slot)
diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h
new file mode 100644
index 0000000..d8a8e24
--- /dev/null
+++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tls.h
@@ -0,0 +1,13 @@
+--- src/mapi/mapi/entry_x86_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/mapi/mapi/entry_x86_tls.h	2014-07-29 20:28:05.000000000 +0200
+@@ -73,8 +73,8 @@ __asm__(".text");
+ extern unsigned long
+ x86_current_tls();
+ 
+-static char x86_entry_start[];
+-static char x86_entry_end[];
++extern char x86_entry_start[] __attribute__((visibility("hidden")));
++extern char x86_entry_end[] __attribute__((visibility("hidden")));
+ 
+ void
+ entry_patch_public(void)
diff --git a/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h
new file mode 100644
index 0000000..b97cf4c
--- /dev/null
+++ b/graphics/libGL/files-old/patch-src_mapi_mapi_entry_x86_tsd.h
@@ -0,0 +1,13 @@
+--- src/mapi/mapi/entry_x86_tsd.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/mapi/mapi/entry_x86_tsd.h	2014-07-29 20:28:05.000000000 +0200
+@@ -60,8 +60,8 @@ __asm__(".balign 32\n"
+ #include <string.h>
+ #include "u_execmem.h"
+ 
+-static const char x86_entry_start[];
+-static const char x86_entry_end[];
++extern const char x86_entry_start[] __attribute__((visibility("hidden")));
++extern const char x86_entry_end[] __attribute__((visibility("hidden")));
+ 
+ void
+ entry_patch_public(void)
diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h b/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h
new file mode 100644
index 0000000..32d4b05
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h
@@ -0,0 +1,13 @@
+--- src/mapi/entry_x86-64_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/mapi/entry_x86-64_tls.h	2014-07-29 20:28:05.000000000 +0200
+@@ -63,8 +63,8 @@ entry_patch_public(void)
+ {
+ }
+ 
+-static char
+-x86_64_entry_start[];
++extern char
++x86_64_entry_start[] __attribute__((visibility("hidden")));
+ 
+ mapi_func
+ entry_get_public(int slot)
diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h b/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h
new file mode 100644
index 0000000..51f2839
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mapi__entry_x86_tls.h
@@ -0,0 +1,13 @@
+--- src/mapi/entry_x86_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/mapi/entry_x86_tls.h	2014-07-29 20:28:05.000000000 +0200
+@@ -73,8 +73,8 @@ __asm__(".text");
+ extern unsigned long
+ x86_current_tls();
+ 
+-static char x86_entry_start[];
+-static char x86_entry_end[];
++extern char x86_entry_start[] __attribute__((visibility("hidden")));
++extern char x86_entry_end[] __attribute__((visibility("hidden")));
+ 
+ void
+ entry_patch_public(void)
diff --git a/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h b/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h
new file mode 100644
index 0000000..0aceed5
--- /dev/null
+++ b/graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h
@@ -0,0 +1,13 @@
+--- src/mapi/entry_x86_tsd.h.orig	2013-10-05 05:59:22.000000000 +0200
++++ src/mapi/entry_x86_tsd.h	2014-07-29 20:28:05.000000000 +0200
+@@ -60,8 +60,8 @@ __asm__(".balign 32\n"
+ #include <string.h>
+ #include "u_execmem.h"
+ 
+-static const char x86_entry_start[];
+-static const char x86_entry_end[];
++extern const char x86_entry_start[] __attribute__((visibility("hidden")));
++extern const char x86_entry_end[] __attribute__((visibility("hidden")));
+ 
+ void
+ entry_patch_public(void)
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
index d910c93..9a46715 100644
--- a/graphics/libGL/pkg-plist
+++ b/graphics/libGL/pkg-plist
@@ -18,5 +18,3 @@ lib/.libGL/libGL.so.1.2.0
 @comment lib/libglapi.so.0.0.0
 @comment libdata/pkgconfig/dri.pc
 libdata/pkgconfig/gl.pc
-@dirrm lib/.libGL
-@dirrmtry include/GL
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 0e5463d..f11d4a3 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -56,5 +56,3 @@ libdata/pkgconfig/libdrm.pc
 %%MAN%%man/man7/drm-mm.7.gz
 %%MAN%%man/man7/drm-ttm.7.gz
 %%MAN%%man/man7/drm.7.gz
-%%KMS%%@dirrm include/libkms
-@dirrm include/libdrm
diff --git a/graphics/libglapi/Makefile b/graphics/libglapi/Makefile
index f5346c3..fd441c6 100644
--- a/graphics/libglapi/Makefile
+++ b/graphics/libglapi/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	${MESAVERSION}
 PORTREVISION=	${LIBGLAPI_REVISION}
 CATEGORIES=	graphics
 
-COMMENT=	Common GL api libary used by Mesa based ports.
+COMMENT=	Common GL api library used by Mesa based ports
 
 LIB_DEPENDS+=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
 
diff --git a/graphics/libglesv2/Makefile b/graphics/libglesv2/Makefile
index 4829157..5f74dbf 100644
--- a/graphics/libglesv2/Makefile
+++ b/graphics/libglesv2/Makefile
@@ -1,5 +1,5 @@
 # Created by: kwm@FreeBSD.org
-# $FreeBSD: head/graphics/libglesv2/Makefile 351411 2014-04-16 18:28:47Z zeising $
+# $FreeBSD$
 
 PORTNAME=	libglesv2
 PORTVERSION=	${MESAVERSION}
diff --git a/graphics/libglesv2/pkg-plist b/graphics/libglesv2/pkg-plist
index 8abc024..3c7cb53 100644
--- a/graphics/libglesv2/pkg-plist
+++ b/graphics/libglesv2/pkg-plist
@@ -9,5 +9,3 @@ lib/libGLESv2.so
 lib/libGLESv2.so.2
 lib/libGLESv2.so.2.0.0
 libdata/pkgconfig/glesv2.pc
-@dirrmtry include/GLES3
-@dirrmtry include/GLES2