[beignet] 05/08: Remove CAN_ENABLE_OPENCL2, as upstream now handles this

[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 1943d3bcef68bc3077139756627e8de6ebcd679f
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Mon Jul 31 21:48:42 2017 +0100

    Remove CAN_ENABLE_OPENCL2, as upstream now handles this
    
    (at CMakeLists.txt:245-265)
---
 debian/changelog | 1 +
 debian/rules     | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 406638b..2588a97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ beignet (1.3.1-1) UNRELEASED; urgency=medium
   * 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.
+  * Remove CAN_ENABLE_OPENCL2, as upstream now handles this.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sun, 30 Jul 2017 14:30:54 +0100
 
diff --git a/debian/rules b/debian/rules
index 0a140cd..3afefc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,13 +14,11 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DGBE_DEBUG=1
 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
 
 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)
 
 override_dh_auto_configure:
 	$(RM) $(patsubst %,include/CL/%,$(SUPERFLUOUS))
 	ls -la include/CL
-	dh_auto_configure --buildsystem cmake -- -DLLVM_INSTALL_DIR=/usr/lib/llvm-$(LLVM_VERSION)/bin -DENABLE_OPENCL_20=$(CAN_ENABLE_OPENCL2)
+	dh_auto_configure --buildsystem cmake -- -DLLVM_INSTALL_DIR=/usr/lib/llvm-$(LLVM_VERSION)/bin
 
 #Include the documentation, without timestamps (which break multiarch because debian/patches/update-docs.patch etc are applied at build time - #840678)
 override_dh_auto_build:

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