mesa: Changes to 'ubuntu'
debian/changelog | 12 ++++++++++++
debian/control | 3 +--
debian/patches/04_osmesa_version.diff | 27 +++++++++------------------
3 files changed, 22 insertions(+), 20 deletions(-)
New commits:
commit 7b841a6f0e7f20d817ad55b1662a8fd78a95e1cb
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Tue Feb 12 14:24:09 2013 -0500
debian/control: Drop libtxc-dxtn-s2tc0 recommends from libgl1-mesa-glx, libgl1-mesa-dri now recommends libtxc-dxtn0.
diff --git a/debian/changelog b/debian/changelog
index af576f4..054acf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
mesa (9.1~git20130207.f1c46c84-0ubuntu1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* Merge from unreleased debian git.
* Refresh patches.
+ [ Robert Hooker ]
+ * Drop ubuntu specific libtxc-dxtn-s2tc0 recommends from libgl1-mesa-glx,
+ libgl1-mesa-dri now recommends libtxc-dxtn0.
+
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 07 Feb 2013 18:09:58 +0200
mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 32dbdca..cce6f60 100644
--- a/debian/control
+++ b/debian/control
@@ -453,7 +453,6 @@ Depends:
${misc:Depends}
Recommends:
libgl1-mesa-dri (>= 7.2),
- libtxc-dxtn-s2tc0
Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
Provides: libgl1
commit a208628411c8141a99ab2e118c5aef4a9fe87402
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Tue Feb 12 11:08:28 2013 -0500
debian/patches04_osmesa_version.diff: Switch to a less fragile way of forcing the version
diff --git a/debian/changelog b/debian/changelog
index 7a4006e..4d8af4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ 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 <jcristau@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 bad5f7b..3232216 100644
--- a/debian/patches/04_osmesa_version.diff
+++ b/debian/patches/04_osmesa_version.diff
@@ -1,20 +1,11 @@
---- 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
+--- 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])
--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 Set internal versions
+-OSMESA_VERSION=8
++OSMESA_VERSION=6:5:3
+ AC_SUBST([OSMESA_VERSION])
- 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
+ dnl Versions for external dependencies
commit 5de85f7bceb3b0639d2ab7be9f2ac8b6b4ed5fc4
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Tue Feb 12 10:57:38 2013 -0500
debian/control: Recommend libtxc-dxtn0 in libgl1-mesa-dri.
diff --git a/debian/changelog b/debian/changelog
index 3786286..7a4006e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,8 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
[ Robert Hooker ]
* 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).
-- Julien Cristau <jcristau@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/control b/debian/control
index 1c2af9a..8f19566 100644
--- a/debian/control
+++ b/debian/control
@@ -604,6 +604,7 @@ Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends}
+Recommends: libtxc-dxtn0
Suggests: libglide3
Conflicts: xlibmesa-dri (<< 1:7.0.0)
Replaces: xlibmesa-dri (<< 1:7.0.0), libgl1-mesa-dri-experimental (<< 7.11.1)
commit a09438e1ad5363724b4f48495f3275e6bea22cd0
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon Feb 11 14:33:16 2013 -0500
debian/control: Drop xutils-dev build dep, makedepend is no longer required.
diff --git a/debian/changelog b/debian/changelog
index 0860c01..3786286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,9 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low
* control: Bump libwayland-dev build-dep to 1.0.2.
* Remove 13-llvm-config-pick-a-version.diff and just pass a flag to configure.
+ [ Robert Hooker ]
+ * Drop xutils-dev build dep, makedepend is no longer required
+
-- Julien Cristau <jcristau@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
mesa (8.0.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 87d0953..1c2af9a 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends:
pkg-config,
libdrm-dev (>= 2.4.39) [!hurd-any],
libx11-dev,
- xutils-dev,
x11proto-gl-dev (>= 1.4.14),
libxxf86vm-dev,
libexpat1-dev,
Reply to: