mesa: Changes to 'ubuntu'
debian/changelog | 10 +++++++++-
debian/control | 3 ++-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 854b4c1de4132553eee83980b607b32eadc96714
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Aug 21 14:52:51 2014 +0200
Rebuild against llvm 3.5-rc3.
Add explicit depends on llvm 3.5-rc3 for libgl1-mesa-dri.
diff --git a/debian/changelog b/debian/changelog
index c6e4928..6fde479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mesa (10.2.5-1ubuntu3) UNRELEASED; urgency=low
* Drop 101_ubuntu_hidden_glname.patch.
- 8 years old patch supposedly to fix glx-tls, but if it was
important nowadays I would have expected it in upstream by now.
+ * Rebuild against llvm 3.5-rc3.
+ * Add explicit depends on llvm 3.5-rc3 for libgl1-mesa-dri.
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 12 Aug 2014 15:00:21 +0200
diff --git a/debian/control b/debian/control
index 0da13b6..9db6b68 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.5-dev (>= 1:3.5~+rc3) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libwayland-dev (>= 1.2.0) [linux-any],
libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
@@ -552,6 +552,7 @@ Priority: optional
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
+ libllvm-3.5 (>= 1:3.5~+rc3) [amd64 i386],
${shlibs:Depends},
${misc:Depends}
Recommends: libtxc-dxtn-s2tc0 | libtxc-dxtn0
diff --git a/debian/rules b/debian/rules
index c4bd048..3c10f52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,7 +110,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
commit 3a694027a64aaccd1e09e067aa2bbc3ec0e76a4a
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Aug 21 14:09:41 2014 +0200
import llvm revert
diff --git a/debian/changelog b/debian/changelog
index b70c0a1..c6e4928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mesa (10.2.5-1ubuntu2) UNRELEASED; urgency=low
+mesa (10.2.5-1ubuntu3) UNRELEASED; urgency=low
* Drop 101_ubuntu_hidden_glname.patch.
- 8 years old patch supposedly to fix glx-tls, but if it was
@@ -6,6 +6,12 @@ mesa (10.2.5-1ubuntu2) UNRELEASED; urgency=low
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 12 Aug 2014 15:00:21 +0200
+mesa (10.2.5-1ubuntu2) utopic; urgency=medium
+
+ * Temporarily revert to llvm 3.4, too many regressions.
+
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Wed, 13 Aug 2014 23:11:15 +0200
+
mesa (10.2.5-1ubuntu1) utopic; urgency=low
* Rebuild with llvm 3.5.
diff --git a/debian/control b/debian/control
index 7bd4e8b..0da13b6 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-3.5-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.4-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
libwayland-dev (>= 1.2.0) [linux-any],
libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el],
diff --git a/debian/rules b/debian/rules
index 3c10f52..c4bd048 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,7 +110,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.5
+ confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.4
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
Reply to: