mesa: Changes to 'debian-experimental'
debian/changelog | 5 ++++-
debian/control | 4 ++--
debian/libgl1-mesa-dri.install.linux.in | 2 ++
debian/rules | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 8544fa1cd5fc5a37d2f0689124c1c0db330e0b56
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Oct 2 18:23:25 2014 +0200
Revert "Remove gallium-pipe, no longer built."
This reverts commit 7369e18ec2f1a282c9f106a3e27f2425f7077eb0.
diff --git a/debian/changelog b/debian/changelog
index a60b5e5..e607920 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ mesa (10.3.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Remove upstreamed patch.
- 01_gallium-util-add-missing-u_debug-include.patch
- * Remove gallium-pipe, no longer built.
[ Andreas Boll ]
* Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils.
diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in
new file mode 100644
index 0000000..211578e
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -0,0 +1,2 @@
+dri/etc/drirc etc
+dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe
commit d48cc6d4db11e4e4c5b65211f458ab1b1539f305
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu Oct 2 18:12:41 2014 +0200
Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils.
diff --git a/debian/changelog b/debian/changelog
index ac5d2ff..a60b5e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
mesa (10.3.0-1) UNRELEASED; urgency=medium
+ [ Maarten Lankhorst ]
* New upstream release.
* Remove upstreamed patch.
- 01_gallium-util-add-missing-u_debug-include.patch
* Remove gallium-pipe, no longer built.
+ [ Andreas Boll ]
+ * Downgrade llvm to 3.4 for now, fixes FTBFS with newer binutils.
+
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 22 Sep 2014 11:31:45 +0200
mesa (10.3.0~rc3-3) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 857f2a5..07bd699 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,10 @@ Build-Depends:
libudev-dev [linux-any],
flex,
bison,
- llvm-3.5-dev (>= 1:3.5-1) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.4-dev (>= 1:3.4.1-3) [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.5-dev (>= 1:3.5-1) [amd64 i386 armhf],
+ libclang-3.4-dev (>= 1:3.4.1-3) [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 c6d154a..97a12bc 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.5
+ confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.4
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
Reply to: