summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilson E. Alvarez2016-03-08 04:50:07 -0400
committerWilson E. Alvarez2016-03-08 04:50:15 -0400
commit5cb799e724a9c6e94d2c159e03647b2cfcc2a6ec (patch)
tree10ecf17e12229381a2138935c59a9e893015ca84
parenta47bd073ac1e8ff34842870439806b50f0c2d28e (diff)
downloadaur-5cb799e724a9c6e94d2c159e03647b2cfcc2a6ec.tar.gz
Added std::isnan patch
-rw-r--r--.SRCINFO8
-rw-r--r--CCActionCamera.patch14
-rw-r--r--CCControlUtils.patch14
-rw-r--r--PKGBUILD10
4 files changed, 43 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 388dfe4a5d7e..1fefec9a5368 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Jan 25 03:44:41 UTC 2016
+# Tue Mar 8 08:49:38 UTC 2016
pkgbase = cocos2d-x-src
pkgdesc = Cocos2D-X is a game engine that supports multiple platforms such as iOS, Android, WinXP/7/8, WP8, BlackBerry, MeeGo, Marmelade, WebOS, Mac OS X
pkgver = 3.10
- pkgrel = 1
+ pkgrel = 2
url = http://www.cocos2d-x.org/filedown/
arch = i686
arch = x86_64
@@ -26,10 +26,14 @@ pkgbase = cocos2d-x-src
source = README
source = cocos2d-x.sh
source = cocos2d-x.csh
+ source = CCActionCamera.patch
+ source = CCControlUtils.patch
sha1sums = c8bb2a1d355d3c6a342fb0f95b0e47f0113eada7
sha1sums = 1f9b4f74223b5ac1ec235c553e9eca2a2c927eca
sha1sums = 353bdefe07bdb6eb7f53aff20d20e83b488c1c05
sha1sums = 49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6
+ sha1sums = d28977c340ffa686a188246c6875c837bbc01fd6
+ sha1sums = 3bb44fe6e6a8f3278ffddc6c849ba97ada31cd30
pkgname = cocos2d-x-src
diff --git a/CCActionCamera.patch b/CCActionCamera.patch
new file mode 100644
index 000000000000..4ef19bfdf56e
--- /dev/null
+++ b/CCActionCamera.patch
@@ -0,0 +1,14 @@
+--- ./cocos/2d/CCActionCamera.cpp 2015-10-21 05:07:32.000000000 -0400
++++ ./cocos/2d/CCActionCameraPatched.cpp 2016-03-06 16:32:51.413506737 -0400
+@@ -29,6 +29,11 @@ THE SOFTWARE.
+ #include "2d/CCNode.h"
+ #include "platform/CCStdC.h"
+
++#if ( CC_TARGET_PLATFORM == CC_PLATFORM_LINUX )
++#include "math.h"
++using std::isnan;
++#endif
++
+ NS_CC_BEGIN
+ //
+ // CameraAction
diff --git a/CCControlUtils.patch b/CCControlUtils.patch
new file mode 100644
index 000000000000..d1c615ef3fc5
--- /dev/null
+++ b/CCControlUtils.patch
@@ -0,0 +1,14 @@
+--- ./extensions/GUI/CCControlExtension/CCControlUtils.cpp 2016-02-28 22:02:18.206802375 -0400
++++ ./extensions/GUI/CCControlExtension/CCControlUtilsPatched.cpp 2016-03-06 16:33:17.555909367 -0400
+@@ -24,6 +24,11 @@ THE SOFTWARE.
+
+ #include "CCControlUtils.h"
+
++#if ( CC_TARGET_PLATFORM == CC_PLATFORM_LINUX )
++#include "math.h"
++using std::isnan;
++#endif
++
+ NS_CC_EXT_BEGIN
+
+ Sprite* ControlUtils::addSpriteToTargetWithPosAndAnchor(const char* spriteName, Node * target, Vec2 pos, Vec2 anchor)
diff --git a/PKGBUILD b/PKGBUILD
index 2d72860d455c..c1c5135299a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_appname=cocos2d-x
pkgname=cocos2d-x-src
pkgver=3.10
-pkgrel=1
+pkgrel=2
pkgdesc="Cocos2D-X is a game engine that supports multiple platforms such as iOS, Android, WinXP/7/8, WP8, BlackBerry, MeeGo, Marmelade, WebOS, Mac OS X"
arch=('i686' 'x86_64')
url="http://www.cocos2d-x.org/filedown/"
@@ -15,15 +15,23 @@ source=("${url}${_appname}-${pkgver}.zip"
"README"
"$_appname.sh"
"$_appname.csh"
+"CCActionCamera.patch"
+"CCControlUtils.patch"
)
sha1sums=('c8bb2a1d355d3c6a342fb0f95b0e47f0113eada7'
'1f9b4f74223b5ac1ec235c553e9eca2a2c927eca'
'353bdefe07bdb6eb7f53aff20d20e83b488c1c05'
'49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6'
+'d28977c340ffa686a188246c6875c837bbc01fd6'
+'3bb44fe6e6a8f3278ffddc6c849ba97ada31cd30'
)
prepare() {
chmod +x "download-deps.py"
+ patch ./cocos/2d/CCActionCamera.cpp CCActionCamera.patch
+ patch ./extensions/GUI/CCControlExtension/CCControlUtils.cpp CCControlUtils.patch
+ rm CCActionCamera.patch
+ rm CCControlUtils.patch
python2 "download-deps.py" -r yes
}