[pocl] 04/09: refresh/drop 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 e9182c5d17ca7c76fd1d0bb973b037d2f4152643
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Jun 9 18:13:28 2016 +0200

    refresh/drop patches
---
 debian/changelog                      |  2 ++
 debian/patches/fix-image-args.patch   | 15 ---------------
 debian/patches/llvm-system-libs.patch | 30 +++++++++++-------------------
 debian/patches/series                 |  1 -
 4 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c0ce71..85332c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pocl (0.13-1) UNRELEASED; urgency=medium
 
   * New upstream release.  (Closes: #820480)
+  * Refresh llvm-system-libs.patch, new upstream only supports llvm 3.7/3.8.
+  * Remove fix-image-args.patch, fixed upstream.
 
  -- Andreas Beckmann <anbe at debian.org>  Wed, 15 Jun 2016 17:38:32 +0200
 
diff --git a/debian/patches/fix-image-args.patch b/debian/patches/fix-image-args.patch
deleted file mode 100644
index 55632ac..0000000
--- a/debian/patches/fix-image-args.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix detection of images when checking kernel arguments.
-Author: James Price <j.price at bristol.ac.uk>
-Last-Update: 2015-10-31
-
---- a/lib/llvmopencl/LLVMUtils.h
-+++ b/lib/llvmopencl/LLVMUtils.h
-@@ -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._pocl_image"))
-       return true;
diff --git a/debian/patches/llvm-system-libs.patch b/debian/patches/llvm-system-libs.patch
index b9b9825..b05c206 100644
--- a/debian/patches/llvm-system-libs.patch
+++ b/debian/patches/llvm-system-libs.patch
@@ -7,31 +7,23 @@ 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`
-+LLVM_SYSTEM_LIBS=
- # Whether we can use our own printf implementation
- NEW_PRINTF_WORKS=true
- LLVM_3_6=false
-@@ -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`"
-+     LLVM_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
-    ;;
-      3.6*)
-      AC_DEFINE([LLVM_3_6], [], "Using LLVM 3.6")
-      LLVM_3_6=true
++LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs`
+ 
+ AC_SUBST([LLVM_VERSION], [$LLVM_VERSION])
+ AC_DEFINE_UNQUOTED([LLVM_VERSION], ["$LLVM_VERSION"], "LLVM version as a string.")
+@@ -93,11 +94,9 @@ AC_DEFINE_UNQUOTED([LLVM_VERSION], ["$LL
+ case "$LLVM_VERSION" in
+      3.7*)
+      AC_DEFINE([LLVM_3_7], [], "Using LLVM 3.7")
 -     LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
-+     LLVM_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
     ;;
-      3.7*)
-      AC_DEFINE([LLVM_3_7], [], "Using LLVM svn, upcoming 3.7")
+      3.8*)
+      AC_DEFINE([LLVM_3_8], [], "Using LLVM 3.8")
 -     LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
-+     LLVM_SYSTEM_LIBS="`$LLVM_CONFIG --system-libs`"
     ;;
       *)
     AC_MSG_ERROR(
-@@ -144,6 +145,7 @@ AC_ARG_ENABLE([static-llvm],
+@@ -122,6 +121,7 @@ AC_ARG_ENABLE([static-llvm],
  LLVM_SHARED_LIB_FILE=$LLVM_LIBDIR/libLLVM-$LLVM_VERSION$LIBRARY_SUFFIX
  
  if test "$link_llvm_static" = "yes"; then
diff --git a/debian/patches/series b/debian/patches/series
index e42096a..c35ac95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 os-compat.patch
 fix-configure-for-debian-archs.patch
 llvm-system-libs.patch
-fix-image-args.patch
 typos.patch
 fix-tests-i386.patch
 find-sys-cdefs-h.patch

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