Attachment #160499 for bug #202758

View | Details | Raw Unified | Return to bug 202758
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ChipmunkPhysics	4	PORTNAME= ChipmunkPhysics
5	PORTVERSION= 7.0.0	5	PORTVERSION= 7.0.1
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://chipmunk-physics.net/release/Chipmunk-7.x/ \	7	MASTER_SITES= http://chipmunk-physics.net/release/Chipmunk-7.x/ \
9	http://files.slembcke.net/chipmunk/release/Chipmunk-7.x/ \	8	http://files.slembcke.net/chipmunk/release/Chipmunk-7.x/ \

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (Chipmunk-7.0.0.tgz) = 14ab380396a96b15951c42a2d7ca259a53ecab4e550a71857d13dcfd388a51cd	1	SHA256 (Chipmunk-7.0.1.tgz) = fe54b464777d89882a9f9d3d6deb17189af8bc5d63833b25bb1a7d16c3e69260
2	SIZE (Chipmunk-7.0.0.tgz) = 1607961	2	SIZE (Chipmunk-7.0.1.tgz) = 1609101

Lines 1-6 Link Here

(-)files/patch-demo_CMakeLists.txt (-2 / +2 lines)
1	--- demo/CMakeLists.txt.orig 2015-02-20 13:46:16 UTC	1	--- demo/CMakeLists.txt.orig 2015-08-29 18:52:41 UTC
2	+++ demo/CMakeLists.txt	2	+++ demo/CMakeLists.txt
3	@@ -27,6 +27,10 @@ if(NOT MSVC)	3	@@ -40,6 +40,10 @@ if(NOT MSVC)
4	list(APPEND chipmunk_demos_libraries m)	4	list(APPEND chipmunk_demos_libraries m)
5	endif(NOT MSVC)	5	endif(NOT MSVC)
6		6




--- include/chipmunk/chipmunk.h.orig	2015-08-29 18:44:21 UTC
+++ include/chipmunk/chipmunk.h
@@ -29,6 +29,10 @@
 #ifdef WIN32
 	// For alloca().
 	#include <malloc.h>
 	#define CP_EXPORT __declspec(dllexport)
+#elif defined(__DragonFly__) || defined(__FreeBSD__) \
+	|| defined(__NetBSD__) || defined(__OpenBSD__) \
+	// alloca() is already included in <stdlib.h>
+	#define CP_EXPORT
 #else
 	#include <alloca.h>
 	#define CP_EXPORT




--- src/cpHastySpace.c.orig	2015-07-02 16:24:47 UTC
+++ src/cpHastySpace.c
@@ -5,8 +5,11 @@
 #include <stdio.h>

 
 #include "chipmunk/chipmunk_private.h"
 #include "chipmunk/cpHastySpace.h"
@@ -314,14 +317,20 @@ cpHastySpaceSetThreads(cpSpace *space, u
 	
 	cpHastySpace *hasty = (cpHastySpace *)space;
 	HaltThreads(hasty);
 	
-#ifdef __APPLE__
+
 	if(threads == 0){
+#ifdef __APPLE__
 		size_t size = sizeof(threads);
 		sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);
-	}
+#elif defined(_SC_NPROCESSORS_ONLN)
+		threads = sysconf(_SC_NPROCESSORS_ONLN);
+#elif defined(_WIN32)
+		SYSTEM_INFO siSysInfo;

Lines 10-15 Link Here

(-)pkg-plist (+1 lines)
10	include/chipmunk/cpSlideJoint.h	10	include/chipmunk/cpSlideJoint.h
11	include/chipmunk/cpSimpleMotor.h	11	include/chipmunk/cpSimpleMotor.h
12	include/chipmunk/cpShape.h	12	include/chipmunk/cpShape.h
		13	include/chipmunk/cpRobust.h
13	include/chipmunk/cpRotaryLimitJoint.h	14	include/chipmunk/cpRotaryLimitJoint.h
14	include/chipmunk/cpRatchetJoint.h	15	include/chipmunk/cpRatchetJoint.h
15	include/chipmunk/cpPolyline.h	16	include/chipmunk/cpPolyline.h

Return to bug 202758

Lines 1-12 Link Here

(-)files/patch-include_chipmunk_chipmunk.h (-6 / +7 lines)
1	--- include/chipmunk/chipmunk.h.orig 2015-01-13 01:54:11 UTC	1	--- include/chipmunk/chipmunk.h.orig 2015-08-29 18:44:21 UTC
2	+++ include/chipmunk/chipmunk.h	2	+++ include/chipmunk/chipmunk.h
3	@@ -32,6 +32,9 @@	3	@@ -29,6 +29,10 @@
4	#ifdef WIN32
5	// For alloca().	4	// For alloca().
6	#include <malloc.h>	5	#include <malloc.h>
		6	#define CP_EXPORT __declspec(dllexport)
7	+#elif defined(__DragonFly__) \|\| defined(__FreeBSD__) \	7	+#elif defined(__DragonFly__) \|\| defined(__FreeBSD__) \
8	+ \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__) \	8	+ \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__) \
9	+ /* already included in <stdlib.h> */	9	+ // alloca() is already included in <stdlib.h>
		10	+ #define CP_EXPORT
10	#else	11	#else
11	#include <alloca.h>	12	#include <alloca.h>
12	#endif	13	#define CP_EXPORT

Lines 1-4 Link Here

(-)files/patch-src_cpHastySpace.c (-8 / +7 lines)
1	--- src/cpHastySpace.c.orig 2015-01-13 01:54:11 UTC	1	--- src/cpHastySpace.c.orig 2015-07-02 16:24:47 UTC
2	+++ src/cpHastySpace.c	2	+++ src/cpHastySpace.c
3	@@ -5,8 +5,11 @@	3	@@ -5,8 +5,11 @@
4	#include <stdio.h>	4	#include <stdio.h>
Lines 14-31 Link Here
14		14
15	#include "chipmunk/chipmunk_private.h"	15	#include "chipmunk/chipmunk_private.h"
16	#include "chipmunk/cpHastySpace.h"	16	#include "chipmunk/cpHastySpace.h"
17	@@ -313,15 +316,18 @@ cpHastySpaceSetThreads(cpSpace *space, u	17	@@ -314,14 +317,20 @@ cpHastySpaceSetThreads(cpSpace *space, u
18
19	cpHastySpace hasty = (cpHastySpace )space;	18	cpHastySpace hasty = (cpHastySpace )space;
20	HaltThreads(hasty);	19	HaltThreads(hasty);
21	-	20
22	-#ifdef __APPLE__	21	-#ifdef __APPLE__
23	+
24	if(threads == 0){	22	if(threads == 0){
25	- size_t size = sizeof(threads);	23	+#ifdef __APPLE__
26	- sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);	24	size_t size = sizeof(threads);
		25	sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);
27	- }	26	- }
28	+#if defined(_SC_NPROCESSORS_ONLN)	27	+#elif defined(_SC_NPROCESSORS_ONLN)
29	+ threads = sysconf(_SC_NPROCESSORS_ONLN);	28	+ threads = sysconf(_SC_NPROCESSORS_ONLN);
30	+#elif defined(_WIN32)	29	+#elif defined(_WIN32)
31	+ SYSTEM_INFO siSysInfo;	30	+ SYSTEM_INFO siSysInfo;