Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] The-Powder-Toy: update to 96.2.350.
@ 2022-10-11  2:22 0x5c
  2022-10-11  2:24 ` [PR PATCH] [Updated] " 0x5c
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: 0x5c @ 2022-10-11  2:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]

There is a new pull request by 0x5c against master on the void-packages repository

https://github.com/0x5c/void-packages adopt/powdertoy
https://github.com/void-linux/void-packages/pull/39878

The-Powder-Toy: update to 96.2.350.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

This might take care of the problems in https://github.com/void-linux/void-packages/issues/39809

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39878.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-adopt/powdertoy-39878.patch --]
[-- Type: text/x-diff, Size: 3552 bytes --]

From f345f19ef74382e996b774aa0d3d6a16e07d07a0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 10 Oct 2022 18:33:06 -0400
Subject: [PATCH] The-Powder-Toy: update to 96.2.350.

---
 srcpkgs/The-Powder-Toy/patches/luacpp.patch | 19 ++++++++++++
 srcpkgs/The-Powder-Toy/template             | 34 +++++++++++----------
 2 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/The-Powder-Toy/patches/luacpp.patch

diff --git a/srcpkgs/The-Powder-Toy/patches/luacpp.patch b/srcpkgs/The-Powder-Toy/patches/luacpp.patch
new file mode 100644
index 000000000000..47e57a5861a3
--- /dev/null
+++ b/srcpkgs/The-Powder-Toy/patches/luacpp.patch
@@ -0,0 +1,19 @@
+They look for a pkg-config file that does not exist in our Lua package nor
+upstream Lua, but the normal .pc file works just fine.
+
+--
+
+--- a/meson.build
++++ b/meson.build
+@@ -108,9 +108,9 @@
+ if uopt_lua == 'luajit'
+ 	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('luajit_dep') : dependency('luajit', static: uopt_static == 'system') ]
+ elif uopt_lua == 'lua5.2'
+-	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua52_dep') : dependency('lua5.2-c++', static: uopt_static == 'system') ]
++	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua52_dep') : dependency('lua5.2', static: uopt_static == 'system') ]
+ elif uopt_lua == 'lua5.1'
+-	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua51_dep') : dependency('lua5.1-c++', static: uopt_static == 'system') ]
++	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua51_dep') : dependency('lua5.1', static: uopt_static == 'system') ]
+ else
+ 	lua_opt_dep = []
+ endif
diff --git a/srcpkgs/The-Powder-Toy/template b/srcpkgs/The-Powder-Toy/template
index 889c42724fb6..129929eb2fd9 100644
--- a/srcpkgs/The-Powder-Toy/template
+++ b/srcpkgs/The-Powder-Toy/template
@@ -1,29 +1,31 @@
 # Template file for 'The-Powder-Toy'
 pkgname=The-Powder-Toy
-version=95.0
+version=96.2.350
 revision=1
-build_style=scons
-make_build_args="--output=powder"
-makedepends="SDL2-devel lua51-devel fftw-devel bzip2-devel zlib-devel
- libcurl-devel"
+build_style=meson
+configure_args="-Dx86_sse=sse2 -Dworkaround_gcc_no_pie=false
+ -Dlua=$(vopt_if luajit luajit lua5.1)"
+hostmakedepends="pkg-config"
+makedepends="SDL2-devel fftw-devel bzip2-devel zlib-devel libcurl-devel
+ $(vopt_if luajit LuaJIT-devel lua51-devel)"
 short_desc="Falling sand physics sandbox, simulates air pressure, velocity & heat"
-maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+maintainer="0x5c <dev@0x5c.io>"
 license="GPL-3.0-or-later"
 homepage="https://powdertoy.co.uk/"
 distfiles="https://github.com/The-Powder-Toy/${pkgname}/archive/v${version}.tar.gz"
-checksum=f60c3dc93e4ceddeda92b768e75a2d218f8df3da4a569b7d7cb57fff5515e15b
-CPPDEFINES=IGNORE_UPDATES
+checksum=d95cbadee22632687661e8fc488bd64405d81c0dca737e16420f26e93ea5bf58
 
-case "$XBPS_TARGET_MACHINE"
-	in x86_64*|i686*)
-		;;
-	*)
-		make_build_args+=" --no-sse";;
-esac
+build_options="luajit"
+
+if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ] ; then
+	build_options_default="luajit"
+fi
 
 do_install() {
 	vbin build/powder
 	vdoc README.md
-	vinstall resources/powder.desktop 664 /usr/share/applications/
-	vinstall resources/icon/powder-256.png 644 /usr/share/pixmaps/ powder.png
+	vinstall resources/powder.desktop 644 /usr/share/applications/
+	for size in 16 24 32 48 128 256 ; do
+		vinstall resources/icon/powder-${size}.png 644 /usr/share/icons/hicolor/${size}x${size}/apps powder.png
+	done
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] The-Powder-Toy: update to 96.2.350.
  2022-10-11  2:22 [PR PATCH] The-Powder-Toy: update to 96.2.350 0x5c
@ 2022-10-11  2:24 ` 0x5c
  2022-10-11  2:34 ` 0x5c
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: 0x5c @ 2022-10-11  2:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

There is an updated pull request by 0x5c against master on the void-packages repository

https://github.com/0x5c/void-packages adopt/powdertoy
https://github.com/void-linux/void-packages/pull/39878

The-Powder-Toy: update to 96.2.350.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

This might take care of the problems in https://github.com/void-linux/void-packages/issues/39809

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39878.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-adopt/powdertoy-39878.patch --]
[-- Type: text/x-diff, Size: 3559 bytes --]

From 7d039de9b1d2f110a405d3b8d7d36d98744ecaa1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 10 Oct 2022 18:33:06 -0400
Subject: [PATCH] The-Powder-Toy: update to 96.2.350, adopt.

---
 srcpkgs/The-Powder-Toy/patches/luacpp.patch | 19 ++++++++++++
 srcpkgs/The-Powder-Toy/template             | 34 +++++++++++----------
 2 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/The-Powder-Toy/patches/luacpp.patch

diff --git a/srcpkgs/The-Powder-Toy/patches/luacpp.patch b/srcpkgs/The-Powder-Toy/patches/luacpp.patch
new file mode 100644
index 000000000000..47e57a5861a3
--- /dev/null
+++ b/srcpkgs/The-Powder-Toy/patches/luacpp.patch
@@ -0,0 +1,19 @@
+They look for a pkg-config file that does not exist in our Lua package nor
+upstream Lua, but the normal .pc file works just fine.
+
+--
+
+--- a/meson.build
++++ b/meson.build
+@@ -108,9 +108,9 @@
+ if uopt_lua == 'luajit'
+ 	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('luajit_dep') : dependency('luajit', static: uopt_static == 'system') ]
+ elif uopt_lua == 'lua5.2'
+-	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua52_dep') : dependency('lua5.2-c++', static: uopt_static == 'system') ]
++	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua52_dep') : dependency('lua5.2', static: uopt_static == 'system') ]
+ elif uopt_lua == 'lua5.1'
+-	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua51_dep') : dependency('lua5.1-c++', static: uopt_static == 'system') ]
++	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua51_dep') : dependency('lua5.1', static: uopt_static == 'system') ]
+ else
+ 	lua_opt_dep = []
+ endif
diff --git a/srcpkgs/The-Powder-Toy/template b/srcpkgs/The-Powder-Toy/template
index 889c42724fb6..129929eb2fd9 100644
--- a/srcpkgs/The-Powder-Toy/template
+++ b/srcpkgs/The-Powder-Toy/template
@@ -1,29 +1,31 @@
 # Template file for 'The-Powder-Toy'
 pkgname=The-Powder-Toy
-version=95.0
+version=96.2.350
 revision=1
-build_style=scons
-make_build_args="--output=powder"
-makedepends="SDL2-devel lua51-devel fftw-devel bzip2-devel zlib-devel
- libcurl-devel"
+build_style=meson
+configure_args="-Dx86_sse=sse2 -Dworkaround_gcc_no_pie=false
+ -Dlua=$(vopt_if luajit luajit lua5.1)"
+hostmakedepends="pkg-config"
+makedepends="SDL2-devel fftw-devel bzip2-devel zlib-devel libcurl-devel
+ $(vopt_if luajit LuaJIT-devel lua51-devel)"
 short_desc="Falling sand physics sandbox, simulates air pressure, velocity & heat"
-maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+maintainer="0x5c <dev@0x5c.io>"
 license="GPL-3.0-or-later"
 homepage="https://powdertoy.co.uk/"
 distfiles="https://github.com/The-Powder-Toy/${pkgname}/archive/v${version}.tar.gz"
-checksum=f60c3dc93e4ceddeda92b768e75a2d218f8df3da4a569b7d7cb57fff5515e15b
-CPPDEFINES=IGNORE_UPDATES
+checksum=d95cbadee22632687661e8fc488bd64405d81c0dca737e16420f26e93ea5bf58
 
-case "$XBPS_TARGET_MACHINE"
-	in x86_64*|i686*)
-		;;
-	*)
-		make_build_args+=" --no-sse";;
-esac
+build_options="luajit"
+
+if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ] ; then
+	build_options_default="luajit"
+fi
 
 do_install() {
 	vbin build/powder
 	vdoc README.md
-	vinstall resources/powder.desktop 664 /usr/share/applications/
-	vinstall resources/icon/powder-256.png 644 /usr/share/pixmaps/ powder.png
+	vinstall resources/powder.desktop 644 /usr/share/applications/
+	for size in 16 24 32 48 128 256 ; do
+		vinstall resources/icon/powder-${size}.png 644 /usr/share/icons/hicolor/${size}x${size}/apps powder.png
+	done
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] The-Powder-Toy: update to 96.2.350.
  2022-10-11  2:22 [PR PATCH] The-Powder-Toy: update to 96.2.350 0x5c
  2022-10-11  2:24 ` [PR PATCH] [Updated] " 0x5c
@ 2022-10-11  2:34 ` 0x5c
  2022-10-11  4:04 ` oreo639
  2022-10-11 17:14 ` [PR PATCH] [Merged]: " classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: 0x5c @ 2022-10-11  2:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

There is an updated pull request by 0x5c against master on the void-packages repository

https://github.com/0x5c/void-packages adopt/powdertoy
https://github.com/void-linux/void-packages/pull/39878

The-Powder-Toy: update to 96.2.350.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

This might take care of the problems in https://github.com/void-linux/void-packages/issues/39809

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/39878.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-adopt/powdertoy-39878.patch --]
[-- Type: text/x-diff, Size: 3547 bytes --]

From 832b30eb98a65cbdf2c336c340d07e59d01196d0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 10 Oct 2022 18:33:06 -0400
Subject: [PATCH] The-Powder-Toy: update to 96.2.350, adopt.

---
 srcpkgs/The-Powder-Toy/patches/luacpp.patch | 19 ++++++++++++
 srcpkgs/The-Powder-Toy/template             | 34 +++++++++++----------
 2 files changed, 37 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/The-Powder-Toy/patches/luacpp.patch

diff --git a/srcpkgs/The-Powder-Toy/patches/luacpp.patch b/srcpkgs/The-Powder-Toy/patches/luacpp.patch
new file mode 100644
index 000000000000..47e57a5861a3
--- /dev/null
+++ b/srcpkgs/The-Powder-Toy/patches/luacpp.patch
@@ -0,0 +1,19 @@
+They look for a pkg-config file that does not exist in our Lua package nor
+upstream Lua, but the normal .pc file works just fine.
+
+--
+
+--- a/meson.build
++++ b/meson.build
+@@ -108,9 +108,9 @@
+ if uopt_lua == 'luajit'
+ 	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('luajit_dep') : dependency('luajit', static: uopt_static == 'system') ]
+ elif uopt_lua == 'lua5.2'
+-	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua52_dep') : dependency('lua5.2-c++', static: uopt_static == 'system') ]
++	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua52_dep') : dependency('lua5.2', static: uopt_static == 'system') ]
+ elif uopt_lua == 'lua5.1'
+-	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua51_dep') : dependency('lua5.1-c++', static: uopt_static == 'system') ]
++	lua_opt_dep = [ use_tpt_libs != 'no' ? tpt_libs.get_variable('lua51_dep') : dependency('lua5.1', static: uopt_static == 'system') ]
+ else
+ 	lua_opt_dep = []
+ endif
diff --git a/srcpkgs/The-Powder-Toy/template b/srcpkgs/The-Powder-Toy/template
index 889c42724fb6..b4cb1b40da42 100644
--- a/srcpkgs/The-Powder-Toy/template
+++ b/srcpkgs/The-Powder-Toy/template
@@ -1,29 +1,31 @@
 # Template file for 'The-Powder-Toy'
 pkgname=The-Powder-Toy
-version=95.0
+version=96.2.350
 revision=1
-build_style=scons
-make_build_args="--output=powder"
-makedepends="SDL2-devel lua51-devel fftw-devel bzip2-devel zlib-devel
- libcurl-devel"
+build_style=meson
+configure_args="-Dx86_sse=sse2 -Dworkaround_gcc_no_pie=false
+ -Dlua=$(vopt_if luajit luajit lua5.1)"
+hostmakedepends="pkg-config"
+makedepends="SDL2-devel fftw-devel zlib-devel libcurl-devel
+ $(vopt_if luajit LuaJIT-devel lua51-devel)"
 short_desc="Falling sand physics sandbox, simulates air pressure, velocity & heat"
-maintainer="Illia Shestakov <ishestakov@airmail.cc>"
+maintainer="0x5c <dev@0x5c.io>"
 license="GPL-3.0-or-later"
 homepage="https://powdertoy.co.uk/"
 distfiles="https://github.com/The-Powder-Toy/${pkgname}/archive/v${version}.tar.gz"
-checksum=f60c3dc93e4ceddeda92b768e75a2d218f8df3da4a569b7d7cb57fff5515e15b
-CPPDEFINES=IGNORE_UPDATES
+checksum=d95cbadee22632687661e8fc488bd64405d81c0dca737e16420f26e93ea5bf58
 
-case "$XBPS_TARGET_MACHINE"
-	in x86_64*|i686*)
-		;;
-	*)
-		make_build_args+=" --no-sse";;
-esac
+build_options="luajit"
+
+if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ] ; then
+	build_options_default="luajit"
+fi
 
 do_install() {
 	vbin build/powder
 	vdoc README.md
-	vinstall resources/powder.desktop 664 /usr/share/applications/
-	vinstall resources/icon/powder-256.png 644 /usr/share/pixmaps/ powder.png
+	vinstall resources/powder.desktop 644 /usr/share/applications/
+	for size in 16 24 32 48 128 256 ; do
+		vinstall resources/icon/powder-${size}.png 644 /usr/share/icons/hicolor/${size}x${size}/apps powder.png
+	done
 }

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: The-Powder-Toy: update to 96.2.350.
  2022-10-11  2:22 [PR PATCH] The-Powder-Toy: update to 96.2.350 0x5c
  2022-10-11  2:24 ` [PR PATCH] [Updated] " 0x5c
  2022-10-11  2:34 ` 0x5c
@ 2022-10-11  4:04 ` oreo639
  2022-10-11 17:14 ` [PR PATCH] [Merged]: " classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: oreo639 @ 2022-10-11  4:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 189 bytes --]

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/39878#issuecomment-1274057155

Comment:
I can confirm that this does build with gcc 12.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: The-Powder-Toy: update to 96.2.350.
  2022-10-11  2:22 [PR PATCH] The-Powder-Toy: update to 96.2.350 0x5c
                   ` (2 preceding siblings ...)
  2022-10-11  4:04 ` oreo639
@ 2022-10-11 17:14 ` classabbyamp
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2022-10-11 17:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1196 bytes --]

There's a merged pull request on the void-packages repository

The-Powder-Toy: update to 96.2.350.
https://github.com/void-linux/void-packages/pull/39878

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

This might take care of the problems in https://github.com/void-linux/void-packages/issues/39809

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-10-11 17:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-11  2:22 [PR PATCH] The-Powder-Toy: update to 96.2.350 0x5c
2022-10-11  2:24 ` [PR PATCH] [Updated] " 0x5c
2022-10-11  2:34 ` 0x5c
2022-10-11  4:04 ` oreo639
2022-10-11 17:14 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).