[Pkg-opencl-devel] [beignet] 10/66: Imported Debian patch 0.1+git20130418+0546d2e-1
Andreas Beckmann
anbe at moszumanska.debian.org
Fri Oct 31 07:27:02 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 e3b167a7f30e54a814f310d98dacbb6cf443793b
Merge: 3779557 2679e31
Author: Simon Richter <sjr at debian.org>
Date: Thu Apr 18 11:51:37 2013 +0200
Imported Debian patch 0.1+git20130418+0546d2e-1
CMake/FindLLVM.cmake | 6 +-
CMake/FindOCLIcd.cmake | 23 +
CMakeLists.txt | 9 +-
backend/CMakeLists.txt | 4 +-
backend/src/backend/gen_context.cpp | 4 +-
backend/src/backend/gen_insn_selection.cpp | 9 +-
backend/src/backend/gen_insn_selection.hpp | 2 +-
backend/src/backend/gen_reg_allocation.hpp | 2 +-
backend/src/backend/program.cpp | 4 +-
backend/src/ir/instruction.cpp | 12 +-
backend/src/llvm/llvm_to_gen.cpp | 9 +-
backend/src/sys/alloc.cpp | 2 +-
backend/src/sys/mutex.hpp | 10 +-
debian/beignet0.0.1.install | 1 +
debian/changelog | 6 +
debian/control | 3 +-
debian/intel.icd | 1 +
debian/patches/asd | 47 --
debian/patches/autogen | 974 -----------------------------
debian/patches/clang-from-path | 20 -
debian/patches/device-info-query | 54 --
debian/patches/fix-clean | 23 -
debian/patches/glibc-memalign | 19 -
debian/patches/ignore-missing-egl | 50 --
debian/patches/implement-gefa | 12 +-
debian/patches/llvm-3.2 | 19 -
debian/patches/missing-header | 6 +-
debian/patches/path | 21 -
debian/patches/respect-flags | 18 +-
debian/patches/series | 5 -
debian/patches/soname | 14 +-
src/CMakeLists.txt | 13 +-
src/cl_api.c | 11 +-
src/cl_command_queue.c | 2 +
src/cl_command_queue.h | 1 +
src/cl_context.c | 2 +
src/cl_context.h | 2 +
src/cl_device_id.c | 4 +
src/cl_device_id.h | 1 +
src/cl_event.h | 1 +
src/cl_extensions.c | 17 +-
src/cl_extensions.h | 60 +-
src/cl_kernel.c | 2 +
src/cl_kernel.h | 1 +
src/cl_khr_icd.c | 175 ++++++
src/{cl_event.h => cl_khr_icd.h} | 21 +-
src/cl_mem.c | 2 +
src/cl_mem.h | 1 +
src/cl_mem_gl.c | 6 +-
src/cl_platform_id.c | 7 +-
src/cl_platform_id.h | 6 +-
src/cl_program.c | 2 +
src/cl_program.h | 1 +
src/cl_sampler.c | 2 +
src/cl_sampler.h | 1 +
utests/utest_helper.hpp | 8 +-
56 files changed, 389 insertions(+), 1349 deletions(-)
diff --cc debian/beignet0.0.1.install
index 24c7e1b,0000000..3fbe284
mode 100644,000000..100644
--- a/debian/beignet0.0.1.install
+++ b/debian/beignet0.0.1.install
@@@ -1,2 -1,0 +1,3 @@@
++debian/intel.icd /etc/OpenCL/vendors
+usr/lib/libcl.so.* /usr/lib
+usr/lib/libgbe.so.* /usr/lib
diff --cc debian/changelog
index ba92740,0000000..11993c3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,0 +1,41 @@@
++beignet (0.1+git20130418+0546d2e-1) experimental; urgency=low
++
++ * New upstream release
++
++ -- Simon Richter <sjr at debian.org> Thu, 18 Apr 2013 11:51:37 +0200
++
+beignet (0.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Tue, 16 Apr 2013 17:16:18 +0200
+
+beignet (0.0.0+git2013.04.11+e6b503e-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Simon Richter <sjr at debian.org> Mon, 15 Apr 2013 18:22:45 +0200
+
+beignet (0.0.0+git2013.04.01+d1b234c-4) unstable; urgency=low
+
+ * Build fix for kfreebsd-*
+
+ -- Simon Richter <sjr at debian.org> Fri, 12 Apr 2013 11:22:36 +0200
+
+beignet (0.0.0+git2013.04.01+d1b234c-3) unstable; urgency=low
+
+ * Adjust Build-Depends, Architecture list
+
+ -- Simon Richter <sjr at debian.org> Fri, 12 Apr 2013 10:32:36 +0200
+
+beignet (0.0.0+git2013.04.01+d1b234c-2) unstable; urgency=low
+
+ * Add patch to support size queries in device info
+
+ -- Simon Richter <sjr at debian.org> Thu, 11 Apr 2013 14:00:59 +0200
+
+beignet (0.0.0+git2013.04.01+d1b234c-1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Simon Richter <sjr at debian.org> Tue, 09 Apr 2013 17:14:00 +0200
diff --cc debian/control
index 9b6d64b,0000000..d75231b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,31 -1,0 +1,32 @@@
+Source: beignet
+Priority: extra
+Maintainer: Simon Richter <sjr at debian.org>
- Build-Depends: debhelper (>= 9), cmake, pkg-config, ocl-icd-opencl-dev, libdrm-dev, libgbm-dev, libxfixes-dev, libxext-dev, llvm-3.2-dev | llvm-dev (>= 1:3.2)
++Build-Depends: debhelper (>= 9), cmake, pkg-config, ocl-icd-dev, ocl-icd-opencl-dev, libdrm-dev, libgbm-dev, libxfixes-dev, libxext-dev, llvm-3.2-dev | llvm-dev (>= 1:3.2)
+Build-Conflicts: libegl1-mesa-dev (<< 9)
+Standards-Version: 3.9.4
+Section: libs
+Homepage: http://cgit.freedesktop.org/beignet/
+
+Package: beignet-dev
+Section: libdevel
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Depends: beignet0.0.1 (= ${binary:Version}), ${misc:Depends}
+Description: Intel OpenCL library
+ OpenCL (Open Computing Language) is a multivendor open standard for
+ general-purpose parallel programming of heterogeneous systems that include
+ CPUs, GPUs and other processors.
+ .
+ This package contains the development files for directly linking against
+ the Intel implementation.
+
+Package: beignet0.0.1
+Section: libs
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang (<< 1:3.1)
++Provides: opencl-icd
+Description: Intel OpenCL library
+ OpenCL (Open Computing Language) is a multivendor open standard for
+ general-purpose parallel programming of heterogeneous systems that include
+ CPUs, GPUs and other processors.
+ .
+ This package contains the shared library for the Intel implementation.
diff --cc debian/intel.icd
index 0000000,0000000..c2ca3f6
new file mode 100644
--- /dev/null
+++ b/debian/intel.icd
@@@ -1,0 -1,0 +1,1 @@@
++/usr/lib/libcl.so.0
diff --cc debian/patches/implement-gefa
index 39c9764,0000000..09c6362
mode 100644,000000..100644
--- a/debian/patches/implement-gefa
+++ b/debian/patches/implement-gefa
@@@ -1,21 -1,0 +1,21 @@@
+commit 08dadaf3f345f3feceefaacebf5045c72821b449
+Author: Simon Richter <Simon.Richter at hogyros.de>
+Date: Tue Apr 2 15:11:01 2013 +0200
+
+ "Implement" clGetExtensionFunctionAddress()
+
+ This function can legally return NULL in the current implementation.
+
- Index: beignet-0.0.0+git2013.04.11+e6b503e/src/cl_api.c
++Index: beignet-0.1+git20130418+0546d2e/src/cl_api.c
+===================================================================
- --- beignet-0.0.0+git2013.04.11+e6b503e.orig/src/cl_api.c 2013-04-12 08:13:48.000000000 +0200
- +++ beignet-0.0.0+git2013.04.11+e6b503e/src/cl_api.c 2013-04-15 18:33:32.788352738 +0200
- @@ -1169,7 +1169,7 @@
- void*
- clGetExtensionFunctionAddress(const char *func_name)
++--- beignet-0.1+git20130418+0546d2e.orig/src/cl_api.c 2013-04-18 05:21:35.000000000 +0200
+++++ beignet-0.1+git20130418+0546d2e/src/cl_api.c 2013-04-18 11:52:29.225428977 +0200
++@@ -1006,7 +1006,7 @@
++ cl_event * event,
++ cl_int * errcode_ret)
+ {
+- NOT_IMPLEMENTED;
++ /* No extensions supported at present */
+ return NULL;
+ }
+
diff --cc debian/patches/missing-header
index adfcafe,0000000..dab28b7
mode 100644,000000..100644
--- a/debian/patches/missing-header
+++ b/debian/patches/missing-header
@@@ -1,16 -1,0 +1,16 @@@
+Description: Fix missing include
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-03
+
- Index: beignet-0.0.0+git2013.04.11+e6b503e/backend/src/sys/alloc.hpp
++Index: beignet-0.1+git20130418+0546d2e/backend/src/sys/alloc.hpp
+===================================================================
- --- beignet-0.0.0+git2013.04.11+e6b503e.orig/backend/src/sys/alloc.hpp 2013-04-12 08:13:48.000000000 +0200
- +++ beignet-0.0.0+git2013.04.11+e6b503e/backend/src/sys/alloc.hpp 2013-04-15 18:33:38.340353060 +0200
++--- beignet-0.1+git20130418+0546d2e.orig/backend/src/sys/alloc.hpp 2013-04-18 05:21:35.000000000 +0200
+++++ beignet-0.1+git20130418+0546d2e/backend/src/sys/alloc.hpp 2013-04-18 11:53:00.793430809 +0200
+@@ -27,6 +27,7 @@
+ #include "sys/platform.hpp"
+ #include "sys/assert.hpp"
+ #include <algorithm>
++#include <limits>
+
+ namespace gbe
+ {
diff --cc debian/patches/respect-flags
index 726c46b,0000000..cc57dcb
mode 100644,000000..100644
--- a/debian/patches/respect-flags
+++ b/debian/patches/respect-flags
@@@ -1,51 -1,0 +1,51 @@@
+Description: Respect CFLAGS/CXXFLAGS from Debian
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-16
+
- Index: beignet-0.0.0+git2013.04.11+e6b503e/CMakeLists.txt
++Index: beignet-0.1+git20130418+0546d2e/CMakeLists.txt
+===================================================================
- --- beignet-0.0.0+git2013.04.11+e6b503e.orig/CMakeLists.txt 2013-04-16 14:49:50.450369637 +0200
- +++ beignet-0.0.0+git2013.04.11+e6b503e/CMakeLists.txt 2013-04-16 14:50:20.298368306 +0200
++--- beignet-0.1+git20130418+0546d2e.orig/CMakeLists.txt 2013-04-18 05:21:35.000000000 +0200
+++++ beignet-0.1+git20130418+0546d2e/CMakeLists.txt 2013-04-18 11:54:52.065437266 +0200
+@@ -18,7 +18,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")
+@@ -55,8 +54,8 @@
+ ADD_DEFINITIONS(-DUSE_FULSIM=0)
+ ENDIF (USE_FULSIM)
+
- -SET(CMAKE_CXX_FLAGS "-Wall -Wno-invalid-offsetof -mfpmath=sse --no-rtti -Wcast-align -std=c++0x -msse2 -msse3 -mssse3 -msse4.1 ")
++-SET(CMAKE_CXX_FLAGS "-Wall -Wno-invalid-offsetof -mfpmath=sse -fno-rtti -Wcast-align -std=c++0x -msse2 -msse3 -mssse3 -msse4.1 ")
+-SET(CMAKE_C_FLAGS "-Wall -mfpmath=sse -msse2 -Wcast-align -msse2 -msse3 -mssse3 -msse4.1")
- +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-invalid-offsetof -mfpmath=sse --no-rtti -Wcast-align -std=c++0x -msse2 -msse3 -mssse3 -msse4.1 ")
+++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-invalid-offsetof -mfpmath=sse -fno-rtti -Wcast-align -std=c++0x -msse2 -msse3 -mssse3 -msse4.1 ")
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -mfpmath=sse -msse2 -Wcast-align -msse2 -msse3 -mssse3 -msse4.1")
+
+ # Front end stuff we need
+ #INCLUDE(CMake/FindLLVM.cmake)
- Index: beignet-0.0.0+git2013.04.11+e6b503e/backend/CMakeLists.txt
++Index: beignet-0.1+git20130418+0546d2e/backend/CMakeLists.txt
+===================================================================
- --- beignet-0.0.0+git2013.04.11+e6b503e.orig/backend/CMakeLists.txt 2013-04-16 14:49:48.290369733 +0200
- +++ beignet-0.0.0+git2013.04.11+e6b503e/backend/CMakeLists.txt 2013-04-16 14:50:20.298368306 +0200
++--- beignet-0.1+git20130418+0546d2e.orig/backend/CMakeLists.txt 2013-04-18 05:21:35.000000000 +0200
+++++ beignet-0.1+git20130418+0546d2e/backend/CMakeLists.txt 2013-04-18 11:54:19.629435384 +0200
+@@ -45,16 +45,16 @@
+ 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 -ffast-math -fPIC -Wall")
++ set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -funroll-loops -Wstrict-aliasing=2 -fstrict-aliasing -msse2 -msse3 -mssse3 -msse4.1 -fPIC -Wall")
+ set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} ${LLVM_CFLAGS}")
+- set (CMAKE_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -Wno-invalid-offsetof -fno-rtti -std=c++0x")
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_C_CXX_FLAGS} -Wno-invalid-offsetof -fno-rtti -std=c++0x")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_DEBUG_MEMORY_FLAG}")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_COMPILE_UTESTS_FLAG}")
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-E")
+- set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${LLVM_LFLAGS}")
++ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined ${LLVM_LFLAGS}")
+ set (CMAKE_CXX_FLAGS_DEBUG "-g -DGBE_DEBUG=1")
+ set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
+ set (CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG -DGBE_DEBUG=0")
+ set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DGBE_DEBUG=0")
+- set (CMAKE_C_FLAGS "${CMAKE_C_CXX_FLAGS}")
++ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_CXX_FLAGS}")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GBE_DEBUG_MEMORY_FLAG}")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GBE_COMPILE_UTESTS_FLAG}")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-E")
diff --cc debian/patches/series
index 6c20ce6,0000000..110055d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,6 @@@
+khronos
+verbose
- clang-from-path
+implement-gefa
+missing-header
- glibc-memalign
- llvm-3.2
- autogen
- ignore-missing-egl
+soname
+respect-flags
diff --cc debian/patches/soname
index 2e270fd,0000000..32597fa
mode 100644,000000..100644
--- a/debian/patches/soname
+++ b/debian/patches/soname
@@@ -1,33 -1,0 +1,33 @@@
+Description: Use proper SONAME
+Author: Simon Richter <sjr at debian.org>
+Last-Update: 2013-04-15
+
- Index: beignet-0.1/backend/src/CMakeLists.txt
++Index: beignet-0.1+git20130418+0546d2e/backend/src/CMakeLists.txt
+===================================================================
- --- beignet-0.1.orig/backend/src/CMakeLists.txt 2013-04-12 08:13:48.000000000 +0200
- +++ beignet-0.1/backend/src/CMakeLists.txt 2013-04-16 17:20:10.497967484 +0200
++--- beignet-0.1+git20130418+0546d2e.orig/backend/src/CMakeLists.txt 2013-04-18 05:21:35.000000000 +0200
+++++ beignet-0.1+git20130418+0546d2e/backend/src/CMakeLists.txt 2013-04-18 11:53:59.985434244 +0200
+@@ -114,7 +114,10 @@
+ ${LLVM_MODULE_LIBS}
+ ${CMAKE_THREAD_LIBS_INIT}
+ ${CMAKE_DL_LIBS})
+-
++set_target_properties(gbe
++ PROPERTIES
++ VERSION 0.1
++ SOVERSION 0)
+ install (TARGETS gbe LIBRARY DESTINATION lib)
+ install (FILES backend/program.h DESTINATION include/gen)
+
- Index: beignet-0.1/src/CMakeLists.txt
++Index: beignet-0.1+git20130418+0546d2e/src/CMakeLists.txt
+===================================================================
- --- beignet-0.1.orig/src/CMakeLists.txt 2013-04-16 17:18:36.000000000 +0200
- +++ beignet-0.1/src/CMakeLists.txt 2013-04-16 17:19:57.913968045 +0200
- @@ -50,4 +50,8 @@
++--- beignet-0.1+git20130418+0546d2e.orig/src/CMakeLists.txt 2013-04-18 05:21:35.000000000 +0200
+++++ beignet-0.1+git20130418+0546d2e/src/CMakeLists.txt 2013-04-18 11:53:59.985434244 +0200
++@@ -58,4 +58,8 @@
+ ${OPENGL_LIBRARIES}
+ ${OPTIONAL_EGL_LIBRARY}
+ ${GBM_LIBRARY})
++set_target_properties(cl
++ PROPERTIES
++ VERSION 0.1
++ SOVERSION 0)
+ install (TARGETS cl LIBRARY DESTINATION lib)
--
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