debian/changelog | 1 -
debian/control | 4 ++--
debian/rules | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit d4476e9feb8334a27dafc3fd43a589af2395dacf
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Oct 6 10:44:39 2014 +0200
Revert "Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils."
This reverts commit d48cc6d4db11e4e4c5b65211f458ab1b1539f305.
diff --git a/debian/changelog b/debian/changelog
index bbcf100..763643e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ mesa (10.3.0-1) UNRELEASED; urgency=medium
- 01_gallium-util-add-missing-u_debug-include.patch
[ Andreas Boll ]
- * Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils.
* Move gallium-pipe installation from libgl1-mesa-dri.install.linux.in
to mesa-opencl-icd.install.in, because it's only needed for opencl.
diff --git a/debian/control b/debian/control
index 07bd699..857f2a5 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,10 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-3.4-dev (>= 1:3.4.1-3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.5-dev (>= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.4-dev (>= 1:3.4.1-3) [amd64 i386 armhf],
+ libclang-3.5-dev (>= 1:3.5-1) [amd64 i386 armhf],
libclc-dev [amd64 i386 armhf],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
diff --git a/debian/rules b/debian/rules
index 97a12bc..c6d154a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,7 +116,7 @@ else
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
armhf))
GALLIUM_DRIVERS += radeonsi
confflags_GALLIUM += --enable-gallium-llvm
- confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.4
+ confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.5
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xbtps-00011x...@moszumanska.debian.org
