rpms/mesa/devel mesa-demos-fix-add-needed.patch, NONE, 1.1 mesa.spec, 1.283, 1.284

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18191

Modified Files:
	mesa.spec 
Added Files:
	mesa-demos-fix-add-needed.patch 
Log Message:
* Sun May 30 2010 Dave Airlie <airlied at redhat.com> 7.9-0.1
- rebase to a git snapshot - disable vmwgfx


mesa-demos-fix-add-needed.patch:
 Makefile.am |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE mesa-demos-fix-add-needed.patch ---
diff -up mesa-demos-20100529/src/tests/Makefile.am.orig mesa-demos-20100529/src/tests/Makefile.am
--- mesa-demos-20100529/src/tests/Makefile.am.orig	2010-05-30 09:11:04.000000000 +1000
+++ mesa-demos-20100529/src/tests/Makefile.am	2010-05-30 09:11:09.000000000 +1000
@@ -169,6 +169,7 @@ endif
 
 afsmultiarb_LDADD = ../util/libutil.la
 arraytexture_LDADD = ../util/libutil.la
+auxbuffer_LDADD = -lX11
 bug_3195_LDADD = ../util/libutil.la
 bumpmap_LDADD = ../util/libutil.la
 floattex_LDADD = ../util/libutil.la


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- mesa.spec	29 May 2010 23:01:25 -0000	1.283
+++ mesa.spec	29 May 2010 23:18:11 -0000	1.284
@@ -44,6 +44,7 @@ Patch1: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
 Patch4: nouveau-legacy-enable.patch
+Patch5: mesa-demos-fix-add-needed.patch
 
 #Patch7: mesa-7.1-link-shared.patch
 
@@ -193,6 +194,7 @@ Group: User Interface/X Hardware Support
 
 # Hack the demos to use installed data files
 cd ../%{demopkg}
+%patch5 -p1 -b .add
 sed -i 's,../images,%{_libdir}/mesa,' src/demos/*.c
 sed -i 's,geartrain.dat,%{_libdir}/mesa/&,' src/demos/geartrain.c
 sed -i 's,isosurf.dat,%{_libdir}/mesa/&,' src/demos/isosurf.c