debian/changelog | 2 --
debian/patches/04_osmesa_version.diff | 27 ++++++++++++++++++---------
2 files changed, 18 insertions(+), 11 deletions(-)
New commits:
commit c263b342fdaabffbced5960c090dc1033b944ffc
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Thu Feb 14 18:10:04 2013 -0500
Revert "debian/patches04_osmesa_version.diff: Switch to a less fragile way
of forcing the version"
This reverts commit a208628411c8141a99ab2e118c5aef4a9fe87402.
It doesn't actually work, sorry about that!
diff --git a/debian/changelog b/debian/changelog
index 4d8af4f..7a4006e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,8 +61,6 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
* Drop xutils-dev build dep, makedepend is no longer required
* Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch
installs (Closes: #668645).
- * 04_osmesa_version.diff: Switch to a less fragile way of forcing the version
- (Closes: 697745)
-- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/patches/04_osmesa_version.diff
b/debian/patches/04_osmesa_version.diff
index 3232216..bad5f7b 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -1,11 +1,20 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+--- a/src/mesa/drivers/osmesa/Makefile.am
++++ b/src/mesa/drivers/osmesa/Makefile.am
+@@ -37,7 +37,7 @@
+ nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
+ lib@OSMESA_LIB@_la_SOURCES = osmesa.c
- dnl Set internal versions
--OSMESA_VERSION=8
-+OSMESA_VERSION=6:5:3
- AC_SUBST([OSMESA_VERSION])
+-lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@
-no-undefined
++lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6:5:3 -no-undefined
- dnl Versions for external dependencies
+ if HAVE_SHARED_GLAPI
+ GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
+@@ -55,7 +55,7 @@
+ all-local: lib@OSMESA_LIB@.la
+ $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+ ln -f .libs/lib@OSMESA_LIB@.so
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
+- ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@;
++ ln -f .libs/lib@OSMESA_LIB@.so.6.5.3
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.6.5.3;
+ endif
+
+ pkgconfigdir = $(libdir)/pkgconfig
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1u67xf-0003bs...@vasks.debian.org
