mesa: Changes to 'debian-experimental'
debian/changelog | 7 +++++++
debian/rules | 18 +++++++-----------
2 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 77287b475df75b6b136069141e8e139485363210
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Dec 10 11:13:13 2013 +0100
Enable radeonsi on arm, and drop EXTRA_SED.
libllvmradeon.so no longer exists
diff --git a/debian/changelog b/debian/changelog
index b6b855f..a0bbd74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (10.0.0-2) UNRELEASED; urgency=low
* Do not attempt to build i915 and i965 on arm.
+ * Enable radeonsi on arm.
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 10 Dec 2013 10:20:24 +0100
diff --git a/debian/rules b/debian/rules
index a910dba..eaf7e8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,12 +73,10 @@ else
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200 radeon nouveau
endif
- ifneq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
+ ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 armhf))
# Radeonsi needs LLVM, so only build it on the subset of archs
# where we have LLVM enabled.
GALLIUM_DRIVERS += radeonsi
- else
- EXTRA_SED="-e/libllvmradeon/ s/^/\#/"
endif
endif
@@ -197,7 +195,6 @@ install: build
for file in debian/*.in; \
do \
sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \
- $(EXTRA_SED) \
$${file} > $${file%%.in}; \
done
commit 01ac02c1b74e6f830b6aec120481a9edc2528e0a
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Dec 10 11:12:39 2013 +0100
Do not attempt to build i915 and i965 on arm.
diff --git a/debian/changelog b/debian/changelog
index 1046d57..b6b855f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.0.0-2) UNRELEASED; urgency=low
+
+ * Do not attempt to build i915 and i965 on arm.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 10 Dec 2013 10:20:24 +0100
+
mesa (10.0.0-1) experimental; urgency=low
[ Emilio Pozuelo Monfort ]
diff --git a/debian/rules b/debian/rules
index 74cdfc8..a910dba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,19 +82,18 @@ else
endif
endif
-
-# Build the llvmpipe driver only on amd64, i386, and arm until it's tested elsewhere
- ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386 arm))
- DRI_DRIVERS += swrast
- else
- GALLIUM_DRIVERS += swrast
+ # Build intel drivers on archs where libdrm-intel is installed
+ ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 x32))
DRI_DRIVERS += i915 i965
endif
- # LLVM is required for r300g and recommended for swrastg on x86:
+ # LLVM is required for r300g and llvmpipe:
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf))
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += --with-llvm-shared-libs
+ GALLIUM_DRIVERS += swrast
+ else
+ DRI_DRIVERS += swrast
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
Reply to: