[pocl] 03/08: refresh patches

[Andreas Beckmann]

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

anbe pushed a commit to branch experimental
in repository pocl.

commit f8111e12d93ab808eb4d51fff8d433c6e1fd4ef8
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon May 9 02:23:43 2016 +0200

    refresh patches
---
 debian/changelog                      |  1 +
 debian/patches/fix-image-args.patch   |  6 +++---
 debian/patches/llvm-system-libs.patch | 21 +++++++++++++--------
 debian/patches/typos.patch            |  8 ++++----
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d746629..5fbd79c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pocl (0.12-1) UNRELEASED; urgency=medium
 
   * New upstream release 0.12.
+  * Refresh patches.
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 09 May 2016 02:11:15 +0200
 
diff --git a/debian/patches/fix-image-args.patch b/debian/patches/fix-image-args.patch
index caf145f..55632ac 100644
--- a/debian/patches/fix-image-args.patch
+++ b/debian/patches/fix-image-args.patch
@@ -4,12 +4,12 @@ Last-Update: 2015-10-31
 
 --- a/lib/llvmopencl/LLVMUtils.h
 +++ b/lib/llvmopencl/LLVMUtils.h
-@@ -64,7 +64,7 @@
+@@ -64,7 +64,7 @@ inline bool
  is_image_type(const llvm::Type& t) 
  {
    if (t.isPointerTy() && t.getPointerElementType()->isStructTy()) {
 -    llvm::StringRef name = t.getPointerElementType()->getStructName().str();
 +    llvm::StringRef name = t.getPointerElementType()->getStructName();
-     if (name.startswith("opencl.image2d_t") || name.startswith("opencl.image3d_t") || 
-         name.startswith("opencl.image1d_t") || name.startswith("struct.dev_image_t"))
+     if (name.startswith("opencl.image2d_t") || name.startswith("opencl.image3d_t") ||
+         name.startswith("opencl.image1d_t") || name.startswith("struct._pocl_image"))
        return true;
diff --git a/debian/patches/llvm-system-libs.patch b/debian/patches/llvm-system-libs.patch
index 1caac75..b9b9825 100644
--- a/debian/patches/llvm-system-libs.patch
+++ b/debian/patches/llvm-system-libs.patch
@@ -7,30 +7,35 @@ Description: llvm-config --system-libs is only needed with static llvm
  LLVM_BINDIR=`$LLVM_CONFIG --bindir`
  LLVM_LIBDIR=`$LLVM_CONFIG --libdir`
  LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
-+LLMV_SYSTEM_LIBS=
++LLVM_SYSTEM_LIBS=
  # Whether we can use our own printf implementation
  NEW_PRINTF_WORKS=true
  LLVM_3_6=false
-@@ -107,12 +108,12 @@ case "$LLVM_VERSION" in
-    ;;   
+@@ -107,16 +108,16 @@ case "$LLVM_VERSION" in
+    ;;
       3.5*)
       AC_DEFINE([LLVM_3_5], [], "Using LLVM 3.5")
 -     LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
-+     LLMV_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
++     LLVM_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
     ;;
       3.6*)
-      AC_DEFINE([LLVM_3_6], [], "Using LLVM svn, upcoming 3.6")
+      AC_DEFINE([LLVM_3_6], [], "Using LLVM 3.6")
       LLVM_3_6=true
 -     LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
-+     LLMV_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
++     LLVM_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
+    ;;
+      3.7*)
+      AC_DEFINE([LLVM_3_7], [], "Using LLVM svn, upcoming 3.7")
+-     LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
++     LLVM_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
     ;;
       *)
     AC_MSG_ERROR(
-@@ -140,6 +141,7 @@ AC_ARG_ENABLE([static-llvm],
+@@ -144,6 +145,7 @@ AC_ARG_ENABLE([static-llvm],
  LLVM_SHARED_LIB_FILE=$LLVM_LIBDIR/libLLVM-$LLVM_VERSION$LIBRARY_SUFFIX
  
  if test "$link_llvm_static" = "yes"; then
-+  LLVM_LDFLAGS="$LLVM_LDFLAGS $LLMV_SYSTEM_LIBS"
++  LLVM_LDFLAGS="$LLVM_LDFLAGS $LLVM_SYSTEM_LIBS"
    LLVM_LIBS=$($LLVM_CONFIG --libfiles)
  else
    LLVM_LIBS=-lLLVM-$LLVM_VERSION
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index 5bee7c2..12fcfbb 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -3,7 +3,7 @@ Description: fix typos found by lintian
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -172,7 +172,7 @@ endif()
+@@ -176,7 +176,7 @@ endif()
  
  ######################################################################################
  
@@ -14,12 +14,12 @@ Description: fix typos found by lintian
  macro(setup_cached_var VARNAME DESCRIPTION DOCS_FEATURE_IS_UNAVAILABLE DOCS_REQUESTED_DISABLING_FEATURE)
 --- a/lib/CL/clBuildProgram.c
 +++ b/lib/CL/clBuildProgram.c
-@@ -173,7 +173,7 @@ CL_API_SUFFIX__VERSION_1_0
+@@ -152,7 +152,7 @@ CL_API_SUFFIX__VERSION_1_0
                  }
                else if (strstr (cl_parameters_not_yet_supported_by_clang, token))
                  {
--                  POCL_MSG_ERR("Build option isnt yet supported by clang: %s\n", token);
-+                  POCL_MSG_ERR("Build option isn't yet supported by clang: %s\n", token);
+-                  APPEND_TO_MAIN_BUILD_LOG("Build option isnt yet supported by clang: %s\n", token);
++                  APPEND_TO_MAIN_BUILD_LOG("Build option isn't yet supported by clang: %s\n", token);
                    token = strtok_r (NULL, " ", &saveptr);  
                    continue;
                  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git