Build dri on 8.x with gcc, didn't get clang to play nice ...

Update patch to fix the build with gcc.


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

2 files changed, 10 insertions, 6 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 00aa4cc..b035895 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -30,12 +30,14 @@ 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)
 CC=clang
 CXX=clang++
 CPP=clang-cpp
+. elif ${OSVERSION} < 901500
+USE_GCC=yes
 . endif
 
 ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
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);