debian/changelog | 19 +++++++++++++++++++
debian/clean | 3 ++-
debian/control | 1 +
debian/libgl1-mesa-dri-experimental.install.amd64.in | 9 +++++++++
debian/libgl1-mesa-dri-experimental.install.armel.in | 9 ---------
debian/libgl1-mesa-dri-experimental.install.i386.in | 9 +++++++++
debian/libgl1-mesa-dri-experimental.install.in | 3 +--
debian/rules | 5 +++--
8 files changed, 44 insertions(+), 14 deletions(-)
New commits:
commit a6aaf514c91a593d79e9ae8899798641d52d19de
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jun 17 21:23:37 2011 +1000
Fix !i386 !amd64 builds by only installing i915g there, ie: where it's
actually built
diff --git a/debian/changelog b/debian/changelog
index e0811e8..d51ff74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,15 @@ mesa (7.10.3-0ubuntu3) oneiric; urgency=low
* debian/rules:
- Enable llvm support
* debian/libgl1-mesa-dri-experimental.install.in:
- * debian/libgl1-mesa-dri-experimental.install.armel.in:
+ * debian/libgl1-mesa-dri-experimental.install.i386.in:
+ * debian/libgl1-mesa-dri-experimental.install.amd64.in:
- Ship llvmpipe software rasteriser in libgl1-mesa-dri-experimental
+ * debian/libgl1-mesa-dri-experimental.install.in:
+ * debian/libgl1-mesa-dri-experimental.i386.install.in:
+ * debian/libgl1-mesa-dir-experimental.amd64.install.in:
+ - Only i386 and amd64 build i915g. Explicitly install it only on those
+ architectures, rather than trying to exclude it on architectures which
+ don't build it. Fixes build (again) on armel and now powerpc as well.
-- Christopher James Halse Rogers <r...@ubuntu.com> Fri, 17 Jun 2011
11:24:37 +1000
diff --git a/debian/clean b/debian/clean
index c0e5aef..21dae68 100644
--- a/debian/clean
+++ b/debian/clean
@@ -12,7 +12,8 @@ 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-dri-experimental.install.i386
+debian/libgl1-mesa-dri-experimental.install.amd64
debian/libgl1-mesa-dev.install
debian/libgl1-mesa-dev.links
debian/libegl1-mesa.install
diff --git a/debian/libgl1-mesa-dri-experimental.install.amd64.in
b/debian/libgl1-mesa-dri-experimental.install.amd64.in
new file mode 100644
index 0000000..3f998c6
--- /dev/null
+++ b/debian/libgl1-mesa-dri-experimental.install.amd64.in
@@ -0,0 +1,9 @@
+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
+
+# i386 and amd64 build i915g; install it here.
+build/dri/${DEB_HOST_MULTIARCH}/gallium/i915_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
diff --git a/debian/libgl1-mesa-dri-experimental.install.armel.in
b/debian/libgl1-mesa-dri-experimental.install.armel.in
deleted file mode 100644
index a339ecd..0000000
--- a/debian/libgl1-mesa-dri-experimental.install.armel.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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/libgl1-mesa-dri-experimental.install.i386.in
b/debian/libgl1-mesa-dri-experimental.install.i386.in
new file mode 100644
index 0000000..3f998c6
--- /dev/null
+++ b/debian/libgl1-mesa-dri-experimental.install.i386.in
@@ -0,0 +1,9 @@
+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
+
+# i386 and amd64 build i915g; install it here.
+build/dri/${DEB_HOST_MULTIARCH}/gallium/i915_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
diff --git a/debian/libgl1-mesa-dri-experimental.install.in
b/debian/libgl1-mesa-dri-experimental.install.in
index dca53ff..e9a4d10 100644
--- a/debian/libgl1-mesa-dri-experimental.install.in
+++ b/debian/libgl1-mesa-dri-experimental.install.in
@@ -1,4 +1,3 @@
-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
diff --git a/debian/rules b/debian/rules
index 2110b1a..ac73080 100755
--- a/debian/rules
+++ b/debian/rules
@@ -245,7 +245,8 @@ 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.install.armel \
+ libgl1-mesa-dri-experimental.install.i386 \
+ libgl1-mesa-dri-experimental.install.amd64 \
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 94858e45bfcb976cd5e54143defab2a7991bb957
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jun 17 11:29:34 2011 +1000
Release to oneiric
diff --git a/debian/changelog b/debian/changelog
index 710583d..e0811e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (7.10.3-0ubuntu3) UNRELEASED; urgency=low
+mesa (7.10.3-0ubuntu3) oneiric; urgency=low
* debian/rules:
- Fix typo in previous armel change. Really fix the build this time.
commit cee7b3e4a7b83712cc138daf0863678203d10a1a
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jun 17 11:25:30 2011 +1000
Re-enable LLVM support; llvm-2.9 is now in main
diff --git a/debian/changelog b/debian/changelog
index 428448f..710583d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ mesa (7.10.3-0ubuntu3) UNRELEASED; urgency=low
* debian/rules:
- Fix typo in previous armel change. Really fix the build this time.
+ * debian/rules:
+ - Enable llvm support
+ * debian/libgl1-mesa-dri-experimental.install.in:
+ * debian/libgl1-mesa-dri-experimental.install.armel.in:
+ - Ship llvmpipe software rasteriser in libgl1-mesa-dri-experimental
- -- Christopher James Halse Rogers <r...@ubuntu.com> Fri, 17 Jun 2011
11:11:36 +1000
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Fri, 17 Jun 2011
11:24:37 +1000
mesa (7.10.3-0ubuntu2) oneiric; urgency=low
diff --git a/debian/control b/debian/control
index f6dac9a..eebf3db 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 8.1.2ubuntu2), quilt (>= 0.40),
pkg-config,
linux-libc-dev (>= 2.6.31) [linux-any],
libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2,
libudev-dev [linux-any],
+ llvm-2.9-dev,
flex,
bison,
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
diff --git a/debian/libgl1-mesa-dri-experimental.install.armel.in
b/debian/libgl1-mesa-dri-experimental.install.armel.in
index 5a85d7d..a339ecd 100644
--- a/debian/libgl1-mesa-dri-experimental.install.armel.in
+++ b/debian/libgl1-mesa-dri-experimental.install.armel.in
@@ -1,7 +1,7 @@
# 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
+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
diff --git a/debian/libgl1-mesa-dri-experimental.install.in
b/debian/libgl1-mesa-dri-experimental.install.in
index 6ce8544..dca53ff 100644
--- a/debian/libgl1-mesa-dri-experimental.install.in
+++ b/debian/libgl1-mesa-dri-experimental.install.in
@@ -1,5 +1,5 @@
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
+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
diff --git a/debian/rules b/debian/rules
index f20c9ee..2110b1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
confflags_GALLIUM = --disable-gallium
else
EGL_DISPLAYS = x11
- GALLIUM_DRIVERS = swrast
+ GALLIUM_DRIVERS = swrast llvm
GALLIUM_STATE_TRACKERS = egl,glx,dri,vega
ifeq ($(DEB_HOST_ARCH_OS), linux)
commit 4be372b3a1753a6f5fbe5d33712642680c923e73
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jun 17 11:14:19 2011 +1000
Fix typo in previous commit.
This fixes the build on arm even harder. Honest to goodness!
diff --git a/debian/changelog b/debian/changelog
index 5567157..428448f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.10.3-0ubuntu3) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - Fix typo in previous armel change. Really fix the build this time.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Fri, 17 Jun 2011
11:11:36 +1000
+
mesa (7.10.3-0ubuntu2) oneiric; urgency=low
* debian/control:
diff --git a/debian/rules b/debian/rules
index 265e15f..f20c9ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -245,7 +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 \
+ libgl1-mesa-dri-experimental.install.armel \
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 \
--
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/e1qxxdt-00035r...@vasks.debian.org
