diff options
| author | Wilson E. Alvarez | 2017-06-18 14:15:06 -0400 |
|---|---|---|
| committer | Wilson E. Alvarez | 2017-06-18 14:15:06 -0400 |
| commit | 9b2fdf7dba95e7ef0d89f5509280c9f7c56ff9ef (patch) | |
| tree | ca19fd3a3be43fdf72f21d410e4c0e704bb4f649 | |
| parent | d3369fc2a9f47ac7b19b6f127be79c331131d702 (diff) | |
| download | aur-9b2fdf7dba95e7ef0d89f5509280c9f7c56ff9ef.tar.gz | |
Added NDK v15 patch
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | ProcessCpuTracker.cpp.patch | 10 |
3 files changed, 20 insertions, 3 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Jun 2 11:11:31 UTC 2017 +# Sun Jun 18 18:14:07 UTC 2017 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.15.1 - pkgrel = 1 + pkgrel = 2 url = http://cdn.cocos2d-x.org/ arch = i686 arch = x86_64 @@ -70,6 +70,7 @@ pkgbase = cocos2d-x-src source = ccShader_Position_uColor.vert.patch source = ccShader_UI_Gray.frag.patch source = CCPhysicsWorld.cpp.patch + source = ProcessCpuTracker.cpp.patch sha256sums = 36299ecc61d95bcb9cbfbaac4410be395aeb61c161b682e5576495b8e2a923f8 sha256sums = 09248ad9af9a94579b56c7c7dbf1b4276a59852c90423ad70c48b16355f28574 sha256sums = f2f74a36538c43045894bd2b2415a2396bcb5c28f9241296b0e6d39a452b56b1 @@ -118,6 +119,7 @@ pkgbase = cocos2d-x-src sha256sums = 5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650 sha256sums = c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000 sha256sums = 3e7d0bf050e877fd94f18589562fd5b5af6a170cc7d2a92b24274492ed4623cb + sha256sums = fa7aa811f6cc248dbdb04eb876ecd8027e2ed52c4b4a4db664f1cfa5e46393eb pkgname = cocos2d-x-src @@ -4,7 +4,7 @@ _appname=cocos2d-x pkgname=cocos2d-x-src pkgver=3.15.1 -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://cdn.cocos2d-x.org/" @@ -61,6 +61,7 @@ source=( "ccShader_Position_uColor.vert.patch" "ccShader_UI_Gray.frag.patch" "CCPhysicsWorld.cpp.patch" +"ProcessCpuTracker.cpp.patch" ) sha256sums=( '36299ecc61d95bcb9cbfbaac4410be395aeb61c161b682e5576495b8e2a923f8' @@ -111,6 +112,7 @@ sha256sums=( '5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650' 'c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000' '3e7d0bf050e877fd94f18589562fd5b5af6a170cc7d2a92b24274492ed4623cb' +'fa7aa811f6cc248dbdb04eb876ecd8027e2ed52c4b4a4db664f1cfa5e46393eb' ) @@ -136,6 +138,9 @@ package() { ## Add CMake configuration flags to ease the configuratino of libcocos2d: patch -s "$srcdir"/$_appname-$pkgver/templates/cpp-template-default/CMakeLists.txt CMakeLists.txt.patch + # Patch ProcessCpuTracker.cpp to fix NDK v15 issue: + patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/android/jni/ProcessCpuTracker.cpp ProcessCpuTracker.cpp.patch + # POSSIBLE FUTURE TODO: There is a memory leak patch currently out for Labels. Stay tuned: https://github.com/cocos2d/cocos2d-x/pull/17670 # Switch C++ multiline string literal to the STRINGIFY macro which uses less memory. See https://github.com/cocos2d/cocos2d-x/pull/16742 diff --git a/ProcessCpuTracker.cpp.patch b/ProcessCpuTracker.cpp.patch new file mode 100644 index 000000000000..e092b8edd06f --- /dev/null +++ b/ProcessCpuTracker.cpp.patch @@ -0,0 +1,10 @@ +--- ./cocos2d/cocos/platform/android/jni/ProcessCpuTracker.cpp 2017-05-31 17:10:38.301993000 -0400 ++++ ProcessCpuTracker.cpp 2017-06-18 13:53:08.432335679 -0400 +@@ -3,6 +3,7 @@ + #ifdef ANDROID + #include <jni.h> + #include <android/log.h> ++#include <unistd.h> + #endif + #include <stdlib.h> + #include <vector> |