games/powder-toy: update 96.2.350 → 97.0.352

6 files changed, 27 insertions, 16 deletions

diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile
index d03b40fe86e8..f4e344329676 100644
--- a/games/powder-toy/Makefile
+++ b/games/powder-toy/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	powder-toy
-PORTVERSION=	96.2.350
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+DISTVERSION=	97.0.352
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -14,15 +13,18 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfftw3f.so:math/fftw3-float \
 		libfftw3.so:math/fftw3 \
-		libcurl.so:ftp/curl
+		libcurl.so:ftp/curl \
+		libpng.so:graphics/png \
+		libjsoncpp.so:devel/jsoncpp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	The-Powder-Toy
 GH_PROJECT=	The-Powder-Toy
 
-USES=		compiler:c++11-lang luajit:luajit-openresty meson pkgconfig \
+USES=		compiler:c++17-lang luajit:luajit-openresty meson pkgconfig \
 		python:build sdl
 USE_SDL=	sdl2
+MESON_ARGS=	-Dapp_exe="${PORTNAME}"
 
 PORTDOCS=	README.md changelog.txt
 
@@ -37,16 +39,16 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/meson.build
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/powder ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/resources/powder.desktop ${STAGEDIR}${PREFIX}/share/applications/powder-toy.desktop
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/powder-toy ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${BUILD_WRKSRC}/resources/powder.desktop ${STAGEDIR}${PREFIX}/share/applications/uk.co.powdertoy.tpt.desktop  # as mentioned in appdata
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
-	${INSTALL_DATA} ${WRKSRC}/resources/powder.appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/powder-toy.appdata.xml
-.for s in 16 24 32 48 128 256
+	${INSTALL_DATA} ${BUILD_WRKSRC}/resources/appdata.xml ${STAGEDIR}${PREFIX}/share/appdata/powder-toy.appdata.xml
+.for s in 16 32 48 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
-	${INSTALL_DATA} ${WRKSRC}/resources/icon/powder-${s}.png \
+	${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe${${s} == 256:?:_${s}}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/powder-toy.png
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/resources/icon/powder-32.png \
+	${INSTALL_DATA} ${WRKSRC}/resources/generated_icons/icon_exe_32.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/powder-toy.png
 
 do-install-DOCS-on:
diff --git a/games/powder-toy/distinfo b/games/powder-toy/distinfo
index f9781105ab62..627301111e0a 100644
--- a/games/powder-toy/distinfo
+++ b/games/powder-toy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646929473
-SHA256 (The-Powder-Toy-The-Powder-Toy-v96.2.350_GH0.tar.gz) = d95cbadee22632687661e8fc488bd64405d81c0dca737e16420f26e93ea5bf58
-SIZE (The-Powder-Toy-The-Powder-Toy-v96.2.350_GH0.tar.gz) = 1322705
+TIMESTAMP = 1673640240
+SHA256 (The-Powder-Toy-The-Powder-Toy-v97.0.352_GH0.tar.gz) = 3ab27e1b9a84db1da7342e61232ad5be981ca1ddf001c4924fd08b61cc8d287a
+SIZE (The-Powder-Toy-The-Powder-Toy-v97.0.352_GH0.tar.gz) = 740294
diff --git a/games/powder-toy/files/patch-resources_meson.build b/games/powder-toy/files/patch-resources_meson.build
new file mode 100644
index 000000000000..8d6c0d5d3829
--- /dev/null
+++ b/games/powder-toy/files/patch-resources_meson.build
@@ -0,0 +1,11 @@
+--- resources/meson.build.orig	2023-01-04 02:02:45 UTC
++++ resources/meson.build
+@@ -68,7 +68,7 @@ elif host_platform == 'darwin'
+ 		output: 'Info.plist',
+ 		configuration: conf_data,
+ 	)
+-elif host_platform == 'linux'
++else
+ 	data_files += to_array.process(rendered_icons['icon_exe'], extra_args: 'icon_exe_png')
+ 	data_files += to_array.process(rendered_icons['icon_cps'], extra_args: 'icon_cps_png')
+ 	data_files += to_array.process('save.xml', extra_args: 'save_xml')
diff --git a/games/powder-toy/files/patch-resources_powder.appdata.xml b/games/powder-toy/files_/patch-resources_powder.appdata.xml
index b6bc4e2b6685..b6bc4e2b6685 100644
--- a/games/powder-toy/files/patch-resources_powder.appdata.xml
+++ b/games/powder-toy/files_/patch-resources_powder.appdata.xml
diff --git a/games/powder-toy/files/patch-resources_powder.desktop b/games/powder-toy/files_/patch-resources_powder.desktop
index eecd45588cbf..eecd45588cbf 100644
--- a/games/powder-toy/files/patch-resources_powder.desktop
+++ b/games/powder-toy/files_/patch-resources_powder.desktop
diff --git a/games/powder-toy/pkg-plist b/games/powder-toy/pkg-plist
index 5cb3ace9de06..46bab49ed0f4 100644
--- a/games/powder-toy/pkg-plist
+++ b/games/powder-toy/pkg-plist
@@ -1,9 +1,7 @@
 bin/powder-toy
 share/appdata/powder-toy.appdata.xml
-share/applications/powder-toy.desktop
-share/icons/hicolor/128x128/apps/powder-toy.png
+share/applications/uk.co.powdertoy.tpt.desktop
 share/icons/hicolor/16x16/apps/powder-toy.png
-share/icons/hicolor/24x24/apps/powder-toy.png
 share/icons/hicolor/256x256/apps/powder-toy.png
 share/icons/hicolor/32x32/apps/powder-toy.png
 share/icons/hicolor/48x48/apps/powder-toy.png