diff -Nru arrayfire-3.3.2+dfsg1/debian/changelog arrayfire-3.3.2+dfsg1/debian/changelog --- arrayfire-3.3.2+dfsg1/debian/changelog 2016-08-07 16:52:53.000000000 +0000 +++ arrayfire-3.3.2+dfsg1/debian/changelog 2016-08-22 10:19:22.000000000 +0000 @@ -1,3 +1,18 @@ +arrayfire (3.3.2+dfsg1-4ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Ignore autopkg test results, some random tests fail; not addressed upstream. + + -- Gianfranco Costamagna Mon, 22 Aug 2016 12:19:05 +0200 + +arrayfire (3.3.2+dfsg1-4) unstable; urgency=medium + + * Build with compute library from Boost 1.61. + * d/rules: disable build of examples. + * d/rules: remove superfluous nocheck guards. + + -- Ghislain Antony Vaillant Fri, 12 Aug 2016 13:05:13 +0100 + arrayfire (3.3.2+dfsg1-3ubuntu1) yakkety; urgency=medium * Ignore autopkg test results, some random tests fail; not addressed upstream. diff -Nru arrayfire-3.3.2+dfsg1/debian/control arrayfire-3.3.2+dfsg1/debian/control --- arrayfire-3.3.2+dfsg1/debian/control 2016-08-03 11:38:15.000000000 +0000 +++ arrayfire-3.3.2+dfsg1/debian/control 2016-08-16 17:14:02.000000000 +0000 @@ -6,11 +6,10 @@ Priority: optional Build-Depends: cmake, debhelper (>= 9), - libboost-dev, + libboost-dev (>= 1.61), libblas-dev | libblas.so, libclblas-dev, libclfft-dev, - libcompute-dev, libfftw3-dev, libfreeimage-dev, libgtest-dev, diff -Nru arrayfire-3.3.2+dfsg1/debian/patches/series arrayfire-3.3.2+dfsg1/debian/patches/series --- arrayfire-3.3.2+dfsg1/debian/patches/series 2016-08-03 11:38:15.000000000 +0000 +++ arrayfire-3.3.2+dfsg1/debian/patches/series 2016-08-16 17:14:03.000000000 +0000 @@ -4,3 +4,4 @@ Disable-git-usage-in-Doxygen-settings.patch Fix-LAPACKE-detection.patch Enable-support-for-GNU-Hurd.patch +Use-compute-library-from-Boost-1.61.patch diff -Nru arrayfire-3.3.2+dfsg1/debian/patches/Use-compute-library-from-Boost-1.61.patch arrayfire-3.3.2+dfsg1/debian/patches/Use-compute-library-from-Boost-1.61.patch --- arrayfire-3.3.2+dfsg1/debian/patches/Use-compute-library-from-Boost-1.61.patch 1970-01-01 00:00:00.000000000 +0000 +++ arrayfire-3.3.2+dfsg1/debian/patches/Use-compute-library-from-Boost-1.61.patch 2016-08-12 12:05:13.000000000 +0000 @@ -0,0 +1,31 @@ +From: Ghislain Antony Vaillant +Date: Fri, 12 Aug 2016 08:35:19 +0100 +Subject: Use compute library from Boost 1.61. + +--- + src/backend/opencl/CMakeLists.txt | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt +index ded53bf..d7e3628 100644 +--- a/src/backend/opencl/CMakeLists.txt ++++ b/src/backend/opencl/CMakeLists.txt +@@ -84,11 +84,13 @@ ADD_DEFINITIONS( -DBOOST_ALL_NO_LIB ) + SET(Boost_USE_STATIC_LIBS OFF) + FIND_PACKAGE(Boost 1.48 REQUIRED) + +-OPTION(USE_SYSTEM_BOOST_COMPUTE "Use system BoostCompute" OFF) +-IF(USE_SYSTEM_BOOST_COMPUTE) +- FIND_PACKAGE(BoostCompute REQUIRED) +-ELSE() +- INCLUDE("${CMAKE_MODULE_PATH}/build_boost_compute.cmake") ++IF(Boost_VERSION VERSION_LESS "1.61") ++ OPTION(USE_SYSTEM_BOOST_COMPUTE "Use system BoostCompute" OFF) ++ IF(USE_SYSTEM_BOOST_COMPUTE) ++ FIND_PACKAGE(BoostCompute REQUIRED) ++ ELSE() ++ INCLUDE("${CMAKE_MODULE_PATH}/build_boost_compute.cmake") ++ ENDIF() + ENDIF() + + SET( cl_kernel_headers diff -Nru arrayfire-3.3.2+dfsg1/debian/rules arrayfire-3.3.2+dfsg1/debian/rules --- arrayfire-3.3.2+dfsg1/debian/rules 2016-08-03 11:38:15.000000000 +0000 +++ arrayfire-3.3.2+dfsg1/debian/rules 2016-08-16 17:14:02.000000000 +0000 @@ -28,20 +28,19 @@ -DBUILD_CPU=ON \ -DBUILD_CPU_ASYNC=OFF \ -DBUILD_CUDA=OFF \ + -DBUILD_EXAMPLES=OFF \ -DBUILD_GRAPHICS=OFF \ -DBUILD_NONFREE=OFF \ -DBUILD_OPENCL=ON \ -DBUILD_UNIFIED=ON \ - -DUSE_SYSTEM_BOOST_COMPUTE=ON \ -DUSE_SYSTEM_CLBLAS=ON \ -DUSE_SYSTEM_CLFFT=ON \ -DWITH_COVERAGE=OFF -# Disable build of examples and testsuite if no check requested. ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) -BUILD_OPTIONS += -DBUILD_EXAMPLES=ON -DBUILD_TEST=ON +BUILD_OPTIONS += -DBUILD_TEST=ON else -BUILD_OPTIONS += -DBUILD_EXAMPLES=OFF -DBUILD_TEST=OFF +BUILD_OPTIONS += -DBUILD_TEST=OFF endif %: @@ -60,11 +59,9 @@ # NOTE: The imageio testcase fails on some architectures. It has been # temporarily disabled whilst upstream is working on a fix. override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) dh_auto_test -- ARGS+="-R cpu -E 'large|dense|imageio'" LD_LIBRARY_PATH=$(shell find $(CURDIR) -type f -name "libafcpu.so*" -exec dirname {} \;) \ dh_auto_test -- ARGS+="-R unified" -endif override_dh_install-indep: dh_install --indep -X LICENSE