[beignet] 03/10: Drop patches applied upstream, refresh others

Rebecca Palmer rnpalmer-guest at moszumanska.debian.org
Sun Jan 22 22:40:01 UTC 2017 

This is an automated email from the git hooks/post-receive script.

rnpalmer-guest pushed a commit to branch master
in repository beignet.

commit 968fbdc575120607f3125b729245b5a6ef69fbaf
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sat Jan 21 14:14:21 2017 +0000

    Drop patches applied upstream, refresh others
---
 debian/changelog                                   |  7 +++
 .../Debian-compliant-compiler-flags-handling.patch | 12 ++--
 debian/patches/add-appstream-metadata.patch        | 10 ++--
 debian/patches/avoid-invalid-iterator.patch        | 24 --------
 debian/patches/cl_accelerator_intel.patch          | 16 ++---
 debian/patches/docs-broken-links.patch             |  4 +-
 debian/patches/find-python35.patch                 |  2 +-
 debian/patches/fix-llvm39-hang.patch               | 69 ----------------------
 debian/patches/llvm39-support.patch                |  1 -
 debian/patches/noassert-failed-context.patch       | 40 -------------
 debian/patches/reduce-notfound-output.patch        | 28 ++++-----
 debian/patches/series                              |  3 -
 debian/patches/ship-test-tool.patch                | 18 +++---
 debian/patches/support-kfreebsd.patch              | 26 +++-----
 debian/patches/update-docs.patch                   | 18 +++---
 15 files changed, 69 insertions(+), 209 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd4b6ba..b27b6a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+beignet (1.3.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop patches applied upstream, refresh others.
+
+ -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Sat, 21 Jan 2017 14:10:45 +0000
+
 beignet (1.2.1-2) unstable; urgency=medium
 
   * Fix invalid-iterator crash when compiling large kernels.
diff --git a/debian/patches/Debian-compliant-compiler-flags-handling.patch b/debian/patches/Debian-compliant-compiler-flags-handling.patch
index ef248f5..99e7325 100644
--- a/debian/patches/Debian-compliant-compiler-flags-handling.patch
+++ b/debian/patches/Debian-compliant-compiler-flags-handling.patch
@@ -6,9 +6,9 @@ Disable non-policy-compliant instruction set assumptions (slows the
 OpenCL compiler by ~few%, no effect on OpenCL execution speed)
 
 Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
---- beignet.orig/CMakeLists.txt
-+++ beignet/CMakeLists.txt
-@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,7 +31,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
  
  INCLUDE (FindPkgConfig)
  
@@ -16,7 +16,7 @@ Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
  INCLUDE (GNUInstallDirs OPTIONAL)
  # support old CMake without GNUInstallDirs
-@@ -83,9 +82,9 @@ ADD_DEFINITIONS(-DGEN7_SAMPLER_CLAMP_BOR
+@@ -73,9 +72,9 @@ ADD_DEFINITIONS(-DGEN7_SAMPLER_CLAMP_BOR
  
  # compiler flag setting
  if (COMPILER STREQUAL "GCC")
@@ -28,8 +28,8 @@ Author: Simon Richter <sjr at debian.org>,Rebecca Palmer <rebecca_palmer at zoho.com>
  elseif (COMPILER STREQUAL "ICC")
    set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS}  -wd2928 -Wall -fPIC -fstrict-aliasing -fp-model fast -msse4.1 -Wl,-E")
  endif ()
---- beignet.orig/backend/src/sys/platform.hpp
-+++ beignet/backend/src/sys/platform.hpp
+--- a/backend/src/sys/platform.hpp
++++ b/backend/src/sys/platform.hpp
 @@ -41,15 +41,6 @@
  #define __X86__
  #endif
diff --git a/debian/patches/add-appstream-metadata.patch b/debian/patches/add-appstream-metadata.patch
index b7a76e4..bfe108b 100644
--- a/debian/patches/add-appstream-metadata.patch
+++ b/debian/patches/add-appstream-metadata.patch
@@ -6,9 +6,9 @@ https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#sect-Meta
 Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 Forwarded: https://lists.freedesktop.org/archives/beignet/2017-January/008464.html
 
---- beignet-1.2.1.orig/CMakeLists.txt
-+++ beignet-1.2.1/CMakeLists.txt
-@@ -287,6 +287,10 @@ IF(BUILD_EXAMPLES)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -317,6 +317,10 @@ IF(BUILD_EXAMPLES)
  ADD_SUBDIRECTORY(examples)
  ENDIF(BUILD_EXAMPLES)
  
@@ -20,7 +20,7 @@ Forwarded: https://lists.freedesktop.org/archives/beignet/2017-January/008464.ht
  SET(CPACK_PACKAGE_VERSION_MAJOR "${LIBCL_DRIVER_VERSION_MAJOR}")
  SET(CPACK_PACKAGE_VERSION_MINOR "${LIBCL_DRIVER_VERSION_MINOR}")
 --- /dev/null
-+++ beignet-1.2.1/com.intel.beignet.metainfo.xml.in
++++ b/com.intel.beignet.metainfo.xml.in
 @@ -0,0 +1,17 @@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<component type="driver">
@@ -40,7 +40,7 @@ Forwarded: https://lists.freedesktop.org/archives/beignet/2017-January/008464.ht
 +</releases>
 +</component>
 --- /dev/null
-+++ beignet-1.2.1/update_metainfo_xml.py
++++ b/update_metainfo_xml.py
 @@ -0,0 +1,32 @@
 +#!/usr/bin/python3
 +
diff --git a/debian/patches/avoid-invalid-iterator.patch b/debian/patches/avoid-invalid-iterator.patch
deleted file mode 100644
index 82b8b74..0000000
--- a/debian/patches/avoid-invalid-iterator.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Avoid possible invalid pointer by vector iterator
-
-Elements may be added to the std::vector "revisit" in
-findPointerEscape(), possibly invalidating iterators on it.
-When compiling huge kernel like blender, it will cause random
-segment fault crash.
-[] operator will be more safe.
-
-Origin: upstream https://cgit.freedesktop.org/beignet/commit/?id=2de87cd63a80dbd4ea4e8e4ce3af8e0535b910cb
-Author: Yan Wang
-
---- a/backend/src/llvm/llvm_gen_backend.cpp
-+++ b/backend/src/llvm/llvm_gen_backend.cpp
-@@ -1390,8 +1390,8 @@ namespace gbe
-       }
-     }
-     // storing/loading pointer would introduce revisit
--    for (std::vector<Value *>::iterator iter = revisit.begin(); iter != revisit.end(); ++iter) {
--      findPointerEscape(*iter, mixedPtr, true, revisit);
-+    for (size_t i = 0; i < revisit.size(); ++i) {
-+      findPointerEscape(revisit[i], mixedPtr, true, revisit);
-     }
- 
-     // the second pass starts from mixed pointer
diff --git a/debian/patches/cl_accelerator_intel.patch b/debian/patches/cl_accelerator_intel.patch
index 847b27a..0732706 100644
--- a/debian/patches/cl_accelerator_intel.patch
+++ b/debian/patches/cl_accelerator_intel.patch
@@ -9,8 +9,8 @@ cl_ext.h that does have it, but this has not been tested.
 Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 Forwarded: not-needed
 
---- beignet-1.2.0.orig/include/CL/cl_intel.h
-+++ beignet-1.2.0/include/CL/cl_intel.h
+--- a/include/CL/cl_intel.h
++++ b/include/CL/cl_intel.h
 @@ -26,6 +26,111 @@
  extern "C" {
  #endif
@@ -123,18 +123,18 @@ Forwarded: not-needed
  #define CL_MEM_PINNABLE (1 << 10)
  
  /* Track allocations and report current number of unfreed allocations */
---- beignet-1.2.0.orig/src/cl_accelerator_intel.h
-+++ beignet-1.2.0/src/cl_accelerator_intel.h
-@@ -3,6 +3,7 @@
- 
+--- a/src/cl_accelerator_intel.h
++++ b/src/cl_accelerator_intel.h
+@@ -4,6 +4,7 @@
+ #include "cl_base_object.h"
  #include "CL/cl.h"
  #include "CL/cl_ext.h"
 +#include "CL/cl_intel.h"
  #include <stdint.h>
  
  struct _cl_accelerator_intel {
---- beignet-1.2.0.orig/src/cl_driver.h
-+++ beignet-1.2.0/src/cl_driver.h
+--- a/src/cl_driver.h
++++ b/src/cl_driver.h
 @@ -24,6 +24,7 @@
  #include <stdlib.h>
  #include "cl_driver_type.h"
diff --git a/debian/patches/docs-broken-links.patch b/debian/patches/docs-broken-links.patch
index 5ca070e..1b85d36 100644
--- a/debian/patches/docs-broken-links.patch
+++ b/debian/patches/docs-broken-links.patch
@@ -21,7 +21,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
  * Run as root without X.
  * Enable the drm render nodes by passing drm.rnodes=1 to the kernel boot args, then you can run beignet with non-root and without X.
  
-@@ -285,13 +286,13 @@ Please specify your hardware when report
+@@ -297,14 +298,14 @@ Please specify your hardware when report
  
  Documents for OpenCL application developers
  -------------------------------------------
@@ -32,6 +32,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 -- [[V4l2 Buffer Sharing|Beignet/howto/v4l2-buffer-sharing-howto]]
 -- [[Video Motion Estimation|Beignet/howto/video-motion-estimation-howto]]
 -- [[Stand Alone Unit Test|Beignet/howto/stand-alone-utest-howto]]
+-- [[Android build|Beignet/android-build-howto]]
 +- [[Cross compile (yocto)|howto/cross-compiler-howto]]
 +- [[Work with old system without c++11|howto/oldgcc-howto]]
 +- [[Kernel Optimization Guide|optimization-guide]]
@@ -39,6 +40,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 +- [[V4l2 Buffer Sharing|howto/v4l2-buffer-sharing-howto]]
 +- [[Video Motion Estimation|howto/video-motion-estimation-howto]]
 +- [[Stand Alone Unit Test|howto/stand-alone-utest-howto]]
++- [[Android build|android-build-howto]]
  
  The wiki URL is as below:
  [http://www.freedesktop.org/wiki/Software/Beignet/](http://www.freedesktop.org/wiki/Software/Beignet/)
diff --git a/debian/patches/find-python35.patch b/debian/patches/find-python35.patch
index 2284d19..fb3dff0 100644
--- a/debian/patches/find-python35.patch
+++ b/debian/patches/find-python35.patch
@@ -8,7 +8,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -233,6 +233,7 @@ ELSE(OCLIcd_FOUND)
+@@ -222,6 +222,7 @@ ELSE(OCLIcd_FOUND)
    MESSAGE(STATUS "Looking for OCL ICD header file - not found")
  ENDIF(OCLIcd_FOUND)
  
diff --git a/debian/patches/fix-llvm39-hang.patch b/debian/patches/fix-llvm39-hang.patch
deleted file mode 100644
index 4637541..0000000
--- a/debian/patches/fix-llvm39-hang.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Fix compiler hang with LLVM 3.9
-
-Test case:
-OCL_STRICT_CONFORMANCE=0 utest_run -c vload_test_uchar
-(or any of the vload_test_*)
-
-I don't know whether this really fixes the problem (as opposed to
-just making it harder to trigger), but I also don't know whether the
-alternative fix of switching back to LLVM 3.8 does so, and I do
-know that using 3.8 with Mesa on 3.9 causes other problems (#848368).
-
-Origin: upstream https://cgit.freedesktop.org/beignet/commit/?id=75cb7ca04610a6750e73c32b9759a0742f495501
-Author: Yang Rong
-
---- beignet-1.2.1.orig/backend/src/llvm/llvm_unroll.cpp
-+++ beignet-1.2.1/backend/src/llvm/llvm_unroll.cpp
-@@ -103,13 +103,11 @@ namespace gbe {
-       }
- 
-       void setUnrollID(Loop *L, bool enable) {
--        if (!enable && disabledLoops.find(L) != disabledLoops.end())
--           return;
-+        assert(enable);
-         LLVMContext &Context = L->getHeader()->getContext();
- #if LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6
-         SmallVector<Metadata *, 2> forceUnroll;
-         forceUnroll.push_back(MDString::get(Context, "llvm.loop.unroll.enable"));
--        forceUnroll.push_back(ConstantAsMetadata::get(ConstantInt::get(Type::getInt1Ty(Context), enable)));
-         MDNode *forceUnrollNode = MDNode::get(Context, forceUnroll);
-         SmallVector<Metadata *, 4> Vals;
-         Vals.push_back(NULL);
-@@ -127,8 +125,6 @@ namespace gbe {
-         // Set operand 0 to refer to the loop id itself.
-         NewLoopID->replaceOperandWith(0, NewLoopID);
-         L->setLoopID(NewLoopID);
--        if (!enable)
--          disabledLoops.insert(L);
-       }
- 
-       static bool hasPrivateLoadStore(Loop *L) {
-@@ -190,7 +186,8 @@ namespace gbe {
- 
-         if (currTripCount > 32) {
-           shouldUnroll = false;
--          setUnrollID(currL, false);
-+          //Don't change the unrollID if doesn't force unroll.
-+          //setUnrollID(currL, false);
-           return shouldUnroll;
-         }
- 
-@@ -206,7 +203,8 @@ namespace gbe {
-               parentTripCount = SE->getSmallConstantTripCount(parentL, parentExitBlock);
-           }
-           if (parentTripCount != 0 && currTripCount * parentTripCount > 32) {
--            setUnrollID(parentL, false);
-+            //Don't change the unrollID if doesn't force unroll.
-+            //setUnrollID(parentL, false);
- #if LLVM_VERSION_MAJOR == 3 &&  LLVM_VERSION_MINOR >= 8
-             loopInfo.markAsRemoved(parentL);
- #else
-@@ -243,8 +241,6 @@ namespace gbe {
-       virtual const char *getPassName() const {
-         return "SPIR backend: custom loop unrolling pass";
-       }
--    private:
--      std::set<Loop *> disabledLoops;
- 
-     };
- 
diff --git a/debian/patches/llvm39-support.patch b/debian/patches/llvm39-support.patch
index 7404458..9e61fc1 100644
--- a/debian/patches/llvm39-support.patch
+++ b/debian/patches/llvm39-support.patch
@@ -19,4 +19,3 @@ Author: Rebecca Palmer
                 DOC "llvm-config executable")
  endif (LLVM_INSTALL_DIR)
  
-
diff --git a/debian/patches/noassert-failed-context.patch b/debian/patches/noassert-failed-context.patch
deleted file mode 100644
index 066e2f1..0000000
--- a/debian/patches/noassert-failed-context.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Return error, don't assert-fail, on failed context_create
-
-As this function is used in the "check whether this is supported
-hardware" stage, it needs to not crash on failure.
-
-(The bug reporter's hardware was much too old for this package
-to actually work, but I don't know whether that is also the trigger
-for the bug.)
-
-Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
-Bug-Debian: https://bugs.debian.org/848792
-Forwarded: accepted https://cgit.freedesktop.org/beignet/commit/?id=81f0205ca922c086999c7a0b648a58a1eed71f40
-
---- beignet-1.2.1.orig/src/intel/intel_driver.c
-+++ beignet-1.2.1/src/intel/intel_driver.c
-@@ -133,11 +133,13 @@ intel_driver_memman_init(intel_driver_t
-   return 1;
- }
- 
--static void
-+static int
- intel_driver_context_init(intel_driver_t *driver)
- {
-   driver->ctx = drm_intel_gem_context_create(driver->bufmgr);
--  assert(driver->ctx);
-+  if (!driver->ctx)
-+    return 0;
-+  return 1;
- }
- 
- static void
-@@ -156,7 +158,7 @@ intel_driver_init(intel_driver_t *driver
-   pthread_mutex_init(&driver->ctxmutex, NULL);
- 
-   if (!intel_driver_memman_init(driver)) return 0;
--  intel_driver_context_init(driver);
-+  if (!intel_driver_context_init(driver)) return 0;
- 
- #if EMULATE_GEN
-   driver->gen_ver = EMULATE_GEN;
diff --git a/debian/patches/reduce-notfound-output.patch b/debian/patches/reduce-notfound-output.patch
index 9de29f5..6e0c8b5 100644
--- a/debian/patches/reduce-notfound-output.patch
+++ b/debian/patches/reduce-notfound-output.patch
@@ -8,7 +8,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
 --- a/src/cl_device_id.c
 +++ b/src/cl_device_id.c
-@@ -770,10 +770,10 @@ kbl_gt4_break:
+@@ -749,10 +749,10 @@ kbl_gt4_break:
      case PCI_CHIP_SANDYBRIDGE_BRIDGE_S:
      case PCI_CHIP_SANDYBRIDGE_S_GT:
        // Intel(R) HD Graphics SandyBridge not supported yet
@@ -23,19 +23,19 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    if (ret == NULL)
 --- a/src/intel/intel_driver.c
 +++ b/src/intel/intel_driver.c
-@@ -240,7 +240,6 @@ intel_driver_open(intel_driver_t *intel,
-   }
+@@ -254,7 +254,6 @@ if(!intel_driver_is_active(intel)) {
+ }
  
-   if(!intel_driver_is_active(intel)) {
--    fprintf(stderr, "Device open failed, aborting...\n");
-     return CL_DEVICE_NOT_FOUND;
-   }
+ if(!intel_driver_is_active(intel)) {
+-  fprintf(stderr, "Device open failed, aborting...\n");
+   return CL_DEVICE_NOT_FOUND;
+ }
  
-@@ -301,7 +300,6 @@ intel_driver_init_master(intel_driver_t
-   // usually dev_name = "/dev/dri/card%d"
-   dev_fd = open(dev_name, O_RDWR);
-   if (dev_fd == -1) {
--    fprintf(stderr, "open(\"%s\", O_RDWR) failed: %s\n", dev_name, strerror(errno));
-     return 0;
-   }
+@@ -315,7 +314,6 @@ drm_client_t client;
+ // usually dev_name = "/dev/dri/card%d"
+ dev_fd = open(dev_name, O_RDWR);
+ if (dev_fd == -1) {
+-  fprintf(stderr, "open(\"%s\", O_RDWR) failed: %s\n", dev_name, strerror(errno));
+   return 0;
+ }
  
diff --git a/debian/patches/series b/debian/patches/series
index 934798d..c177ca8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,4 @@ find-python35.patch
 docs-broken-links.patch
 cl_accelerator_intel.patch
 llvm39-support.patch
-avoid-invalid-iterator.patch
-noassert-failed-context.patch
 add-appstream-metadata.patch
-fix-llvm39-hang.patch
diff --git a/debian/patches/ship-test-tool.patch b/debian/patches/ship-test-tool.patch
index 3966187..dc34778 100644
--- a/debian/patches/ship-test-tool.patch
+++ b/debian/patches/ship-test-tool.patch
@@ -11,15 +11,15 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -33,7 +33,6 @@ configure_file (
-   "src/OCLConfig.h"
- )
- 
+@@ -23,7 +23,6 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL
+ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+   set(COMPILER "ICC")
+ endif()
 -set (NOT_BUILD_STAND_ALONE_UTEST 1)
  
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}/include)
-@@ -276,7 +275,7 @@ ENDIF(BUILD_EXAMPLES)
+@@ -306,7 +305,7 @@ ENDIF(BUILD_EXAMPLES)
  ADD_SUBDIRECTORY(include)
  ADD_SUBDIRECTORY(backend)
  ADD_SUBDIRECTORY(src)
@@ -30,7 +30,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
  IF (NOT (USE_STANDALONE_GBE_COMPILER STREQUAL "true"))
 --- a/utests/utest_helper.cpp
 +++ b/utests/utest_helper.cpp
-@@ -219,7 +219,7 @@ cl_do_kiss_path(const char *file, cl_dev
+@@ -221,7 +221,7 @@ cl_do_kiss_path(const char *file, cl_dev
    sub_path = "";
  
    if (kiss_path == NULL)
@@ -39,7 +39,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
    sz += strlen(kiss_path) + strlen(sub_path) + 2; /* +1 for end of string, +1 for '/' */
    if ((ker_path = (char*) malloc(sz)) == NULL)
      clpanic("Allocation failed", -1);
-@@ -455,7 +455,7 @@ cl_ocl_init(void)
+@@ -457,7 +457,7 @@ cl_ocl_init(void)
  
    /* Get the device (only GPU device is supported right now) */
    try {
@@ -50,7 +50,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
        GET_DEVICE_STR_INFO(profile, PROFILE);
 --- a/utests/CMakeLists.txt
 +++ b/utests/CMakeLists.txt
-@@ -324,9 +324,7 @@ else(GEN_PCI_ID)
+@@ -342,9 +342,7 @@ else(GEN_PCI_ID)
    DEPENDS ${GBE_BIN_FILE} ${kernel_bin}.cl)
  endif(GEN_PCI_ID)
  
@@ -60,7 +60,7 @@ Forwarded: partly https://lists.freedesktop.org/archives/beignet/2016-October/00
  
  add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/generated
      COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/generated -p
-@@ -374,6 +372,9 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
+@@ -393,6 +391,9 @@ if (NOT_BUILD_STAND_ALONE_UTEST)
  endif (NOT_BUILD_STAND_ALONE_UTEST)
  
  ADD_DEPENDENCIES (utests utest_generator)
diff --git a/debian/patches/support-kfreebsd.patch b/debian/patches/support-kfreebsd.patch
index b5603f2..af724bd 100644
--- a/debian/patches/support-kfreebsd.patch
+++ b/debian/patches/support-kfreebsd.patch
@@ -9,7 +9,7 @@ Author: Koop Mast, Rebecca Palmer
 
 --- a/src/cl_device_id.c
 +++ b/src/cl_device_id.c
-@@ -35,7 +35,12 @@
+@@ -34,7 +34,12 @@
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h>
@@ -22,7 +22,7 @@ Author: Koop Mast, Rebecca Palmer
  
  #ifndef CL_VERSION_1_2
  #define CL_DEVICE_BUILT_IN_KERNELS 0x103F
-@@ -787,11 +792,24 @@ kbl_gt4_break:
+@@ -767,11 +772,24 @@ kbl_gt4_break:
    #define toMB(size) (size)&(UINT64_MAX<<20)
    /* Get the global_mem_size and max_mem_alloc size from
     * driver, system ram and hardware*/
@@ -50,23 +50,11 @@ Author: Koop Mast, Rebecca Palmer
      ret->global_mem_size = toMB((totalram / 2 > totalgpumem) ?
 --- a/src/cl_event.c
 +++ b/src/cl_event.c
-@@ -27,6 +27,7 @@
- 
- #include <assert.h>
+@@ -22,6 +22,7 @@
+ #include "cl_alloc.h"
+ #include <string.h>
  #include <stdio.h>
 +#include <time.h>
  
- void cl_event_update_last_events(cl_command_queue queue, int wait)
- {
-@@ -657,7 +658,11 @@ cl_ulong cl_event_get_cpu_timestamp(cl_u
- {
-   struct timespec ts;
- 
-+#if defined(linux) || defined(__linux__) || defined(__LINUX__)
-  if(clock_gettime(CLOCK_MONOTONIC_RAW,&ts) != 0){
-+#else
-+ if(clock_gettime(CLOCK_MONOTONIC,&ts) != 0){
-+#endif
-   printf("CPU Timmer error\n");
-   return CL_FALSE;
-   }
+ // TODO: Need to move it to some device related file later.
+ static void
diff --git a/debian/patches/update-docs.patch b/debian/patches/update-docs.patch
index a61783b..0fd8c7e 100644
--- a/debian/patches/update-docs.patch
+++ b/debian/patches/update-docs.patch
@@ -8,7 +8,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 
 --- a/src/cl_device_id.c
 +++ b/src/cl_device_id.c
-@@ -879,7 +879,7 @@ cl_self_test(cl_device_id device, cl_sel
+@@ -859,7 +859,7 @@ cl_self_test(cl_device_id device, cl_sel
                      } else {
                        ret = SELF_TEST_SLM_FAIL;
                        printf("Beignet: self-test failed: (3, 7, 5) + (5, 7, 3) returned (%i, %i, %i)\n"
@@ -94,7 +94,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
   * 3rd Generation Intel Core Processors "Ivybridge".
   * 3rd Generation Intel Atom Processors "BayTrail".
   * 4th Generation Intel Core Processors "Haswell", need kernel patch if your linux kernel older than 4.2, see the "Known Issues" section.
-@@ -158,6 +154,12 @@ Supported Targets
+@@ -158,6 +154,12 @@
   * 6th Generation Intel Core Processors "Skylake" and "Kabylake".
   * 5th Generation Intel Atom Processors "Broxten" or "Apollolake".
  
@@ -104,10 +104,10 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
 +
 +Attempting to run Beignet on unsupported hardware should return CL_DEVICE_NOT_FOUND; if it does anything else (especially crashing) please [report a bug](#howtocontribute).
 +
- Known Issues
- ------------
- 
-@@ -177,7 +179,7 @@ Known Issues
+ OpenCL 2.0
+ ----------
+ From release v1.3.0, beignet support OpenCL 2.0. By default, OpenCL 2.0 support is disabled, you can enable it when cmake with option
+@@ -189,7 +191,7 @@ Known Issues
    forever until a reboot.
  
  * "Beignet: self-test failed" and almost all unit tests fail.
@@ -116,7 +116,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    to [c9224fa](https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=c9224faa59c3071ecfa2d4b24592f4eb61e57069))
    enable the register whitelist by default but miss some registers needed
    for Beignet.
-@@ -191,10 +193,11 @@ Known Issues
+@@ -203,10 +205,11 @@ Known Issues
    Linux <= 4.0, and requires the i915.enable_ppgtt=2 [boot parameter](https://wiki.ubuntu.com/Kernel/KernelBootParameters)
    on Linux 4.1.
    
@@ -131,7 +131,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
    
    `export OCL_IGNORE_SELF_TEST=1`
    
-@@ -210,10 +213,26 @@ Known Issues
+@@ -222,10 +225,26 @@ Known Issues
    This loses some precision but gains performance.
  
  * cl\_khr\_gl\_sharing.
@@ -162,7 +162,7 @@ Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
  
  Project repository
  ------------------
-@@ -260,9 +279,9 @@ The official mail list is as below:
+@@ -272,9 +291,9 @@ The official mail list is as below:
  [http://lists.freedesktop.org/mailman/listinfo/beignet](http://lists.freedesktop.org/mailman/listinfo/beignet)  
  The official bugzilla is at:
  [https://bugs.freedesktop.org/enter_bug.cgi?product=Beignet](https://bugs.freedesktop.org/enter_bug.cgi?product=Beignet)  

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

More information about the Pkg-opencl-commits mailing list