diff options
| author | Julien Cristau <jcristau@debian.org> | 2010-07-20 14:25:53 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2010-07-20 14:25:53 +0100 |
| commit | 1487dab78d7f037ca17e43bdf8c99f4f371630d5 (patch) | |
| tree | 9745f6671b8901641de3c8adaaccad332213d89e /debian | |
| parent | b5c9ba9dbfa4fdf0e6b1eca3f5c2e0097fe41b7f (diff) | |
gallium: handle kfreebsd like freebsd, fixing FTBFS (closes: #585618)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/08-kfreebsd-gallium.diff | 26 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index fb4c95074bb..545b21f30b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mesa (7.8.2-2) UNRELEASED; urgency=low * Add missing dependencies to libegl1-mesa-dev, thanks to Alexandros Frantzis (LP: #600243). + * gallium: handle kfreebsd like freebsd, fixing FTBFS (closes: #585618) -- Julien Cristau <jcristau@debian.org> Thu, 15 Jul 2010 17:05:56 +0100 diff --git a/debian/patches/08-kfreebsd-gallium.diff b/debian/patches/08-kfreebsd-gallium.diff new file mode 100644 index 00000000000..baeb123b582 --- /dev/null +++ b/debian/patches/08-kfreebsd-gallium.diff @@ -0,0 +1,26 @@ +Index: mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c +=================================================================== +--- mesa.orig/src/gallium/auxiliary/rtasm/rtasm_execmem.c ++++ mesa/src/gallium/auxiliary/rtasm/rtasm_execmem.c +@@ -37,7 +37,7 @@ + + #include "rtasm_execmem.h" + +-#if defined(PIPE_OS_BSD) ++#ifndef MAP_ANONYMOUS + #define MAP_ANONYMOUS MAP_ANON + #endif + +Index: mesa/src/gallium/include/pipe/p_config.h +=================================================================== +--- mesa.orig/src/gallium/include/pipe/p_config.h ++++ mesa/src/gallium/include/pipe/p_config.h +@@ -128,7 +128,7 @@ + #define PIPE_OS_UNIX + #endif + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + #define PIPE_OS_FREEBSD + #define PIPE_OS_BSD + #define PIPE_OS_UNIX diff --git a/debian/patches/series b/debian/patches/series index d4df6df2761..ccf4830b630 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 05_hurd-ftbfs.diff 06_kfreebsd-ftbfs.diff 07-nouveau-update.diff +08-kfreebsd-gallium.diff |