[beignet] 04/07: Convert documentation to HTML + more update-docs.patch updates

Rebecca Palmer rnpalmer-guest at moszumanska.debian.org
Sat Jun 18 18:27:38 UTC 2016 

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

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

commit a08517548d8319732cfda22fac35ccb65e5c09aa
Author: Rebecca N. Palmer <rebecca_palmer at zoho.com>
Date:   Sat Jun 18 14:49:46 2016 +0100

    Convert documentation to HTML + more update-docs.patch updates
---
 debian/beignet-opencl-icd.docs   |  2 +-
 debian/changelog                 |  1 +
 debian/clean                     |  1 +
 debian/control                   |  3 ++-
 debian/patches/update-docs.patch | 21 ++++++++++++++-------
 debian/rules                     |  5 +++++
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/debian/beignet-opencl-icd.docs b/debian/beignet-opencl-icd.docs
index a188e06..7f07a05 100644
--- a/debian/beignet-opencl-icd.docs
+++ b/debian/beignet-opencl-icd.docs
@@ -1 +1 @@
-docs/*
+docs_build/*
diff --git a/debian/changelog b/debian/changelog
index 199d8c8..fd293d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ beignet (1.1.2-3) UNRELEASED; urgency=medium
   * Return failure (instead of asserting) on input containing
     unresolvable function calls.
   * Update update-docs.patch.
+  * Convert documentation to HTML.
 
  -- Rebecca N. Palmer <rebecca_palmer at zoho.com>  Wed, 08 Jun 2016 22:10:03 +0100
 
diff --git a/debian/clean b/debian/clean
index b596299..e311e27 100644
--- a/debian/clean
+++ b/debian/clean
@@ -13,3 +13,4 @@ src/git_sha1.h
 utests/*.bmp
 utests/*.pyc
 utests/generated/*
+docs_build
diff --git a/debian/control b/debian/control
index 366197c..ec57d25 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Build-Depends:
  libdrm-dev,
  libxext-dev,
  libxfixes-dev,
- libx11-dev
+ libx11-dev,
+ ikiwiki
 Standards-Version: 3.9.8
 Homepage: https://www.freedesktop.org/wiki/Software/Beignet/
 Vcs-Git: https://anonscm.debian.org/git/pkg-opencl/beignet.git
diff --git a/debian/patches/update-docs.patch b/debian/patches/update-docs.patch
index c576942..1de13ef 100644
--- a/debian/patches/update-docs.patch
+++ b/debian/patches/update-docs.patch
@@ -15,7 +15,7 @@ index e9e2c16..3227340 100644
                        ret = SELF_TEST_SLM_FAIL;
                        printf("Beignet: self-test failed: (3, 7, 5) + (5, 7, 3) returned (%i, %i, %i)\n"
 -                             "See README.md or http://www.freedesktop.org/wiki/Software/Beignet/\n",
-+                             "This can usually be fixed by upgrading Linux to >= 4.2,\nsee /usr/share/doc/beignet-opencl-icd/Beignet.mdwn.gz or http://www.freedesktop.org/wiki/Software/Beignet/\n",
++                             "This can usually be fixed by upgrading Linux to >= 4.2,\nsee /usr/share/doc/beignet-opencl-icd/Beignet.html or http://www.freedesktop.org/wiki/Software/Beignet/\n",
                               test_data[0], test_data[1], test_data[2]);
  
                      }
@@ -34,6 +34,10 @@ index 583e5d2..e0de7bf 100644
  
  - `OCL_SIMD_WIDTH` `(8 or 16)`. Select the number of lanes per hardware thread,
    Normally, you don't need to set it, we will select suitable simd width for
+--- /dev/null
++++ beignet-1.1.2/docs/index.mdwn
+@@ -0,0 +1 @@
++[[!map pages="* and !ikiwiki/*" show=title]]
 --- beignet-1.1.2.orig/docs/Beignet.mdwn
 +++ beignet-1.1.2/docs/Beignet.mdwn
 @@ -9,6 +9,19 @@ the programs and run them on the GPU. Th
@@ -47,7 +51,7 @@ index 583e5d2..e0de7bf 100644
 + * Ivy Bridge (ix-3xxx) and later Intel Core processors
 + * Bay Trail and later Intel Atom processors with Intel HD (not PowerVR) graphics
 +
-+As these GPUs are not necessarily backwards compatible, Beignet will not attempt to use processors it does not recognise.  Hence, processors introduced after this release of Beignet (even within the Skylake family) may require a newer version of beignet-opencl-icd (and possibly the kernel, linux-image-amd64 or -i386): for Debian stable, this [may be available](https://packages.debian.org/search?keywords=beignet-opencl-icd&searchon=names&exact=1&suite=all&section=all) in [-backports](htt [...]
++As these GPUs are not necessarily backwards compatible, Beignet will not attempt to use processors it does not recognise.  Hence, processors introduced after this release of Beignet (even within the Skylake family) may require a newer version of beignet-opencl-icd (and possibly the kernel, linux-image-amd64 or linux-image-i686-pae): for Debian stable, this [may be available](https://packages.debian.org/search?keywords=beignet-opencl-icd&searchon=names&exact=1&suite=all&section=all) in [ [...]
 +
 +Not all processor models have an integrated GPU, and systems that also have a discrete GPU may disable the integrated GPU: check _xrandr --listproviders_ or see [here](https://nouveau.freedesktop.org/wiki/Optimus/).
 +
@@ -109,11 +113,11 @@ index 583e5d2..e0de7bf 100644
 +  `sudo apt-get install -t jessie-backports linux-image-amd64`
    
 -  If you do not need \_\_local, you can override the self-test with
-+  (or -i386).  If you do not need \_\_local, you can override the self-test with
++  (or -i686-pae).  If you do not need \_\_local, you can override the self-test with
    
    `export OCL_IGNORE_SELF_TEST=1`
    
-@@ -208,17 +215,6 @@ Known Issues
+@@ -208,16 +215,10 @@ Known Issues
    extension. This feature used to work with a previous mesa git version. But now, it's
    simply broken.
  
@@ -127,11 +131,14 @@ index 583e5d2..e0de7bf 100644
 -  store/load pointers to/from memory. As we know, this feature has been used in Luxmark
 -  3.0 and maybe the latest BOINC. Beignet could support them currently. We plan to fix
 -  it in next major release 1.1.0.
--
++* clCreateBuffer with CL_MEM_ALLOC_HOST_PTR doesn't work.
++  
++  This feature is unreliable on older versions of Linux, including jessie's 3.16.
++  Upgrading to Linux 3.18+ (e.g. from jessie-backports) should fix this problem.
+ 
  TODO
  ----
- 
-@@ -295,9 +292,9 @@ The official mail list is as below:
+@@ -296,9 +297,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)  
diff --git a/debian/rules b/debian/rules
index cad9332..4679137 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,5 +24,10 @@ override_dh_auto_configure:
 	ls -la include/CL
 	dh_auto_configure --buildsystem cmake -- -DLLVM_INSTALL_DIR=/usr/lib/llvm-$(LLVM_VERSION)/bin
 
+override_dh_auto_build:
+	dh_auto_build
+	ikiwiki --verbose --no-usedirs --underlaydir docs --plugin map --rebuild docs docs_build
+	rm -rf docs_build/ikiwiki
+
 override_dh_gencontrol:
 	dh_gencontrol -- -VBuilt-Using:clang="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), \n' -W libclang-$(LLVM_VERSION)-dev)"

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