debian/changelog | 2 +-
debian/control | 2 +-
debian/patches/13-llvm-config-pick-a-version.diff | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 3d6b009477ea130fc75f20b11c86f529170257c2
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Fri Jan 4 11:59:53 2013 +0200
switch to llvm 3.2
diff --git a/debian/changelog b/debian/changelog
index 24b5962..4c3f863 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ mesa (9.0.1-1) UNRELEASED; urgency=low
- Set close on exec flag when opening dri devices (Closes: #651370).
* Refresh patches
- disable 05_kfreebsd-egl-x11.diff for now.
- - switch to llvm-3.1 (Closes: #678822).
+ - switch to llvm-3.2 (Closes: #678822).
* control: Added libtool to build-depends.
* rules: Drop special handling of config.{guess,sub}, not needed anymore.
* rules, libosmesa*: Build only the 32bit OSMesa library.
diff --git a/debian/control b/debian/control
index 3979fe5..ee50e25 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-3.1-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
+ llvm-3.2-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libwayland-dev (>= 0.99.0) [linux-any],
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/patches/13-llvm-config-pick-a-version.diff
b/debian/patches/13-llvm-config-pick-a-version.diff
index 4e85ff6..01eb3cc 100644
--- a/debian/patches/13-llvm-config-pick-a-version.diff
+++ b/debian/patches/13-llvm-config-pick-a-version.diff
@@ -1,18 +1,18 @@
Several versions of llvm can coexist in the archive (at the time of this
-writing, 2.9, 3.0 and 3.1), so pick a version. Let's assume the last version
-receives bug fixes quickly, so pick 3.1 for now.
+writing, 2.9, 3.0, 3.1 and 3.2), so pick a version. Let's assume the last
version
+receives bug fixes quickly, so pick 3.2 for now.
--- a/configure.ac
+++ b/configure.ac
-@@ -1632,9 +1632,9 @@
+@@ -1638,9 +1638,9 @@ if test "x$enable_gallium_llvm" = xauto;
fi
if test "x$enable_gallium_llvm" = xyes; then
if test "x$llvm_prefix" != x; then
- AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
-+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.1], [no],
["$llvm_prefix/bin"])
++ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.2], [no],
["$llvm_prefix/bin"])
else
- AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
-+ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.1], [no])
++ AC_PATH_PROG([LLVM_CONFIG], [llvm-config-3.2], [no])
fi
if test "x$LLVM_CONFIG" != xno; then
--
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/e1tr44p-00052o...@vasks.debian.org
