From owner-svn-ports-all@FreeBSD.ORG Mon May 26 17:33:30 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CB9B972A; Mon, 26 May 2014 17:33:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B85052A36; Mon, 26 May 2014 17:33:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4QHXU7g072054; Mon, 26 May 2014 17:33:30 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4QHXTgO072049; Mon, 26 May 2014 17:33:29 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201405261733.s4QHXTgO072049@svn.freebsd.org> From: John Marino Date: Mon, 26 May 2014 17:33:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355420 - head/graphics/libGL/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 May 2014 17:33:31 -0000 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 +#if defined(__linux__) #include -+#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) +#include +#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 +#if defined(__linux__) #include -+#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) +#include +#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 -+#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) +#include +#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 -+#elif defined(__FreeBSD__) ++#elif defined(__FreeBSD__) || defined(__DragonFly__) +#include +#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) {