Attachment 160499 Details for Bug 202758 – Diff file for the update.

[patch] Diff file for the update.

ChipmunkPhysics-7.0.1.diff (text/plain), 3.64 KB, created by ports on 2015-08-29 19:06:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ports

Created: 2015-08-29 19:06:50 UTC

Size: 3.64 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 395565)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	ChipmunkPhysics
>-PORTVERSION=	7.0.0
>-PORTREVISION=	1
>+PORTVERSION=	7.0.1
> CATEGORIES=	devel
> MASTER_SITES=	http://chipmunk-physics.net/release/Chipmunk-7.x/ \
> 		http://files.slembcke.net/chipmunk/release/Chipmunk-7.x/ \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 395565)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (Chipmunk-7.0.0.tgz) = 14ab380396a96b15951c42a2d7ca259a53ecab4e550a71857d13dcfd388a51cd
>-SIZE (Chipmunk-7.0.0.tgz) = 1607961
>+SHA256 (Chipmunk-7.0.1.tgz) = fe54b464777d89882a9f9d3d6deb17189af8bc5d63833b25bb1a7d16c3e69260
>+SIZE (Chipmunk-7.0.1.tgz) = 1609101
>Index: files/patch-demo_CMakeLists.txt
>===================================================================
>--- files/patch-demo_CMakeLists.txt	(revision 395565)
>+++ files/patch-demo_CMakeLists.txt	(working copy)
>@@ -1,6 +1,6 @@
>---- demo/CMakeLists.txt.orig	2015-02-20 13:46:16 UTC
>+--- demo/CMakeLists.txt.orig	2015-08-29 18:52:41 UTC
> +++ demo/CMakeLists.txt
>-@@ -27,6 +27,10 @@ if(NOT MSVC)
>+@@ -40,6 +40,10 @@ if(NOT MSVC)
>    list(APPEND chipmunk_demos_libraries m)
>  endif(NOT MSVC)
>  
>Index: files/patch-include_chipmunk_chipmunk.h
>===================================================================
>--- files/patch-include_chipmunk_chipmunk.h	(revision 395565)
>+++ files/patch-include_chipmunk_chipmunk.h	(working copy)
>@@ -1,12 +1,13 @@
>---- include/chipmunk/chipmunk.h.orig	2015-01-13 01:54:11 UTC
>+--- include/chipmunk/chipmunk.h.orig	2015-08-29 18:44:21 UTC
> +++ include/chipmunk/chipmunk.h
>-@@ -32,6 +32,9 @@
>- #ifdef WIN32
>+@@ -29,6 +29,10 @@
>  	// For alloca().
>  	#include <malloc.h>
>+ 	#define CP_EXPORT __declspec(dllexport)
> +#elif defined(__DragonFly__) || defined(__FreeBSD__) \
>-+   || defined(__NetBSD__) || defined(__OpenBSD__) \
>-+	/* already included in <stdlib.h> */
>++	|| defined(__NetBSD__) || defined(__OpenBSD__) \
>++	// alloca() is already included in <stdlib.h>
>++	#define CP_EXPORT
>  #else
>  	#include <alloca.h>
>- #endif
>+ 	#define CP_EXPORT
>Index: files/patch-src_cpHastySpace.c
>===================================================================
>--- files/patch-src_cpHastySpace.c	(revision 395565)
>+++ files/patch-src_cpHastySpace.c	(working copy)
>@@ -1,4 +1,4 @@
>---- src/cpHastySpace.c.orig	2015-01-13 01:54:11 UTC
>+--- src/cpHastySpace.c.orig	2015-07-02 16:24:47 UTC
> +++ src/cpHastySpace.c
> @@ -5,8 +5,11 @@
>  #include <stdio.h>
>@@ -14,18 +14,17 @@
>  
>  #include "chipmunk/chipmunk_private.h"
>  #include "chipmunk/cpHastySpace.h"
>-@@ -313,15 +316,18 @@ cpHastySpaceSetThreads(cpSpace *space, u
>- 	
>+@@ -314,14 +317,20 @@ 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);
>++#ifdef __APPLE__
>+ 		size_t size = sizeof(threads);
>+ 		sysctlbyname("hw.ncpu", &threads, &size, NULL, 0);
> -	}
>-+#if defined(_SC_NPROCESSORS_ONLN)
>++#elif defined(_SC_NPROCESSORS_ONLN)
> +		threads = sysconf(_SC_NPROCESSORS_ONLN);
> +#elif defined(_WIN32)
> +		SYSTEM_INFO siSysInfo;
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 395565)
>+++ pkg-plist	(working copy)
>@@ -10,6 +10,7 @@
> include/chipmunk/cpSlideJoint.h
> include/chipmunk/cpSimpleMotor.h
> include/chipmunk/cpShape.h
>+include/chipmunk/cpRobust.h
> include/chipmunk/cpRotaryLimitJoint.h
> include/chipmunk/cpRatchetJoint.h
> include/chipmunk/cpPolyline.h

Actions: View | Diff

Attachments on bug 202758: 160499