From nobody Mon Jan 16 14:54:43 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NwZmz4M56z2sZH2; Mon, 16 Jan 2023 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NwZmz3wFjz4NGC; Mon, 16 Jan 2023 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673880883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jrv+laWopX/NdMhdO5Vv77eTKaNgx+JzqJfJn47SE7s=; b=O0PCcuupk6vWNpB9Q7x2esK4UZ4rdi0bZUEi+utM1DkyeGi2IMlv9E3HQj8hMn8YO+62QY pK4/BqrmmPbh9FL4KjwuD8NnY2mfhZwmI1DamTyz919VDpV978hl1ICp1wJfgJrkVLl/2L 4LotPVLhf5sGrK1JqwG+jdz8Wu7c+uopaYHQVsZlsIoAqdPsJeCKDlCxGXi9FWLFhHrwsX 9z+QvBxWW78vZXcqoj6Bblckmi7onm2BDTcfXHMbzgqPzAZmSyyhuIJUhcbe9Og2l4oIDt fbe6darf1XVwoQcfg3ykUGxfslkram2/c1OgKigyERaF1PuHRUo05yFZO0dbKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673880883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jrv+laWopX/NdMhdO5Vv77eTKaNgx+JzqJfJn47SE7s=; b=is+ji5b0f1hcJdP5+Bb1pUyUwtUnX3chuOi96VfYa6E+9LJwoABQygSqB2AI5xx4svxXGR SxmVkP5wqbOcUoHEOl2qEeU1LlbvVTVPM/mKXTF5eCX9ZZVbjauxsFDCU1AE2SSVZq23D9 hJImr8QNUo3hQ6zSfzWeD8CLwUix/et5kPYW87euif37Lq/BAWaJ/Nnk7+vRDTEgulIrg4 xOa2jYN/9pdVbIZOwQDreC1TiXiUaa+Z15zeFcI3FAaX2uwNpsufzgbQxRP6/IFrOaXVdx 0vewIut40G/4Fzei05Hnm83vKVf6tRGM50arVUUnoSqAlY+G/La0X33XOCRcpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673880883; a=rsa-sha256; cv=none; b=YXyYZvWYdxvzA53gZfbKdUeTLCBxXkSIRMCJgiXVcCbMFKGvvsN7SZZxLyQI3JHlFSevPk dzcX3F4D/kjV4+16W/pPlB5JAcsiZazOlqDXHkfYNhxHHCIW7kRGkudKjNfwu7d5vf2ciu BnY+QNjEFJxwhdGbJh9jfPF1X8AkHlirN3Yr3NaEIbGQhMYYugRrLG16bZFyStusTHcmoT r674wjHhFbMNqbCuQTc5TGFZJU2IMfHBKsT2PbTYFv0lLzVvHvgy92bST2RTXVWHPsfLwI gcEGoeW0NkfgQf+M83uJg5rr7u5I/27b47q1VnWdwrVY3YJq0rWwFmr3VmNKaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NwZmz30nRz19pd; Mon, 16 Jan 2023 14:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30GEshlm077741; Mon, 16 Jan 2023 14:54:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GEshMO077740; Mon, 16 Jan 2023 14:54:43 GMT (envelope-from git) Date: Mon, 16 Jan 2023 14:54:43 GMT Message-Id: <202301161454.30GEshMO077740@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 532e8c1df142 - main - =?utf-8?Q?games/powder-toy:=20update=2096.2.350=20=E2=86=92=2097.0.352?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 532e8c1df142c60c7055e45a7ccf99c869a8c6f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=532e8c1df142c60c7055e45a7ccf99c869a8c6f3 commit 532e8c1df142c60c7055e45a7ccf99c869a8c6f3 Author: Dmitry Marakasov AuthorDate: 2023-01-16 13:25:09 +0000 Commit: Dmitry Marakasov CommitDate: 2023-01-16 14:54:26 +0000 games/powder-toy: update 96.2.350 → 97.0.352 --- games/powder-toy/Makefile | 22 ++++++++++++---------- games/powder-toy/distinfo | 6 +++--- games/powder-toy/files/patch-resources_meson.build | 11 +++++++++++ .../patch-resources_powder.appdata.xml | 0 .../patch-resources_powder.desktop | 0 games/powder-toy/pkg-plist | 4 +--- 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 similarity index 100% rename from games/powder-toy/files/patch-resources_powder.appdata.xml rename to 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 similarity index 100% rename from games/powder-toy/files/patch-resources_powder.desktop rename to 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