[beignet] 04/10: Drop allow-+-in-directory.patch, as it no longer applies (the default build directory has not required it for some time).

[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 e4a270ee96614fcee73c777403fd4a1ddf273b1b
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sat Jan 21 14:22:04 2017 +0000

    Drop allow-+-in-directory.patch, as it no longer applies
    (the default build directory has not required it for some time).
---
 debian/changelog                          |  2 ++
 debian/patches/allow-+-in-directory.patch | 30 ------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b27b6a0..447db8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ beignet (1.3.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop patches applied upstream, refresh others.
+  * Drop allow-+-in-directory.patch, as it no longer applies
+    (the default build directory has not required it for some time).
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sat, 21 Jan 2017 14:10:45 +0000
 
diff --git a/debian/patches/allow-+-in-directory.patch b/debian/patches/allow-+-in-directory.patch
deleted file mode 100644
index a911bef..0000000
--- a/debian/patches/allow-+-in-directory.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Allow + in directory name
-
-+ is a special character in a regex, which makes the build fail in
-directories such as beignet_1.0.3+dfsg
-
---- beignet.orig/backend/src/libocl/CMakeLists.txt
-+++ beignet/backend/src/libocl/CMakeLists.txt
-@@ -129,11 +129,12 @@ FOREACH(M ${OCL_BASH_GENERATED_MODULES})
-     GENERATE_SOURCE_BASH(${M})
- ENDFOREACH(M) 
- 
-+STRING(REPLACE "+" "\\+" ESCAPED_LIBOCL_BINARY_DIR ${LIBOCL_BINARY_DIR})
- 
- SET (CLANG_OCL_FLAGS -fno-builtin -ffp-contract=off -cl-kernel-arg-info -DGEN7_SAMPLER_CLAMP_BORDER_WORKAROUND "-cl-std=CL1.2")
- MACRO(ADD_CL_TO_BC_TARGET _file)
-     # CMake seems can not add pattern rule, use MACRO to replace.
--    STRING(REGEX REPLACE "${LIBOCL_BINARY_DIR}/src/\(o.*\)\\.cl" "${OCL_OBJECT_DIR}/\\1.bc" output_name ${_file})
-+    STRING(REGEX REPLACE "${ESCAPED_LIBOCL_BINARY_DIR}/src/\(o.*\)\\.cl" "${OCL_OBJECT_DIR}/\\1.bc" output_name ${_file})
-     ADD_CUSTOM_COMMAND(OUTPUT ${output_name}
- 	COMMAND mkdir -p ${OCL_OBJECT_DIR}/
- 	#COMMAND echo ${LLVM_INSTALL_DIR}clang -cc1 ${CLANG_OCL_FLAGS} -I ${LIBOCL_BINARY_DIR}/include/ -emit-llvm-bc -triple spir -o ${output_name} -x cl ${_file}
-@@ -149,7 +150,7 @@ FOREACH(f ${OCL_SOURCE_FILES})
- ENDFOREACH(f) 
- 
- FOREACH(f ${OCL_SOURCE_FILES})
--    STRING(REGEX REPLACE "${LIBOCL_BINARY_DIR}/src/\(o.*\)\\.cl" "${OCL_OBJECT_DIR}/\\1.bc" bc_name ${f})
-+    STRING(REGEX REPLACE "${ESCAPED_LIBOCL_BINARY_DIR}/src/\(o.*\)\\.cl" "${OCL_OBJECT_DIR}/\\1.bc" bc_name ${f})
-     SET(OCL_BC_FILES ${OCL_BC_FILES} ${bc_name})
- ENDFOREACH(f) 
- 
diff --git a/debian/patches/series b/debian/patches/series
index c177ca8..c5b3d7d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ support-kfreebsd.patch
 reduce-notfound-output.patch
 shared-llvm.patch
 update-docs.patch
-allow-+-in-directory.patch
 ship-test-tool.patch
 find-python35.patch
 docs-broken-links.patch

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