- rebase for legacy nouveau drivers

3 files changed, 33 insertions, 205 deletions

diff --git a/mesa.spec b/mesa.spec
index cec845a..7a06ffc 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -13,7 +13,7 @@
 
 %define manpages gl-manpages-1.0.1
 %define xdriinfo xdriinfo-1.0.3
-%define gitdate 20100204
+%define gitdate 20100208
 #% define snapshot 
 
 %define demodir %{_libdir}/mesa
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.14%{?dist}
+Release: 0.15%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -37,10 +37,10 @@ Source3: make-git-snapshot.sh
 
 Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2
 
-Patch0: nouveau-build-fix.patch
 Patch1: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
+Patch4: nouveau-legacy-enable.patch
 
 #Patch7: mesa-7.1-link-shared.patch
 
@@ -178,10 +178,10 @@ Group: User Interface/X Hardware Support
 %prep
 #setup -q -n mesa-%{version}%{?snapshot} -b0 -b2 -b5
 %setup -q -n mesa-%{gitdate} -b2 -b5
-%patch0 -p1 -b .nouveau-build
 %patch1 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .no-mach64
+%patch4 -p1 -b .nouveau-legacy
 #%patch7 -p1 -b .dricore
 %patch30 -p1 -b .vblank-warning
 
@@ -268,7 +268,7 @@ make install DESTDIR=$RPM_BUILD_ROOT DRI_DIRS=
 # just the DRI drivers that are sane
 install -d $RPM_BUILD_ROOT%{_libdir}/dri
 #install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri %{_lib}/libdricore.so >& /dev/null
-for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome gallium/vmwgfx; do
+for f in i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome nouveau_vieux gallium/vmwgfx; do
     so=%{_lib}/${f}_dri.so
     test -e $so && echo $so
 done | xargs install -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/dri >& /dev/null || :
@@ -283,7 +283,7 @@ rm -rf EGL KHR
 popd
 
 pushd $RPM_BUILD_ROOT%{_libdir}
-rm -f libEGL* dri/EGL* egl/egl_glx* xorg/modules/drivers/modesetting_drv.so
+rm -f libEGL* dri/EGL* egl/egl_glx* egl/egl_dri2* xorg/modules/drivers/modesetting_drv.so
 popd
 
 # XXX demos, since they don't install automatically.  should fix that.
@@ -338,11 +338,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/dri/*_dri.so
 %exclude %{_libdir}/dri/vmwgfx_dri.so
 %exclude %{_libdir}/dri/nouveau_dri.so
+%exclude %{_libdir}/dri/nouveau_vieux_dri.so
 
 %files dri-drivers-experimental
 %defattr(-,root,root,-)
 %{_libdir}/dri/vmwgfx_dri.so
 %{_libdir}/dri/nouveau_dri.so
+%{_libdir}/dri/nouveau_vieux_dri.so
 
 %files libGL-devel
 %defattr(-,root,root,-)
@@ -402,6 +404,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xorg/modules/drivers/vmwgfx_drv.so
 
 %changelog
+* Mon Feb 08 2010 Ben Skeggs <bskeggs@redhat.com> 7.8-0.15
+- rebase for legacy nouveau drivers
+
 * Thu Feb 04 2010 Dave Airlie <airlied@redhat.com> 7.8-0.14
 - rebase again to fix r300
 
diff --git a/nouveau-build-fix.patch b/nouveau-build-fix.patch
deleted file mode 100644
index 0be7bce..0000000
--- a/nouveau-build-fix.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
-index 1ad539d..156cb2d 100644
---- a/src/gallium/drivers/nouveau/nouveau_screen.c
-+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
-@@ -3,7 +3,9 @@
- #include <pipe/p_state.h>
- 
- #include <util/u_memory.h>
-+#include <util/u_inlines.h>
- 
-+#include <stdio.h>
- #include <errno.h>
- 
- #include "nouveau/nouveau_bo.h"
-diff --git a/src/gallium/drivers/nv04/nv04_context.h b/src/gallium/drivers/nv04/nv04_context.h
-index fe3b527..83acb59 100644
---- a/src/gallium/drivers/nv04/nv04_context.h
-+++ b/src/gallium/drivers/nv04/nv04_context.h
-@@ -1,6 +1,8 @@
- #ifndef __NV04_CONTEXT_H__
- #define __NV04_CONTEXT_H__
- 
-+#include <stdio.h>
-+
- #include "pipe/p_context.h"
- #include "pipe/p_defines.h"
- #include "pipe/p_state.h"
-@@ -8,6 +10,7 @@
- 
- #include "util/u_memory.h"
- #include "util/u_math.h"
-+#include "util/u_inlines.h"
- 
- #include "draw/draw_vertex.h"
- 
-diff --git a/src/gallium/drivers/nv10/nv10_context.h b/src/gallium/drivers/nv10/nv10_context.h
-index ab4b825..f0dcbe3 100644
---- a/src/gallium/drivers/nv10/nv10_context.h
-+++ b/src/gallium/drivers/nv10/nv10_context.h
-@@ -1,6 +1,8 @@
- #ifndef __NV10_CONTEXT_H__
- #define __NV10_CONTEXT_H__
- 
-+#include <stdio.h>
-+
- #include "pipe/p_context.h"
- #include "pipe/p_defines.h"
- #include "pipe/p_state.h"
-diff --git a/src/gallium/drivers/nv20/nv20_context.h b/src/gallium/drivers/nv20/nv20_context.h
-index c7dfada..270f648 100644
---- a/src/gallium/drivers/nv20/nv20_context.h
-+++ b/src/gallium/drivers/nv20/nv20_context.h
-@@ -1,6 +1,8 @@
- #ifndef __NV20_CONTEXT_H__
- #define __NV20_CONTEXT_H__
- 
-+#include <stdio.h>
-+
- #include "pipe/p_context.h"
- #include "pipe/p_defines.h"
- #include "pipe/p_state.h"
-diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h
-index e594492..7d05338 100644
---- a/src/gallium/drivers/nv30/nv30_context.h
-+++ b/src/gallium/drivers/nv30/nv30_context.h
-@@ -1,6 +1,8 @@
- #ifndef __NV30_CONTEXT_H__
- #define __NV30_CONTEXT_H__
- 
-+#include <stdio.h>
-+
- #include "pipe/p_context.h"
- #include "pipe/p_defines.h"
- #include "pipe/p_state.h"
-@@ -8,6 +10,7 @@
- 
- #include "util/u_memory.h"
- #include "util/u_math.h"
-+#include "util/u_inlines.h"
- 
- #include "draw/draw_vertex.h"
- 
-diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
-index e219bb5..3998cf2 100644
---- a/src/gallium/drivers/nv40/nv40_context.h
-+++ b/src/gallium/drivers/nv40/nv40_context.h
-@@ -1,6 +1,8 @@
- #ifndef __NV40_CONTEXT_H__
- #define __NV40_CONTEXT_H__
- 
-+#include <stdio.h>
-+
- #include "pipe/p_context.h"
- #include "pipe/p_defines.h"
- #include "pipe/p_state.h"
-@@ -8,6 +10,7 @@
- 
- #include "util/u_memory.h"
- #include "util/u_math.h"
-+#include "util/u_inlines.h"
- 
- #include "draw/draw_vertex.h"
- 
-diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h
-index bebcd95..44d8f61 100644
---- a/src/gallium/drivers/nv50/nv50_context.h
-+++ b/src/gallium/drivers/nv50/nv50_context.h
-@@ -1,6 +1,7 @@
- #ifndef __NV50_CONTEXT_H__
- #define __NV50_CONTEXT_H__
- 
-+#include <stdio.h>
- #include "pipe/p_context.h"
- #include "pipe/p_defines.h"
- #include "pipe/p_state.h"
-@@ -8,6 +9,7 @@
- 
- #include "util/u_memory.h"
- #include "util/u_math.h"
-+#include "util/u_inlines.h"
- 
- #include "draw/draw_vertex.h"
- 
-diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c
-index 1f456cb..f7ed660 100644
---- a/src/gallium/state_trackers/dri/dri_drawable.c
-+++ b/src/gallium/state_trackers/dri/dri_drawable.c
-@@ -46,6 +46,7 @@
- #include "util/u_format.h"
- #include "util/u_memory.h"
- #include "util/u_rect.h"
-+#include "util/u_inlines.h"
-  
- static struct pipe_surface *
- dri_surface_from_handle(struct drm_api *api,
-diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
-index 34dbe5b..2052867 100644
---- a/src/gallium/state_trackers/dri/dri_screen.c
-+++ b/src/gallium/state_trackers/dri/dri_screen.c
-@@ -42,6 +42,8 @@
- #include "state_tracker/drm_api.h"
- #include "state_tracker/dri1_api.h"
- 
-+#include "util/u_debug.h"
-+
- PUBLIC const char __driConfigOptions[] =
-    DRI_CONF_BEGIN DRI_CONF_SECTION_PERFORMANCE
-    DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS)
-diff --git a/src/gallium/state_trackers/xorg/xorg_tracker.h b/src/gallium/state_trackers/xorg/xorg_tracker.h
-index a88b1d5..58bb60a 100644
---- a/src/gallium/state_trackers/xorg/xorg_tracker.h
-+++ b/src/gallium/state_trackers/xorg/xorg_tracker.h
-@@ -47,6 +47,8 @@
- #endif
- 
- #include "pipe/p_screen.h"
-+#include "util/u_inlines.h"
-+#include "util/u_debug.h"
- #include "state_tracker/drm_api.h"
- 
- #define DRV_ERROR(msg)	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg);
-diff --git a/src/gallium/winsys/drm/vmware/core/vmw_buffer.h b/src/gallium/winsys/drm/vmware/core/vmw_buffer.h
-index 634bdca..41fb447 100644
---- a/src/gallium/winsys/drm/vmware/core/vmw_buffer.h
-+++ b/src/gallium/winsys/drm/vmware/core/vmw_buffer.h
-@@ -27,7 +27,7 @@
- #ifndef VMW_BUFFER_H_
- #define VMW_BUFFER_H_
- 
--
-+#include <assert.h>
- #include "pipe/p_compiler.h"
- 
- struct SVGAGuestPtr;
-diff --git a/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c b/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
-index 454e9a5..2939c10 100644
---- a/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
-+++ b/src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
-@@ -27,6 +27,7 @@
- #include "pipe/p_compiler.h"
- #include "util/u_inlines.h"
- #include "util/u_memory.h"
-+#include "util/u_format.h"
- #include "vmw_screen.h"
- 
- #include "trace/tr_drm.h"
-diff --git a/src/gallium/winsys/drm/vmware/core/vmw_surface.h b/src/gallium/winsys/drm/vmware/core/vmw_surface.h
-index b843c4d..3d61595 100644
---- a/src/gallium/winsys/drm/vmware/core/vmw_surface.h
-+++ b/src/gallium/winsys/drm/vmware/core/vmw_surface.h
-@@ -37,7 +37,7 @@
- 
- #include "pipe/p_compiler.h"
- #include "util/u_atomic.h"
--#include "util/u_atomic.h"
-+#include "util/u_inlines.h"
- 
- #define VMW_MAX_PRESENTS 3
- 
diff --git a/nouveau-legacy-enable.patch b/nouveau-legacy-enable.patch
new file mode 100644
index 0000000..96db12c
--- /dev/null
+++ b/nouveau-legacy-enable.patch
@@ -0,0 +1,22 @@
+diff --git a/configure.ac b/configure.ac
+index b6c6535..ec44d68 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -723,7 +723,7 @@ if test "$mesa_driver" = dri; then
+             # be used.
+             if test "x$DRI_DIRS" = "xyes"; then
+                 DRI_DIRS="i915 i965 mga r128 r200 r300 r600 radeon \
+-                    savage tdfx unichrome swrast"
++                    savage tdfx unichrome swrast nouveau"
+             fi
+             ;;
+         powerpc*)
+@@ -756,7 +756,7 @@ if test "$mesa_driver" = dri; then
+         # to use the new interface.
+         if test "x$DRI_DIRS" = "xyes"; then
+             DRI_DIRS="i810 i915 i965 mga r128 r200 r300 r600 radeon tdfx \
+-                unichrome savage sis swrast"
++                unichrome savage sis swrast nouveau"
+         fi
+         ;;
+     gnu*)