[beignet] 08/09: Fix FTBFS on kfreebsd-*.

[Rebecca Palmer]

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

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

commit 63c43884e8b7995cbe7343f414a6b0683629ae19
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Wed Nov 11 22:47:51 2015 +0000

    Fix FTBFS on kfreebsd-*.
---
 debian/changelog                      |  1 +
 debian/patches/support-kfreebsd.patch | 30 +++++++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b700d5..576c906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ beignet (1.1.1-2) UNRELEASED; urgency=medium
   * Fix shutdown order bug ("i915 kernel driver may not be sane").
   * Better document that linux >= 4.2 fixes the
     "no __local on Haswell" bug.
+  * Fix FTBFS on kfreebsd-*.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Mon, 09 Nov 2015 21:47:04 +0000
 
diff --git a/debian/patches/support-kfreebsd.patch b/debian/patches/support-kfreebsd.patch
index 88e9ef3..c7c02c1 100644
--- a/debian/patches/support-kfreebsd.patch
+++ b/debian/patches/support-kfreebsd.patch
@@ -1,9 +1,10 @@
-Description: Don't try to use sysinfo on non-Linux
+Description: Don't try to use sysinfo or CLOCK_MONOTONIC_RAW on non-Linux
 
-Fixes FTBFS on kfreebsd due to use of a Linux-specific system call:
+Fixes two FTBFS on kfreebsd due to use of Linux-specific features:
 https://buildd.debian.org/status/fetch.php?pkg=beignet&arch=kfreebsd-amd64&ver=1.0.1-3&stamp=1425101150
+https://buildd.debian.org/status/fetch.php?pkg=beignet&arch=kfreebsd-amd64&ver=1.1.1-1&stamp=1445338350
 
-Origin: https://github.com/freebsd/freebsd-ports-graphics/blob/opencl/lang/beignet/files/patch-src_cl__device__id.c
+Origin: https://github.com/freebsd/freebsd-ports-graphics/blob/opencl/lang/beignet/files/patch-src_cl__device__id.c https://github.com/freebsd/freebsd-ports-graphics/blob/master/lang/beignet/files/patch-src_cl__event.c
 Author: Koop Mast, Rebecca Palmer
 
 --- a/src/cl_device_id.c
@@ -52,4 +53,27 @@ Author: Koop Mast, Rebecca Palmer
  
    return ret;
  }
+--- a/src/cl_event.c
++++ b/src/cl_event.c
+@@ -27,6 +27,7 @@
+ 
+ #include <assert.h>
+ #include <stdio.h>
++#include <time.h>
+ 
+ inline cl_bool
+ cl_event_is_gpu_command_type(cl_command_type type)
+@@ -617,7 +618,11 @@ cl_ulong cl_event_get_cpu_timestamp(cl_u
+ {
+   struct timespec ts;
+ 
+- if(clock_gettime(CLOCK_MONOTONIC_RAW,&ts) != 0){
++#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;
+   }
 

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