SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/mesa-wayland/stuff/nouveau-fix-header.patch	Mon Apr 14 00:35:12 2014 +0200
     1.3 @@ -0,0 +1,86 @@
     1.4 +From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001
     1.5 +From: Ben Skeggs <bskeggs@redhat.com>
     1.6 +Date: Mon, 20 Dec 2010 03:39:36 +0000
     1.7 +Subject: nouveau: fix includes for latest libdrm
     1.8 +
     1.9 +Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
    1.10 +---
    1.11 +diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
    1.12 +index ab480ca..747b084 100644
    1.13 +--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
    1.14 ++++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
    1.15 +@@ -10,7 +10,7 @@
    1.16 + #include "nouveau/nouveau_grobj.h"
    1.17 + #include "nouveau/nouveau_notifier.h"
    1.18 + #include "nouveau/nouveau_resource.h"
    1.19 +-#include "nouveau/nouveau_pushbuf.h"
    1.20 ++#include "nouveau/nv04_pushbuf.h"
    1.21 + 
    1.22 + #ifndef NV04_PFIFO_MAX_PACKET_LEN
    1.23 + #define NV04_PFIFO_MAX_PACKET_LEN 2047
    1.24 +diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
    1.25 +index ce48022..a99df76 100644
    1.26 +--- a/src/gallium/drivers/nv50/nv50_surface.c
    1.27 ++++ b/src/gallium/drivers/nv50/nv50_surface.c
    1.28 +@@ -22,7 +22,7 @@
    1.29 + 
    1.30 + #define __NOUVEAU_PUSH_H__
    1.31 + #include <stdint.h>
    1.32 +-#include "nouveau/nouveau_pushbuf.h"
    1.33 ++#include "nouveau/nv04_pushbuf.h"
    1.34 + #include "nv50_context.h"
    1.35 + #include "nv50_resource.h"
    1.36 + #include "pipe/p_defines.h"
    1.37 +diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
    1.38 +index e0e65e7..e2fadd3 100644
    1.39 +--- a/src/gallium/drivers/nvfx/nv04_2d.c
    1.40 ++++ b/src/gallium/drivers/nvfx/nv04_2d.c
    1.41 +@@ -34,11 +34,11 @@
    1.42 + #include <stdio.h>
    1.43 + #include <stdint.h>
    1.44 + #include <nouveau/nouveau_device.h>
    1.45 +-#include <nouveau/nouveau_pushbuf.h>
    1.46 + #include <nouveau/nouveau_channel.h>
    1.47 + #include <nouveau/nouveau_bo.h>
    1.48 + #include <nouveau/nouveau_notifier.h>
    1.49 + #include <nouveau/nouveau_grobj.h>
    1.50 ++#include <nouveau/nv04_pushbuf.h>
    1.51 + #include "nv04_2d.h"
    1.52 + 
    1.53 + #include "nouveau/nv_object.xml.h"
    1.54 +diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
    1.55 +index 597664e..339b317 100644
    1.56 +--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
    1.57 ++++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
    1.58 +@@ -9,8 +9,7 @@
    1.59 + #include "nvfx_resource.h"
    1.60 + 
    1.61 + #include "nouveau/nouveau_channel.h"
    1.62 +-
    1.63 +-#include "nouveau/nouveau_pushbuf.h"
    1.64 ++#include "nouveau/nv04_pushbuf.h"
    1.65 + 
    1.66 + static inline unsigned
    1.67 + util_guess_unique_indices_count(unsigned mode, unsigned indices)
    1.68 +diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
    1.69 +index 8036b18..c5ac128 100644
    1.70 +--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
    1.71 ++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
    1.72 +@@ -38,7 +38,6 @@
    1.73 + #include <assert.h>
    1.74 + 
    1.75 + #include "nouveau_device.h"
    1.76 +-#include "nouveau_pushbuf.h"
    1.77 + #include "nouveau_grobj.h"
    1.78 + #include "nouveau_channel.h"
    1.79 + #include "nouveau_bo.h"
    1.80 +@@ -46,6 +45,7 @@
    1.81 + #include "nouveau_screen.h"
    1.82 + #include "nouveau_state.h"
    1.83 + #include "nouveau_surface.h"
    1.84 ++#include "nv04_pushbuf.h"
    1.85 + 
    1.86 + #define DRIVER_DATE	"20091015"
    1.87 + #define DRIVER_AUTHOR	"Nouveau"
    1.88 +--
    1.89 +cgit v0.8.3-6-g21f6