cocos2d-x V3.11

2 files changed, 23 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 331f77a7d94c..b32a31e3e11f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Sun Mar 20 14:05:11 UTC 2016
+# Sat May 14 02:17:42 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 = 3
-	url = http://www.cocos2d-x.org/filedown/
+	pkgver = 3.11
+	pkgrel = 1
+	url = http://cdn.cocos2d-x.org/
 	arch = i686
 	arch = x86_64
 	license = MIT License
@@ -22,11 +22,11 @@ pkgbase = cocos2d-x-src
 	options = !buildflags
 	options = !strip
 	options = staticlibs
-	source = http://www.cocos2d-x.org/filedown/cocos2d-x-3.10.zip
+	source = http://cdn.cocos2d-x.org/cocos2d-x-3.11.zip
 	source = README
 	source = cocos2d-x.sh
 	source = cocos2d-x.csh
-	sha1sums = c8bb2a1d355d3c6a342fb0f95b0e47f0113eada7
+	sha1sums = b57ecf01747097ec9682bcc4ed37b22559ce78de
 	sha1sums = 1f9b4f74223b5ac1ec235c553e9eca2a2c927eca
 	sha1sums = 353bdefe07bdb6eb7f53aff20d20e83b488c1c05
 	sha1sums = 49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6
diff --git a/PKGBUILD b/PKGBUILD
index 1152651b70d6..6bd25937db74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,11 @@
 
 _appname=cocos2d-x
 pkgname=cocos2d-x-src
-pkgver=3.10
-pkgrel=3
+pkgver=3.11
+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://www.cocos2d-x.org/filedown/"
+url="http://cdn.cocos2d-x.org/"
 license=('MIT License')
 depends=('glew' 'glfw' 'glibc' 'fontconfig' 'libgl' 'curl' 'libx11' 'zlib' 'libpng' 'freetype2' 'python2')
 #depends=('openssl' 'sqlite3')
@@ -16,35 +16,15 @@ source=("${url}${_appname}-${pkgver}.zip"
 "$_appname.sh"
 "$_appname.csh"
 )
-sha1sums=('c8bb2a1d355d3c6a342fb0f95b0e47f0113eada7'
+sha1sums=('b57ecf01747097ec9682bcc4ed37b22559ce78de'
 '1f9b4f74223b5ac1ec235c553e9eca2a2c927eca'
 '353bdefe07bdb6eb7f53aff20d20e83b488c1c05'
 '49b7919fc38803c1dd2f5b1d47fb0c75fde1fec6'
 )
 
 prepare() {
+	cd "$srcdir"/$_appname-$pkgver
 	chmod +x "download-deps.py"
-
-	# isnan patch
-	sed -e 's/isnan/std::isnan/g' -i  \
-		./cocos/2d/CCActionCamera.cpp \
-		./extensions/GUI/CCControlExtension/CCControlUtils.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_3d_extension_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_builder_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_navmesh_auto.cpp \
-		./cocos/scripting/js-bindings/auto/jsb_cocos2dx_physics3d_auto.cpp \
-		./cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp \
-		./cocos/scripting/js-bindings/manual/js_manual_conversions.cpp \
-		./cocos/scripting/js-bindings/manual/physics3d/jsb_cocos2dx_physics3d_manual.cpp \
-		./cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_conversions.cpp \
-		./tests/js-tests/project/Classes/js_Effect3D_bindings.cpp
-
 	python2 "download-deps.py" -r yes
 }
 
@@ -53,7 +33,11 @@ package() {
 	install -Dm644 "README" "$pkgdir/opt/$_appname/README"
 	install -Dm755 "$_appname.sh" "$pkgdir/etc/profile.d/$_appname.sh"
 	install -Dm755 "$_appname.csh" "$pkgdir/etc/profile.d/$_appname.csh"
+
+	# Remove unnecessary files:
 	rm "README" "$_appname.sh" "$_appname.csh" "${_appname}-${pkgver}.zip"
+
+	# Necessary libfmod symbolic link
 	mkdir -p "$pkgdir/usr/lib"
 	if [[ $CARCH == "x86_64" ]]; then
 		ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/64-bit/libfmod.so "$pkgdir/usr/lib/libfmod.so.6"
@@ -62,5 +46,12 @@ package() {
 		ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/32-bit/libfmod.so "$pkgdir/usr/lib/libfmod.so.6"
 		ln -sf /opt/cocos2d-x/external/linux-specific/fmod/prebuilt/32-bit/libfmodL.so "$pkgdir/usr/lib/libfmodL.so.6"
 	fi
-	mv "$srcdir/"*  "$pkgdir/opt/$_appname" 	
+
+	# Inconsistent executable test name patch
+	sed -i 's/cpp_tests/cpp-tests/g' "$srcdir/$_appname-$pkgver/tests/cpp-tests/CMakeLists.txt"
+	sed -i 's/js_tests/js-tests/g' "$srcdir/$_appname-$pkgver/tests/js-tests/project/CMakeLists.txt"
+	sed -i 's/lua_tests/lua-tests/g' "$srcdir/$_appname-$pkgver/tests/lua-tests/project/CMakeLists.txt"
+
+	# Packaging source
+	mv "$srcdir"/$_appname-$pkgver/* "$pkgdir/opt/$_appname" 	
 }