diff options
| author | Dave Airlie <airlied@fedoraproject.org> | 2008-08-28 12:36:35 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@fedoraproject.org> | 2008-08-28 12:36:35 +0000 |
| commit | 336da42a01c84c398a0149fa7599fae0b1add157 (patch) | |
| tree | bbd802bc26a10e14ff1f3fba1d4e2cf922ce8eff | |
| parent | 249ba36e24bd3195ae48a99ec0266d71a046b360 (diff) | |
| download | mesa-336da42a01c84c398a0149fa7599fae0b1add157.tar.gz mesa-336da42a01c84c398a0149fa7599fae0b1add157.tar.xz mesa-336da42a01c84c398a0149fa7599fae0b1add157.zip | |
- latest Mesa snapshot - re-enable tex offsetmesa-7_1-0_38_fc10
- add r300 command buffer support on top of snapshot
- fix mesa build on intel driver
| -rw-r--r-- | mesa-7.1pre-osmesa-version.patch | 26 | ||||
| -rw-r--r-- | mesa.spec | 5 |
2 files changed, 15 insertions, 16 deletions
diff --git a/mesa-7.1pre-osmesa-version.patch b/mesa-7.1pre-osmesa-version.patch index ba22b2f..b958f89 100644 --- a/mesa-7.1pre-osmesa-version.patch +++ b/mesa-7.1pre-osmesa-version.patch @@ -1,21 +1,21 @@ -diff -up mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080612/src/mesa/drivers/osmesa/Makefile ---- mesa-20080612/src/mesa/drivers/osmesa/Makefile.osmesa 2008-06-12 12:17:27.000000000 +1000 -+++ mesa-20080612/src/mesa/drivers/osmesa/Makefile 2008-06-12 13:14:24.000000000 +1000 -@@ -47,7 +47,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME) +diff -up mesa-20080814/src/mesa/drivers/osmesa/Makefile.osmesa mesa-20080814/src/mesa/drivers/osmesa/Makefile +--- mesa-20080814/src/mesa/drivers/osmesa/Makefile.osmesa 2008-08-28 22:33:46.000000000 +1000 ++++ mesa-20080814/src/mesa/drivers/osmesa/Makefile 2008-08-28 22:34:06.000000000 +1000 +@@ -46,7 +46,7 @@ osmesa8: $(TOP)/lib/$(OSMESA_LIB_NAME) + $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS) - $(TOP)/bin/mklib -o $(OSMESA_LIB) \ - -linker "$(CC)" \ + $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ + -major 6 -minor 5 -patch 3 \ - -install $(TOP)/$(LIB_DIR) \ - $(MKLIB_OPTIONS) \ + -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ + -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ $(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) - $(TOP)/bin/mklib -o $(OSMESA_LIB) \ - -linker "$(CC)" \ + $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ + -major 6 -minor 5 -patch 3 \ - -install $(TOP)/$(LIB_DIR) \ - $(MKLIB_OPTIONS) \ + -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ + -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) @@ -163,7 +163,7 @@ This package provides some demo applications for testing Mesa. %prep #%setup -q -n Mesa-%{version}pre -b1 -b2 %setup -q -n mesa-%{gitdate} -b2 -#patch0 -p1 -b .osmesa +%patch0 -p1 -b .osmesa %patch1 -p1 -b .fixes %patch2 -p1 -b .intel-glthread %patch5 -p1 -b .r300cmdbuf @@ -402,10 +402,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/mesa-demos-data %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 - add r300 command buffer support on top of snapshot -- disable osmesa version patch -- (ajax???) - fix mesa build on intel driver * Fri Jun 27 2008 Adam Jackson <ajax@redhat.com> 7.1-0.37 |