diff --git a/mingw-w64-glfw/PKGBUILD b/mingw-w64-glfw/PKGBUILD index 949e8f1a4e..ec54216a0b 100644 --- a/mingw-w64-glfw/PKGBUILD +++ b/mingw-w64-glfw/PKGBUILD @@ -2,20 +2,18 @@ _realname=glfw pkgbase=mingw-w64-${_realname} -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=3.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="A free, open source, portable framework for OpenGL application development (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') -url="https://www.glfw.org/" -license=('custom:ZLIB') -depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +url='https://www.glfw.org/' +license=('spdx:Zlib') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-vulkan-headers") -options=('strip' '!debug' 'staticlibs') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/glfw/glfw/archive/${pkgver}.tar.gz" 001-3.2-cmake-suffix.patch) sha256sums=('ed07b90e334dcd39903e6288d90fa1ae0cf2d2119fec516cf743a0a404527c02' @@ -35,8 +33,8 @@ build() { fi # Build shared libs - [[ -d "${srcdir}/shared-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/shared-${MINGW_CHOST}" - mkdir -p "${srcdir}/shared-${MINGW_CHOST}" && cd "${srcdir}/shared-${MINGW_CHOST}" + [[ -d "${srcdir}/shared-${MSYSTEM}" ]] && rm -rf "${srcdir}/shared-${MSYSTEM}" + mkdir -p "${srcdir}/shared-${MSYSTEM}" && cd "${srcdir}/shared-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ @@ -51,8 +49,8 @@ build() { ${MINGW_PREFIX}/bin/cmake.exe --build ./ # Build static libs - [[ -d "${srcdir}/static-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/static-${MINGW_CHOST}" - mkdir -p "${srcdir}/static-${MINGW_CHOST}" && cd "${srcdir}/static-${MINGW_CHOST}" + [[ -d "${srcdir}/static-${MSYSTEM}" ]] && rm -rf "${srcdir}/static-${MSYSTEM}" + mkdir -p "${srcdir}/static-${MSYSTEM}" && cd "${srcdir}/static-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ @@ -68,12 +66,12 @@ build() { } package() { - cd "${srcdir}/static-${MINGW_CHOST}" - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install + cd "${srcdir}/static-${MSYSTEM}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./ - cd "${srcdir}/shared-${MINGW_CHOST}" - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install + cd "${srcdir}/shared-${MSYSTEM}" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./ # License - install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.md" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE.md" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/mingw-w64-glslang/PKGBUILD b/mingw-w64-glslang/PKGBUILD index df6e3b9128..d9b108ab70 100644 --- a/mingw-w64-glslang/PKGBUILD +++ b/mingw-w64-glslang/PKGBUILD @@ -8,7 +8,7 @@ pkgver=11.8.0 pkgrel=1 pkgdesc='An OpenGL and OpenGL ES shader front end and validator (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url='https://github.com/KhronosGroup/glslang' license=('BSD') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" diff --git a/mingw-w64-libplacebo/PKGBUILD b/mingw-w64-libplacebo/PKGBUILD index 53d59ab533..b4a88c0d03 100644 --- a/mingw-w64-libplacebo/PKGBUILD +++ b/mingw-w64-libplacebo/PKGBUILD @@ -7,7 +7,7 @@ pkgver=4.192.1 pkgrel=1 pkgdesc="Reusable library for GPU-accelerated video/image rendering primitives (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://code.videolan.org/videolan/libplacebo" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-glslang" diff --git a/mingw-w64-libwebp/PKGBUILD b/mingw-w64-libwebp/PKGBUILD index 0b01feff69..94cf0062b8 100644 --- a/mingw-w64-libwebp/PKGBUILD +++ b/mingw-w64-libwebp/PKGBUILD @@ -3,14 +3,14 @@ _realname=libwebp pkgbase=mingw-w64-${_realname} -pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.2.2 -pkgrel=1 -pkgdesc="the WebP library. Includes conversion tools (mingw-w64)" +pkgrel=2 +pkgdesc="A library to encode and decode images in WebP format (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') -url="https://developers.google.com/speed/webp/" -license=('BSD') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +url='https://developers.google.com/speed/webp/' +license=('spdx:BSD-3-Clause') depends=("${MINGW_PACKAGE_PREFIX}-giflib" "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" "${MINGW_PACKAGE_PREFIX}-libpng" @@ -23,18 +23,19 @@ sha256sums=('51e9297aadb7d9eb99129fe0050f53a11fcce38a0848fb2b0389e385ad93695e') validpgpkeys=('6B0E6B70976DE303EDF2F601F9C3D6BDB8232B5D') prepare() { - cd ${srcdir}/${_realname}-${pkgver} + cd "${srcdir}/${_realname}-${pkgver}" + ./autogen.sh } build() { - [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} - mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + cd "${srcdir}/${_realname}-${pkgver}" + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" ../${_realname}-${pkgver}/configure \ + --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ - --prefix=${MINGW_PREFIX} \ --enable-static \ --enable-swap-16bit-csp \ --enable-libwebpmux \ @@ -47,6 +48,9 @@ build() { } package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MSYSTEM}" + make install DESTDIR="${pkgdir}" + + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } diff --git a/mingw-w64-python-nose/PKGBUILD b/mingw-w64-python-nose/PKGBUILD index 1d74eb7fdf..2f9b89294a 100644 --- a/mingw-w64-python-nose/PKGBUILD +++ b/mingw-w64-python-nose/PKGBUILD @@ -8,38 +8,41 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.3.7 -pkgrel=3 +pkgrel=4 pkgdesc="A discovery-based unittest extension (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') -license=('LGPL-2.1') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +license=('spdx:LGPL-2.1') url="https://nose.readthedocs.io/" depends=("${MINGW_PACKAGE_PREFIX}-python-setuptools") source=("https://pypi.python.org/packages/source/n/nose/nose-${pkgver}.tar.gz") sha256sums=('f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98') prepare() { - cd ${srcdir} - rm -rf python-build-${CARCH} | true - cp -r "${_realname}-${pkgver}" "python-build-${CARCH}" + cd "${srcdir}/${_realname}-${pkgver}" + + sed -i -e "s:man/man1:share/man/man1:g" setup.py } build() { cd "${srcdir}" - msg "Python build for ${CARCH}" - cd "${srcdir}/python-build-${CARCH}" - sed -i -e "s:man/man1:share/man/man1:g" setup.py - ${MINGW_PREFIX}/bin/python setup.py build + cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}" && cd "python-build-${MSYSTEM}" + + ${MINGW_PREFIX}/bin/python setup.py build } package() { - local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX}) + cd "${srcdir}/python-build-${MSYSTEM}" - cd "${srcdir}/python-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 + ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ + --root="${pkgdir}" --optimize=1 --skip-build - for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do - sed -e '1 { s/^#!.*$// }' -i ${_f} + install -Dm644 lgpl.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE" + + # fixup shebangs + for _f in nosetests; do + sed -i "s|^#!.*$|#!/usr/bin/env python.exe|g" \ + "${pkgdir}${MINGW_PREFIX}"/bin/${_f} done } diff --git a/mingw-w64-shaderc/PKGBUILD b/mingw-w64-shaderc/PKGBUILD index 2a9c49bf99..17f4f454fb 100644 --- a/mingw-w64-shaderc/PKGBUILD +++ b/mingw-w64-shaderc/PKGBUILD @@ -8,7 +8,7 @@ pkgrel=1 pkgdesc="Collection of tools, libraries and tests for shader compilation (mingw-w64)" url="https://github.com/google/shaderc" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') license=('Apache') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-glslang" diff --git a/mingw-w64-spirv-cross/PKGBUILD b/mingw-w64-spirv-cross/PKGBUILD index 7f0bf7d2a8..64c867daae 100644 --- a/mingw-w64-spirv-cross/PKGBUILD +++ b/mingw-w64-spirv-cross/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2021.01.15 pkgrel=2 pkgdesc="A tool and library for parsing and converting SPIR-V to other shader languages (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url='https://github.com/KhronosGroup/SPIRV-Cross/' license=('Apache') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") @@ -30,8 +30,8 @@ prepare() { } build() { - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}" + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ @@ -46,12 +46,12 @@ build() { } check() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MSYSTEM}" ${MINGW_PREFIX}/bin/ctest.exe ./ || true } package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MSYSTEM}" DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install install -Dm644 "${srcdir}/SPIRV-Cross-${pkgver//./-}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" diff --git a/mingw-w64-vulkan-headers/PKGBUILD b/mingw-w64-vulkan-headers/PKGBUILD index 3a16291cc5..1c27da0e99 100644 --- a/mingw-w64-vulkan-headers/PKGBUILD +++ b/mingw-w64-vulkan-headers/PKGBUILD @@ -8,7 +8,7 @@ pkgver=1.3.207 pkgrel=1 pkgdesc='Vulkan header files (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://www.khronos.org/vulkan/" groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel") license=('Apache') diff --git a/mingw-w64-vulkan-loader/PKGBUILD b/mingw-w64-vulkan-loader/PKGBUILD index 72ddeb2b2d..817590a54a 100644 --- a/mingw-w64-vulkan-loader/PKGBUILD +++ b/mingw-w64-vulkan-loader/PKGBUILD @@ -10,7 +10,7 @@ pkgver=1.3.207 pkgrel=1 pkgdesc='Vulkan Installable Client Driver (ICD) Loader (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://www.khronos.org/vulkan/" groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel") license=('Apache') diff --git a/mingw-w64-vulkan-validation-layers/PKGBUILD b/mingw-w64-vulkan-validation-layers/PKGBUILD index aad27fa4fc..ca43a84952 100644 --- a/mingw-w64-vulkan-validation-layers/PKGBUILD +++ b/mingw-w64-vulkan-validation-layers/PKGBUILD @@ -8,7 +8,7 @@ pkgver=1.3.206 pkgrel=1 pkgdesc='Vulkan Validation Layers (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://www.khronos.org/vulkan/" groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel") license=('Apache')