cocos2d-x V3.16

4 files changed, 160 insertions, 186 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a490076f0dcb..c1452b70b1ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jun 18 18:14:07 UTC 2017
+# Fri Dec 22 10:40:15 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 = 2
+	pkgver = 3.16
+	pkgrel = 1
 	url = http://cdn.cocos2d-x.org/
 	arch = i686
 	arch = x86_64
@@ -22,104 +22,104 @@ pkgbase = cocos2d-x-src
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://cdn.cocos2d-x.org/cocos2d-x-3.15.1.zip
+	source = http://cdn.cocos2d-x.org/cocos2d-x-3.16.zip
 	source = README
 	source = cocos2d-x.sh
 	source = cocos2d-x.csh
-	source = CMakeLists.txt.patch
+	source = ccShader_PositionTexture.frag.patch
+	source = ccShader_3D_ColorTex.frag.patch
+	source = ccShader_PositionTextureColor_noMVP.vert.patch
+	source = ccShader_3D_ColorNormalTex.frag.patch
+	source = ccShader_Label.vert.patch
+	source = ccShader_PositionTextureColorAlphaTest.frag.patch
+	source = ccShader_PositionTexture_uColor.vert.patch
+	source = ccShader_PositionTextureA8Color.vert.patch
 	source = CCGLViewImpl-desktop.cpp.patch
-	source = Cocos2dxActivity.java.patch
 	source = ccShader_3D_Color.frag.patch
-	source = ccShader_3D_ColorNormal.frag.patch
-	source = ccShader_3D_ColorNormalTex.frag.patch
-	source = ccShader_3D_ColorTex.frag.patch
-	source = ccShader_3D_Particle.frag.patch
-	source = ccShader_3D_Particle.vert.patch
 	source = ccShader_3D_PositionNormalTex.vert.patch
-	source = ccShader_3D_PositionTex.vert.patch
-	source = ccShader_3D_Skybox.frag.patch
-	source = ccShader_3D_Skybox.vert.patch
-	source = ccShader_3D_Terrain.frag.patch
-	source = ccShader_3D_Terrain.vert.patch
-	source = ccShader_CameraClear.frag.patch
-	source = ccShader_CameraClear.vert.patch
-	source = ccShader_ETC1AS_PositionTextureColor.frag.patch
+	source = CMakeLists.patch
 	source = ccShader_ETC1AS_PositionTextureGray.frag.patch
-	source = ccShader_Label_df.frag.patch
-	source = ccShader_Label_df_glow.frag.patch
+	source = ccShader_ETC1AS_PositionTextureColor.frag.patch
+	source = ccShader_Position_uColor.vert.patch
+	source = ccShader_3D_Skybox.vert.patch
+	source = ccShader_PositionColor.frag.patch
 	source = ccShader_Label_normal.frag.patch
+	source = ccShader_3D_Particle.frag.patch
+	source = ccShader_3D_PositionTex.vert.patch
+	source = ccShader_PositionTextureA8Color.frag.patch
 	source = ccShader_Label_outline.frag.patch
-	source = ccShader_Label.vert.patch
-	source = ccShader_PositionColor.frag.patch
-	source = ccShader_PositionColorLengthTexture.frag.patch
+	source = ccShader_CameraClear.frag.patch
+	source = CMakeLists.txt.patch
+	source = ccShader_CameraClear.vert.patch
+	source = ccShader_PositionTexture.vert.patch
+	source = Cocos2dxActivity.java.patch
 	source = ccShader_PositionColorLengthTexture.vert.patch
+	source = ccShader_3D_Skybox.frag.patch
+	source = ccShader_Label_df.frag.patch
+	source = ccShader_UI_Gray.frag.patch
+	source = ccShader_3D_Terrain.frag.patch
+	source = ccShader_3D_Terrain.vert.patch
+	source = ccShader_Position_uColor.frag.patch
 	source = ccShader_PositionColorTextureAsPointsize.vert.patch
-	source = ccShader_PositionColor.vert.patch
-	source = ccShader_PositionTextureA8Color.frag.patch
-	source = ccShader_PositionTextureA8Color.vert.patch
-	source = ccShader_PositionTextureColorAlphaTest.frag.patch
-	source = ccShader_PositionTextureColor.frag.patch
 	source = ccShader_PositionTextureColor_noMVP.frag.patch
-	source = ccShader_PositionTextureColor_noMVP.vert.patch
+	source = CCPhysicsBody.patch
+	source = ccShader_3D_ColorNormal.frag.patch
+	source = ccShader_Label_df_glow.frag.patch
+	source = ccShader_PositionColor.vert.patch
 	source = ccShader_PositionTextureColor.vert.patch
-	source = ccShader_PositionTexture.frag.patch
 	source = ccShader_PositionTexture_uColor.frag.patch
-	source = ccShader_PositionTexture_uColor.vert.patch
-	source = ccShader_PositionTexture.vert.patch
-	source = ccShader_Position_uColor.frag.patch
-	source = ccShader_Position_uColor.vert.patch
-	source = ccShader_UI_Gray.frag.patch
-	source = CCPhysicsWorld.cpp.patch
-	source = ProcessCpuTracker.cpp.patch
-	sha256sums = 36299ecc61d95bcb9cbfbaac4410be395aeb61c161b682e5576495b8e2a923f8
+	source = ccShader_PositionColorLengthTexture.frag.patch
+	source = ccShader_3D_Particle.vert.patch
+	source = ccShader_PositionTextureColor.frag.patch
+	sha256sums = 36a2d5e9aab9ba3a7e4229546f3ead8ff4d47b693de4577bdf7db245d09180d6
 	sha256sums = 09248ad9af9a94579b56c7c7dbf1b4276a59852c90423ad70c48b16355f28574
 	sha256sums = f2f74a36538c43045894bd2b2415a2396bcb5c28f9241296b0e6d39a452b56b1
 	sha256sums = 3a7ae492fe9b2d7db8ef15c2d47e147746823942943e099d5a494c7076b2e92b
-	sha256sums = 9a5a73ed7a1fc0cc152b0d27878b973abd525dd1a5906757d6dd385178f69835
+	sha256sums = 07d8dbc9dd529b04341bdd4dc047eafb6674f2413d54baa6450f9b7dce78ae53
+	sha256sums = 0efc1d771e2b6a5bbca414732317e709c82a53878a0431c64aa2279b9f4321fe
+	sha256sums = 120250a97af3be476df8dcac1472538c8a11d1ae9ab0624ddae8261b539695a8
+	sha256sums = 13de90070e6242d299232778f8a9d41c22c92d518e3a38e32501577826f52149
+	sha256sums = 2a7e2557b1d7d85405b1a8337a876d2633921dccdfef8d5a34fb13f923b0ffd2
+	sha256sums = 308fa40e69de2c5cfa79e65edc326323bd80e26eb9da539d84ffeddf4e913017
+	sha256sums = 35d5761e0005d8a583692a9c44517d956c9ae41da9c1cc69e05ce42d425e26fa
+	sha256sums = 39bb1106c7df3a2958589b5ae5cdbbf9afd1b381951791761372424c28e4dd4e
 	sha256sums = 3cc0e9666eeed8c0b4f7a8d0edfe1e5245c1cca53ca7e4a150660dc1bbf2a299
-	sha256sums = b2575e466cbba3d1abf3f467b0ea4505a00c3645de5ee8f8908b693d708b3c67
 	sha256sums = 3f697c60080e85940a623a358a6d13ccab8a8f87346521c210196cc8ee48dcac
-	sha256sums = e8418d25047914058adbddce65b5f9ca7abd88bf45a1e063d8eb69aa997d4a9c
-	sha256sums = 13de90070e6242d299232778f8a9d41c22c92d518e3a38e32501577826f52149
-	sha256sums = 0efc1d771e2b6a5bbca414732317e709c82a53878a0431c64aa2279b9f4321fe
-	sha256sums = 70351ae2d5a53fd42c96d5702efcef48d15a71ed7c4e55911c9678cfca7c4ab6
-	sha256sums = f956e3b937c663a159a6c7bc92d5c951fd18836113dcc125bb0fe46147e62531
 	sha256sums = 3fb4eb3b15dd0f28e8d171719c779d9680329126ae6cc56ce10d0d3784b0aa15
-	sha256sums = 79b79366bc2690a01128fbfd0742f58ccf8f9f2ca1d7dd0a4b73d47c096ee7f6
-	sha256sums = b8292b1c7971c285a7732e39b492f919df985c35a982a30bd9f004e9cd07f2fb
-	sha256sums = 572d86d285fa1bb6b72aa6d012244adfe3f3a304b66764fd555997dc8462baf4
-	sha256sums = c56d1402ddfa5a7c5607a23b44768880797f84bc1081cbf773fa457be5b2be0a
-	sha256sums = c7101ce86d01afa4c20efb4f89dd3e2b6d85059df233e57539648922c3eaca8f
-	sha256sums = 898e63f7352513848213e8fa929364acbd85707c9bbf054250c253499b65b4b7
-	sha256sums = 9b7f760d99844b456a2f56e2a875e5355a7766537b4d2b33970d5d66bb397e3e
-	sha256sums = 4b588741894aec0b2da47a35ff39787458202a431b88f0af6e422fcb4ee34709
+	sha256sums = 4616ec6d01530d168d5f9369bff764cbd33e944d8d0f66ff3ecffbc2d7423292
 	sha256sums = 485ea7adc13632762aa78758c96287cc41f85a2d3edf2ab9e7b299883db52c9b
-	sha256sums = bdd4bb3218853c9f0a7675d3d98a50e5e1d6b69b1b3861255bf0f497782d8954
-	sha256sums = e847773c38ef54d23b6f3fefbf9b717ca187a2780cd2b3d020f0eeb3b4a94971
+	sha256sums = 4b588741894aec0b2da47a35ff39787458202a431b88f0af6e422fcb4ee34709
+	sha256sums = 5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650
+	sha256sums = 572d86d285fa1bb6b72aa6d012244adfe3f3a304b66764fd555997dc8462baf4
+	sha256sums = 5a7b57272514d4204fea0944151ab9eb23d533b1a97c289e408269eb2d877728
 	sha256sums = 62db6b5d01b14d8f4322a8e32cd7257ca8b87b6d55aa9a18418bc90d85ccfc89
+	sha256sums = 70351ae2d5a53fd42c96d5702efcef48d15a71ed7c4e55911c9678cfca7c4ab6
+	sha256sums = 79b79366bc2690a01128fbfd0742f58ccf8f9f2ca1d7dd0a4b73d47c096ee7f6
+	sha256sums = 7b33a4d78fa89b8b6a8fe3317dbf2e93e72f4579b9bedcefa1d4ac5daa5e4872
 	sha256sums = 8437d3cf0d8ae3af545917095cf236b93fa0c2c480062cfefd786bfa2db5c209
-	sha256sums = 2a7e2557b1d7d85405b1a8337a876d2633921dccdfef8d5a34fb13f923b0ffd2
-	sha256sums = 5a7b57272514d4204fea0944151ab9eb23d533b1a97c289e408269eb2d877728
-	sha256sums = ef4fd5d339ed872d41848847596a49a79f6a5d26c46a7edce8aadf2a9764e53a
+	sha256sums = 898e63f7352513848213e8fa929364acbd85707c9bbf054250c253499b65b4b7
+	sha256sums = 9a5a73ed7a1fc0cc152b0d27878b973abd525dd1a5906757d6dd385178f69835
+	sha256sums = 9b7f760d99844b456a2f56e2a875e5355a7766537b4d2b33970d5d66bb397e3e
+	sha256sums = afe36a4cd2347c33c6c610b15966c1c4072d813a1b8a7ddcf611f3b8c0d08836
+	sha256sums = b2575e466cbba3d1abf3f467b0ea4505a00c3645de5ee8f8908b693d708b3c67
 	sha256sums = b2e422006a7f5348f3833d28b17a44ab1c4afd9daaeed65d4505bbedf0647eff
+	sha256sums = b8292b1c7971c285a7732e39b492f919df985c35a982a30bd9f004e9cd07f2fb
+	sha256sums = bdd4bb3218853c9f0a7675d3d98a50e5e1d6b69b1b3861255bf0f497782d8954
+	sha256sums = c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000
+	sha256sums = c56d1402ddfa5a7c5607a23b44768880797f84bc1081cbf773fa457be5b2be0a
+	sha256sums = c7101ce86d01afa4c20efb4f89dd3e2b6d85059df233e57539648922c3eaca8f
+	sha256sums = db37cb1c64fc1990e26da2cc1d7a7756d50c2059a24c5d0d29757275850ace4d
 	sha256sums = dcb815b3c7a8e431fb8678701785d8cfb6568dc0976b86ab43c824fce765338c
-	sha256sums = e962c317447119b2730103ddb9cddad5f366c614cab05249a5b52a92d14d0147
-	sha256sums = 7b33a4d78fa89b8b6a8fe3317dbf2e93e72f4579b9bedcefa1d4ac5daa5e4872
-	sha256sums = 39bb1106c7df3a2958589b5ae5cdbbf9afd1b381951791761372424c28e4dd4e
-	sha256sums = 308fa40e69de2c5cfa79e65edc326323bd80e26eb9da539d84ffeddf4e913017
-	sha256sums = ffd5fb98cc4f6edfdda8a2e807ce97351fca6bf2dfd9570e158da797fc6b1245
 	sha256sums = de468779316ec6438fde600328aa648c7904db0dc3c918535efd59e67d410013
-	sha256sums = 120250a97af3be476df8dcac1472538c8a11d1ae9ab0624ddae8261b539695a8
+	sha256sums = e0a639cb2f2aa2b918e8a320e4faf6fb30878d2db0235e4e999a0836a23d684f
+	sha256sums = e8418d25047914058adbddce65b5f9ca7abd88bf45a1e063d8eb69aa997d4a9c
+	sha256sums = e847773c38ef54d23b6f3fefbf9b717ca187a2780cd2b3d020f0eeb3b4a94971
+	sha256sums = e962c317447119b2730103ddb9cddad5f366c614cab05249a5b52a92d14d0147
 	sha256sums = eb2bee833918146282c2e9df02b3b021c5e95f0014d3eaa7df8da20ba3df7403
-	sha256sums = 07d8dbc9dd529b04341bdd4dc047eafb6674f2413d54baa6450f9b7dce78ae53
 	sha256sums = ed7882c39f4074cc71d3498a4825b0e20ee895bc926419fda30ad8de1a2eaa43
-	sha256sums = 35d5761e0005d8a583692a9c44517d956c9ae41da9c1cc69e05ce42d425e26fa
-	sha256sums = afe36a4cd2347c33c6c610b15966c1c4072d813a1b8a7ddcf611f3b8c0d08836
-	sha256sums = db37cb1c64fc1990e26da2cc1d7a7756d50c2059a24c5d0d29757275850ace4d
-	sha256sums = 5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650
-	sha256sums = c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000
-	sha256sums = 3e7d0bf050e877fd94f18589562fd5b5af6a170cc7d2a92b24274492ed4623cb
-	sha256sums = fa7aa811f6cc248dbdb04eb876ecd8027e2ed52c4b4a4db664f1cfa5e46393eb
+	sha256sums = ef4fd5d339ed872d41848847596a49a79f6a5d26c46a7edce8aadf2a9764e53a
+	sha256sums = f956e3b937c663a159a6c7bc92d5c951fd18836113dcc125bb0fe46147e62531
+	sha256sums = ffd5fb98cc4f6edfdda8a2e807ce97351fca6bf2dfd9570e158da797fc6b1245
 
 pkgname = cocos2d-x-src
 
diff --git a/CCPhysicsWorld.cpp.patch b/CCPhysicsWorld.cpp.patch
deleted file mode 100644
index ad7a49415311..000000000000
--- a/CCPhysicsWorld.cpp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /opt/cocos2d-x/cocos/physics/CCPhysicsWorld.cpp	2017-04-21 10:59:42.793940004 -0400
-+++ CCPhysicsWorld.cpp	2017-05-28 19:06:08.120723151 -0400
-@@ -811,7 +811,7 @@
- 
- void PhysicsWorld::setDebugDrawMask(int mask)
- {
--    if (mask == DEBUGDRAW_NONE)
-+    if (mask == DEBUGDRAW_NONE && _debugDraw)
-     {
-         _debugDraw->removeFromParent();
-         CC_SAFE_RELEASE_NULL(_debugDraw);
diff --git a/PKGBUILD b/PKGBUILD
index 6978d960dfc7..659f03abccfa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _appname=cocos2d-x
 pkgname=cocos2d-x-src
-pkgver=3.15.1
-pkgrel=2
+pkgver=3.16
+pkgrel=1
 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/"
@@ -17,102 +17,102 @@ source=(
 "README"
 "$_appname.sh"
 "$_appname.csh"
-"CMakeLists.txt.patch"
-"CCGLViewImpl-desktop.cpp.patch"
-"Cocos2dxActivity.java.patch"
-"ccShader_3D_Color.frag.patch"
-"ccShader_3D_ColorNormal.frag.patch"
-"ccShader_3D_ColorNormalTex.frag.patch"
-"ccShader_3D_ColorTex.frag.patch"
-"ccShader_3D_Particle.frag.patch"
-"ccShader_3D_Particle.vert.patch"
-"ccShader_3D_PositionNormalTex.vert.patch"
-"ccShader_3D_PositionTex.vert.patch"
-"ccShader_3D_Skybox.frag.patch"
-"ccShader_3D_Skybox.vert.patch"
-"ccShader_3D_Terrain.frag.patch"
-"ccShader_3D_Terrain.vert.patch"
-"ccShader_CameraClear.frag.patch"
-"ccShader_CameraClear.vert.patch"
-"ccShader_ETC1AS_PositionTextureColor.frag.patch"
-"ccShader_ETC1AS_PositionTextureGray.frag.patch"
-"ccShader_Label_df.frag.patch"
-"ccShader_Label_df_glow.frag.patch"
-"ccShader_Label_normal.frag.patch"
-"ccShader_Label_outline.frag.patch"
-"ccShader_Label.vert.patch"
-"ccShader_PositionColor.frag.patch"
-"ccShader_PositionColorLengthTexture.frag.patch"
-"ccShader_PositionColorLengthTexture.vert.patch"
-"ccShader_PositionColorTextureAsPointsize.vert.patch"
-"ccShader_PositionColor.vert.patch"
-"ccShader_PositionTextureA8Color.frag.patch"
-"ccShader_PositionTextureA8Color.vert.patch"
-"ccShader_PositionTextureColorAlphaTest.frag.patch"
-"ccShader_PositionTextureColor.frag.patch"
-"ccShader_PositionTextureColor_noMVP.frag.patch"
-"ccShader_PositionTextureColor_noMVP.vert.patch"
-"ccShader_PositionTextureColor.vert.patch"
-"ccShader_PositionTexture.frag.patch"
-"ccShader_PositionTexture_uColor.frag.patch"
-"ccShader_PositionTexture_uColor.vert.patch"
-"ccShader_PositionTexture.vert.patch"
-"ccShader_Position_uColor.frag.patch"
-"ccShader_Position_uColor.vert.patch"
-"ccShader_UI_Gray.frag.patch"
-"CCPhysicsWorld.cpp.patch"
-"ProcessCpuTracker.cpp.patch"
+'ccShader_PositionTexture.frag.patch'
+'ccShader_3D_ColorTex.frag.patch'
+'ccShader_PositionTextureColor_noMVP.vert.patch'
+'ccShader_3D_ColorNormalTex.frag.patch'
+'ccShader_Label.vert.patch'
+'ccShader_PositionTextureColorAlphaTest.frag.patch'
+'ccShader_PositionTexture_uColor.vert.patch'
+'ccShader_PositionTextureA8Color.vert.patch'
+'CCGLViewImpl-desktop.cpp.patch'
+'ccShader_3D_Color.frag.patch'
+'ccShader_3D_PositionNormalTex.vert.patch'
+'CMakeLists.patch'
+'ccShader_ETC1AS_PositionTextureGray.frag.patch'
+'ccShader_ETC1AS_PositionTextureColor.frag.patch'
+'ccShader_Position_uColor.vert.patch'
+'ccShader_3D_Skybox.vert.patch'
+'ccShader_PositionColor.frag.patch'
+'ccShader_Label_normal.frag.patch'
+'ccShader_3D_Particle.frag.patch'
+'ccShader_3D_PositionTex.vert.patch'
+'ccShader_PositionTextureA8Color.frag.patch'
+'ccShader_Label_outline.frag.patch'
+'ccShader_CameraClear.frag.patch'
+'CMakeLists.txt.patch'
+'ccShader_CameraClear.vert.patch'
+'ccShader_PositionTexture.vert.patch'
+'Cocos2dxActivity.java.patch'
+'ccShader_PositionColorLengthTexture.vert.patch'
+'ccShader_3D_Skybox.frag.patch'
+'ccShader_Label_df.frag.patch'
+'ccShader_UI_Gray.frag.patch'
+'ccShader_3D_Terrain.frag.patch'
+'ccShader_3D_Terrain.vert.patch'
+'ccShader_Position_uColor.frag.patch'
+'ccShader_PositionColorTextureAsPointsize.vert.patch'
+'ccShader_PositionTextureColor_noMVP.frag.patch'
+'CCPhysicsBody.patch'
+'ccShader_3D_ColorNormal.frag.patch'
+'ccShader_Label_df_glow.frag.patch'
+'ccShader_PositionColor.vert.patch'
+'ccShader_PositionTextureColor.vert.patch'
+'ccShader_PositionTexture_uColor.frag.patch'
+'ccShader_PositionColorLengthTexture.frag.patch'
+'ccShader_3D_Particle.vert.patch'
+'ccShader_PositionTextureColor.frag.patch'
 )
 sha256sums=(
-'36299ecc61d95bcb9cbfbaac4410be395aeb61c161b682e5576495b8e2a923f8'
+'36a2d5e9aab9ba3a7e4229546f3ead8ff4d47b693de4577bdf7db245d09180d6'
 '09248ad9af9a94579b56c7c7dbf1b4276a59852c90423ad70c48b16355f28574'
 'f2f74a36538c43045894bd2b2415a2396bcb5c28f9241296b0e6d39a452b56b1'
 '3a7ae492fe9b2d7db8ef15c2d47e147746823942943e099d5a494c7076b2e92b'
-'9a5a73ed7a1fc0cc152b0d27878b973abd525dd1a5906757d6dd385178f69835'
+'07d8dbc9dd529b04341bdd4dc047eafb6674f2413d54baa6450f9b7dce78ae53'
+'0efc1d771e2b6a5bbca414732317e709c82a53878a0431c64aa2279b9f4321fe'
+'120250a97af3be476df8dcac1472538c8a11d1ae9ab0624ddae8261b539695a8'
+'13de90070e6242d299232778f8a9d41c22c92d518e3a38e32501577826f52149'
+'2a7e2557b1d7d85405b1a8337a876d2633921dccdfef8d5a34fb13f923b0ffd2'
+'308fa40e69de2c5cfa79e65edc326323bd80e26eb9da539d84ffeddf4e913017'
+'35d5761e0005d8a583692a9c44517d956c9ae41da9c1cc69e05ce42d425e26fa'
+'39bb1106c7df3a2958589b5ae5cdbbf9afd1b381951791761372424c28e4dd4e'
 '3cc0e9666eeed8c0b4f7a8d0edfe1e5245c1cca53ca7e4a150660dc1bbf2a299'
-'b2575e466cbba3d1abf3f467b0ea4505a00c3645de5ee8f8908b693d708b3c67'
 '3f697c60080e85940a623a358a6d13ccab8a8f87346521c210196cc8ee48dcac'
-'e8418d25047914058adbddce65b5f9ca7abd88bf45a1e063d8eb69aa997d4a9c'
-'13de90070e6242d299232778f8a9d41c22c92d518e3a38e32501577826f52149'
-'0efc1d771e2b6a5bbca414732317e709c82a53878a0431c64aa2279b9f4321fe'
-'70351ae2d5a53fd42c96d5702efcef48d15a71ed7c4e55911c9678cfca7c4ab6'
-'f956e3b937c663a159a6c7bc92d5c951fd18836113dcc125bb0fe46147e62531'
 '3fb4eb3b15dd0f28e8d171719c779d9680329126ae6cc56ce10d0d3784b0aa15'
-'79b79366bc2690a01128fbfd0742f58ccf8f9f2ca1d7dd0a4b73d47c096ee7f6'
-'b8292b1c7971c285a7732e39b492f919df985c35a982a30bd9f004e9cd07f2fb'
-'572d86d285fa1bb6b72aa6d012244adfe3f3a304b66764fd555997dc8462baf4'
-'c56d1402ddfa5a7c5607a23b44768880797f84bc1081cbf773fa457be5b2be0a'
-'c7101ce86d01afa4c20efb4f89dd3e2b6d85059df233e57539648922c3eaca8f'
-'898e63f7352513848213e8fa929364acbd85707c9bbf054250c253499b65b4b7'
-'9b7f760d99844b456a2f56e2a875e5355a7766537b4d2b33970d5d66bb397e3e'
-'4b588741894aec0b2da47a35ff39787458202a431b88f0af6e422fcb4ee34709'
+'4616ec6d01530d168d5f9369bff764cbd33e944d8d0f66ff3ecffbc2d7423292'
 '485ea7adc13632762aa78758c96287cc41f85a2d3edf2ab9e7b299883db52c9b'
-'bdd4bb3218853c9f0a7675d3d98a50e5e1d6b69b1b3861255bf0f497782d8954'
-'e847773c38ef54d23b6f3fefbf9b717ca187a2780cd2b3d020f0eeb3b4a94971'
+'4b588741894aec0b2da47a35ff39787458202a431b88f0af6e422fcb4ee34709'
+'5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650'
+'572d86d285fa1bb6b72aa6d012244adfe3f3a304b66764fd555997dc8462baf4'
+'5a7b57272514d4204fea0944151ab9eb23d533b1a97c289e408269eb2d877728'
 '62db6b5d01b14d8f4322a8e32cd7257ca8b87b6d55aa9a18418bc90d85ccfc89'
+'70351ae2d5a53fd42c96d5702efcef48d15a71ed7c4e55911c9678cfca7c4ab6'
+'79b79366bc2690a01128fbfd0742f58ccf8f9f2ca1d7dd0a4b73d47c096ee7f6'
+'7b33a4d78fa89b8b6a8fe3317dbf2e93e72f4579b9bedcefa1d4ac5daa5e4872'
 '8437d3cf0d8ae3af545917095cf236b93fa0c2c480062cfefd786bfa2db5c209'
-'2a7e2557b1d7d85405b1a8337a876d2633921dccdfef8d5a34fb13f923b0ffd2'
-'5a7b57272514d4204fea0944151ab9eb23d533b1a97c289e408269eb2d877728'
-'ef4fd5d339ed872d41848847596a49a79f6a5d26c46a7edce8aadf2a9764e53a'
+'898e63f7352513848213e8fa929364acbd85707c9bbf054250c253499b65b4b7'
+'9a5a73ed7a1fc0cc152b0d27878b973abd525dd1a5906757d6dd385178f69835'
+'9b7f760d99844b456a2f56e2a875e5355a7766537b4d2b33970d5d66bb397e3e'
+'afe36a4cd2347c33c6c610b15966c1c4072d813a1b8a7ddcf611f3b8c0d08836'
+'b2575e466cbba3d1abf3f467b0ea4505a00c3645de5ee8f8908b693d708b3c67'
 'b2e422006a7f5348f3833d28b17a44ab1c4afd9daaeed65d4505bbedf0647eff'
+'b8292b1c7971c285a7732e39b492f919df985c35a982a30bd9f004e9cd07f2fb'
+'bdd4bb3218853c9f0a7675d3d98a50e5e1d6b69b1b3861255bf0f497782d8954'
+'c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000'
+'c56d1402ddfa5a7c5607a23b44768880797f84bc1081cbf773fa457be5b2be0a'
+'c7101ce86d01afa4c20efb4f89dd3e2b6d85059df233e57539648922c3eaca8f'
+'db37cb1c64fc1990e26da2cc1d7a7756d50c2059a24c5d0d29757275850ace4d'
 'dcb815b3c7a8e431fb8678701785d8cfb6568dc0976b86ab43c824fce765338c'
-'e962c317447119b2730103ddb9cddad5f366c614cab05249a5b52a92d14d0147'
-'7b33a4d78fa89b8b6a8fe3317dbf2e93e72f4579b9bedcefa1d4ac5daa5e4872'
-'39bb1106c7df3a2958589b5ae5cdbbf9afd1b381951791761372424c28e4dd4e'
-'308fa40e69de2c5cfa79e65edc326323bd80e26eb9da539d84ffeddf4e913017'
-'ffd5fb98cc4f6edfdda8a2e807ce97351fca6bf2dfd9570e158da797fc6b1245'
 'de468779316ec6438fde600328aa648c7904db0dc3c918535efd59e67d410013'
-'120250a97af3be476df8dcac1472538c8a11d1ae9ab0624ddae8261b539695a8'
+'e0a639cb2f2aa2b918e8a320e4faf6fb30878d2db0235e4e999a0836a23d684f'
+'e8418d25047914058adbddce65b5f9ca7abd88bf45a1e063d8eb69aa997d4a9c'
+'e847773c38ef54d23b6f3fefbf9b717ca187a2780cd2b3d020f0eeb3b4a94971'
+'e962c317447119b2730103ddb9cddad5f366c614cab05249a5b52a92d14d0147'
 'eb2bee833918146282c2e9df02b3b021c5e95f0014d3eaa7df8da20ba3df7403'
-'07d8dbc9dd529b04341bdd4dc047eafb6674f2413d54baa6450f9b7dce78ae53'
 'ed7882c39f4074cc71d3498a4825b0e20ee895bc926419fda30ad8de1a2eaa43'
-'35d5761e0005d8a583692a9c44517d956c9ae41da9c1cc69e05ce42d425e26fa'
-'afe36a4cd2347c33c6c610b15966c1c4072d813a1b8a7ddcf611f3b8c0d08836'
-'db37cb1c64fc1990e26da2cc1d7a7756d50c2059a24c5d0d29757275850ace4d'
-'5394b03f78a25d6736171c792b384b6abdb20e80647cbf5220c55729eb9a2650'
-'c4cb76c3d896e66391453173f30417f8646257c1d702ee5a3cb3e4980f3df000'
-'3e7d0bf050e877fd94f18589562fd5b5af6a170cc7d2a92b24274492ed4623cb'
-'fa7aa811f6cc248dbdb04eb876ecd8027e2ed52c4b4a4db664f1cfa5e46393eb'
+'ef4fd5d339ed872d41848847596a49a79f6a5d26c46a7edce8aadf2a9764e53a'
+'f956e3b937c663a159a6c7bc92d5c951fd18836113dcc125bb0fe46147e62531'
+'ffd5fb98cc4f6edfdda8a2e807ce97351fca6bf2dfd9570e158da797fc6b1245'
 )
 
 
@@ -135,13 +135,11 @@ package() {
 
 	## Performance tweaks
 
-	## Add CMake configuration flags to ease the configuratino of libcocos2d:
-	patch -s "$srcdir"/$_appname-$pkgver/templates/cpp-template-default/CMakeLists.txt CMakeLists.txt.patch
+	## TODO: 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
+	#patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/android/jni/ProcessCpuTracker.cpp ProcessCpuTracker.cpp.patch
 
 	# Switch C++ multiline string literal to the STRINGIFY macro which uses less memory. See https://github.com/cocos2d/cocos2d-x/pull/16742
 	# TL;DR: For smoother development, using the C++ multiline string literal is convenient, however the STRINGIFY macro defined at ccShaders.cpp uses less memory.
@@ -186,9 +184,6 @@ package() {
 	patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_Position_uColor.vert ccShader_Position_uColor.vert.patch 
 	patch -s "$srcdir"/$_appname-$pkgver/cocos/renderer/ccShader_UI_Gray.frag ccShader_UI_Gray.frag.patch 
 
-	# Fix for issue: https://github.com/cocos2d/cocos2d-x/pull/17875
-	patch -s "$srcdir"/$_appname-$pkgver/cocos/physics/CCPhysicsWorld.cpp CCPhysicsWorld.cpp.patch
-
 	# Engine tweaks that must be adjusted on a user basis -- must be enabled by the users. These change the behaviour of the engine in certain areas
 
 	# Disable antialiasing globally for higher performance in general.
@@ -201,8 +196,8 @@ package() {
 	# Disabled Multi-Sample Anti-Aliasing (MSAA) for higher performance
 	if [[ -n $COCOS2D_X_DISABLE_MSAA ]]; then
 		msg "Disabling MSAA globally..."
-		# For Android
-		patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java Cocos2dxActivity.java.patch
+		# TODO: For Android
+		# patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java Cocos2dxActivity.java.patch
 
 		# For Linux, Mac and Windows:
 		patch -s "$srcdir"/$_appname-$pkgver/cocos/platform/desktop/CCGLViewImpl-desktop.cpp CCGLViewImpl-desktop.cpp.patch
diff --git a/ProcessCpuTracker.cpp.patch b/ProcessCpuTracker.cpp.patch
deleted file mode 100644
index e092b8edd06f..000000000000
--- a/ProcessCpuTracker.cpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./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>