Click here to go back to the commit logs for powder-toy.

Commit:

---

Hash: fd9eb461c104327fa5715c75cc2549c0f0616698

Message: update to 91.0

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index b00c8db..1cf7d87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = powder-toy
 	pkgdesc = Desktop version of the classic falling sand physics sandbox, simulates air pressure, velocity & heat!
-	pkgver = 90.2
-	pkgrel = 4
+	pkgver = 91.0
+	pkgrel = 1
 	url = http://powdertoy.co.uk/
 	arch = i686
 	arch = x86_64
@@ -13,14 +13,12 @@ pkgbase = powder-toy
 	depends = fftw
 	depends = bzip2
 	depends = zlib
-	source = http://github.com/FacialTurd/The-Powder-Toy/archive/v90.2.322.tar.gz
+	source = http://github.com/FacialTurd/The-Powder-Toy/archive/v91.0.324.tar.gz
 	source = powder-toy.desktop
 	source = powder-toy.png
-	source = lua-5.2-arch.patch
-	md5sums = 0eec9ce14da705b1525e9c641460cc2c
+	md5sums = ae877df14a7a5167008e864a64a74bb7
 	md5sums = 8901d334c53c04738cbd3518c80fa37c
 	md5sums = bb40bf9c2fa3982e2872b5d32de3b006
-	md5sums = 6d17fa966ac45f42e51eb574bcd08881
 
 pkgname = powder-toy
 
diff --git a/PKGBUILD b/PKGBUILD
index 50f8a49..f296dc0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,11 +11,11 @@ NATIVE_OPTIMIZATIONS=n
 
 
 pkgname=powder-toy
-_sver=90
-_mver=2
-_build=322
+_sver=91
+_mver=0
+_build=324
 pkgver=${_sver}.${_mver}
-pkgrel=4
+pkgrel=1
 pkgdesc="Desktop version of the classic falling sand physics sandbox, simulates air pressure, velocity & heat!"
 arch=(i686 x86_64)
 depends=('sdl' 'lua52' 'fftw' 'bzip2' 'zlib')
@@ -23,7 +23,7 @@ makedepends=('python2' 'scons')
 url="http://powdertoy.co.uk/"
 license=('GPL3')
 source=(http://github.com/FacialTurd/The-Powder-Toy/archive/v${_sver}.${_mver}.${_build}.tar.gz
-	${pkgname}.desktop ${pkgname}.png lua-5.2-arch.patch)
+	${pkgname}.desktop ${pkgname}.png)
 
 prepare() {
   cd "${srcdir}/The-Powder-Toy-${_sver}.${_mver}.${_build}"
@@ -32,7 +32,6 @@ prepare() {
   #Also I do not know the logic behind the generated snapshotids.
   sed 's|//#define I|#define I|' -i src/Config.h
 
-  patch --binary -p0 -i ../lua-5.2-arch.patch
 }
 
 build() {
@@ -57,7 +56,8 @@ build() {
 
   msg2 "building powder with options with following extra flags ${_xarch} --${_ssever} ${_native}"
   scons --lin ${_xarch} --release --${_ssever} ${_native} --save-version=${_sver} \
-	--minor-version=${_mver} --build-number=${_build} ${MAKEFLAGS}
+	--minor-version=${_mver} --build-number=${_build} ${MAKEFLAGS} \
+    --lua52
 
   mv build/{powder*,binary}
 }
@@ -68,7 +68,6 @@ package() {
   install -Dm 644 "${srcdir}/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
 
-md5sums=('0eec9ce14da705b1525e9c641460cc2c'
+md5sums=('ae877df14a7a5167008e864a64a74bb7'
          '8901d334c53c04738cbd3518c80fa37c'
-         'bb40bf9c2fa3982e2872b5d32de3b006'
-         '6d17fa966ac45f42e51eb574bcd08881')
+         'bb40bf9c2fa3982e2872b5d32de3b006')
diff --git a/lua-5.2-arch.patch b/lua-5.2-arch.patch
deleted file mode 100644
index 130d927..0000000
--- a/lua-5.2-arch.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- SConscript	2014-08-31 04:33:31.000000000 +0300
-+++ SConscript.arch	2014-08-31 23:31:50.732594365 +0300
-@@ -248,13 +248,8 @@
- 
- 	if not GetOption('nolua') and not GetOption('renderer'):
- 		#Look for Lua
--		luaver = "lua5.1"
--		if not conf.CheckLib(['lua5.1', 'lua-5.1', 'lua51', 'lua']):
--			if conf.CheckLib(['lua5.2', 'lua-5.2', 'lua52']):
--				env.Append(CPPDEFINES=["LUA_COMPAT_ALL"])
--				luaver = "lua5.2"
--			elif platform != "Darwin" or not conf.CheckFramework("Lua"):
--				FatalError("lua5.1 development library not found or not installed")
-+		env.Append(CPPDEFINES=["LUA_COMPAT_ALL"])
-+		luaver = "lua52"
- 		if platform == "Linux":
- 			try:
- 				env.ParseConfig("pkg-config --cflags {0}".format(luaver))