[Pkg-opencl-devel] [beignet] 32/47: Imported Debian patch 0.3-1

[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 7bbe72498f7403c577ffb0c09aa28090c9b8dfa9
Author: Simon Richter <sjr at debian.org>
Date:   Wed Oct 23 21:33:44 2013 +0200

    Imported Debian patch 0.3-1
---
 debian/changelog                                   |  6 +++++
 debian/clean                                       | 11 +++++++++
 .../0002-Revert-GBE-disable-cl_khr_fp64.patch      | 26 ----------------------
 .../0003-ICD-dispatch-table-must-be-first.patch    | 26 ----------------------
 debian/patches/series                              |  2 --
 debian/source/options                              |  8 -------
 6 files changed, 17 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbad468..3a18626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beignet (0.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Simon Richter <sjr at debian.org>  Wed, 23 Oct 2013 21:33:44 +0200
+
 beignet (0.2+git20130928+187c17e-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/clean b/debian/clean
index a841701..796c9ed 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,12 @@
+CMakeFiles/CMakeDetermineCompilerABI_C.bin
+CMakeFiles/CMakeDetermineCompilerABI_CXX.bin
+CMakeFiles/CompilerIdC/a.out
+CMakeFiles/CompilerIdCXX/a.out
+backend/src/ocl_common_defines_str.cpp
+backend/src/ocl_stdlib_str.cpp
+backend/src/ocl_vector.h
 kernels/compiler_ceil.bin
+src/kernels/cl_internal_copy_buf_align16_str.c
+src/kernels/cl_internal_copy_buf_align1_str.c
+src/kernels/cl_internal_copy_buf_align4_str.c
+utests/*.bmp
diff --git a/debian/patches/0002-Revert-GBE-disable-cl_khr_fp64.patch b/debian/patches/0002-Revert-GBE-disable-cl_khr_fp64.patch
deleted file mode 100644
index 00b208b..0000000
--- a/debian/patches/0002-Revert-GBE-disable-cl_khr_fp64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b0c0f12711e3a370310c92c6406c06e4ddd5a81d Mon Sep 17 00:00:00 2001
-From: Simon Richter <Simon.Richter at hogyros.de>
-Date: Fri, 23 Aug 2013 17:14:43 +0200
-Subject: [PATCH 2/2] Revert "GBE: disable cl_khr_fp64."
-To: beignet at lists.freedesktop.org
-
-This reverts commit 6e4e01b7a0e15f454e0b5d05887cc2870be7f5a7.
----
- src/cl_extensions.c |    1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/cl_extensions.c b/src/cl_extensions.c
-index d07a525..cc361db 100644
---- a/src/cl_extensions.c
-+++ b/src/cl_extensions.c
-@@ -26,7 +26,6 @@ void check_basic_extension(cl_extensions_t *extensions)
- {
-   int id;
-   for(id = BASE_EXT_START_ID; id <= BASE_EXT_END_ID; id++)
--    if (id != EXT_ID(khr_fp64))
-       extensions->extensions[id].base.ext_enabled = 1;
- }
- 
--- 
-1.7.10.4
-
diff --git a/debian/patches/0003-ICD-dispatch-table-must-be-first.patch b/debian/patches/0003-ICD-dispatch-table-must-be-first.patch
deleted file mode 100644
index c2c63ad..0000000
--- a/debian/patches/0003-ICD-dispatch-table-must-be-first.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 47bde186856f3592ce71ba17db527a678477ed62 Mon Sep 17 00:00:00 2001
-From: Simon Richter <Simon.Richter at hogyros.de>
-Date: Sat, 28 Sep 2013 06:32:24 +0200
-Subject: [PATCH 3/3] ICD dispatch table must be first
-To: beignet at lists.freedesktop.org
-
-The ICD loader expects the first member of any dispatchable object to be
-the dispatch table.
----
- src/cl_mem.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: beignet-0.2+git20130928+187c17e/src/cl_mem.h
-===================================================================
---- beignet-0.2+git20130928+187c17e.orig/src/cl_mem.h	2013-09-26 10:55:59.000000000 +0200
-+++ beignet-0.2+git20130928+187c17e/src/cl_mem.h	2013-09-28 06:34:22.884556905 +0200
-@@ -73,8 +73,8 @@
- #define IS_GL_IMAGE(mem) (mem->type == CL_MEM_GL_IMAGE_TYPE)
- 
- typedef  struct _cl_mem {
--  uint64_t magic;           /* To identify it as a memory object */
-   DEFINE_ICD(dispatch)
-+  uint64_t magic;           /* To identify it as a memory object */
-   cl_mem prev, next;        /* We chain the memory buffers together */
-   enum cl_mem_type type;
-   volatile int ref_n;       /* This object is reference counted */
diff --git a/debian/patches/series b/debian/patches/series
index 578d9e4..dfd681e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,3 @@ flags
 khronos
 deprecated-in-utest
 private
-0002-Revert-GBE-disable-cl_khr_fp64.patch
-0003-ICD-dispatch-table-must-be-first.patch
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index f3c9f63..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,8 +0,0 @@
-extend-diff-ignore="(^|/)utests/.*\.bmp"
-extend-diff-ignore="(^|/)backend/src/ocl_stdlib_str.cpp"
-extend-diff-ignore="(^|/)backend/src/ocl_common_defines_str.cpp"
-extend-diff-ignore="(^|/)backend/src/ocl_vector.h"
-extend-diff-ignore="(^|/)CMakeFiles/CMakeDetermineCompilerABI_C.bin"
-extend-diff-ignore="(^|/)CMakeFiles/CMakeDetermineCompilerABI_CXX.bin"
-extend-diff-ignore="(^|/)CMakeFiles/CompilerIdCXX/a.out"
-extend-diff-ignore="(^|/)CMakeFiles/CompilerIdC/a.out"

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