summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorJulien Cristau <[email protected]>2009-01-21 19:01:17 +0100
committerJulien Cristau <[email protected]>2009-01-21 19:01:17 +0100
commitf1939c868505c59798de1b88a32b633fe292ac03 (patch)
tree53abd491123dca58088d8c0470dbdf0fbf648957 /debian
parent3ac4d678ef4f95268be2a34f4511593900ba1357 (diff)
Refresh patches 03 and 04.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/03_optional-progs-and-install.patch12
-rw-r--r--debian/patches/04_osmesa_version.diff10
3 files changed, 15 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 052d3db285f..b521e3a92f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
mesa (7.3~rc3-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release candidate.
+ [ Julien Cristau ]
+ * Refresh patches 03 and 04.
+
-- Timo Aaltonen <[email protected]> Fri, 16 Jan 2009 23:06:40 +0200
mesa (7.3~rc1-1) experimental; urgency=low
diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch
index 211c7a9fb7e..6eac84ae2ba 100644
--- a/debian/patches/03_optional-progs-and-install.patch
+++ b/debian/patches/03_optional-progs-and-install.patch
@@ -12,8 +12,8 @@ and we don't actually build it at this point.
Index: mesa/progs/xdemos/Makefile
===================================================================
---- mesa.orig/progs/xdemos/Makefile 2008-07-01 15:26:56.000000000 +0300
-+++ mesa/progs/xdemos/Makefile 2008-07-01 15:48:47.000000000 +0300
+--- mesa.orig/progs/xdemos/Makefile
++++ mesa/progs/xdemos/Makefile
@@ -10,7 +10,7 @@
LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
@@ -21,9 +21,9 @@ Index: mesa/progs/xdemos/Makefile
-PROGS = \
+PROGS ?= \
corender \
+ glsync \
glthreads \
- glxdemo \
-@@ -60,6 +60,11 @@
+@@ -61,6 +61,11 @@
extra: $(EXTRA_PROGS)
@@ -37,8 +37,8 @@ Index: mesa/progs/xdemos/Makefile
-rm -f *.o *~
Index: mesa/progs/Makefile
===================================================================
---- mesa.orig/progs/Makefile 2008-07-01 15:26:56.000000000 +0300
-+++ mesa/progs/Makefile 2008-07-01 15:48:07.000000000 +0300
+--- mesa.orig/progs/Makefile
++++ mesa/progs/Makefile
@@ -21,8 +21,12 @@
fi \
done
diff --git a/debian/patches/04_osmesa_version.diff b/debian/patches/04_osmesa_version.diff
index 573439702cd..108916c675c 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -1,17 +1,17 @@
Index: mesa/src/mesa/drivers/osmesa/Makefile
===================================================================
---- mesa.orig/src/mesa/drivers/osmesa/Makefile 2008-09-12 10:44:02.000000000 +0300
-+++ mesa/src/mesa/drivers/osmesa/Makefile 2008-09-23 16:07:40.000000000 +0300
-@@ -46,7 +46,7 @@
+--- mesa.orig/src/mesa/drivers/osmesa/Makefile
++++ mesa/src/mesa/drivers/osmesa/Makefile
+@@ -45,7 +45,7 @@
- $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
+ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS)
$(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) \
-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
$(OSMESA_LIB_DEPS) $(OBJECTS)
-@@ -58,7 +58,7 @@
+@@ -57,7 +57,7 @@
# with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
osmesa16: $(OBJECTS) $(CORE_MESA)
$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \