diff options
-rw-r--r-- | .SRCINFO | 28 | ||||
-rw-r--r-- | .gitignore | 10 | ||||
-rw-r--r-- | PKGBUILD | 157 | ||||
-rw-r--r-- | powder-toy-open.desktop | 12 | ||||
-rw-r--r-- | powder-toy-ptsave.desktop | 12 | ||||
-rw-r--r-- | powder-toy.desktop | 10 | ||||
-rw-r--r-- | powder-toy.patch | 11 | ||||
-rwxr-xr-x | powder-toy.sh | 9 |
8 files changed, 100 insertions, 149 deletions
@@ -1,35 +1,25 @@ pkgbase = powder-toy-git pkgdesc = Desktop version of the classic falling sand physics sandbox, simulates air pressure, velocity & heat! - pkgver = snapshot.206.1.g55c14fc1 + pkgver = 97.0.352.r218.g5584acd18 pkgrel = 1 - url = http://powdertoy.co.uk/ + url = https://github.com/ThePowderToy/The-Powder-Toy arch = x86_64 arch = i686 license = GPL3 + makedepends = git makedepends = meson - makedepends = libicns - depends = glibc - depends = libx11 - depends = sdl2 depends = luajit - depends = fftw depends = bzip2 - depends = zlib + depends = curl + depends = fftw + depends = glibc depends = hicolor-icon-theme + depends = jsoncpp + depends = libpng + depends = sdl2 provides = powder-toy conflicts = powder-toy source = powder-toy::git+https://github.com/ThePowderToy/The-Powder-Toy.git#branch=master - source = powder-toy.sh - source = powder-toy.patch - source = powder-toy.desktop - source = powder-toy-open.desktop - source = powder-toy-ptsave.desktop sha256sums = SKIP - sha256sums = b5d181c3141715b7dced8813cae6d07d2adc03bca2a7efe527592740de2d45e2 - sha256sums = 2b3a51ed0f41be065da71c6f9b48d4b8e75111dd8ea6028b5ad069817c31b7bf - sha256sums = 265f530be7597fcc7bbaf2690fd517fe4f8f18372c808a90ddef49a604c8d455 - sha256sums = 398f6d068dd37e12989f4132ea5966886b14036bac07a589991b283d242b4ca5 - sha256sums = fcbf035d286d805dced55f147d649aa0bc74d3be873d5430de92d175d9f59431 pkgname = powder-toy-git - diff --git a/.gitignore b/.gitignore index 8b37d12ed638..018a3de08144 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -/src/ -/pkg/ -/powder-toy/ -/powder-toy-*.pkg.tar.* - -/powder-toy-*.tar.gz +* +!PKGBUILD +!.SRCINFO +!.gitignore @@ -1,100 +1,117 @@ -# Maintainer: Jonathan Knapp <jaknapp8+aur@gmail.com> -# Maintainer: Dmytro Meleshko <dmytro.meleshko@gmail.com> -# Contributor: farseerfc <farseerfc@archlinuxcn.org> -# Contributor: refujee <gmail.com: refujee> -# Contributor: sausageandeggs <archlinux.us: sausageandeggs> -# Contributor: Jesse Jaara <gmail.com: jesse.jaara> +# Maintainer: +# Contributor: Jonathan Knapp <jaknapp8+aur@gmail.com> +# Contributor: Dmytro Meleshko <dmytro.meleshko@gmail.com> +# Contributor: farseerfc <farseerfc@archlinuxcn.org> +# Contributor: refujee <gmail.com: refujee> +# Contributor: sausageandeggs <archlinux.us: sausageandeggs> +# Contributor: Jesse Jaara <gmail.com: jesse.jaara> # 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 _branch=master -#_branch=stable -_ogname=powder-toy -pkgname=powder-toy-git -pkgver=snapshot.206.1.g55c14fc1 +_appexe="powder-toy" +_appid="uk.co.powdertoy.tpt" +_appvendor="powdertoy" + +_pkgname="powder-toy" +pkgname="$_pkgname-git" +pkgver=97.0.352.r218.g5584acd18 pkgrel=1 pkgdesc="Desktop version of the classic falling sand physics sandbox, simulates air pressure, velocity & heat!" arch=(x86_64 i686) -provides=('powder-toy') -conflicts=('powder-toy') -depends=('glibc' 'libx11' 'sdl2' $_lua 'fftw' 'bzip2' 'zlib' 'hicolor-icon-theme') -makedepends=('meson' 'libicns') url="http://powdertoy.co.uk/" license=('GPL3') -source=("${_ogname}::git+https://github.com/ThePowderToy/The-Powder-Toy.git#branch=$_branch" - "${_ogname}.sh" - "${_ogname}.patch" - "${_ogname}.desktop" - "${_ogname}-open.desktop" - "${_ogname}-ptsave.desktop") -sha256sums=('SKIP' - 'b5d181c3141715b7dced8813cae6d07d2adc03bca2a7efe527592740de2d45e2' - '2b3a51ed0f41be065da71c6f9b48d4b8e75111dd8ea6028b5ad069817c31b7bf' - '265f530be7597fcc7bbaf2690fd517fe4f8f18372c808a90ddef49a604c8d455' - '398f6d068dd37e12989f4132ea5966886b14036bac07a589991b283d242b4ca5' - 'fcbf035d286d805dced55f147d649aa0bc74d3be873d5430de92d175d9f59431') -pkgver() { - cd ${_ogname} - git describe --tags | sed 's/^v//;s/[-+]/./g' -} +depends=( + "$_lua" + + bzip2 + curl + fftw + glibc + hicolor-icon-theme + jsoncpp + libpng + sdl2 +) +makedepends=( + git + meson +) -prepare() { - cd ${_ogname} - patch --forward --strip=1 --input="${srcdir}/${_ogname}.patch" +if [ x"$_pkgname" != x"$pkgname" ] ; then + url="https://github.com/ThePowderToy/The-Powder-Toy" + provides=("$_pkgname") + conflicts=("$_pkgname") +fi + +source=( + "$_pkgname"::"git+https://github.com/ThePowderToy/The-Powder-Toy.git#branch=$_branch" +) +sha256sums=( + 'SKIP' +) + +pkgver() { + cd "$_pkgname" + git describe --tags --match "v[0-9]*" | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } build() { - cd ${_ogname} + cd "$_pkgname" - # extract document icons from macOS .icns files - ( cd resources && icns2png -x document.icns ) + local opt_lua opt_sse - local extra_flags=() + case "$_lua" in + luajit) opt_lua=luajit ;; + lua51) opt_lua=lua5.1 ;; + lua52) opt_lua=lua5.2 ;; + *) opt_lua=none ;; + esac - if grep -q -i pni /proc/cpuinfo; then - extra_flags+=("-D x86_sse=sse3") + if grep -q -i pni /proc/cpuinfo; then + opt_sse=sse3 elif grep -q -i sse2 /proc/cpuinfo; then - extra_flags+=("-D x86_sse=sse2") - elif grep -q -i sse /proc/cpuinfo; then - extra_flags+=("-D x86_sse=sse") + opt_sse=sse2 + elif grep -q -i sse /proc/cpuinfo; then + opt_sse=sse else - extra_flags+=("-D x86_sse=none") + opt_sse=none fi - case "$_lua" in - luajit) extra_flags+=("-D lua=luajit") ;; - lua51) extra_flags+=("-D lua=lua5.1") ;; - lua52) extra_flags+=("-D lua=lua5.2") ;; - esac + local extra_flags=( + -Dignore_updates=true + -Dapp_exe="${_appexe}" + -Dapp_id="${_appid}" + -Dapp_vendor="${_appvendor}" + -Dlua="${opt_lua}" + -Dx86_sse="${opt_sse}" + ) - msg2 "building ${_ogname} with the following extra flags: ${extra_flags[*]}" - meson build_debug -D "ignore-updates=true" "${extra_flags[@]}" - cd build_debug - ninja + echo "building ${pkgname} with the following extra flags: ${extra_flags[*]}" + arch-meson --buildtype=release build "${extra_flags[@]}" + meson compile -C build } package() { - install -Dm755 "${_ogname}.sh" "${pkgdir}/usr/bin/${_ogname}" - install -Dm644 "${_ogname}.desktop" "${pkgdir}/usr/share/applications/${_ogname}.desktop" - install -Dm644 "${_ogname}-open.desktop" "${pkgdir}/usr/share/applications/${_ogname}-open.desktop" - install -Dm644 "${_ogname}-ptsave.desktop" "${pkgdir}/usr/share/applications/${_ogname}-ptsave.desktop" + cd "$_pkgname" - cd ${_ogname} - - install -Dm755 "build_debug/powder" "${pkgdir}/usr/lib/${_ogname}/${_ogname}" - install -Dm644 "resources/powdertoy-save.xml" "${pkgdir}/usr/share/mime/packages/${_ogname}-save.xml" - install -Dm644 "resources/powder.appdata.xml" "${pkgdir}/usr/share/metainfo/${_ogname}.appdata.xml" - - local icon_size - for icon_size in 16 24 32 48 128 256; do - install -Dm644 "resources/icon/powder-${icon_size}.png" \ - "${pkgdir}/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps/${_ogname}.png" - done - for icon_size in 16 32 128 256 512; do - install -Dm644 "resources/document_${icon_size}x${icon_size}x32.png" \ - "${pkgdir}/usr/share/icons/hicolor/${icon_size}x${icon_size}/mimetypes/application-vnd.${_ogname}.save.png" + install -Dm755 "build/${_appexe}" "${pkgdir}/usr/bin/${_appexe}" + install -Dm644 "build/resources/powder.desktop" "${pkgdir}/usr/share/applications/${_appid}.desktop" + install -Dm644 "build/resources/appdata.xml" "${pkgdir}/usr/share/metainfo/${_appid}.appdata.xml" + install -Dm644 "resources/save.xml" "${pkgdir}/usr/share/mime/packages/${_appvendor}-save.xml" + install -Dm644 "resources/powder.man" "${pkgdir}/usr/share/man/man6/${_appexe}.6" + local theme_dir="${pkgdir}/usr/share/icons/hicolor" mimetype="application-vnd.powdertoy.save" + install -Dm644 "resources/icon_exe.svg" "${theme_dir}/scalable/apps/${_appvendor}-${_appexe}.svg" + install -Dm644 "resources/icon_cps.svg" "${theme_dir}/scalable/mimetypes/${mimetype}.svg" + install -Dm644 "resources/generated_icons/icon_exe.png" "${theme_dir}/256x256/apps/${_appvendor}-${_appexe}.png" + install -Dm644 "resources/generated_icons/icon_cps.png" "${theme_dir}/256x256/mimetypes/${mimetype}.png" + local icon_size; for icon_size in 16 32 48; do + install -Dm644 "resources/generated_icons/icon_exe_${icon_size}.png" \ + "${theme_dir}/${icon_size}x${icon_size}/apps/${_appvendor}-${_appexe}.png" + install -Dm644 "resources/generated_icons/icon_cps_${icon_size}.png" \ + "${theme_dir}/${icon_size}x${icon_size}/mimetypes/${mimetype}.png" done } diff --git a/powder-toy-open.desktop b/powder-toy-open.desktop deleted file mode 100644 index 715a38ecfb69..000000000000 --- a/powder-toy-open.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Powder Toy -NoDisplay=true -Comment=Physics sandbox game -Icon=powder-toy -Exec=powder-toy open %f -Terminal=false -MimeType=application/vnd.powder-toy.save; -Categories=Game;Simulation; -StartupNotify=false diff --git a/powder-toy-ptsave.desktop b/powder-toy-ptsave.desktop deleted file mode 100644 index bf90bb551e81..000000000000 --- a/powder-toy-ptsave.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Powder Toy -NoDisplay=true -Comment=Physics sandbox game -Icon=powder-toy -Exec=powder-toy ptsave %u -Terminal=false -MimeType=x-scheme-handler/ptsave; -Categories=Game;Simulation; -StartupNotify=false diff --git a/powder-toy.desktop b/powder-toy.desktop deleted file mode 100644 index 5aa018043c2c..000000000000 --- a/powder-toy.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Powder Toy -Comment=Physics sandbox game -Icon=powder-toy -Exec=powder-toy -Terminal=false -Categories=Game;Simulation; -StartupNotify=false diff --git a/powder-toy.patch b/powder-toy.patch deleted file mode 100644 index 9ce1f4237b73..000000000000 --- a/powder-toy.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --unified --recursive --text --color The-Powder-Toy-94.1.orig/resources/powdertoy-save.xml The-Powder-Toy-94.1/resources/powdertoy-save.xml ---- The-Powder-Toy-94.1.orig/resources/powdertoy-save.xml 2019-02-21 07:23:45.000000000 +0200 -+++ The-Powder-Toy-94.1/resources/powdertoy-save.xml 2019-10-06 00:21:51.080019592 +0300 -@@ -1,6 +1,6 @@ - <?xml version="1.0"?> - <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> -- <mime-type type="application/vnd.powdertoy.save"> -+ <mime-type type="application/vnd.powder-toy.save"> - <comment>Powder Toy save</comment> - <glob pattern="*.cps"/> - <glob pattern="*.stm"/> diff --git a/powder-toy.sh b/powder-toy.sh deleted file mode 100755 index db640fb98173..000000000000 --- a/powder-toy.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env sh -set -eu - -pkgname=powder-toy -data_home="${XDG_DATA_HOME:-${HOME}/.local/share}/${pkgname}" - -mkdir -p "${data_home}" -cd "${data_home}" -exec "/usr/lib/${pkgname}/${pkgname}" "$@" |