v96.0.348

3 files changed, 48 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b753850773c8..be6e3e0f586b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,29 @@
 pkgbase = powder-toy
 	pkgdesc = Desktop version of the classic falling sand physics sandbox, simulates air pressure, velocity & heat!
-	pkgver = 95.0
-	pkgrel = 2
+	pkgver = 96.0.348
+	pkgrel = 1
 	url = https://powdertoy.co.uk/
+	install = powder-toy.install
 	arch = x86_64
 	arch = i686
 	license = GPL3
-	makedepends = scons
+	makedepends = meson
+	makedepends = ninja
 	makedepends = libicns
 	depends = glibc
 	depends = libx11
 	depends = sdl2
 	depends = luajit
 	depends = fftw
-	depends = bzip2
 	depends = zlib
+	depends = curl
 	depends = hicolor-icon-theme
-	source = powder-toy-95.0.tar.gz::https://github.com/ThePowderToy/The-Powder-Toy/archive/v95.0.tar.gz
-	source = powder-toy.patch
+	source = powder-toy-96.0.348.tar.gz::https://github.com/The-Powder-Toy/The-Powder-Toy/archive/refs/tags/v96.0.348.tar.gz
 	source = powder-toy.sh
 	source = powder-toy.desktop
 	source = powder-toy-open.desktop
 	source = powder-toy-ptsave.desktop
-	sha256sums = f60c3dc93e4ceddeda92b768e75a2d218f8df3da4a569b7d7cb57fff5515e15b
-	sha256sums = 4b75d58bfff9278bceb27fa14738e9a1abef6fe60680bb9f5eb0592f3d69a02a
+	sha256sums = 25e405e547961485a498672ddb27adc87abe906f6b8f49516c28bdf751e66334
 	sha256sums = b5d181c3141715b7dced8813cae6d07d2adc03bca2a7efe527592740de2d45e2
 	sha256sums = 265f530be7597fcc7bbaf2690fd517fe4f8f18372c808a90ddef49a604c8d455
 	sha256sums = 398f6d068dd37e12989f4132ea5966886b14036bac07a589991b283d242b4ca5
diff --git a/PKGBUILD b/PKGBUILD
index 97aceca4932b..e2c3e6449013 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,72 @@
-# Maintainer: Dmytro Meleshko <dmytro.meleshko@gmail.com>
+# Maintainer:	Dmytro Meleshko	<qzlgeb.zryrfuxb@tznvy.pbz(rot13)>
 # Contributor:	farseerfc	<farseerfc@archlinuxcn.org>
 # Contributor:	refujee		<gmail.com: refujee>
 # Contributor:	sausageandeggs	<archlinux.us: sausageandeggs>
 # Contributor:	Jesse Jaara	<gmail.com: jesse.jaara>
+# Mesonification is based on <https://aur.archlinux.org/cgit/aur.git/commit/PKGBUILD?h=powder-toy-git&id=65c5f88eb2df75df77c4da139859232d7d94f2c0>
 
 # Select version of Lua. Possible values are luajit, lua51, lua52 and an empty
 # string to disable Lua support. luajit is used in the official builds.
 _lua=luajit
 
 pkgname=powder-toy
-pkgver=95.0
-pkgrel=2
+pkgver=96.0.348
+pkgrel=1
 pkgdesc="Desktop version of the classic falling sand physics sandbox, simulates air pressure, velocity & heat!"
 arch=(x86_64 i686)
-depends=('glibc' 'libx11' 'sdl2' $_lua 'fftw' 'bzip2' 'zlib' 'hicolor-icon-theme')
-makedepends=('scons' 'libicns')
+depends=('glibc' 'libx11' 'sdl2' "$_lua" 'fftw' 'zlib' 'curl' 'hicolor-icon-theme')
+makedepends=('meson' 'ninja' 'libicns')
 url="https://powdertoy.co.uk/"
 license=('GPL3')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ThePowderToy/The-Powder-Toy/archive/v${pkgver}.tar.gz"
-        "${pkgname}.patch"
+install="${pkgname}.install"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/The-Powder-Toy/The-Powder-Toy/archive/refs/tags/v${pkgver}.tar.gz"
         "${pkgname}.sh"
         "${pkgname}.desktop"
         "${pkgname}-open.desktop"
         "${pkgname}-ptsave.desktop")
-sha256sums=('f60c3dc93e4ceddeda92b768e75a2d218f8df3da4a569b7d7cb57fff5515e15b'
-            '4b75d58bfff9278bceb27fa14738e9a1abef6fe60680bb9f5eb0592f3d69a02a'
+sha256sums=('25e405e547961485a498672ddb27adc87abe906f6b8f49516c28bdf751e66334'
             'b5d181c3141715b7dced8813cae6d07d2adc03bca2a7efe527592740de2d45e2'
             '265f530be7597fcc7bbaf2690fd517fe4f8f18372c808a90ddef49a604c8d455'
             '398f6d068dd37e12989f4132ea5966886b14036bac07a589991b283d242b4ca5'
             'fcbf035d286d805dced55f147d649aa0bc74d3be873d5430de92d175d9f59431')
 
-prepare() {
-  cd "The-Powder-Toy-${pkgver}"
-  patch --forward --strip=1 --input="${srcdir}/${pkgname}.patch"
-}
-
 build() {
   cd "The-Powder-Toy-${pkgver}"
 
   # extract document icons from macOS .icns files
-  ( cd resources && icns2png -x document.icns )
+  pushd >/dev/null resources
+  icns2png -x document.icns
+  popd >/dev/null
 
   local extra_flags=()
 
-  case "$CARCH" in
-    x86_64) extra_flags+=(--64bit) ;;
-      i686) extra_flags+=(--32bit) ;;
-  esac
+  extra_flags+=(-Dignore_updates=true)
+  extra_flags+=(-Dinstall_check=false)
 
   if   grep -q -i pni  /proc/cpuinfo; then
-    extra_flags+=(--sse3)
+    extra_flags+=(-Dx86_sse=sse3)
   elif grep -q -i sse2 /proc/cpuinfo; then
-    extra_flags+=(--sse2)
+    extra_flags+=(-Dx86_sse=sse2)
   elif grep -q -i sse  /proc/cpuinfo; then
-    extra_flags+=(--sse)
+    extra_flags+=(-Dx86_sse=sse)
   else
-    extra_flags+=(--no-sse)
+    extra_flags+=(-Dx86_sse=none)
   fi
 
   case "$_lua" in
-    luajit) extra_flags+=(--luajit) ;;
-     lua51)                         ;; # lua51 support is enabled by default
-     lua52) extra_flags+=(--lua52)  ;;
-        "") extra_flags+=(--nolua)  ;;
+    luajit) extra_flags+=(-Dlua=luajit) ;;
+     lua51) extra_flags+=(-Dlua=lua5.1) ;;
+     lua52) extra_flags+=(-Dlua=lua5.2) ;;
   esac
 
   msg2 "building ${pkgname} with the following extra flags: ${extra_flags[*]}"
-  scons --lin --release --output="${pkgname}" ${MAKEFLAGS} "${extra_flags[@]}"
+  arch-meson --buildtype=release build "${extra_flags[@]}"
+  meson compile -C build
+}
+
+check() {
+  cd "The-Powder-Toy-${pkgver}"
+  meson test -C build
 }
 
 package() {
@@ -77,9 +77,10 @@ package() {
 
   cd "The-Powder-Toy-${pkgver}"
 
-  install -Dm755 "build/${pkgname}" "${pkgdir}/usr/lib/${pkgname}/${pkgname}"
+  install -Dm755 "build/powder" "${pkgdir}/usr/lib/${pkgname}/${pkgname}"
   install -Dm644 "resources/powdertoy-save.xml" "${pkgdir}/usr/share/mime/packages/${pkgname}-save.xml"
   install -Dm644 "resources/powder.appdata.xml" "${pkgdir}/usr/share/metainfo/${pkgname}.appdata.xml"
+  install -Dm644 "resources/powder.man" "${pkgdir}/usr/share/man/man6/${pkgname}.6"
 
   local icon_size
   for icon_size in 16 24 32 48 128 256; do
diff --git a/powder-toy.install b/powder-toy.install
new file mode 100644
index 000000000000..5d4747cdb066
--- /dev/null
+++ b/powder-toy.install
@@ -0,0 +1,10 @@
+post_upgrade() {
+  local new_pkgver="$1" old_pkgver="$2"
+  if [ "$(vercmp "$old_pkgver" 96.0)" -lt 0 ] && [ "$(vercmp "$new_pkgver" 96.0)" -ge 0 ]; then
+    cat <<EOF
+The saves directory has been changed from \`~/.local/share/powder-toy\` to
+\`~/.local/share/The Powder Toy\` in the version 96.0, please, move your saves
+accordingly.
+EOF
+  fi
+}