From 13ebfa819972d68e01b55df2b3e777ec0a9ecb1c Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 30 Mar 2020 08:55:16 +0300 Subject: [PATCH] opencl-headers: Update to latest from git. Fix license --- mingw-w64-opencl-headers/LICENSE.txt | 20 -------------------- mingw-w64-opencl-headers/PKGBUILD | 22 ++++++++-------------- 2 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 mingw-w64-opencl-headers/LICENSE.txt diff --git a/mingw-w64-opencl-headers/LICENSE.txt b/mingw-w64-opencl-headers/LICENSE.txt deleted file mode 100644 index a89e4f5c07..0000000000 --- a/mingw-w64-opencl-headers/LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ - * Copyright (c) 2008-2010 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. diff --git a/mingw-w64-opencl-headers/PKGBUILD b/mingw-w64-opencl-headers/PKGBUILD index 1f9014e9c3..41c6ed094a 100644 --- a/mingw-w64-opencl-headers/PKGBUILD +++ b/mingw-w64-opencl-headers/PKGBUILD @@ -3,25 +3,19 @@ _realname=opencl-headers pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -pkgver=2.2.20191024 +pkgver=2.2.20200327 pkgrel=1 epoch=2 pkgdesc='OpenCL (Open Computing Language) header files' arch=('any') url='https://www.khronos.org/registry/cl/' -license=('custom') +license=('Apache 2.0') makedepends=(git - "${MINGW_PACKAGE_PREFIX}-python3") -source=('git+https://github.com/KhronosGroup/OpenCL-Headers.git#commit=0d5f18c' - 'git+https://github.com/KhronosGroup/OpenCL-CLHPP.git#commit=a9dc80a' - 'LICENSE.txt') + "${MINGW_PACKAGE_PREFIX}-python") +source=('git+https://github.com/KhronosGroup/OpenCL-Headers.git#commit=35deb75' + 'git+https://github.com/KhronosGroup/OpenCL-CLHPP.git#commit=3871748') sha256sums=('SKIP' - 'SKIP' - 'd1059405dce021e0c0a7f7e01b48447e641477e0c14a9bc29983f4202b67c410') - -prepare() { - cd "${srcdir}"/OpenCL-CLHPP -} + 'SKIP') package() { cd "${srcdir}"/OpenCL-Headers/CL @@ -37,9 +31,9 @@ package() { install -m 644 ${h} "${pkgdir}${MINGW_PREFIX}/include/CL/" done - #python3 gen_cl_hpp.py -i input_cl.hpp -o cl.hpp + #python gen_cl_hpp.py -i input_cl.hpp -o cl.hpp #install -m 644 cl.hpp "${pkgdir}${MINGW_PREFIX}/include/CL/" #install -m 644 input_cl2.hpp "${pkgdir}${MINGW_PREFIX}/include/CL/cl2.hpp" - install -D -m644 ${srcdir}/LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + install -D -m644 "${srcdir}"/OpenCL-Headers/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" }