mesa: Changes to 'ubuntu'
debian/changelog | 6
debian/patches/114_update_for_2.4.24_nouveau_headers.diff | 85 ++++++++++++++
debian/patches/series | 1
3 files changed, 91 insertions(+), 1 deletion(-)
New commits:
commit 4f340ccdde5fe88311ade94cffe78a2393176cf3
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Apr 4 12:55:55 2011 +1000
Add cherry-pick to follow libdrm 2.4.24 headers
diff --git a/debian/changelog b/debian/changelog
index 4230423..c7eecca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,11 @@ mesa (7.10.1-0ubuntu4) UNRELEASED; urgency=low
* The architecture we're building for is DEB_HOST_ARCH, not
DEB_BUILD_ARCH.
- -- Robert Hooker <sarvatt@ubuntu.com> Wed, 23 Mar 2011 15:51:12 -0400
+ [ Christopher James Halse Rogers ]
+ * debian/patches/114_update_for_2.4.24_nouveau_headers.diff:
+ - Cherry-pick from upstream to follow headers renamed in libdrm 2.4.24
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 04 Apr 2011 12:52:13 +1000
mesa (7.10.1-0ubuntu3) natty; urgency=low
diff --git a/debian/patches/114_update_for_2.4.24_nouveau_headers.diff b/debian/patches/114_update_for_2.4.24_nouveau_headers.diff
new file mode 100644
index 0000000..7f57e69
--- /dev/null
+++ b/debian/patches/114_update_for_2.4.24_nouveau_headers.diff
@@ -0,0 +1,85 @@
+commit 5c102dd94f435e97507213fbd128e50dd15f5f54
+Author: Ben Skeggs <bskeggs@redhat.com>
+Date: Mon Dec 20 13:39:36 2010 +1000
+
+ nouveau: fix includes for latest libdrm
+
+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+
+diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
+index ab480ca..747b084 100644
+--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
+@@ -10,7 +10,7 @@
+ #include "nouveau/nouveau_grobj.h"
+ #include "nouveau/nouveau_notifier.h"
+ #include "nouveau/nouveau_resource.h"
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+
+ #ifndef NV04_PFIFO_MAX_PACKET_LEN
+ #define NV04_PFIFO_MAX_PACKET_LEN 2047
+diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
+index ce48022..a99df76 100644
+--- a/src/gallium/drivers/nv50/nv50_surface.c
++++ b/src/gallium/drivers/nv50/nv50_surface.c
+@@ -22,7 +22,7 @@
+
+ #define __NOUVEAU_PUSH_H__
+ #include <stdint.h>
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+ #include "nv50_context.h"
+ #include "nv50_resource.h"
+ #include "pipe/p_defines.h"
+diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
+index e0e65e7..e2fadd3 100644
+--- a/src/gallium/drivers/nvfx/nv04_2d.c
++++ b/src/gallium/drivers/nvfx/nv04_2d.c
+@@ -34,11 +34,11 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <nouveau/nouveau_device.h>
+-#include <nouveau/nouveau_pushbuf.h>
+ #include <nouveau/nouveau_channel.h>
+ #include <nouveau/nouveau_bo.h>
+ #include <nouveau/nouveau_notifier.h>
+ #include <nouveau/nouveau_grobj.h>
++#include <nouveau/nv04_pushbuf.h>
+ #include "nv04_2d.h"
+
+ #include "nouveau/nv_object.xml.h"
+diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
+index 597664e..339b317 100644
+--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
+@@ -9,8 +9,7 @@
+ #include "nvfx_resource.h"
+
+ #include "nouveau/nouveau_channel.h"
+-
+-#include "nouveau/nouveau_pushbuf.h"
++#include "nouveau/nv04_pushbuf.h"
+
+ static inline unsigned
+ util_guess_unique_indices_count(unsigned mode, unsigned indices)
+diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+index 8036b18..c5ac128 100644
+--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+@@ -38,7 +38,6 @@
+ #include <assert.h>
+
+ #include "nouveau_device.h"
+-#include "nouveau_pushbuf.h"
+ #include "nouveau_grobj.h"
+ #include "nouveau_channel.h"
+ #include "nouveau_bo.h"
+@@ -46,6 +45,7 @@
+ #include "nouveau_screen.h"
+ #include "nouveau_state.h"
+ #include "nouveau_surface.h"
++#include "nv04_pushbuf.h"
+
+ #define DRIVER_DATE "20091015"
+ #define DRIVER_AUTHOR "Nouveau"
diff --git a/debian/patches/series b/debian/patches/series
index ce155ea..cc1bcf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
111_export_searchdirs_in_dripc.diff
112_fix_segfault_on_nvAF.diff
113_fix_tls.diff
+114_update_for_2.4.24_nouveau_headers.diff
Reply to: