rpms/mesa/devel mesa-7.1-link-shared.patch, 1.5, 1.6 mesa.spec, 1.262, 1.263

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27861

Modified Files:
	mesa-7.1-link-shared.patch mesa.spec 
Log Message:
* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.6
- mesa fix link shared to actually link


mesa-7.1-link-shared.patch:
 drivers/dri/Makefile          |   12 ++++++++++--
 drivers/dri/Makefile.template |    5 +++--
 x86/read_rgba_span_x86.S      |    4 ----
 3 files changed, 13 insertions(+), 8 deletions(-)

Index: mesa-7.1-link-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa-7.1-link-shared.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- mesa-7.1-link-shared.patch	20 Dec 2009 22:50:28 -0000	1.5
+++ mesa-7.1-link-shared.patch	21 Dec 2009 02:48:56 -0000	1.6
@@ -54,12 +54,13 @@ diff -up mesa-20091221/src/mesa/drivers/
  
  COMMON_GALLIUM_SOURCES = \
          ../common/utils.c \
-@@ -70,7 +70,7 @@ lib: symlinks subdirs depend
+@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
  $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
  		$(TOP)/src/mesa/drivers/dri/Makefile.template
  	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 -		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
 +		$(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
++		-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore
  		$(DRI_LIB_DEPS)
  
  


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -p -r1.262 -r1.263
--- mesa.spec	21 Dec 2009 00:17:47 -0000	1.262
+++ mesa.spec	21 Dec 2009 02:48:56 -0000	1.263
@@ -21,7 +21,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.8
-Release: 0.5%{?dist}
+Release: 0.6%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -385,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
 %{demodir}
 
 %changelog
+* Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.6
+- mesa fix link shared to actually link
+
 * Mon Dec 21 2009 Dave Airlie <airlied at redhat.com> 7.8-0.5
 - one more libOSMesa build fix