[beignet] 04/08: Explicitly specify LLVM 3.9/3.8, as we no longer need to match mesa (#848368 has been fixed) and this package FTBFS with LLVM 4.0

[Rebecca Palmer]

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit 53923af86a4f00065470a8d4e387b398b089605b
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sun Jul 30 16:18:40 2017 +0100

    Explicitly specify LLVM 3.9/3.8, as we no longer need to match mesa
    (#848368 has been fixed) and this package FTBFS with LLVM 4.0
---
 debian/changelog                 |  2 ++
 debian/control                   | 14 ++++++--------
 debian/patches/update-docs.patch |  9 +--------
 debian/rules                     |  7 +------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 545b40c..406638b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ beignet (1.3.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop patches applied upstream, refresh others. 
+  * Explicitly specify LLVM 3.9/3.8, as we no longer need to match
+    mesa (#848368 has been fixed) and this package FTBFS with LLVM 4.0.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 30 Jul 2017 14:30:54 +0100
 
diff --git a/debian/control b/debian/control
index 8962363..f888049 100644
--- a/debian/control
+++ b/debian/control
@@ -9,14 +9,12 @@ Uploaders:
 Build-Depends:
  debhelper (>= 9),
  cmake (>= 2.8.5),
-# We use the same LLVM version as mesa (see debian/rules - backports mesa in jessie-backports)
- libgl1-mesa-dri (>= 12),
- clang-3.8,
- libclang-3.8-dev,
- llvm-3.8-dev,
- clang-3.9 [amd64 i386 x32],
- libclang-3.9-dev [amd64 i386 x32],
- llvm-3.9-dev [amd64 i386 x32],
+ clang-3.8 [!amd64 !i386],
+ libclang-3.8-dev [!amd64 !i386],
+ llvm-3.8-dev [!amd64 !i386],
+ clang-3.9 [amd64 i386],
+ libclang-3.9-dev [amd64 i386],
+ llvm-3.9-dev [amd64 i386],
  ocl-icd-dev,
  ocl-icd-opencl-dev,
  opencl-headers (>= 2.0~),
diff --git a/debian/patches/update-docs.patch b/debian/patches/update-docs.patch
index e6e70ba..648f6c9 100644
--- a/debian/patches/update-docs.patch
+++ b/debian/patches/update-docs.patch
@@ -131,7 +131,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    
    `export OCL_IGNORE_SELF_TEST=1`
    
-@@ -221,8 +224,26 @@ Known Issues
+@@ -221,8 +224,19 @@ Known Issues
    This loses some precision but gains performance.
  
  * cl\_khr\_gl\_sharing.
@@ -141,13 +141,6 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 +  This extension is disabled by default, as it is only partially implemented.
 +  Enabling it requires recompiling with cmake -DENABLE\_GL\_SHARING=ON.
 +
-+* Crash when the same program (e.g. Blender) uses both OpenCL and graphics.
-+  
-+  This [can happen](https://bugs.debian.org/848368) if Beignet and Mesa use different
-+  LLVM versions.
-+  To avoid this, the Debian packages use matching versions: if you installed this
-+  package from -backports, try also installing libgl1-mesa-dri from -backports.
-+
 +* clCreateBuffer with CL_MEM_ALLOC_HOST_PTR doesn't work.
 +  
 +  This feature is unreliable on older versions of Linux, including jessie's 3.16.
diff --git a/debian/rules b/debian/rules
index 9bc87e4..0a140cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,12 +13,7 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DGBE_DEBUG=1
 # We build with the headers from opencl-headers.
 SUPERFLUOUS=cl.h cl_d3d10.h cl_dx9_media_sharing.h cl_ext.h cl_gl_ext.h cl_platform.h cl.hpp cl_d3d11.h cl_egl.h cl_gl.h opencl.h
 
-# Use the same LLVM version as mesa (build will fail if this version is not available; this is intentional, as mixing versions may cause crashes)
-# http://lists.alioth.debian.org/pipermail/pkg-opencl-devel/Week-of-Mon-20160418/000963.html
-LLVM_VERSION_MESA	:= $(shell dpkg-query -f '$${Depends} \n' -W libgl1-mesa-dri:$(DEB_HOST_ARCH) | sed -r 's/.*libllvm([0-9.]+).*/\1/p;d')
-#x32 mesa doesn't use libllvm - use 3.8 there, as their "3.9" snapshot doesn't work for us https://buildd.debian.org/status/fetch.php?pkg=beignet&arch=x32&ver=1.3.0-2&stamp=1489907158&raw=0
-LLVM_VERSION_DEFAULT	 = 3.8
-LLVM_VERSION		 = $(or $(LLVM_VERSION_MESA),$(LLVM_VERSION_DEFAULT))
+LLVM_VERSION		:= $(if $(shell [ -d /usr/lib/llvm-3.9/include/clang ] && echo 1),3.9,3.8)
 #this looks the wrong way round because --compare-versions uses success=0 and we need on=1
 CAN_ENABLE_OPENCL2	:= $(if $(findstring amd64,$(DEB_HOST_ARCH)),$(shell dpkg --compare-versions $(LLVM_VERSION) lt 3.9 || dpkg --compare-versions `dpkg-query -f '$${Version}' -W libdrm-dev:$(DEB_HOST_ARCH)` lt 2.4.66 ; echo $$?),0)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git