[Pkg-opencl-devel] [beignet] 10/47: Imported Debian patch 0.1+git20130422+003fac5-1

Andreas Beckmann anbe at moszumanska.debian.org
Fri Oct 31 21:45:47 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 83f8956a1d565b2d3cd71bd3459eb245bb68b9b6
Author: Simon Richter <sjr at debian.org>
Date:   Mon Apr 22 15:10:54 2013 +0200

    Imported Debian patch 0.1+git20130422+003fac5-1
---
 debian/changelog             |  6 ++++
 debian/patches/const64       | 24 ++++++++++++++
 debian/patches/respect-flags | 78 +++++++++++++++++++++++++++++++++++++-------
 debian/patches/series        |  1 +
 4 files changed, 97 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 982239f..9d14052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+beignet (0.1+git20130422+003fac5-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Simon Richter <sjr at debian.org>  Mon, 22 Apr 2013 15:10:54 +0200
+
 beignet (0.1+git20130419+9c11c18-1) experimental; urgency=low
 
   * Add more functionality patches
diff --git a/debian/patches/const64 b/debian/patches/const64
new file mode 100644
index 0000000..5ce8d29
--- /dev/null
+++ b/debian/patches/const64
@@ -0,0 +1,24 @@
+Index: beignet-0.1+git20130419+9c11c18/backend/src/ir/instruction.cpp
+===================================================================
+--- beignet-0.1+git20130419+9c11c18.orig/backend/src/ir/instruction.cpp	2013-04-19 10:28:49.000000000 +0200
++++ beignet-0.1+git20130419+9c11c18/backend/src/ir/instruction.cpp	2013-04-19 19:17:43.329603279 +0200
+@@ -591,17 +591,17 @@
+     static const Type madType[] = {TYPE_FLOAT};
+     static const uint32_t madTypeNum = ARRAY_ELEM_NUM(madType);
+ 
+-    // TODO add support for 64 bits values
+     static const Type allButBool[] = {TYPE_S8,  TYPE_U8,
+                                       TYPE_S16, TYPE_U16,
+                                       TYPE_S32, TYPE_U32,
++                                      TYPE_S64, TYPE_U64,
+                                       TYPE_FLOAT, TYPE_DOUBLE};
+     static const uint32_t allButBoolNum = ARRAY_ELEM_NUM(allButBool);
+ 
+-    // TODO add support for 64 bits values
+     static const Type logicalType[] = {TYPE_S8,  TYPE_U8,
+                                        TYPE_S16, TYPE_U16,
+                                        TYPE_S32, TYPE_U32,
++                                       TYPE_S64, TYPE_U64,
+                                        TYPE_BOOL};
+     static const uint32_t logicalTypeNum = ARRAY_ELEM_NUM(logicalType);
+ 
diff --git a/debian/patches/respect-flags b/debian/patches/respect-flags
index cc57dcb..c7c84ff 100644
--- a/debian/patches/respect-flags
+++ b/debian/patches/respect-flags
@@ -2,10 +2,10 @@ Description: Respect CFLAGS/CXXFLAGS from Debian
 Author: Simon Richter <sjr at debian.org>
 Last-Update: 2013-04-16
 
-Index: beignet-0.1+git20130418+0546d2e/CMakeLists.txt
+Index: beignet-0.1+git20130419+9c11c18/CMakeLists.txt
 ===================================================================
---- 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
+--- beignet-0.1+git20130419+9c11c18.orig/CMakeLists.txt	2013-04-19 10:28:49.000000000 +0200
++++ beignet-0.1+git20130419+9c11c18/CMakeLists.txt	2013-04-19 19:05:35.000000000 +0200
 @@ -18,7 +18,6 @@
  
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
@@ -25,11 +25,11 @@ Index: beignet-0.1+git20130418+0546d2e/CMakeLists.txt
  
  # Front end stuff we need
  #INCLUDE(CMake/FindLLVM.cmake)
-Index: beignet-0.1+git20130418+0546d2e/backend/CMakeLists.txt
+Index: beignet-0.1+git20130419+9c11c18/backend/CMakeLists.txt
 ===================================================================
---- 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 @@
+--- beignet-0.1+git20130419+9c11c18.orig/backend/CMakeLists.txt	2013-04-19 10:28:49.000000000 +0200
++++ beignet-0.1+git20130419+9c11c18/backend/CMakeLists.txt	2013-04-19 19:09:27.509625385 +0200
+@@ -45,39 +45,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")
    set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS}  ${LLVM_CFLAGS}")
@@ -39,13 +39,67 @@ Index: beignet-0.1+git20130418+0546d2e/backend/CMakeLists.txt
    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_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_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined ${LLVM_LFLAGS}")
++  set (CMAKE_CXX_FLAGS_DEBUG          "-DGBE_DEBUG=1")
++  set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
++  set (CMAKE_CXX_FLAGS_MINSIZEREL     "-DNDEBUG -DGBE_DEBUG=0")
++  set (CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG -DGBE_DEBUG=0")
 +  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")
+-  set (CMAKE_C_FLAGS_DEBUG          "-g -DGBE_DEBUG=1")
+-  set (CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
+-  set (CMAKE_C_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DGBE_DEBUG=0")
+-  set (CMAKE_C_FLAGS_RELEASE        "-O2 -DNDEBUG -DGBE_DEBUG=0")
++  set (CMAKE_C_FLAGS_DEBUG          "-DGBE_DEBUG=1")
++  set (CMAKE_C_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
++  set (CMAKE_C_FLAGS_MINSIZEREL     "-DNDEBUG -DGBE_DEBUG=0")
++  set (CMAKE_C_FLAGS_RELEASE        "-DNDEBUG -DGBE_DEBUG=0")
+ elseif (COMPILER STREQUAL "CLANG")
+   set (CMAKE_C_COMPILER             "clang")
+   set (CMAKE_C_FLAGS                "-Wall -std=c99")
+-  set (CMAKE_C_FLAGS_DEBUG          "-g -DGBE_DEBUG=1")
+-  set (CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1")
+-  set (CMAKE_C_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DGBE_DEBUG=0")
+-  set (CMAKE_C_FLAGS_RELEASE        "-O2 -DNDEBUG -DGBE_DEBUG=0")
++  set (CMAKE_C_FLAGS_DEBUG          "-DGBE_DEBUG=1")
++  set (CMAKE_C_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
++  set (CMAKE_C_FLAGS_MINSIZEREL     "-DNDEBUG -DGBE_DEBUG=0")
++  set (CMAKE_C_FLAGS_RELEASE        "-DNDEBUG -DGBE_DEBUG=0")
+   set (CMAKE_CXX_COMPILER             "clang++")
+   set (CMAKE_CXX_FLAGS "-fstrict-aliasing -msse2 -fPIC -Wall -Wno-format-security -Wno-invalid-offsetof -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} ${VISIBILITY_FLAG}")
+-  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_CXX_FLAGS_DEBUG          "-DGBE_DEBUG=1")
++  set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
++  set (CMAKE_CXX_FLAGS_MINSIZEREL     "-DNDEBUG -DGBE_DEBUG=0")
++  set (CMAKE_CXX_FLAGS_RELEASE        "-DNDEBUG -DGBE_DEBUG=0")
+   set (CMAKE_AR      "/usr/bin/llvm-ar")
+   set (CMAKE_LINKER  "/usr/bin/llvm-ld")
+   set (CMAKE_NM      "/usr/bin/llvm-nm")
+@@ -91,10 +91,10 @@
+   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_COMPILE_UTESTS_FLAG}")
+   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VISIBILITY_FLAG} -Wl,-E")
+   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GBE_DEBUG_MODE_FLAG}")
+-  set (CMAKE_CXX_FLAGS_DEBUG "-g -O0 -DGBE_DEBUG=1")
+-  set (CCMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O2 -DGBE_DEBUG=1")
+-  set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O2 -DGBE_DEBUG=0")
+-  set (CCMAKE_CXX_FLAGS_MINSIZEREL "-Os -DGBE_DEBUG=0")
++  set (CMAKE_CXX_FLAGS_DEBUG "-DGBE_DEBUG=1")
++  set (CCMAKE_CXX_FLAGS_RELWITHDEBINFO "-DGBE_DEBUG=1")
++  set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DGBE_DEBUG=0")
++  set (CCMAKE_CXX_FLAGS_MINSIZEREL "-DGBE_DEBUG=0")
+   set (CMAKE_EXE_LINKER_FLAGS "")
+ endif ()
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 742c689..ddef2bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ respect-flags
 clang-3.0
 gdi
 driver_version
+const64

-- 
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