diff --git a/mingw-w64-chipmunk/001-build-fix.patch b/mingw-w64-chipmunk/001-build-fix.patch new file mode 100644 index 0000000000..90cc51352b --- /dev/null +++ b/mingw-w64-chipmunk/001-build-fix.patch @@ -0,0 +1,12 @@ +--- Chipmunk-7.0.0/src/cpHastySpace.c.orig 2015-01-18 21:26:39.565400000 +0300 ++++ Chipmunk-7.0.0/src/cpHastySpace.c 2015-01-18 21:26:51.561800000 +0300 +@@ -6,7 +6,9 @@ + + #include + //#include ++#ifndef _WIN32 + #include ++#endif + + #include "chipmunk/chipmunk_private.h" + #include "chipmunk/cpHastySpace.h" diff --git a/mingw-w64-chipmunk/PKGBUILD b/mingw-w64-chipmunk/PKGBUILD index c00ecf8b4c..2f4d44fb13 100644 --- a/mingw-w64-chipmunk/PKGBUILD +++ b/mingw-w64-chipmunk/PKGBUILD @@ -1,24 +1,23 @@ # Maintainer: Martell Malone _realname=chipmunk - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=6.2.1 +pkgver=7.0.0 pkgrel=1 pkgdesc="A high-performance 2D rigid body physics library (mingw-w64)" arch=('any') url="http://chipmunk-physics.net/" license=('MIT') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake") -source=(http://files.slembcke.net/chipmunk/release/Chipmunk-6.x/Chipmunk-${pkgver}.tgz - fix-install-locations.patch) -md5sums=('1cc6ff6a1f1cfcc6e167841fb24bf3c6' - 'ae50c9ed773b2858435ca7c6dbb8d524') +source=(http://files.slembcke.net/chipmunk/release/Chipmunk-7.x/Chipmunk-${pkgver}.tgz + 001-build-fix.patch) +md5sums=('87c2c3836036d172b55246854d270e67' + '457ee3f8fb9a4779d8f7eaaab7eb2697') options=(staticlibs !buildflags !strip) prepare() { cd ${srcdir}/Chipmunk-$pkgver - patch -p1 -i ${srcdir}/fix-install-locations.patch + patch -p1 -i ${srcdir}/001-build-fix.patch } build() { @@ -28,11 +27,11 @@ build() { #unset LDFLAGS CFLAGS CXXFLAGS ${MINGW_PREFIX}/bin/cmake -G"MSYS Makefiles" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX="${pkgdir}${MINGW_PREFIX}" \ - -DBUILD_DEMOS=OFF \ - -DBUILD_SHARED=ON \ - -DINSTALL_STATIC=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="${pkgdir}${MINGW_PREFIX}" \ + -DBUILD_DEMOS=OFF \ + -DBUILD_SHARED=ON \ + -DINSTALL_STATIC=ON \ ../Chipmunk-$pkgver make } diff --git a/mingw-w64-chipmunk/fix-install-locations.patch b/mingw-w64-chipmunk/fix-install-locations.patch deleted file mode 100644 index 517ebf7832..0000000000 --- a/mingw-w64-chipmunk/fix-install-locations.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Chipmunk-6.2.1/src/CMakeLists.txt.orig 2014-06-30 13:03:21.036600000 +0400 -+++ Chipmunk-6.2.1/src/CMakeLists.txt 2014-06-30 13:03:27.276600000 +0400 -@@ -22,7 +22,7 @@ - # need to explicitly link to the math library because the CMake/Android toolchains may not do it automatically - target_link_libraries(chipmunk m) - endif(ANDROID) -- install(TARGETS chipmunk RUNTIME DESTINATION lib LIBRARY DESTINATION lib) -+ install(TARGETS chipmunk RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - endif(BUILD_SHARED) - - if(BUILD_STATIC)