[Pkg-opencl-devel] [beignet] 31/47: Imported Debian patch 0.2+git20130928+187c17e-1
Andreas Beckmann
anbe at moszumanska.debian.org
Fri Oct 31 21:45:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
anbe pushed a commit to branch master
in repository beignet.
commit 43dbe1d36e0d92b66681c3d83f18148b3266fa3a
Author: Simon Richter <sjr at debian.org>
Date: Sat Sep 28 14:19:29 2013 +1000
Imported Debian patch 0.2+git20130928+187c17e-1
---
debian/changelog | 6 ++
debian/clean | 1 +
...d-OpenCL-1.2-definitions-required-for-ICD.patch | 97 ----------------------
.../0002-Revert-GBE-disable-cl_khr_fp64.patch | 26 ++++++
.../0003-ICD-dispatch-table-must-be-first.patch | 26 ++++++
debian/patches/private | 26 +++---
debian/patches/series | 2 +
7 files changed, 74 insertions(+), 110 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0690704..bbad468 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beignet (0.2+git20130928+187c17e-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Sat, 28 Sep 2013 14:19:29 +1000
+
beignet (0.2+git20130816+cc09b26-1) experimental; urgency=low
* New upstream release
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..a841701
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+kernels/compiler_ceil.bin
diff --git a/debian/patches/0001-Readd-OpenCL-1.2-definitions-required-for-ICD.patch b/debian/patches/0001-Readd-OpenCL-1.2-definitions-required-for-ICD.patch
deleted file mode 100644
index eb569f1..0000000
--- a/debian/patches/0001-Readd-OpenCL-1.2-definitions-required-for-ICD.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 074355de8299078b334cc8d76ec1964da64bd68e Mon Sep 17 00:00:00 2001
-From: Simon Richter <Simon.Richter at hogyros.de>
-Date: Wed, 19 Jun 2013 11:30:36 +0200
-Subject: [PATCH 1/2] Readd OpenCL 1.2 definitions required for ICD
-To: beignet at lists.freedesktop.org
-
-The definition for the ICD dispatch table requires a few additional
-definitions from OpenCL 1.2.
-
-Signed-off-by: Simon Richter <Simon.Richter at hogyros.de>
----
- include/CL/cl.h | 15 +++++++++++++++
- include/CL/cl_platform.h | 2 ++
- src/cl_mem.h | 12 ------------
- 3 files changed, 17 insertions(+), 12 deletions(-)
-
-diff --git a/include/CL/cl.h b/include/CL/cl.h
-index 4355e74..a7f25d1 100644
---- a/include/CL/cl.h
-+++ b/include/CL/cl.h
-@@ -67,6 +67,7 @@ typedef cl_uint cl_channel_type;
- typedef cl_bitfield cl_mem_flags;
- typedef cl_uint cl_mem_object_type;
- typedef cl_uint cl_mem_info;
-+typedef cl_bitfield cl_mem_migration_flags;
- typedef cl_uint cl_image_info;
- typedef cl_uint cl_buffer_create_type;
- typedef cl_uint cl_addressing_mode;
-@@ -75,8 +76,10 @@ typedef cl_uint cl_sampler_info;
- typedef cl_bitfield cl_map_flags;
- typedef cl_uint cl_program_info;
- typedef cl_uint cl_program_build_info;
-+typedef intptr_t cl_device_partition_property;
- typedef cl_int cl_build_status;
- typedef cl_uint cl_kernel_info;
-+typedef cl_uint cl_kernel_arg_info;
- typedef cl_uint cl_kernel_work_group_info;
- typedef cl_uint cl_event_info;
- typedef cl_uint cl_command_type;
-@@ -87,6 +90,18 @@ typedef struct _cl_image_format {
- cl_channel_type image_channel_data_type;
- } cl_image_format;
-
-+typedef struct _cl_image_desc {
-+ cl_mem_object_type image_type;
-+ size_t image_width;
-+ size_t image_height;
-+ size_t image_depth;
-+ size_t image_array_size;
-+ size_t image_row_pitch;
-+ size_t image_slice_pitch;
-+ cl_uint num_mip_levels;
-+ cl_uint num_samples;
-+ cl_mem buffer;
-+} cl_image_desc;
-
- typedef struct _cl_buffer_region {
- size_t origin;
-diff --git a/include/CL/cl_platform.h b/include/CL/cl_platform.h
-index 043b048..9a2f17a 100644
---- a/include/CL/cl_platform.h
-+++ b/include/CL/cl_platform.h
-@@ -58,6 +58,8 @@ extern "C" {
- #define CL_EXT_SUFFIX__VERSION_1_0
- #define CL_API_SUFFIX__VERSION_1_1
- #define CL_EXT_SUFFIX__VERSION_1_1
-+ #define CL_API_SUFFIX__VERSION_1_2
-+ #define CL_EXT_SUFFIX__VERSION_1_2
- #define CL_EXT_SUFFIX__VERSION_1_0_DEPRECATED
- #endif
-
-diff --git a/src/cl_mem.h b/src/cl_mem.h
-index 1b1709a..08515d0 100644
---- a/src/cl_mem.h
-+++ b/src/cl_mem.h
-@@ -29,18 +29,6 @@
- #define CL_MEM_OBJECT_IMAGE1D_ARRAY 0x10F5
- #define CL_MEM_OBJECT_IMAGE1D_BUFFER 0x10F6
- #define CL_MEM_OBJECT_IMAGE2D_ARRAY 0x10F3
--typedef struct _cl_image_desc {
-- cl_mem_object_type image_type;
-- size_t image_width;
-- size_t image_height;
-- size_t image_depth;
-- size_t image_array_size;
-- size_t image_row_pitch;
-- size_t image_slice_pitch;
-- cl_uint num_mip_levels;
-- cl_uint num_samples;
-- cl_mem buffer;
--} cl_image_desc;
- #endif
-
- typedef enum cl_image_tiling {
---
-1.7.10.4
-
diff --git a/debian/patches/0002-Revert-GBE-disable-cl_khr_fp64.patch b/debian/patches/0002-Revert-GBE-disable-cl_khr_fp64.patch
new file mode 100644
index 0000000..00b208b
--- /dev/null
+++ b/debian/patches/0002-Revert-GBE-disable-cl_khr_fp64.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 0000000..c2c63ad
--- /dev/null
+++ b/debian/patches/0003-ICD-dispatch-table-must-be-first.patch
@@ -0,0 +1,26 @@
+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/private b/debian/patches/private
index 759566d..9067723 100644
--- a/debian/patches/private
+++ b/debian/patches/private
@@ -2,13 +2,13 @@ Description: Install as private library
Author: Simon Richter <sjr at debian.org>
Last-Update: 2013-05-21
-Index: beignet-0.2+git20130730+da26376/backend/src/CMakeLists.txt
+Index: beignet-0.2+git20130928+187c17e/backend/src/CMakeLists.txt
===================================================================
---- beignet-0.2+git20130730+da26376.orig/backend/src/CMakeLists.txt 2013-07-30 11:12:48.000000000 +0200
-+++ beignet-0.2+git20130730+da26376/backend/src/CMakeLists.txt 2013-07-30 13:45:45.987594708 +0200
-@@ -154,11 +154,11 @@
- ${CMAKE_THREAD_LIBS_INIT}
- ${CMAKE_DL_LIBS})
+--- beignet-0.2+git20130928+187c17e.orig/backend/src/CMakeLists.txt 2013-09-26 10:55:59.000000000 +0200
++++ beignet-0.2+git20130928+187c17e/backend/src/CMakeLists.txt 2013-09-28 06:20:45.396509466 +0200
+@@ -159,11 +159,11 @@
+ ADD_EXECUTABLE(gbe_bin_generater gbe_bin_generater.cpp)
+ TARGET_LINK_LIBRARIES(gbe_bin_generater gbe)
-install (TARGETS gbe LIBRARY DESTINATION lib)
-install (FILES ${pch_object} DESTINATION lib)
@@ -21,22 +21,22 @@ Index: beignet-0.2+git20130730+da26376/backend/src/CMakeLists.txt
configure_file (
"GBEConfig.h.in"
"GBEConfig.h"
-Index: beignet-0.2+git20130730+da26376/src/CMakeLists.txt
+Index: beignet-0.2+git20130928+187c17e/src/CMakeLists.txt
===================================================================
---- beignet-0.2+git20130730+da26376.orig/src/CMakeLists.txt 2013-07-30 11:12:48.000000000 +0200
-+++ beignet-0.2+git20130730+da26376/src/CMakeLists.txt 2013-07-30 13:44:56.743596438 +0200
+--- beignet-0.2+git20130928+187c17e.orig/src/CMakeLists.txt 2013-09-26 10:55:59.000000000 +0200
++++ beignet-0.2+git20130928+187c17e/src/CMakeLists.txt 2013-09-28 06:21:15.052511187 +0200
@@ -47,6 +47,8 @@
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic,--allow-shlib-undefined")
+SET(CMAKE_INSTALL_RPATH /usr/lib/beignet)
+
link_directories (${LLVM_LIBRARY_DIR})
add_library(cl SHARED ${OPENCL_SRC})
target_link_libraries(
-@@ -60,4 +62,4 @@
+@@ -59,4 +61,4 @@
+ ${DRM_LIBRARY}
${OPENGL_LIBRARIES}
- ${OPTIONAL_EGL_LIBRARY}
- ${OPTIONAL_GBM_LIBRARY})
+ ${OPTIONAL_EGL_LIBRARY})
-install (TARGETS cl LIBRARY DESTINATION lib)
+install (TARGETS cl LIBRARY DESTINATION lib/beignet)
diff --git a/debian/patches/series b/debian/patches/series
index dfd681e..578d9e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ flags
khronos
deprecated-in-utest
private
+0002-Revert-GBE-disable-cl_khr_fp64.patch
+0003-ICD-dispatch-table-must-be-first.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/beignet.git
More information about the Pkg-opencl-devel
mailing list