debian/changelog | 2 ++
debian/rules | 11 -----------
2 files changed, 2 insertions(+), 11 deletions(-)
New commits:
commit a4380bf54282e9666468e111d644ce88f3e363af
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Jan 25 00:34:56 2012 +0200
rules: Drop the dri-alternates driver search path
and don't ship gallium version of i915_dri.so for now.
diff --git a/debian/changelog b/debian/changelog
index f1754ba..ae72071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ mesa (8.0~rc1-0ubuntu1) UNRELEASED; urgency=low
- Included upstream.
* Update 115_llvm_dynamic_linking.diff,
116_use_shared_galliumcore.diff to apply.
+ * rules: Drop the dri-alternates driver search path, and don't ship
+ gallium version of i915_dri.so for now.
[ Robert Hooker ]
* Stop shipping r300/r600 classic drivers in libgl1-mesa-dri-experimental,
diff --git a/debian/rules b/debian/rules
index 13d4aff..7278f5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -191,13 +190,6 @@ confflags-swx11+glu-i386-i686 = \
CFLAGS="$(CFLAGS) -march=i686" \
CXXFLAGS="$(CXXFLAGS) -march=i686"
-# Add /usr/lib/dri-alternates for classic fallback for gallium drivers
-ifeq ($(DEB_BUILD_ARCH),i386)
- confflags-dri +=
--with-dri-searchpath=/usr/lib/$(DEB_HOST_MULTIARCH)/dri:/usr/lib/dri:/usr/lib/$(DEB_HOST_MULTIARCH)/dri-alternates:/usr/lib/dri-alternates:/usr/lib32/dri:/usr/lib32/dri-alternates
-else
- confflags-dri +=
--with-dri-searchpath=/usr/lib/$(DEB_HOST_MULTIARCH)/dri:/usr/lib/dri:/usr/lib/$(DEB_HOST_MULTIARCH)/dri-alternates:/usr/lib/dri-alternates
-endif
-
configure: $(QUILT_STAMPFN) configure.ac
autoreconf -vfi
@@ -317,9 +309,6 @@ endif
ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
dh_install -plibgl1-mesa-dri
build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
endif
-ifneq (,$(filter i915,$(GALLIUM_DRIVERS)))
- dh_install -plibgl1-mesa-dri-experimental
build/dri/$(DEB_HOST_MULTIARCH)/gallium/i915_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri-alternates
-endif
# Create an ld.so.conf which says where to find libGL from Mesa
echo "/usr/lib/$(DEB_HOST_MULTIARCH)/mesa" \
--
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/e1rpoyv-0000mf...@vasks.debian.org
