Date: Mon, 23 Feb 2015 18:02:58 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379695 - in head/devel/ChipmunkPhysics: . files Message-ID: <201502231802.t1NI2wU3054327@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon Feb 23 18:02:58 2015 New Revision: 379695 URL: https://svnweb.freebsd.org/changeset/ports/379695 QAT: https://qat.redports.org/buildarchive/r379695/ Log: - Update to 7.0.0 [1] - Convert to option helpers Changes: https://github.com/slembcke/Chipmunk2D/blob/7133e4a/VERSION.txt PR: 197852 [1] Submitted by: Tim Cas <ports@stdrand.com> (maintainer) [1] Added: head/devel/ChipmunkPhysics/files/ head/devel/ChipmunkPhysics/files/patch-demo_CMakeLists.txt (contents, props changed) head/devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h (contents, props changed) head/devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c (contents, props changed) Modified: head/devel/ChipmunkPhysics/Makefile head/devel/ChipmunkPhysics/distinfo head/devel/ChipmunkPhysics/pkg-plist Modified: head/devel/ChipmunkPhysics/Makefile ============================================================================== --- head/devel/ChipmunkPhysics/Makefile Mon Feb 23 16:22:01 2015 (r379694) +++ head/devel/ChipmunkPhysics/Makefile Mon Feb 23 18:02:58 2015 (r379695) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= ChipmunkPhysics -PORTVERSION= 6.2.1 -PORTREVISION= 1 +PORTVERSION= 7.0.0 +#PORTREVISION= 0 CATEGORIES= devel -MASTER_SITES= http://chipmunk-physics.net/release/Chipmunk-6.x/ \ - http://files.slembcke.net/chipmunk/release/Chipmunk-6.x/ \ +MASTER_SITES= http://chipmunk-physics.net/release/Chipmunk-7.x/ \ + http://files.slembcke.net/chipmunk/release/Chipmunk-7.x/ \ http://files.libsiege.org/chipmunk/ DISTNAME= Chipmunk-${PORTVERSION} @@ -20,21 +20,17 @@ USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION} OPTIONS_DEFINE= DOCS EXAMPLES DEMOS -DEMOS_DESC= Install the demo program (requires GLFW and GLEW) +OPTIONS_SUB= yes PORTDOCS= * PORTEXAMPLES= *.c *.h -.include <bsd.port.options.mk> +DEMOS_DESC= Install the demo program (requires GLFW and GLEW) +DEMOS_USE= GL=glew +DEMOS_LIB_DEPENDS= libglfw.so:${PORTSDIR}/graphics/glfw2 +DEMOS_CMAKE_OFF= -DBUILD_DEMOS=OFF -.if ${PORT_OPTIONS:MDEMOS} -USE_GL= glew -LIB_DEPENDS+= libglfw.so:${PORTSDIR}/graphics/glfw2 -PLIST_SUB+= DEMOS="" -.else -CMAKE_ARGS= -DBUILD_DEMOS=OFF -PLIST_SUB+= DEMOS="@comment " -.endif +.include <bsd.port.options.mk> post-install: .if ${PORT_OPTIONS:MDOCS} @@ -45,11 +41,11 @@ post-install: .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/Demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "-name *\.c -or -name *\.h") + (cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "-name *\.c -or -name *\.h") .endif .if ${PORT_OPTIONS:MDEMOS} - ${INSTALL_PROGRAM} ${WRKSRC}/Demo/chipmunk_demos ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/demo/chipmunk_demos ${STAGEDIR}${PREFIX}/bin .endif .include <bsd.port.mk> Modified: head/devel/ChipmunkPhysics/distinfo ============================================================================== --- head/devel/ChipmunkPhysics/distinfo Mon Feb 23 16:22:01 2015 (r379694) +++ head/devel/ChipmunkPhysics/distinfo Mon Feb 23 18:02:58 2015 (r379695) @@ -1,2 +1,2 @@ -SHA256 (Chipmunk-6.2.1.tgz) = 83a47da80c506541c00e1919c0dc83e5f94d13f6534ae15ad663359c171bc7aa -SIZE (Chipmunk-6.2.1.tgz) = 1076190 +SHA256 (Chipmunk-7.0.0.tgz) = 14ab380396a96b15951c42a2d7ca259a53ecab4e550a71857d13dcfd388a51cd +SIZE (Chipmunk-7.0.0.tgz) = 1607961 Added: head/devel/ChipmunkPhysics/files/patch-demo_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ChipmunkPhysics/files/patch-demo_CMakeLists.txt Mon Feb 23 18:02:58 2015 (r379695) @@ -0,0 +1,13 @@ +--- demo/CMakeLists.txt.orig 2015-02-20 13:46:16 UTC ++++ demo/CMakeLists.txt +@@ -27,6 +27,10 @@ if(NOT MSVC) + list(APPEND chipmunk_demos_libraries m) + endif(NOT MSVC) + ++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ list(APPEND chipmunk_demos_libraries BlocksRuntime) ++endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ + file(GLOB chipmunk_demos_source_files "*.c") + + include_directories(${chipmunk_demos_include_dirs}) Added: head/devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ChipmunkPhysics/files/patch-include_chipmunk_chipmunk.h Mon Feb 23 18:02:58 2015 (r379695) @@ -0,0 +1,12 @@ +--- include/chipmunk/chipmunk.h.orig 2015-01-13 01:54:11 UTC ++++ include/chipmunk/chipmunk.h +@@ -32,6 +32,9 @@ + #ifdef WIN32 + // For alloca(). + #include <malloc.h> ++#elif defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) \ ++ /* already included in <stdlib.h> */ + #else + #include <alloca.h> + #endif Added: head/devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ChipmunkPhysics/files/patch-src_cpHastySpace.c Mon Feb 23 18:02:58 2015 (r379695) @@ -0,0 +1,41 @@ +--- src/cpHastySpace.c.orig 2015-01-13 01:54:11 UTC ++++ src/cpHastySpace.c +@@ -5,8 +5,11 @@ + #include <stdio.h> + + #include <pthread.h> +-//#include <sys/param.h > +-#include <sys/sysctl.h> ++#ifdef _WIN32 ++#include <windows.h> ++#else ++#include <unistd.h> ++#endif + + #include "chipmunk/chipmunk_private.h" + #include "chipmunk/cpHastySpace.h" +@@ -313,15 +316,18 @@ cpHastySpaceSetThreads(cpSpace *space, u + + cpHastySpace *hasty = (cpHastySpace *)space; + HaltThreads(hasty); +- +-#ifdef __APPLE__ ++ + if(threads == 0){ +- size_t size = sizeof(threads); +- sysctlbyname("hw.ncpu", &threads, &size, NULL, 0); +- } ++#if defined(_SC_NPROCESSORS_ONLN) ++ threads = sysconf(_SC_NPROCESSORS_ONLN); ++#elif defined(_WIN32) ++ SYSTEM_INFO siSysInfo; ++ GetSystemInfo(&siSysInfo); ++ threads = siSysInfo.dwNumberOfProcessors; + #else +- if(threads == 0) threads = 1; ++ threads = 1; + #endif ++ } + + hasty->num_threads = (threads < MAX_THREADS ? threads : MAX_THREADS); + hasty->num_working = hasty->num_threads - 1; Modified: head/devel/ChipmunkPhysics/pkg-plist ============================================================================== --- head/devel/ChipmunkPhysics/pkg-plist Mon Feb 23 16:22:01 2015 (r379694) +++ head/devel/ChipmunkPhysics/pkg-plist Mon Feb 23 18:02:58 2015 (r379695) @@ -1,27 +1,31 @@ %%DEMOS%%bin/chipmunk_demos +lib/libchipmunk.so.7 lib/libchipmunk.so.%%VERSION%% lib/libchipmunk.so lib/libchipmunk.a include/chipmunk/cpVect.h +include/chipmunk/cpTransform.h include/chipmunk/cpSpatialIndex.h include/chipmunk/cpSpace.h +include/chipmunk/cpSlideJoint.h +include/chipmunk/cpSimpleMotor.h include/chipmunk/cpShape.h +include/chipmunk/cpRotaryLimitJoint.h +include/chipmunk/cpRatchetJoint.h +include/chipmunk/cpPolyline.h include/chipmunk/cpPolyShape.h +include/chipmunk/cpPivotJoint.h +include/chipmunk/cpPinJoint.h +include/chipmunk/cpMarch.h +include/chipmunk/cpHastySpace.h +include/chipmunk/cpGrooveJoint.h +include/chipmunk/cpGearJoint.h +include/chipmunk/cpDampedSpring.h +include/chipmunk/cpDampedRotarySpring.h +include/chipmunk/cpConstraint.h include/chipmunk/cpBody.h include/chipmunk/cpBB.h include/chipmunk/cpArbiter.h -include/chipmunk/constraints/util.h -include/chipmunk/constraints/cpSlideJoint.h -include/chipmunk/constraints/cpSimpleMotor.h -include/chipmunk/constraints/cpRotaryLimitJoint.h -include/chipmunk/constraints/cpRatchetJoint.h -include/chipmunk/constraints/cpPivotJoint.h -include/chipmunk/constraints/cpPinJoint.h -include/chipmunk/constraints/cpGrooveJoint.h -include/chipmunk/constraints/cpGearJoint.h -include/chipmunk/constraints/cpDampedSpring.h -include/chipmunk/constraints/cpDampedRotarySpring.h -include/chipmunk/constraints/cpConstraint.h include/chipmunk/chipmunk_unsafe.h include/chipmunk/chipmunk_types.h include/chipmunk/chipmunk_private.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502231802.t1NI2wU3054327>