summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2014-05-28 15:44:54 +0800
committerkwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09>2014-05-28 15:44:54 +0800
commit8e72d3d29d31eea50558e3d2b8c86487547f1f71 (patch)
tree31cdac4ab51afdc757b245fbd8bbf19b5349199e
parenta826334801cdb7dde33ddd9ed9892696ad8c92c4 (diff)
downloadxorg-devel-ports-8e72d3d29d31eea50558e3d2b8c86487547f1f71.tar
xorg-devel-ports-8e72d3d29d31eea50558e3d2b8c86487547f1f71.tar.gz
xorg-devel-ports-8e72d3d29d31eea50558e3d2b8c86487547f1f71.tar.bz2
xorg-devel-ports-8e72d3d29d31eea50558e3d2b8c86487547f1f71.tar.lz
xorg-devel-ports-8e72d3d29d31eea50558e3d2b8c86487547f1f71.tar.xz
xorg-devel-ports-8e72d3d29d31eea50558e3d2b8c86487547f1f71.tar.zst
xorg-devel-ports-8e72d3d29d31eea50558e3d2b8c86487547f1f71.zip
Sync with ports. 10.2 will need some manuely reworking of the patches.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1449 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--graphics/libGL/files/patch-src_gallium_drivers_r600_r600-asm.c2
-rw-r--r--graphics/libGL/files/patch-src_gallium_drivers_r600_r600-shader.c2
-rw-r--r--graphics/libGL/files/patch-src_gallium_drivers_r600_r600_state_common.c2
-rw-r--r--graphics/libGL/files/patch-src_gallium_drivers_radeonsi_r600-buffer.c2
-rw-r--r--graphics/libGL/files/patch-src_mesa_main_imports.c10
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 bdaada3..3b580dd 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 536529e..3721b25 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 89b2d7a..f7ad4ca 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 4e69603..505f3a1 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 0000000..c5979f7
--- /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) {