svn commit: r371387 - head/graphics/libGL/files

[John Marino]

Author: marino
Date: Thu Oct 23 11:27:42 2014
New Revision: 371387
URL: https://svnweb.freebsd.org/changeset/ports/371387
QAT: https://qat.redports.org/buildarchive/r371387/

Log:
  graphics/libGL: Fix Gallium drivers on DragonFly (No-Op for FreeBSD)

Added:
  head/graphics/libGL/files/patch-src__gallium__auxiliary__os__os_misc.c   (contents, props changed)
  head/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c   (contents, props changed)
Modified:
  head/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h

Added: head/graphics/libGL/files/patch-src__gallium__auxiliary__os__os_misc.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libGL/files/patch-src__gallium__auxiliary__os__os_misc.c	Thu Oct 23 11:27:42 2014	(r371387)
@@ -0,0 +1,11 @@
+--- src/gallium/auxiliary/os/os_misc.c.orig	2014-09-19 18:23:33 UTC
++++ src/gallium/auxiliary/os/os_misc.c
+@@ -128,6 +128,8 @@ os_get_total_physical_memory(uint64_t *s
+    mib[1] = HW_PHYSMEM64;
+ #elif defined(PIPE_OS_FREEBSD)
+    mib[1] = HW_REALMEM;
++#elif defined(PIPE_OS_DRAGONFLY)
++   mib[1] = HW_PHYSMEM;
+ #else
+ #error Unsupported *BSD
+ #endif

Added: head/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libGL/files/patch-src__gallium__auxiliary__util__u_cpu_detect.c	Thu Oct 23 11:27:42 2014	(r371387)
@@ -0,0 +1,11 @@
+--- src/gallium/auxiliary/util/u_cpu_detect.c.orig	2014-09-19 18:23:33 UTC
++++ src/gallium/auxiliary/util/u_cpu_detect.c
+@@ -52,7 +52,7 @@
+ #include <machine/cpu.h>
+ #endif
+ 
+-#if defined(PIPE_OS_FREEBSD)
++#if defined(PIPE_OS_FREEBSD) || defined(PIPE_OS_DRAGONFLY)
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif

Modified: head/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h
==============================================================================
--- head/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h	Thu Oct 23 11:12:00 2014	(r371386)
+++ head/graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h	Thu Oct 23 11:27:42 2014	(r371387)
@@ -1,5 +1,5 @@
---- ./src/gallium/include/pipe/p_config.h.orig	2014-01-23 18:02:42.000000000 +0100
-+++ ./src/gallium/include/pipe/p_config.h	2014-02-23 22:01:50.000000000 +0100
+--- src/gallium/include/pipe/p_config.h.orig	2014-08-14 17:22:24 UTC
++++ src/gallium/include/pipe/p_config.h
 @@ -81,6 +81,13 @@
  #define PIPE_CC_SUNPRO
  #endif
@@ -14,3 +14,16 @@
  
  /*
   * Processor architecture
+@@ -200,6 +207,12 @@
+ #define PIPE_OS_ANDROID
+ #endif
+ 
++#if defined(__DragonFly__)
++#define PIPE_OS_DRAGONFLY
++#define PIPE_OS_BSD
++#define PIPE_OS_UNIX
++#endif
++
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define PIPE_OS_FREEBSD
+ #define PIPE_OS_BSD