diff --git a/mingw-w64-coin/PKGBUILD b/mingw-w64-coin/PKGBUILD index 104c77ddf6..3927758060 100644 --- a/mingw-w64-coin/PKGBUILD +++ b/mingw-w64-coin/PKGBUILD @@ -4,11 +4,14 @@ _realname=coin pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-docs") -pkgver=4.0.0.r12283.g5297f6c +pkgver=4.0.2 pkgrel=1 pkgdesc="A high-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1 (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +msys2_references=( + 'archlinux: coin' +) url="https://github.com/coin3d/coin" license=('spdx:BSD-3-Clause') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" @@ -16,8 +19,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-graphviz" - "${MINGW_PACKAGE_PREFIX}-doxygen" - 'git') + "${MINGW_PACKAGE_PREFIX}-doxygen") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-expat" "${MINGW_PACKAGE_PREFIX}-fontconfig" @@ -25,40 +27,34 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-bzip2" "${MINGW_PACKAGE_PREFIX}-zlib" "${MINGW_PACKAGE_PREFIX}-openal") -_commit='5297f6c34c1a2c436bd230914a695f06e152f4d6' -source=("${_realname}"::"git+https://github.com/coin3d/coin.git#commit=${_commit}") -sha256sums=('SKIP') - -pkgver() { - cd "${srcdir}/${_realname}" - printf "4.0.0.r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)" -} +source=("https://github.com/coin3d/coin/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz") +sha256sums=('fab19ccdb5f199dae5543036738076a957a3097589b473ef496696c24eeac3d2') build() { - [[ "${MSYSTEM}" == "MINGW32" ]] && { - # For more info see https://github.com/coin3d/coin/issues/440 - local _cmake_opts="-DCMAKE_CXX_FLAGS=-fno-ipa-icf" - } + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" + + declare -a _extra_config + if check_option "debug" "n"; then + _extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + _extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi + + export CXXFLAGS+=" -Wno-attributes" + export CFLAGS+=" -Wno-attributes" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -GNinja \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - -DCMAKE_BUILD_TYPE=Release \ + "${_extra_config[@]}" \ -DCOIN_BUILD_DOCUMENTATION=ON \ -DUSE_EXTERNAL_EXPAT=ON \ - -DFONTCONFIG_RUNTIME_LINKING=OFF \ - -DFREETYPE_RUNTIME_LINKING=OFF \ - -DLIBBZIP2_RUNTIME_LINKING=OFF \ - -DOPENAL_RUNTIME_LINKING=OFF \ - -DZLIB_RUNTIME_LINKING=OFF \ - -DGLU_RUNTIME_LINKING=OFF \ + -DCOIN_THREADSAFE=ON \ -DCOIN_EXTRA_CFLAGS=-DCOIN_DLL \ - ${_cmake_opts} \ - -S "${_realname}" \ - -B "build-${MSYSTEM}" + "../${_realname}-${pkgver}" - ${MINGW_PREFIX}/bin/cmake.exe --build "build-${MSYSTEM}" + ${MINGW_PREFIX}/bin/cmake.exe --build . } check() { @@ -68,7 +64,7 @@ check() { package_coin() { DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install "build-${MSYSTEM}" - install -Dm644 "${srcdir}/${_realname}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" # split docs mkdir -p dest${MINGW_PREFIX}/share diff --git a/mingw-w64-quarter/PKGBUILD b/mingw-w64-quarter/PKGBUILD index af4256701a..15a42d3b14 100644 --- a/mingw-w64-quarter/PKGBUILD +++ b/mingw-w64-quarter/PKGBUILD @@ -7,7 +7,7 @@ pkgver=1.1.0 pkgrel=3 pkgdesc="Coin GUI binding for Qt (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://github.com/coin3d/quarter" license=('BSD') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" diff --git a/mingw-w64-simvoleon/PKGBUILD b/mingw-w64-simvoleon/PKGBUILD index e12e0f70bd..3e58db46ff 100644 --- a/mingw-w64-simvoleon/PKGBUILD +++ b/mingw-w64-simvoleon/PKGBUILD @@ -7,7 +7,7 @@ pkgver=2.1.0 pkgrel=1 pkgdesc="A volume rendering library for Coin (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://github.com/coin3d/simvoleon" license=('custom:coin') makedepends=("${MINGW_PACKAGE_PREFIX}-cc"