debian/changelog | 15 +++++++++++++++
debian/clean | 1 +
debian/control | 6 +++---
debian/libgl1-mesa-dri-experimental.install.armel.in | 9 +++++++++
debian/rules | 1 +
5 files changed, 29 insertions(+), 3 deletions(-)
New commits:
commit 092f92a73ced20edbf8c925335aae8e887d334af
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Thu Jun 16 20:46:19 2011 +1000
Fix armel build by not trying to install non-existent i915g drivers
diff --git a/debian/changelog b/debian/changelog
index efc31e4..5567157 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,13 @@ mesa (7.10.3-0ubuntu2) oneiric; urgency=low
nvidia-current upload broke my sly attempt at avoiding this work.
The Breaks: should therefore stay unversioned until we know the version
of the fixed packages. (LP: #798007)
+ * debian/rules:
+ * debian/clean:
+ * debian/libgl1-mesa-dri-experimental.armel.install.in
+ - We don't build i915g on armel as there's no concievable hardware to
+ support. Don't try to install it. Fixes the build on armel.
- -- Christopher James Halse Rogers <r...@ubuntu.com> Thu, 16 Jun 2011
18:02:02 +1000
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Thu, 16 Jun 2011
20:45:20 +1000
mesa (7.10.3-0ubuntu1) oneiric; urgency=low
diff --git a/debian/clean b/debian/clean
index 14fc6cc..c0e5aef 100644
--- a/debian/clean
+++ b/debian/clean
@@ -12,6 +12,7 @@ debian/libgl1-mesa-glx-i686.install
debian/libgl1-mesa-dri.install
debian/libgl1-mesa-dri.install.linux
debian/libgl1-mesa-dri-experimental.install
+debian/libgl1-mesa-dri-experimental.armel.install
debian/libgl1-mesa-dev.install
debian/libgl1-mesa-dev.links
debian/libegl1-mesa.install
diff --git a/debian/libgl1-mesa-dri-experimental.install.armel.in
b/debian/libgl1-mesa-dri-experimental.install.armel.in
new file mode 100644
index 0000000..5a85d7d
--- /dev/null
+++ b/debian/libgl1-mesa-dri-experimental.install.armel.in
@@ -0,0 +1,9 @@
+# Armel doesn't build i915g, as there's no Intel GPUs for arm hardware.
+#build/dri/${DEB_HOST_MULTIARCH}/gallium/i915_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
+
+#build/dri/${DEB_HOST_MULTIARCH}/gallium/swrastg_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
+
+# Install the classic radeon drivers for UMS fallback
+# Most users will not need these, and we don't want to support them
+build/dri/${DEB_HOST_MULTIARCH}/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
+build/dri/${DEB_HOST_MULTIARCH}/r600_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
diff --git a/debian/rules b/debian/rules
index ac6af8a..265e15f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -245,6 +245,7 @@ install: build
libgl1-mesa-glx-i686.install libgl1-mesa-dri.install \
libgl1-mesa-dri.install.linux libegl1-mesa.install \
libgl1-mesa-dri-experimental.install \
+ libgl1-mesa-dri-experimental.armel.install \
libegl1-mesa-drivers.install libegl1-mesa-dev.install \
libgl1-mesa-dev.install libgl1-mesa-dev.links \
libgl1-mesa-swx11-dev.install libgl1-mesa-swx11.install \
commit 5f6910220795ca0dddeb65b1d9c077448061e2a6
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Thu Jun 16 18:04:50 2011 +1000
Declare unversioned Breaks against the proprietary drivers until we know
what versions will work
diff --git a/debian/changelog b/debian/changelog
index 56495e5..efc31e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mesa (7.10.3-0ubuntu2) oneiric; urgency=low
+
+ * debian/control:
+ - Make the Breaks against the proprietary drivers unversioned. A sneaky
+ nvidia-current upload broke my sly attempt at avoiding this work.
+ The Breaks: should therefore stay unversioned until we know the version
+ of the fixed packages. (LP: #798007)
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Thu, 16 Jun 2011
18:02:02 +1000
+
mesa (7.10.3-0ubuntu1) oneiric; urgency=low
* New upstream 7.10.3 bugfix release.
diff --git a/debian/control b/debian/control
index 71cf883..f6dac9a 100644
--- a/debian/control
+++ b/debian/control
@@ -393,9 +393,9 @@ Conflicts: libgl1, libgl1-mesa-dri (<< 6.4.0)
Replaces: libgl1, libgl1-mesa-dri (<< 6.4.0)
Provides: libgl1
Breaks:
- nvidia-current (<= 270.41.19-0ubuntu1),
- nvidia-173 (<= 173.14.30-0ubuntu2),
- fglrx (<= 2:8.850-0ubuntu1),
+ nvidia-current,
+ nvidia-173,
+ fglrx,
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
Description: free implementation of the OpenGL API -- GLX runtime
--
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/e1qxa79-00072d...@vasks.debian.org
