[Pkg-opencl-devel] [beignet] 01/03: refresh patches from upstream git, pick one more from 0.9.x branch

[Andreas Beckmann]

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

anbe pushed a commit to branch master
in repository beignet.

commit 8a8318cf09205e9748e94d1121f7187b92975738
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Nov 3 13:36:54 2014 +0100

    refresh patches from upstream git, pick one more from 0.9.x branch
---
 debian/changelog                                   |  2 ++
 debian/patches/0001-fix-some-typos.patch           |  5 ++--
 ...set-environment-variables-for-GBE_BIN_GEN.patch |  5 ++--
 .../0003-GBE-fix-one-compilation-warning.patch     | 30 ++++++++++++++++++++++
 debian/patches/series                              |  5 ++--
 5 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0895e55..1e337a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ beignet (0.9.3~dfsg-1) UNRELEASED; urgency=medium
   * 0001-fix-some-typos.patch: New.
   * 0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch: New, fix
     FTBFS of "~dfsg" versions in pbuilder etc.
+  * 0003-GBE-fix-one-compilation-warning.patch: New. Cherry-picked from
+    upstream 0.9.x branch.
   * Skip-deleted-tests.patch: New. Thanks to Rebecca N. Palmer.
   * Simplify using system OpenCL headers.
   * Use-Khronos-Group-headers.patch: Removed.
diff --git a/debian/patches/0001-fix-some-typos.patch b/debian/patches/0001-fix-some-typos.patch
index 0341efe..dc7c1fb 100644
--- a/debian/patches/0001-fix-some-typos.patch
+++ b/debian/patches/0001-fix-some-typos.patch
@@ -1,9 +1,10 @@
-From 1e8d00640dd432c099fc94d5e7385d1b998fae3f Mon Sep 17 00:00:00 2001
+From a336562fa58a0675376eebad21d25eeab2617119 Mon Sep 17 00:00:00 2001
 From: Andreas Beckmann <anbe at debian.org>
 Date: Fri, 31 Oct 2014 16:00:20 +0100
-Subject: [PATCH] fix some typos
+Subject: [PATCH 1/3] fix some typos
 
 Signed-off-by: Andreas Beckmann <anbe at debian.org>
+Reviewed-by: Zhigang Gong <zhigang.gong at intel.com>
 ---
  backend/src/ir/instruction.cpp          | 2 +-
  backend/src/llvm/llvm_printf_parser.cpp | 6 +++---
diff --git a/debian/patches/0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch b/debian/patches/0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
index b5110c3..36f6e7f 100644
--- a/debian/patches/0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
+++ b/debian/patches/0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
@@ -1,7 +1,7 @@
-From dd8a10b17d567274ea7a8ea0771ad2044aff682e Mon Sep 17 00:00:00 2001
+From 90e33de8f585ceaa5c7181f9c9675997c4ec1dc8 Mon Sep 17 00:00:00 2001
 From: Andreas Beckmann <anbe at debian.org>
 Date: Fri, 31 Oct 2014 21:45:58 +0100
-Subject: [PATCH] use env to set environment variables for
+Subject: [PATCH 2/3] use env to set environment variables for
  GBE_BIN_GENERATER
 
 cmake interprets OCL_PCM_PATH=... as a command and will enclose it in
@@ -12,6 +12,7 @@ exist), not a variable setting for a following command
 use env to set the variables unambiguously
 
 Signed-off-by: Andreas Beckmann <anbe at debian.org>
+Reviewed-by: Zhigang Gong <zhigang.gong at intel.com>
 ---
  backend/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/0003-GBE-fix-one-compilation-warning.patch b/debian/patches/0003-GBE-fix-one-compilation-warning.patch
new file mode 100644
index 0000000..e9d2817
--- /dev/null
+++ b/debian/patches/0003-GBE-fix-one-compilation-warning.patch
@@ -0,0 +1,30 @@
+From d1462db82ea6dafee0c6cfe0081a2c5d89487ff6 Mon Sep 17 00:00:00 2001
+From: Zhigang Gong <zhigang.gong at intel.com>
+Date: Mon, 3 Nov 2014 09:06:46 +0800
+Subject: [PATCH 3/3] GBE: fix one compilation warning.
+
+Signed-off-by: Zhigang Gong <zhigang.gong at intel.com>
+---
+ backend/src/llvm/llvm_gen_backend.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/backend/src/llvm/llvm_gen_backend.cpp b/backend/src/llvm/llvm_gen_backend.cpp
+index 6cb3834..d5e5341 100644
+--- a/backend/src/llvm/llvm_gen_backend.cpp
++++ b/backend/src/llvm/llvm_gen_backend.cpp
+@@ -1103,8 +1103,10 @@ namespace gbe
+       ctx.ADD(ir::Type::TYPE_S32, reg, pointer_reg, offset_reg);
+       return reg;
+     }
+-    else
+-      assert(0);
++    else {
++      GBE_ASSERT(0 && "Unsupported constant expression");
++      return regTranslator.getScalar(val, elemID);
++    }
+   }
+ 
+   ir::Register GenWriter::getConstantRegister(Constant *c, uint32_t elemID) {
+-- 
+2.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 245d366..4bf7bc8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,9 @@
+0001-fix-some-typos.patch
+0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
+0003-GBE-fix-one-compilation-warning.patch
 Enhance-debug-output.patch
 Debian-compliant-compiler-flags-handling.patch
 Utest-requires-deprecated-function-names.patch
 Link-against-terminfo.patch
 Fix-build-failure.patch
-0001-fix-some-typos.patch
-0002-use-env-to-set-environment-variables-for-GBE_BIN_GEN.patch
 Skip-deleted-tests.patch

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