mesa: Changes to 'debian-experimental'
debian/changelog | 2 ++
debian/rules | 19 ++++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 3134e1406817adc366770492650fb94f4fa4efb8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Mar 2 19:41:23 2014 +0100
Enable radeon/r200/r300/r600/radeonsi on kfreebsd (closes: #732337).
Thanks, Robert Millan!
diff --git a/debian/changelog b/debian/changelog
index 7bfb282..a5286a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ mesa (10.1.0~rc2-1) UNRELEASED; urgency=medium
[ Julien Cristau ]
* libgbm1.symbols: try to avoid listing private symbols.
+ * Enable radeon/r200/r300/r600/radeonsi on kfreebsd (closes: #732337).
+ Thanks, Robert Millan!
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 20 Feb 2014 19:12:12 +0100
diff --git a/debian/rules b/debian/rules
index 86464e6..4ea269c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,7 @@ ifeq ($(DEB_HOST_ARCH_OS), hurd)
else
ifeq ($(DEB_HOST_ARCH_OS), linux)
# Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux
- GALLIUM_DRIVERS += nouveau r600 r300 svga
+ GALLIUM_DRIVERS += nouveau svga
#
# Although the KMS egl drivers will probably build on kfreebsd & hurd
# only linux actually has KMS drivers implemented at this point.
@@ -68,12 +68,7 @@ else
# Non-Linux ports also lack *_CLOEXEC and epoll, so wayland isn't ready yet:
EGL_DISPLAYS += wayland
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
- DRI_DRIVERS += r200 radeon nouveau
- endif
- 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
+ DRI_DRIVERS += nouveau
endif
endif
@@ -89,6 +84,16 @@ else
DRI_DRIVERS += swrast
endif
+ ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
+ DRI_DRIVERS += r200 radeon
+ GALLIUM_DRIVERS += r600 r300
+ endif
+ 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
+ endif
+
# LLVM is required for r300g and llvmpipe:
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf))
confflags_GALLIUM += --enable-gallium-llvm
Reply to: