Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 26 May 2014 17:33:29 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r355420 - head/graphics/libGL/files
Message-ID:  <201405261733.s4QHXTgO072049@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marino
Date: Mon May 26 17:33:29 2014
New Revision: 355420
URL: http://svnweb.freebsd.org/changeset/ports/355420
QAT: https://qat.redports.org/buildarchive/r355420/

Log:
  graphics/libGL: Improve gallium patches to unbreak DragonFly
  
  Some dependent ports are now building Gallium by default.  This never
  build on DragonFly before so the ports broke.  Add DragonFly macro
  to existing patches and add one new patch to restore DF builds.
  
  Approved by:	portmgr (bapt)

Added:
  head/graphics/libGL/files/patch-src_mesa_main_imports.c   (contents, props changed)
Modified:
  head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c
  head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c
  head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c
  head/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c

Modified: head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c
==============================================================================
--- head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c	Mon May 26 17:31:43 2014	(r355419)
+++ head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c	Mon May 26 17:33:29 2014	(r355420)
@@ -6,7 +6,7 @@
  #include <errno.h>
 +#if defined(__linux__)
  #include <byteswap.h>
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
 +#define bswap_32(x)	bswap32((x))
 +#endif

Modified: head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c
==============================================================================
--- head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c	Mon May 26 17:31:43 2014	(r355419)
+++ head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c	Mon May 26 17:33:29 2014	(r355420)
@@ -6,7 +6,7 @@
  #include <errno.h>
 +#if defined(__linux__)
  #include <byteswap.h>
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
 +#define bswap_32(x)	bswap32((x))
 +#endif

Modified: head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c
==============================================================================
--- head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c	Mon May 26 17:31:43 2014	(r355419)
+++ head/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c	Mon May 26 17:33:29 2014	(r355420)
@@ -6,7 +6,7 @@
  #include "tgsi/tgsi_parse.h"
 +#if defined(__linux__)
  #include <byteswap.h>
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
 +#define bswap_32(x)	bswap32((x))
 +#endif

Modified: head/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c
==============================================================================
--- head/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c	Mon May 26 17:31:43 2014	(r355419)
+++ head/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c	Mon May 26 17:33:29 2014	(r355420)
@@ -7,7 +7,7 @@
 +
 +#if defined(__linux__)
  #include <byteswap.h>
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/endian.h>
 +#define bswap_32(x)	bswap32((x))
 +#endif

Added: head/graphics/libGL/files/patch-src_mesa_main_imports.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libGL/files/patch-src_mesa_main_imports.c	Mon May 26 17:33:29 2014	(r355420)
@@ -0,0 +1,10 @@
+--- src/mesa/main/imports.c.orig	2013-10-05 03:59:22.000000000 +0000
++++ src/mesa/main/imports.c
+@@ -566,6 +566,7 @@ float
+ _mesa_strtof( const char *s, char **end )
+ {
+ #if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
++   !defined(__DragonFly__) && \
+    !defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__)
+    static locale_t loc = NULL;
+    if (!loc) {

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405261733.s4QHXTgO072049>