This is my proposed freeze-policy-compliant 0.8+dfsg-1 for jessie (0.9.3 would go to jessie-backports). Please do not upload right now as it hasn't been tested yet.

It may still happen that we decide to drop beignet from jessie and just have 0.9.3 in -backports, but I'd rather not be rushed into choosing.

Non-DFSG files deleted:

kernels/lenna128x128.bmp kernels/compiler_box_blur_float_ref.bmp kernels/compiler_box_blur_ref.bmp kernels/compiler_chocolux.cl kernels/compiler_chocolux_ref.bmp kernels/compiler_clod.cl kernels/compiler_clod_function_call.cl kernels/compiler_clod_ref.bmp kernels/compiler_julia.cl kernels/compiler_julia_function_call.cl kernels/compiler_julia_no_break.cl kernels/compiler_julia_no_break_ref.bmp kernels/compiler_julia_ref.bmp kernels/compiler_menger_sponge.cl kernels/compiler_menger_sponge_no_shadow.cl kernels/compiler_menger_sponge_no_shadow_ref.bmp kernels/compiler_menger_sponge_ref.bmp kernels/compiler_nautilus.cl kernels/compiler_nautilus_ref.bmp kernels/compiler_ribbon.cl kernels/compiler_ribbon_ref.bmp

Debian directory diff:

diff -Nru beignet-0.8/debian/changelog beignet-0.8+dfsg/debian/changelog
--- beignet-0.8/debian/changelog        2014-09-12 17:11:43.000000000 +0100
+++ beignet-0.8+dfsg/debian/changelog   2014-11-01 14:08:08.000000000 +0000
@@ -1,3 +1,13 @@
+beignet (0.8+dfsg-1) unstable; urgency=medium
+
+  * Change of maintainer.
+  * Remove non-DFSG tests. (Closes: #767387)
+  * Revert to LLVM/Clang 3.4, update versioned-llvm-tools.patch.
+    (Closes: #764930)
+  * State in the description what hardware this supports.
+
+ -- Rebecca N. Palmer <rebecca_pal...@zoho.com> Sat, 01 Nov 2014 14:01:26 +0000
+
 beignet (0.8-1.1) unstable; urgency=medium

   * Non-maintainer upload.
diff -Nru beignet-0.8/debian/control beignet-0.8+dfsg/debian/control
--- beignet-0.8/debian/control  2014-09-11 16:43:33.000000000 +0100
+++ beignet-0.8+dfsg/debian/control     2014-11-01 14:01:06.000000000 +0000
@@ -1,12 +1,16 @@
 Source: beignet
 Priority: extra
-Maintainer: Simon Richter <s...@debian.org>
+Maintainer: Debian OpenCL Maintainers <pkg-opencl-de...@lists.alioth.debian.org>
+Uploaders:
+ Simon Richter <s...@debian.org>,
+ Rebecca N. Palmer <rebecca_pal...@zoho.com>,
+ Andreas Beckmann <a...@debian.org>,
 Build-Depends: debhelper (>= 9), cmake, pkg-config, python-minimal,
  ocl-icd-dev, ocl-icd-opencl-dev,
  libdrm-dev, libxfixes-dev, libxext-dev,
- llvm-dev (>= 1:3.4),
- clang (>= 1:3.4),
- libclang-dev (>= 1:3.4),
+ llvm-3.4-dev,
+ clang-3.4,
+ libclang-3.4-dev,
  libgl1-mesa-dev (>= 9) [!kfreebsd-any],
  libegl1-mesa-dev (>= 9) [!kfreebsd-any],
  libgbm-dev (>= 9) [!kfreebsd-any],
@@ -34,9 +38,13 @@
 Conflicts: beignet0.0.1
 Replaces: beignet0.0.1
 Provides: opencl-icd
-Description: Intel OpenCL library
+Description: OpenCL library for Intel Ivy Bridge GPUs
  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.
+ .
+ This version of the package supports only Ivy Bridge GPUs
+ (HD Graphics 2500/4000, Core ix-3xxx); versions supporting new hardware
+ will be made available in -backports.
diff -Nru beignet-0.8/debian/patches/versioned-llvm-tools beignet-0.8+dfsg/debian/patches/versioned-llvm-tools --- beignet-0.8/debian/patches/versioned-llvm-tools 2014-04-19 18:54:55.000000000 +0100 +++ beignet-0.8+dfsg/debian/patches/versioned-llvm-tools 2014-11-01 13:28:17.000000000 +0000
@@ -1,9 +1,20 @@
 Description: Use versioned LLVM tools
-Author: Simon Richter <s...@debian.org>
-Last-Update: 2014-04-19
+Author: Simon Richter <s...@debian.org>, Rebecca N. Palmer <rebecca_pal...@zoho.com>
+Bug-Debian: https://bugs.debian.org/759933,https://bugs.debian.org/764930

 --- beignet-0.8.orig/backend/src/CMakeLists.txt
 +++ beignet-0.8/backend/src/CMakeLists.txt
+@@ -58,8 +58,8 @@ set (clang_cmd ${clang_cmd} -fno-builtin
+ add_custom_command(
+      OUTPUT ${pch_object}
+      COMMAND rm -f ${pch_object}
+- COMMAND clang ${clang_cmd} --relocatable-pch -emit-pch -isysroot ${CMAKE_CURRENT_BINARY_DIR} ${ocl_blob_file} -o ${pch_object} +- COMMAND clang ${clang_cmd} -emit-pch ${ocl_blob_file} -o ${local_pch_object} ++ COMMAND clang-3.4 ${clang_cmd} --relocatable-pch -emit-pch -isysroot ${CMAKE_CURRENT_BINARY_DIR} ${ocl_blob_file} -o ${pch_object} ++ COMMAND clang-3.4 ${clang_cmd} -emit-pch ${ocl_blob_file} -o ${local_pch_object}
+      DEPENDS ${ocl_blob_file}
+      )
+
 @@ -71,14 +71,14 @@ macro(ll_add_library ll_lib ll_sources)
    add_custom_command(
         OUTPUT  ${ll}.bc


--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to