debian/changelog | 2 ++
debian/patches/04_osmesa_version.diff | 21 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 24 insertions(+)
New commits:
commit 213803b4d4580bfc5baaf0814968e53219484dd5
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Thu Jul 3 18:30:35 2008 +0200
fix libOSMesa versioning, to revert accidental SONAME bump.
diff --git a/debian/changelog b/debian/changelog
index 40d9b0a..5fea75d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mesa (7.1~rc1-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* New upstream release candidate.
* Build against libdrm >= 2.3.1.
+ * 04_osmesa_version.diff: fix libOSMesa versioning, to revert accidental
+ SONAME bump.
[ Timo Aaltonen ]
* Refresh patches, and drop obsolete 00_create-libdir.patch and
diff --git a/debian/patches/04_osmesa_version.diff
b/debian/patches/04_osmesa_version.diff
new file mode 100644
index 0000000..ba22b2f
--- /dev/null
+++ b/debian/patches/04_osmesa_version.diff
@@ -0,0 +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)
+ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS)
+ $(TOP)/bin/mklib -o $(OSMESA_LIB) \
+ -linker "$(CC)" \
+- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
++ -major 6 -minor 5 -patch 3 \
+ -install $(TOP)/$(LIB_DIR) \
+ $(MKLIB_OPTIONS) \
+ $(OSMESA_LIB_DEPS) $(OBJECTS)
+@@ -60,7 +60,7 @@ $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS
+ osmesa16: $(OBJECTS) $(CORE_MESA)
+ $(TOP)/bin/mklib -o $(OSMESA_LIB) \
+ -linker "$(CC)" \
+- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
++ -major 6 -minor 5 -patch 3 \
+ -install $(TOP)/$(LIB_DIR) \
+ $(MKLIB_OPTIONS) \
+ $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
diff --git a/debian/patches/series b/debian/patches/series
index fa395b1..4611842 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_fix-libdir.patch
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
+04_osmesa_version.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
