[Pkg-opencl-devel] [beignet] 33/47: Imported Debian patch 0.8-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 28dd331d4cd2a228214d25f68f942e5bbc6d6171
Author: Simon Richter <sjr at debian.org>
Date: Sat Apr 19 15:52:26 2014 +0200
Imported Debian patch 0.8-1
---
debian/beignet.install | 6 +-
debian/changelog | 6 +
debian/clean | 288 +++++++++++++++++++++++++++++++++++-
debian/control | 15 +-
debian/patches/deprecated-in-utest | 6 +-
debian/patches/flags | 20 +--
debian/patches/khronos | 48 +++---
debian/patches/private | 33 +----
debian/patches/series | 3 +-
debian/patches/terminfo | 16 ++
debian/patches/versioned-llvm-tools | 23 +++
debian/source/include-binaries | 1 +
12 files changed, 384 insertions(+), 81 deletions(-)
diff --git a/debian/beignet.install b/debian/beignet.install
index a76ddbf..1c75eb4 100644
--- a/debian/beignet.install
+++ b/debian/beignet.install
@@ -1,4 +1,2 @@
-debian/intel.icd /etc/OpenCL/vendors
-usr/lib/beignet/ocl_stdlib.h.pch /usr/lib/beignet
-usr/lib/beignet/libcl.so /usr/lib/beignet
-usr/lib/beignet/libgbe.so /usr/lib/beignet
+etc/OpenCL
+usr/lib/beignet
diff --git a/debian/changelog b/debian/changelog
index 3a18626..14f5074 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beignet (0.8-1) unstable; urgency=low
+
+ * New upstream release (Closes: #739534)
+
+ -- Simon Richter <sjr at debian.org> Sat, 19 Apr 2014 15:52:26 +0200
+
beignet (0.3-1) unstable; urgency=low
* New upstream release
diff --git a/debian/clean b/debian/clean
index 796c9ed..a66d5f9 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,12 +1,294 @@
+backend/src/ocl_common_defines_str.cpp
+backend/src/ocl_stdlib_str.cpp
+backend/src/ocl_vector.h
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/builtin_acos_float16.cl
+kernels/builtin_acos_float2.cl
+kernels/builtin_acos_float4.cl
+kernels/builtin_acos_float8.cl
+kernels/builtin_acos_float.cl
+kernels/builtin_acosh_float16.cl
+kernels/builtin_acosh_float2.cl
+kernels/builtin_acosh_float4.cl
+kernels/builtin_acosh_float8.cl
+kernels/builtin_acosh_float.cl
+kernels/builtin_acospi_float16.cl
+kernels/builtin_acospi_float2.cl
+kernels/builtin_acospi_float4.cl
+kernels/builtin_acospi_float8.cl
+kernels/builtin_acospi_float.cl
+kernels/builtin_asin_float16.cl
+kernels/builtin_asin_float2.cl
+kernels/builtin_asin_float4.cl
+kernels/builtin_asin_float8.cl
+kernels/builtin_asin_float.cl
+kernels/builtin_asinh_float16.cl
+kernels/builtin_asinh_float2.cl
+kernels/builtin_asinh_float4.cl
+kernels/builtin_asinh_float8.cl
+kernels/builtin_asinh_float.cl
+kernels/builtin_asinpi_float16.cl
+kernels/builtin_asinpi_float2.cl
+kernels/builtin_asinpi_float4.cl
+kernels/builtin_asinpi_float8.cl
+kernels/builtin_asinpi_float.cl
+kernels/builtin_atan2_float16.cl
+kernels/builtin_atan2_float2.cl
+kernels/builtin_atan2_float4.cl
+kernels/builtin_atan2_float8.cl
+kernels/builtin_atan2_float.cl
+kernels/builtin_atan_float16.cl
+kernels/builtin_atan_float2.cl
+kernels/builtin_atan_float4.cl
+kernels/builtin_atan_float8.cl
+kernels/builtin_atan_float.cl
+kernels/builtin_atanh_float16.cl
+kernels/builtin_atanh_float2.cl
+kernels/builtin_atanh_float4.cl
+kernels/builtin_atanh_float8.cl
+kernels/builtin_atanh_float.cl
+kernels/builtin_atanpi_float16.cl
+kernels/builtin_atanpi_float2.cl
+kernels/builtin_atanpi_float4.cl
+kernels/builtin_atanpi_float8.cl
+kernels/builtin_atanpi_float.cl
+kernels/builtin_cbrt_float16.cl
+kernels/builtin_cbrt_float2.cl
+kernels/builtin_cbrt_float4.cl
+kernels/builtin_cbrt_float8.cl
+kernels/builtin_cbrt_float.cl
+kernels/builtin_ceil_float16.cl
+kernels/builtin_ceil_float2.cl
+kernels/builtin_ceil_float4.cl
+kernels/builtin_ceil_float8.cl
+kernels/builtin_ceil_float.cl
+kernels/builtin_copysign_float16.cl
+kernels/builtin_copysign_float2.cl
+kernels/builtin_copysign_float4.cl
+kernels/builtin_copysign_float8.cl
+kernels/builtin_copysign_float.cl
+kernels/builtin_cos_float16.cl
+kernels/builtin_cos_float2.cl
+kernels/builtin_cos_float4.cl
+kernels/builtin_cos_float8.cl
+kernels/builtin_cos_float.cl
+kernels/builtin_cosh_float16.cl
+kernels/builtin_cosh_float2.cl
+kernels/builtin_cosh_float4.cl
+kernels/builtin_cosh_float8.cl
+kernels/builtin_cosh_float.cl
+kernels/builtin_cospi_float16.cl
+kernels/builtin_cospi_float2.cl
+kernels/builtin_cospi_float4.cl
+kernels/builtin_cospi_float8.cl
+kernels/builtin_cospi_float.cl
+kernels/builtin_erfc_float16.cl
+kernels/builtin_erfc_float2.cl
+kernels/builtin_erfc_float4.cl
+kernels/builtin_erfc_float8.cl
+kernels/builtin_erfc_float.cl
+kernels/builtin_erf_float16.cl
+kernels/builtin_erf_float2.cl
+kernels/builtin_erf_float4.cl
+kernels/builtin_erf_float8.cl
+kernels/builtin_erf_float.cl
+kernels/builtin_exp10_float16.cl
+kernels/builtin_exp10_float2.cl
+kernels/builtin_exp10_float4.cl
+kernels/builtin_exp10_float8.cl
+kernels/builtin_exp10_float.cl
+kernels/builtin_exp2_float16.cl
+kernels/builtin_exp2_float2.cl
+kernels/builtin_exp2_float4.cl
+kernels/builtin_exp2_float8.cl
+kernels/builtin_exp2_float.cl
+kernels/builtin_exp_float16.cl
+kernels/builtin_exp_float2.cl
+kernels/builtin_exp_float4.cl
+kernels/builtin_exp_float8.cl
+kernels/builtin_exp_float.cl
+kernels/builtin_expm1_float16.cl
+kernels/builtin_expm1_float2.cl
+kernels/builtin_expm1_float4.cl
+kernels/builtin_expm1_float8.cl
+kernels/builtin_expm1_float.cl
+kernels/builtin_fabs_float16.cl
+kernels/builtin_fabs_float2.cl
+kernels/builtin_fabs_float4.cl
+kernels/builtin_fabs_float8.cl
+kernels/builtin_fabs_float.cl
+kernels/builtin_fdim_float16.cl
+kernels/builtin_fdim_float2.cl
+kernels/builtin_fdim_float4.cl
+kernels/builtin_fdim_float8.cl
+kernels/builtin_fdim_float.cl
+kernels/builtin_floor_float16.cl
+kernels/builtin_floor_float2.cl
+kernels/builtin_floor_float4.cl
+kernels/builtin_floor_float8.cl
+kernels/builtin_floor_float.cl
+kernels/builtin_fmax_float16.cl
+kernels/builtin_fmax_float2.cl
+kernels/builtin_fmax_float4.cl
+kernels/builtin_fmax_float8.cl
+kernels/builtin_fmax_float.cl
+kernels/builtin_fmin_float16.cl
+kernels/builtin_fmin_float2.cl
+kernels/builtin_fmin_float4.cl
+kernels/builtin_fmin_float8.cl
+kernels/builtin_fmin_float.cl
+kernels/builtin_fmod_float16.cl
+kernels/builtin_fmod_float2.cl
+kernels/builtin_fmod_float4.cl
+kernels/builtin_fmod_float8.cl
+kernels/builtin_fmod_float.cl
+kernels/builtin_hypot_float16.cl
+kernels/builtin_hypot_float2.cl
+kernels/builtin_hypot_float4.cl
+kernels/builtin_hypot_float8.cl
+kernels/builtin_hypot_float.cl
+kernels/builtin_ilogb_float16.cl
+kernels/builtin_ilogb_float2.cl
+kernels/builtin_ilogb_float4.cl
+kernels/builtin_ilogb_float8.cl
+kernels/builtin_ilogb_float.cl
+kernels/builtin_lgamma_float16.cl
+kernels/builtin_lgamma_float2.cl
+kernels/builtin_lgamma_float4.cl
+kernels/builtin_lgamma_float8.cl
+kernels/builtin_lgamma_float.cl
+kernels/builtin_log10_float16.cl
+kernels/builtin_log10_float2.cl
+kernels/builtin_log10_float4.cl
+kernels/builtin_log10_float8.cl
+kernels/builtin_log10_float.cl
+kernels/builtin_log1p_float16.cl
+kernels/builtin_log1p_float2.cl
+kernels/builtin_log1p_float4.cl
+kernels/builtin_log1p_float8.cl
+kernels/builtin_log1p_float.cl
+kernels/builtin_log2_float16.cl
+kernels/builtin_log2_float2.cl
+kernels/builtin_log2_float4.cl
+kernels/builtin_log2_float8.cl
+kernels/builtin_log2_float.cl
+kernels/builtin_logb_float16.cl
+kernels/builtin_logb_float2.cl
+kernels/builtin_logb_float4.cl
+kernels/builtin_logb_float8.cl
+kernels/builtin_logb_float.cl
+kernels/builtin_log_float16.cl
+kernels/builtin_log_float2.cl
+kernels/builtin_log_float4.cl
+kernels/builtin_log_float8.cl
+kernels/builtin_log_float.cl
+kernels/builtin_maxmag_float16.cl
+kernels/builtin_maxmag_float2.cl
+kernels/builtin_maxmag_float4.cl
+kernels/builtin_maxmag_float8.cl
+kernels/builtin_maxmag_float.cl
+kernels/builtin_minmag_float16.cl
+kernels/builtin_minmag_float2.cl
+kernels/builtin_minmag_float4.cl
+kernels/builtin_minmag_float8.cl
+kernels/builtin_minmag_float.cl
+kernels/builtin_nextafter_float16.cl
+kernels/builtin_nextafter_float2.cl
+kernels/builtin_nextafter_float4.cl
+kernels/builtin_nextafter_float8.cl
+kernels/builtin_nextafter_float.cl
+kernels/builtin_pow_float16.cl
+kernels/builtin_pow_float2.cl
+kernels/builtin_pow_float4.cl
+kernels/builtin_pow_float8.cl
+kernels/builtin_pow_float.cl
+kernels/builtin_pown_float16.cl
+kernels/builtin_pown_float2.cl
+kernels/builtin_pown_float4.cl
+kernels/builtin_pown_float8.cl
+kernels/builtin_pown_float.cl
+kernels/builtin_powr_float16.cl
+kernels/builtin_powr_float2.cl
+kernels/builtin_powr_float4.cl
+kernels/builtin_powr_float8.cl
+kernels/builtin_powr_float.cl
+kernels/builtin_remainder_float16.cl
+kernels/builtin_remainder_float2.cl
+kernels/builtin_remainder_float4.cl
+kernels/builtin_remainder_float8.cl
+kernels/builtin_remainder_float.cl
+kernels/builtin_rint_float16.cl
+kernels/builtin_rint_float2.cl
+kernels/builtin_rint_float4.cl
+kernels/builtin_rint_float8.cl
+kernels/builtin_rint_float.cl
+kernels/builtin_rootn_float16.cl
+kernels/builtin_rootn_float2.cl
+kernels/builtin_rootn_float4.cl
+kernels/builtin_rootn_float8.cl
+kernels/builtin_rootn_float.cl
+kernels/builtin_round_float16.cl
+kernels/builtin_round_float2.cl
+kernels/builtin_round_float4.cl
+kernels/builtin_round_float8.cl
+kernels/builtin_round_float.cl
+kernels/builtin_rsqrt_float16.cl
+kernels/builtin_rsqrt_float2.cl
+kernels/builtin_rsqrt_float4.cl
+kernels/builtin_rsqrt_float8.cl
+kernels/builtin_rsqrt_float.cl
+kernels/builtin_sin_float16.cl
+kernels/builtin_sin_float2.cl
+kernels/builtin_sin_float4.cl
+kernels/builtin_sin_float8.cl
+kernels/builtin_sin_float.cl
+kernels/builtin_sinh_float16.cl
+kernels/builtin_sinh_float2.cl
+kernels/builtin_sinh_float4.cl
+kernels/builtin_sinh_float8.cl
+kernels/builtin_sinh_float.cl
+kernels/builtin_sinpi_float16.cl
+kernels/builtin_sinpi_float2.cl
+kernels/builtin_sinpi_float4.cl
+kernels/builtin_sinpi_float8.cl
+kernels/builtin_sinpi_float.cl
+kernels/builtin_sqrt_float16.cl
+kernels/builtin_sqrt_float2.cl
+kernels/builtin_sqrt_float4.cl
+kernels/builtin_sqrt_float8.cl
+kernels/builtin_sqrt_float.cl
+kernels/builtin_tan_float16.cl
+kernels/builtin_tan_float2.cl
+kernels/builtin_tan_float4.cl
+kernels/builtin_tan_float8.cl
+kernels/builtin_tan_float.cl
+kernels/builtin_tanh_float16.cl
+kernels/builtin_tanh_float2.cl
+kernels/builtin_tanh_float4.cl
+kernels/builtin_tanh_float8.cl
+kernels/builtin_tanh_float.cl
+kernels/builtin_tanpi_float16.cl
+kernels/builtin_tanpi_float2.cl
+kernels/builtin_tanpi_float4.cl
+kernels/builtin_tanpi_float8.cl
+kernels/builtin_tanpi_float.cl
+kernels/builtin_tgamma_float16.cl
+kernels/builtin_tgamma_float2.cl
+kernels/builtin_tgamma_float4.cl
+kernels/builtin_tgamma_float8.cl
+kernels/builtin_tgamma_float.cl
+kernels/builtin_trunc_float16.cl
+kernels/builtin_trunc_float2.cl
+kernels/builtin_trunc_float4.cl
+kernels/builtin_trunc_float8.cl
+kernels/builtin_trunc_float.cl
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
+utests/*.pyc
+utests/generated/*
diff --git a/debian/control b/debian/control
index 175228c..4b99dfb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,16 @@ Maintainer: Simon Richter <sjr at debian.org>
Build-Depends: debhelper (>= 9), cmake, pkg-config, python-minimal,
ocl-icd-dev, ocl-icd-opencl-dev,
libdrm-dev, libxfixes-dev, libxext-dev,
- llvm-dev (>= 1:3.2),
- clang (>= 1:3.2) | clang (>= 3.2),
- clang (>= 1:3.2) | clang (<< 1:0),
- libclang-dev (>= 1:3.2) | libclang-dev (>= 3.2),
- libclang-dev (>= 1:3.2) | libclang-dev (<< 1:0),
+ llvm-3.4-dev | llvm-dev (>= 1:3.4),
+ clang-3.4 | clang (>= 1:3.4) | clang (>= 3.4),
+ clang-3.4 | clang (>= 1:3.4) | clang (<< 1:0),
+ libclang-3.4-dev | libclang-dev (>= 1:3.4) | libclang-dev (>= 3.4),
+ libclang-3.4-dev | libclang-dev (>= 1:3.4) | libclang-dev (<< 1:0),
libgl1-mesa-dev (>= 9) [!kfreebsd-any],
libegl1-mesa-dev (>= 9) [!kfreebsd-any],
- libgbm-dev (>= 9) [!kfreebsd-any]
-Standards-Version: 3.9.4
+ libgbm-dev (>= 9) [!kfreebsd-any],
+ libtinfo-dev
+Standards-Version: 3.9.5
Section: libs
Homepage: http://cgit.freedesktop.org/beignet/
diff --git a/debian/patches/deprecated-in-utest b/debian/patches/deprecated-in-utest
index 152a2cc..29b390b 100644
--- a/debian/patches/deprecated-in-utest
+++ b/debian/patches/deprecated-in-utest
@@ -2,10 +2,10 @@ Description: Utest requires deprecated function names
Author: Simon Richter <sjr at debian.org>
Last-Update: 2013-06-19
-Index: beignet-0.1+git20130619+42967d2/utests/utest_helper.hpp
+Index: beignet-0.8/utests/utest_helper.hpp
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/utests/utest_helper.hpp 2013-06-19 21:04:23.714667388 +0200
-+++ beignet-0.1+git20130619+42967d2/utests/utest_helper.hpp 2013-06-19 21:04:35.066666882 +0200
+--- beignet-0.8.orig/utests/utest_helper.hpp 2014-04-19 15:53:08.407441680 +0200
++++ beignet-0.8/utests/utest_helper.hpp 2014-04-19 15:53:08.403441680 +0200
@@ -25,6 +25,8 @@
#ifndef __UTEST_HELPER_HPP__
#define __UTEST_HELPER_HPP__
diff --git a/debian/patches/flags b/debian/patches/flags
index 7928bd5..70dc48f 100644
--- a/debian/patches/flags
+++ b/debian/patches/flags
@@ -2,22 +2,22 @@ Description: Debian compliant compiler flags handling
Author: Simon Richter <sjr at debian.org>
Last-Update: 2013-05-21
-Index: beignet-0.2+git20130730+da26376/CMakeLists.txt
+Index: beignet-0.8/CMakeLists.txt
===================================================================
---- beignet-0.2+git20130730+da26376.orig/CMakeLists.txt 2013-07-30 11:12:48.000000000 +0200
-+++ beignet-0.2+git20130730+da26376/CMakeLists.txt 2013-07-30 13:44:41.583596970 +0200
-@@ -20,7 +20,6 @@
+--- beignet-0.8.orig/CMakeLists.txt 2014-04-19 15:52:54.463442302 +0200
++++ beignet-0.8/CMakeLists.txt 2014-04-19 15:52:54.463442302 +0200
+@@ -21,7 +21,6 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-SET(CMAKE_VERBOSE_MAKEFILE "false")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
- SET(EMULATE_IVB false CACHE BOOL "To emulate IVB")
- SET(EMULATE_SNB false CACHE BOOL "To emulate SNB")
-Index: beignet-0.2+git20130730+da26376/backend/CMakeLists.txt
+ if (NOT LIB_INSTALL_DIR)
+ set (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+Index: beignet-0.8/backend/CMakeLists.txt
===================================================================
---- beignet-0.2+git20130730+da26376.orig/backend/CMakeLists.txt 2013-07-30 11:12:48.000000000 +0200
-+++ beignet-0.2+git20130730+da26376/backend/CMakeLists.txt 2013-07-30 13:44:41.583596970 +0200
+--- beignet-0.8.orig/backend/CMakeLists.txt 2014-04-19 15:52:54.463442302 +0200
++++ beignet-0.8/backend/CMakeLists.txt 2014-04-19 15:52:54.463442302 +0200
@@ -39,39 +39,39 @@
if (COMPILER STREQUAL "GCC")
set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -funroll-loops -Wstrict-aliasing=2 -fstrict-aliasing -msse2 -msse3 -mssse3 -msse4.1 -fPIC -Wall")
@@ -91,4 +91,4 @@ Index: beignet-0.2+git20130730+da26376/backend/CMakeLists.txt
+ set (CCMAKE_CXX_FLAGS_MINSIZEREL "-DGBE_DEBUG=0")
set (CMAKE_EXE_LINKER_FLAGS "")
endif ()
- include_directories (${CMAKE_CURRENT_BINARY_DIR})
+
diff --git a/debian/patches/khronos b/debian/patches/khronos
index 0b418f1..3fb63e2 100644
--- a/debian/patches/khronos
+++ b/debian/patches/khronos
@@ -2,10 +2,10 @@ Description: Use Khronos Group headers
Author: Simon Richter <sjr at debian.org>
Last-Update: 2013-05-21
-Index: beignet-0.1+git20130619+42967d2/include/CL/cl_ext.h
+Index: beignet-0.8/include/CL/cl_ext.h
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/include/CL/cl_ext.h 2013-06-19 21:04:24.122667370 +0200
-+++ beignet-0.1+git20130619+42967d2/include/CL/cl_ext.h 2013-06-19 21:04:33.466666953 +0200
+--- beignet-0.8.orig/include/CL/cl_ext.h 2014-04-19 15:53:04.435441857 +0200
++++ beignet-0.8/include/CL/cl_ext.h 2014-04-19 15:53:04.427441857 +0200
@@ -1,213 +1 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 The Khronos Group Inc.
@@ -221,10 +221,10 @@ Index: beignet-0.1+git20130619+42967d2/include/CL/cl_ext.h
-
-#endif /* __CL_EXT_H */
+#include_next <CL/cl_ext.h>
-Index: beignet-0.1+git20130619+42967d2/include/CL/opencl.h
+Index: beignet-0.8/include/CL/opencl.h
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/include/CL/opencl.h 2013-06-19 21:04:24.122667370 +0200
-+++ beignet-0.1+git20130619+42967d2/include/CL/opencl.h 2013-06-19 21:04:33.466666953 +0200
+--- beignet-0.8.orig/include/CL/opencl.h 2014-04-19 15:53:04.435441857 +0200
++++ beignet-0.8/include/CL/opencl.h 2014-04-19 15:53:04.431441857 +0200
@@ -1,54 +1 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 The Khronos Group Inc.
@@ -281,10 +281,10 @@ Index: beignet-0.1+git20130619+42967d2/include/CL/opencl.h
-#endif /* __OPENCL_H */
-
+#include_next <CL/opencl.h>
-Index: beignet-0.1+git20130619+42967d2/include/CL/cl_d3d10.h
+Index: beignet-0.8/include/CL/cl_d3d10.h
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/include/CL/cl_d3d10.h 2013-06-19 21:04:24.122667370 +0200
-+++ beignet-0.1+git20130619+42967d2/include/CL/cl_d3d10.h 2013-06-19 21:04:33.470666953 +0200
+--- beignet-0.8.orig/include/CL/cl_d3d10.h 2014-04-19 15:53:04.435441857 +0200
++++ beignet-0.8/include/CL/cl_d3d10.h 2014-04-19 15:53:04.431441857 +0200
@@ -1,126 +1 @@
-/**********************************************************************************
- * Copyright (c) 2008-2010 The Khronos Group Inc.
@@ -413,10 +413,10 @@ Index: beignet-0.1+git20130619+42967d2/include/CL/cl_d3d10.h
-#endif // __OPENCL_CL_D3D10_H
-
+#include_next <CL/cl_d3d10.h>
-Index: beignet-0.1+git20130619+42967d2/include/CL/cl.h
+Index: beignet-0.8/include/CL/cl.h
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/include/CL/cl.h 2013-06-19 21:04:24.122667370 +0200
-+++ beignet-0.1+git20130619+42967d2/include/CL/cl.h 2013-06-19 21:04:33.474666953 +0200
+--- beignet-0.8.orig/include/CL/cl.h 2014-04-19 15:53:04.435441857 +0200
++++ beignet-0.8/include/CL/cl.h 2014-04-19 15:53:04.431441857 +0200
@@ -1,998 +1 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 The Khronos Group Inc.
@@ -1417,10 +1417,10 @@ Index: beignet-0.1+git20130619+42967d2/include/CL/cl.h
-#endif /* __OPENCL_CL_H */
-
+#include_next <CL/cl.h>
-Index: beignet-0.1+git20130619+42967d2/include/CL/cl_platform.h
+Index: beignet-0.8/include/CL/cl_platform.h
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/include/CL/cl_platform.h 2013-06-19 21:04:24.122667370 +0200
-+++ beignet-0.1+git20130619+42967d2/include/CL/cl_platform.h 2013-06-19 21:04:33.478666953 +0200
+--- beignet-0.8.orig/include/CL/cl_platform.h 2014-04-19 15:53:04.435441857 +0200
++++ beignet-0.8/include/CL/cl_platform.h 2014-04-19 15:53:04.431441857 +0200
@@ -1,1198 +1 @@
-/**********************************************************************************
- * Copyright (c) 2008-2010 The Khronos Group Inc.
@@ -2621,10 +2621,10 @@ Index: beignet-0.1+git20130619+42967d2/include/CL/cl_platform.h
-
-#endif /* __CL_PLATFORM_H */
+#include_next <CL/cl_platform.h>
-Index: beignet-0.1+git20130619+42967d2/include/CL/cl_gl.h
+Index: beignet-0.8/include/CL/cl_gl.h
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/include/CL/cl_gl.h 2013-06-19 21:04:24.122667370 +0200
-+++ beignet-0.1+git20130619+42967d2/include/CL/cl_gl.h 2013-06-19 21:04:33.478666953 +0200
+--- beignet-0.8.orig/include/CL/cl_gl.h 2014-04-19 15:53:04.435441857 +0200
++++ beignet-0.8/include/CL/cl_gl.h 2014-04-19 15:53:04.431441857 +0200
@@ -1,155 +1 @@
-/**********************************************************************************
- * Copyright (c) 2008-2010 The Khronos Group Inc.
@@ -2782,10 +2782,10 @@ Index: beignet-0.1+git20130619+42967d2/include/CL/cl_gl.h
-
-#endif /* __OPENCL_CL_GL_H */
+#include_next <CL/cl_gl.h>
-Index: beignet-0.1+git20130619+42967d2/include/CL/cl_gl_ext.h
+Index: beignet-0.8/include/CL/cl_gl_ext.h
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/include/CL/cl_gl_ext.h 2013-06-19 21:04:24.122667370 +0200
-+++ beignet-0.1+git20130619+42967d2/include/CL/cl_gl_ext.h 2013-06-19 21:04:33.478666953 +0200
+--- beignet-0.8.orig/include/CL/cl_gl_ext.h 2014-04-19 15:53:04.435441857 +0200
++++ beignet-0.8/include/CL/cl_gl_ext.h 2014-04-19 15:53:04.431441857 +0200
@@ -1,69 +1 @@
-/**********************************************************************************
- * Copyright (c) 2008-2010 The Khronos Group Inc.
@@ -2857,10 +2857,10 @@ Index: beignet-0.1+git20130619+42967d2/include/CL/cl_gl_ext.h
-
-#endif /* __OPENCL_CL_GL_EXT_H */
+#include_next <CL/cl_gl_ext.h>
-Index: beignet-0.1+git20130619+42967d2/include/CL/cl.hpp
+Index: beignet-0.8/include/CL/cl.hpp
===================================================================
---- beignet-0.1+git20130619+42967d2.orig/include/CL/cl.hpp 2013-06-19 21:04:24.122667370 +0200
-+++ beignet-0.1+git20130619+42967d2/include/CL/cl.hpp 2013-06-19 21:04:33.482666952 +0200
+--- beignet-0.8.orig/include/CL/cl.hpp 2014-04-19 15:53:04.435441857 +0200
++++ beignet-0.8/include/CL/cl.hpp 2014-04-19 15:53:04.431441857 +0200
@@ -1,4011 +1 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 The Khronos Group Inc.
diff --git a/debian/patches/private b/debian/patches/private
index 9067723..29f8828 100644
--- a/debian/patches/private
+++ b/debian/patches/private
@@ -2,30 +2,11 @@ Description: Install as private library
Author: Simon Richter <sjr at debian.org>
Last-Update: 2013-05-21
-Index: beignet-0.2+git20130928+187c17e/backend/src/CMakeLists.txt
+Index: beignet-0.8/src/CMakeLists.txt
===================================================================
---- 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)
-+install (TARGETS gbe LIBRARY DESTINATION lib/beignet)
-+install (FILES ${pch_object} DESTINATION lib/beignet)
- install (FILES backend/program.h DESTINATION include/gen)
-
--set (PCH_OBJECT_DIR "${pch_object};${CMAKE_INSTALL_PREFIX}/lib/ocl_stdlib.h.pch")
-+set (PCH_OBJECT_DIR "${pch_object};${CMAKE_INSTALL_PREFIX}/lib/beignet/ocl_stdlib.h.pch")
- configure_file (
- "GBEConfig.h.in"
- "GBEConfig.h"
-Index: beignet-0.2+git20130928+187c17e/src/CMakeLists.txt
-===================================================================
---- 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 @@
+--- beignet-0.8.orig/src/CMakeLists.txt 2014-04-19 15:53:59.775439390 +0200
++++ beignet-0.8/src/CMakeLists.txt 2014-04-19 15:53:59.775439390 +0200
+@@ -66,6 +66,8 @@
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic,--allow-shlib-undefined")
@@ -34,9 +15,3 @@ Index: beignet-0.2+git20130928+187c17e/src/CMakeLists.txt
link_directories (${LLVM_LIBRARY_DIR})
add_library(cl SHARED ${OPENCL_SRC})
target_link_libraries(
-@@ -59,4 +61,4 @@
- ${DRM_LIBRARY}
- ${OPENGL_LIBRARIES}
- ${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..08eae33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@ debug
flags
khronos
deprecated-in-utest
-private
+versioned-llvm-tools
+terminfo
diff --git a/debian/patches/terminfo b/debian/patches/terminfo
new file mode 100644
index 0000000..ed245e6
--- /dev/null
+++ b/debian/patches/terminfo
@@ -0,0 +1,16 @@
+Description: Link against terminfo
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2014-04-19
+
+--- beignet-0.8.orig/backend/src/CMakeLists.txt
++++ beignet-0.8/backend/src/CMakeLists.txt
+@@ -186,7 +186,8 @@ target_link_libraries(
+ ${LLVM_MODULE_LIBS}
+ ${LLVM_SYSTEM_LIBS}
+ ${CMAKE_THREAD_LIBS_INIT}
+- ${CMAKE_DL_LIBS})
++ ${CMAKE_DL_LIBS}
++ tinfo)
+
+ link_directories (${LLVM_LIBRARY_DIR})
+ ADD_EXECUTABLE(gbe_bin_generater gbe_bin_generater.cpp)
diff --git a/debian/patches/versioned-llvm-tools b/debian/patches/versioned-llvm-tools
new file mode 100644
index 0000000..65e77b3
--- /dev/null
+++ b/debian/patches/versioned-llvm-tools
@@ -0,0 +1,23 @@
+Description: Use versioned LLVM tools
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2014-04-19
+
+--- beignet-0.8.orig/backend/src/CMakeLists.txt
++++ beignet-0.8/backend/src/CMakeLists.txt
+@@ -71,14 +71,14 @@ macro(ll_add_library ll_lib ll_sources)
+ add_custom_command(
+ OUTPUT ${ll}.bc
+ COMMAND rm -f ${ll}.bc
+- COMMAND llvm-as -o ${ll}.bc ${GBE_SOURCE_DIR}/src/${ll}
++ COMMAND llvm-as-3.4 -o ${ll}.bc ${GBE_SOURCE_DIR}/src/${ll}
+ DEPENDS ${ll}
+ )
+ set (ll_objects ${ll_objects} ${ll}.bc)
+ endforeach (ll ${ll_sources})
+ add_custom_command(
+ OUTPUT ${ll_lib}
+- COMMAND llvm-link -o ${ll_lib} ${ll_objects}
++ COMMAND llvm-link-3.4 -o ${ll_lib} ${ll_objects}
+ DEPENDS ${ll_objects}
+ )
+ add_custom_target(${ll_lib}
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 3481d43..48d5e49 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -150,3 +150,4 @@ obj-x86_64-linux-gnu/utests/CMakeFiles/utests.dir/utest_helper.cpp.o
obj-x86_64-linux-gnu/utests/flat_address_space
obj-x86_64-linux-gnu/utests/libutests.so
obj-x86_64-linux-gnu/utests/utest_run
+utests/utest_generator.pyc
--
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