diff options
| author | Cyril Brulebois <kibi@debian.org> | 2011-12-23 14:19:15 +0100 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2011-12-23 14:19:15 +0100 |
| commit | 7b062cfec8664b52f5e933b1d31ac0810a3facb6 (patch) | |
| tree | 62d3695ffbbe63c4c7cf16b28e537013c4b9532c | |
| parent | 0e0d1c6ffa4a683c9a0ecef758264f421216e4f1 (diff) | |
Refresh patches.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/14-load-swrastg-before-swrast.diff | 19 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 5 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog index cebc82a51d..f3a946db92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ mesa (7.12~0-1) UNRELEASED; urgency=low * New upstream snapshot. + * Disable patch temporarily (needs a refresh): + - 11-hurd-ftbfs-again.diff + * Drop patch, no longer needed since swrastg was renamed to swrast: + - 14-load-swrastg-before-swrast.diff -- Cyril Brulebois <kibi@debian.org> Fri, 23 Dec 2011 14:13:28 +0100 diff --git a/debian/patches/14-load-swrastg-before-swrast.diff b/debian/patches/14-load-swrastg-before-swrast.diff deleted file mode 100644 index 58072a2d26..0000000000 --- a/debian/patches/14-load-swrastg-before-swrast.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- - src/glx/drisw_glx.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/src/glx/drisw_glx.c -+++ b/src/glx/drisw_glx.c -@@ -430,10 +430,10 @@ - void *driver = NULL; - - if (driver == NULL) -- driver = driOpenDriver("swrast"); -+ driver = driOpenDriver("swrastg"); - - if (driver == NULL) -- driver = driOpenDriver("swrastg"); -+ driver = driOpenDriver("swrast"); - - return driver; - } diff --git a/debian/patches/series b/debian/patches/series index 6f53c26359..574645434e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,5 @@ 06_kfreebsd-ftbfs.diff 08-kfreebsd-gallium.diff 10-hurd-configure-tweaks.diff -11-hurd-ftbfs-again.diff +#11-hurd-ftbfs-again.diff 13-llvm-config-pick-a-version.diff -14-load-swrastg-before-swrast.diff |