diff --git a/mingw-w64-partio/002-fix-64bit-cast-error.patch b/mingw-w64-partio/002-fix-64bit-cast-error.patch new file mode 100644 index 0000000000..80a21ab351 --- /dev/null +++ b/mingw-w64-partio/002-fix-64bit-cast-error.patch @@ -0,0 +1,13 @@ +diff --git a/src/py/partio.i b/src/py/partio.i +index 8f7a0b2..a2d2b1f 100644 +--- a/src/py/partio.i ++++ b/src/py/partio.i +@@ -465,7 +465,7 @@ public: + + %feature("autodoc"); + %feature("docstring","Workaround to get the address to the ptr to help with interop python binding"); +- unsigned long ptr() const { return (unsigned long)(void*)self; } ++ unsigned long long ptr() const { return (unsigned long long)(void*)self; } + } + + %extend ParticlesInfo { diff --git a/mingw-w64-partio/010-threads.patch b/mingw-w64-partio/010-threads.patch index 345c7a31cd..3c9ba88b3e 100644 --- a/mingw-w64-partio/010-threads.patch +++ b/mingw-w64-partio/010-threads.patch @@ -1,14 +1,3 @@ - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -91,6 +91,7 @@ include(GNUInstallDirs) - set(OpenGL_GL_PREFERENCE GLVND) - - ## Search for useful libraries -+find_package(Threads REQUIRED) - find_package(GLUT REQUIRED) - find_package(OpenGL REQUIRED) - find_package(ZLIB) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index ce7828b..15c8929 100644 --- a/src/lib/CMakeLists.txt diff --git a/mingw-w64-partio/PKGBUILD b/mingw-w64-partio/PKGBUILD index 5bce82b429..178e57249a 100644 --- a/mingw-w64-partio/PKGBUILD +++ b/mingw-w64-partio/PKGBUILD @@ -3,8 +3,8 @@ _realname=partio pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.10.1 -pkgrel=4 +pkgver=1.14.6 +pkgrel=1 pkgdesc="A library for particle IO and manipulation (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -14,24 +14,27 @@ depends=("${MINGW_PACKAGE_PREFIX}-freeglut" "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-doxygen" - "${MINGW_PACKAGE_PREFIX}-python3" + "${MINGW_PACKAGE_PREFIX}-graphviz" + "${MINGW_PACKAGE_PREFIX}-python" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-swig") optdepends=("${MINGW_PACKAGE_PREFIX}-python3: Python module for partio") options=('staticlibs' '!emptydirs' 'strip' '!debug') source=(${_realname}-${pkgver}.tar.gz::https://github.com/wdas/partio/archive/v${pkgver}.tar.gz 001-install-layout.patch - 010-threads.patch) -sha256sums=('49f0d61bcca4ac3900dc68fdf11fa325cec6fab6cedde37c5a2ce365b1b46112' + 010-threads.patch + 002-fix-64bit-cast-error.patch) +sha256sums=('53a5754d6b2fc3e184953d985c233118ef0ab87169f34e3aec4a7e6d20cd9bd4' '02bbebb3dc97501eb2634759915304511e2ffef60882f23103c9644d6f69b940' - '0cbccff3c54412feef3a633fa31fc606b802608dd8c4a7cf1f71652e467888de') + '785341c71d4dba51f19e4b2ba6969ec7af1e5a772c16073c3336dbc0038717d5' + 'c4033175267fff9c7b7a540da800597288f460ad61ec6463fcc085a123eda031') prepare() { cd ${srcdir}/${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-install-layout.patch patch -p1 -i ${srcdir}/010-threads.patch + patch -p1 -i ${srcdir}/002-fix-64bit-cast-error.patch } build() { @@ -42,13 +45,14 @@ build() { extra_config+=("-DCMAKE_BUILD_TYPE=Debug") fi - [[ -d build-${MINGW_CHOST} ]] && rm -r build-${MINGW_CHOST} - mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST} + [[ -d build-${MSYSTEM} ]] && rm -r build-${MSYSTEM} + mkdir build-${MSYSTEM} && cd build-${MSYSTEM} MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -G"Ninja" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DPARTIO_BUILD_SHARED_LIBS=ON \ ${extra_config} \ ../${_realname}-${pkgver} @@ -56,8 +60,8 @@ build() { } package() { - cd ${srcdir}/build-${MINGW_CHOST} + cd ${srcdir}/build-${MSYSTEM} - DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install + DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake.exe --install ./ install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" }