diff options
| author | marino <marino@FreeBSD.org> | 2014-05-27 01:33:29 +0800 |
|---|---|---|
| committer | marino <marino@FreeBSD.org> | 2014-05-27 01:33:29 +0800 |
| commit | dc4d60333d243bcda07ce6f1a751e39faf57429e (patch) | |
| tree | 00b1cc0756544783e7590eb1b0f9ed45135dec32 /graphics | |
| parent | 13a6593c4004535b1bedebb7654a71385f1290eb (diff) | |
| download | freebsd-ports-gnome-dc4d60333d243bcda07ce6f1a751e39faf57429e.tar.gz freebsd-ports-gnome-dc4d60333d243bcda07ce6f1a751e39faf57429e.tar.zst freebsd-ports-gnome-dc4d60333d243bcda07ce6f1a751e39faf57429e.zip | |
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)
Diffstat (limited to 'graphics')
5 files changed, 14 insertions, 4 deletions
diff --git a/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c b/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c index bdaada3f1fe7..3b580dd81030 100644 --- a/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c +++ b/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c @@ -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 diff --git a/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c b/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c index 536529e39704..3721b25cd83b 100644 --- a/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c +++ b/graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c @@ -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 diff --git a/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c b/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c index 89b2d7acbf83..f7ad4caea427 100644 --- a/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c +++ b/graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c @@ -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 diff --git a/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c b/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c index 4e69603030a2..505f3a17f03f 100644 --- a/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c +++ b/graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c @@ -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 diff --git a/graphics/libGL/files/patch-src_mesa_main_imports.c b/graphics/libGL/files/patch-src_mesa_main_imports.c new file mode 100644 index 000000000000..c5979f7c15fe --- /dev/null +++ b/graphics/libGL/files/patch-src_mesa_main_imports.c @@ -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) { |