debian/changelog | 1 +
debian/rules | 38 +++++++++++++++++++-------------------
2 files changed, 20 insertions(+), 19 deletions(-)
New commits:
commit 95d489e41a70e6c0389405190ea17d8ba0c76863
Author: Julien Cristau <jcris...@debian.org>
Date: Thu Jul 1 11:16:05 2010 +0100
Rename radeong_dri.so in build, not binary
binary should be idempotent, and the rename failed on a second
invocation.
diff --git a/debian/changelog b/debian/changelog
index aa3c2ac..4672033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ mesa (7.8.2-1) UNRELEASED; urgency=low
and it's big.
* debian/scripts/choose-configs: use DEB_HOST_ARCH, not DEB_BUILD_ARCH
(closes: #451648).
+ * Rename radeong_dri.so to r300_dri.so in build, not binary.
[ Christopher James Halse Rogers ]
* debian/patches/07-nouveau-update.diff:
diff --git a/debian/rules b/debian/rules
index d355709..0dc5694 100755
--- a/debian/rules
+++ b/debian/rules
@@ -202,7 +202,24 @@ $(STAMP_DIR)/stamp:
$(QUILT_STAMPFN): $(STAMP_DIR)/stamp
-build: $(BUILD_STAMPS)
+build: build-stamp
+
+build-stamp: $(BUILD_STAMPS)
+ifeq ($(findstring radeon, $(GALLIUM_DRIVERS)), radeon)
+ # Radeon searches for r{200,300,600}_dri only, but the gallium driver
+ # is (at the moment) radeong_dri. Rename it to r300_dri, as it
+ # fails to support r600.
+ # We don't actually install radeong yet, although it will probably
+ # replace r300 classic soon.
+ mv build/dri/lib/gallium/radeong_dri.so \
+ build/dri/lib/gallium/r300_dri.so
+endif
+ifeq ($(findstring intel, $(GALLIUM_DRIVERS)), intel)
+ # Intel i965 Gallium appears to do nothing more than generate GPU
+ # lockups. Kill it with fire. i915 is apparently useful.
+ rm build/dri/lib/gallium/i965_dri.so
+ rm build/dri/lib/egl_*_i965.so
+endif
$(STAMP)-build-%: configure
dh_testdir
@@ -215,8 +232,7 @@ $(STAMP)-build-%: configure
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
--localstatedir=/var $(confflags) $(confflags-$*)
cd $(DEB_BUILD_DIR)/$* && $(MAKE)
-
- touch $@
+ >$@
install: build
# Add here commands to install the package into debian/tmp
@@ -264,22 +280,6 @@ binary-arch: install
# install the right files manually.
rm -r debian/tmp/dri/usr/lib/dri
-ifeq ($(findstring radeon, $(GALLIUM_DRIVERS)), radeon)
- # Radeon searches for r{200,300,600}_dri only, but the gallium driver
- # is (at the moment) radeong_dri. Rename it to r300_dri, as it
- # fails to support r600.
- # We don't actually install radeong yet, although it will probably
- # replace r300 classic soon.
- mv build/dri/lib/gallium/radeong_dri.so \
- build/dri/lib/gallium/r300_dri.so
-endif
-ifeq ($(findstring intel, $(GALLIUM_DRIVERS)), intel)
- # Intel i965 Gallium appears to do nothing more than generate GPU
- # lockups. Kill it with fire. i915 is apparently useful.
- rm build/dri/lib/gallium/i965_dri.so
- rm debian/tmp/dri/usr/lib/egl/egl_*_i965.so
-endif
-
dh_install -s --list-missing
dh_installman -s
dh_lintian -s
--
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/e1ougpx-0007wi...@alioth.debian.org
