metalefty/mesa
1
0
Fork 0
forked from rpms/mesa
Code Pull Requests Activity

- latest Mesa snapshot - re-enable tex offset

Browse Source 
- add r300 command buffer support on top of snapshot
- fix mesa build on intel driver
This commit is contained in:
Dave Airlie 2008-08-28 12:36:35 +00:00
parent 249ba36e24
commit 336da42a01
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mesa-7.1pre-osmesa-version.patch
View File

@ -1,21 +1,21 @@
diff -up mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080612/src/mesa/drivers/osmesa/Makefile diff -up mesa-20080814/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080814/src/mesa/drivers/osmesa/Makefile
--- mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa 2008-06-12 12:17:27.000000000 +1000 --- mesa-20080814/src/mesa/drivers/osmesa/Makefile.osmesa 2008-08-28 22:33:46.000000000 +1000
+++ mesa-20080612/src/mesa/drivers/osmesa/Makefile 2008-06-12 13:14:24.000000000 +1000 +++ mesa-20080814/src/mesa/drivers/osmesa/Makefile 2008-08-28 22:34:06.000000000 +1000
@@ -47,7 +47,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME) @@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME)
$(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS) $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
$(TOP)/bin/mklib -o $(OSMESA_LIB) \ $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-linker "$(CC)" \
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \ + -major 6 -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) \ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
$(MKLIB_OPTIONS) \ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS) $(OSMESA_LIB_DEPS) $(OBJECTS)
@@ -60,7 +60,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS @@ -58,7 +58,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
# with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
osmesa16: $(OBJECTS) $(CORE_MESA) osmesa16: $(OBJECTS) $(CORE_MESA)
$(TOP)/bin/mklib -o $(OSMESA_LIB) \ $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-linker "$(CC)" \
- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
+ -major 6 -minor 5 -patch 3 \ + -major 6 -minor 5 -patch 3 \
-install $(TOP)/$(LIB_DIR) \ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
$(MKLIB_OPTIONS) \ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)

5
mesa.spec
View File

@ -163,7 +163,7 @@ This package provides some demo applications for testing Mesa.
%prep %prep
#%setup -q -n Mesa-%{version}pre -b1 -b2 #%setup -q -n Mesa-%{version}pre -b1 -b2
%setup -q -n mesa-%{gitdate} -b2 %setup -q -n mesa-%{gitdate} -b2
#patch0 -p1 -b .osmesa %patch0 -p1 -b .osmesa
%patch1 -p1 -b .fixes %patch1 -p1 -b .fixes
%patch2 -p1 -b .intel-glthread %patch2 -p1 -b .intel-glthread
%patch5 -p1 -b .r300cmdbuf %patch5 -p1 -b .r300cmdbuf
@ -402,10 +402,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/mesa-demos-data %{_libdir}/mesa-demos-data
%changelog %changelog
* Thu Aug 14 2008 Dave Airlie <airlied@redhat.com> 7.1-0.38 * Thu Aug 28 2008 Dave Airlie <airlied@redhat.com> 7.1-0.38
- latest Mesa snapshot - re-enable tex offset - latest Mesa snapshot - re-enable tex offset
- add r300 command buffer support on top of snapshot - add r300 command buffer support on top of snapshot
- disable osmesa version patch -- (ajax???)
- fix mesa build on intel driver - fix mesa build on intel driver
* Fri Jun 27 2008 Adam Jackson <ajax@redhat.com> 7.1-0.37 * Fri Jun 27 2008 Adam Jackson <ajax@redhat.com> 7.1-0.37