* [PR PATCH] New package: dsda-doom-0.21.3
@ 2021-09-08 20:33 TwelveEyes
2021-09-09 7:52 ` [PR PATCH] [Updated] " TwelveEyes
` (41 more replies)
0 siblings, 42 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-08 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1599 bytes --]
There is a new pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 2127 bytes --]
From 2c39746df641b59b047f141439ccd2d4d5148713 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 60 ++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..29905053dc14
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,60 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+cmake_build_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SERVER=ON"
+hostmakedepends="cmake make"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback."
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+
+do_configure() {
+ cd prboom2
+ mkdir build
+}
+
+do_build() {
+ cd prboom2
+ cd build
+
+ cmake ${cmake_build_args} ..
+ make
+}
+
+do_install() {
+ cd prboom2
+ cd build
+
+ vbin dsda-doom
+ vbin dsda-doom-game-server
+
+ vmkdir /usr/share/games/doom
+ vcopy dsda-doom.wad /usr/share/games/doom
+
+ cd ../doc
+
+ vdoc boom.txt
+ vdoc DeePBSPV4specs.txt
+ vdoc MBF.txt
+ vdoc MBFFAQ.txt
+ vdoc README.command-line
+ vdoc README.compat
+ vdoc README.demos
+ vdoc umapinfo.txt
+
+ vman dsda-doom.cfg.5
+ vman dsda-doom-game-server.6
+ vman dsda-doom.6
+
+ cd ../ICONS
+
+ vmkdir /usr/share/applications
+ vcopy dsda-doom.desktop /usr/share/applications
+
+ vmkdir /usr/share/pixmaps
+ vcopy dsda-doom.png /usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
@ 2021-09-09 7:52 ` TwelveEyes
2021-09-27 20:14 ` TwelveEyes
` (40 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-09 7:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 2934 bytes --]
From 2c39746df641b59b047f141439ccd2d4d5148713 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH 1/2] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 60 ++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..29905053dc14
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,60 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+cmake_build_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SERVER=ON"
+hostmakedepends="cmake make"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback."
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+
+do_configure() {
+ cd prboom2
+ mkdir build
+}
+
+do_build() {
+ cd prboom2
+ cd build
+
+ cmake ${cmake_build_args} ..
+ make
+}
+
+do_install() {
+ cd prboom2
+ cd build
+
+ vbin dsda-doom
+ vbin dsda-doom-game-server
+
+ vmkdir /usr/share/games/doom
+ vcopy dsda-doom.wad /usr/share/games/doom
+
+ cd ../doc
+
+ vdoc boom.txt
+ vdoc DeePBSPV4specs.txt
+ vdoc MBF.txt
+ vdoc MBFFAQ.txt
+ vdoc README.command-line
+ vdoc README.compat
+ vdoc README.demos
+ vdoc umapinfo.txt
+
+ vman dsda-doom.cfg.5
+ vman dsda-doom-game-server.6
+ vman dsda-doom.6
+
+ cd ../ICONS
+
+ vmkdir /usr/share/applications
+ vcopy dsda-doom.desktop /usr/share/applications
+
+ vmkdir /usr/share/pixmaps
+ vcopy dsda-doom.png /usr/share/pixmaps
+}
From 1f3642c60a354dca84d6481cc8bafccc4ddfe165 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Thu, 9 Sep 2021 00:51:16 -0700
Subject: [PATCH 2/2] dsda-doom: move cmake cmd into do_configure()
---
srcpkgs/dsda-doom/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
index 29905053dc14..9db31c7e7602 100644
--- a/srcpkgs/dsda-doom/template
+++ b/srcpkgs/dsda-doom/template
@@ -15,13 +15,15 @@ checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
do_configure() {
cd prboom2
mkdir build
+ cd build
+
+ cmake ${cmake_build_args} ..
}
do_build() {
cd prboom2
cd build
- cmake ${cmake_build_args} ..
make
}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
2021-09-09 7:52 ` [PR PATCH] [Updated] " TwelveEyes
@ 2021-09-27 20:14 ` TwelveEyes
2021-09-27 20:33 ` TwelveEyes
` (39 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-27 20:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 2147 bytes --]
From 566a150a1365c6d89b60beebedbcf95825cb81cd Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 62 ++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..9db31c7e7602
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,62 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+cmake_build_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SERVER=ON"
+hostmakedepends="cmake make"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback."
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+
+do_configure() {
+ cd prboom2
+ mkdir build
+ cd build
+
+ cmake ${cmake_build_args} ..
+}
+
+do_build() {
+ cd prboom2
+ cd build
+
+ make
+}
+
+do_install() {
+ cd prboom2
+ cd build
+
+ vbin dsda-doom
+ vbin dsda-doom-game-server
+
+ vmkdir /usr/share/games/doom
+ vcopy dsda-doom.wad /usr/share/games/doom
+
+ cd ../doc
+
+ vdoc boom.txt
+ vdoc DeePBSPV4specs.txt
+ vdoc MBF.txt
+ vdoc MBFFAQ.txt
+ vdoc README.command-line
+ vdoc README.compat
+ vdoc README.demos
+ vdoc umapinfo.txt
+
+ vman dsda-doom.cfg.5
+ vman dsda-doom-game-server.6
+ vman dsda-doom.6
+
+ cd ../ICONS
+
+ vmkdir /usr/share/applications
+ vcopy dsda-doom.desktop /usr/share/applications
+
+ vmkdir /usr/share/pixmaps
+ vcopy dsda-doom.png /usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
2021-09-09 7:52 ` [PR PATCH] [Updated] " TwelveEyes
2021-09-27 20:14 ` TwelveEyes
@ 2021-09-27 20:33 ` TwelveEyes
2021-09-27 20:41 ` TwelveEyes
` (38 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-27 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1938 bytes --]
From dd9f769c45ef030893599040b14ad3966f986fb0 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 62 ++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..1c63b38aeedc
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,62 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+hostmakedepends="cmake make"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+_cmake_build_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SERVER=ON"
+
+do_configure() {
+ cd prboom2
+ mkdir build
+ cd build
+
+ cmake ${_cmake_build_args} ..
+}
+
+do_build() {
+ cd prboom2
+ cd build
+
+ make
+}
+
+do_install() {
+ cd prboom2
+ cd build
+
+ vbin dsda-doom
+ vbin dsda-doom-game-server
+
+ vmkdir /usr/share/games/doom
+ vcopy dsda-doom.wad /usr/share/games/doom
+
+ cd ../doc
+
+ vdoc boom.txt
+ vdoc DeePBSPV4specs.txt
+ vdoc MBF.txt
+ vdoc MBFFAQ.txt
+ vdoc README.command-line
+ vdoc README.compat
+ vdoc README.demos
+ vdoc umapinfo.txt
+
+ vman dsda-doom.cfg.5
+ vman dsda-doom-game-server.6
+ vman dsda-doom.6
+
+ cd ../ICONS
+
+ vmkdir /usr/share/applications
+ vcopy dsda-doom.desktop /usr/share/applications
+
+ vmkdir /usr/share/pixmaps
+ vcopy dsda-doom.png /usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (2 preceding siblings ...)
2021-09-27 20:33 ` TwelveEyes
@ 2021-09-27 20:41 ` TwelveEyes
2021-09-27 20:50 ` TwelveEyes
` (37 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-27 20:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1938 bytes --]
From 7ac48c4a7b5e9ed154f68d7169c645736d0d11c2 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 62 ++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..1c63b38aeedc
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,62 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+hostmakedepends="cmake make"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+_cmake_build_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SERVER=ON"
+
+do_configure() {
+ cd prboom2
+ mkdir build
+ cd build
+
+ cmake ${_cmake_build_args} ..
+}
+
+do_build() {
+ cd prboom2
+ cd build
+
+ make
+}
+
+do_install() {
+ cd prboom2
+ cd build
+
+ vbin dsda-doom
+ vbin dsda-doom-game-server
+
+ vmkdir /usr/share/games/doom
+ vcopy dsda-doom.wad /usr/share/games/doom
+
+ cd ../doc
+
+ vdoc boom.txt
+ vdoc DeePBSPV4specs.txt
+ vdoc MBF.txt
+ vdoc MBFFAQ.txt
+ vdoc README.command-line
+ vdoc README.compat
+ vdoc README.demos
+ vdoc umapinfo.txt
+
+ vman dsda-doom.cfg.5
+ vman dsda-doom-game-server.6
+ vman dsda-doom.6
+
+ cd ../ICONS
+
+ vmkdir /usr/share/applications
+ vcopy dsda-doom.desktop /usr/share/applications
+
+ vmkdir /usr/share/pixmaps
+ vcopy dsda-doom.png /usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (3 preceding siblings ...)
2021-09-27 20:41 ` TwelveEyes
@ 2021-09-27 20:50 ` TwelveEyes
2021-09-28 0:59 ` [PR REVIEW] " ericonr
` (36 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-27 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by TwelveEyes on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-928266126
Comment:
@ericonr Looks like this needs maintainer approval for the CI build tests.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (4 preceding siblings ...)
2021-09-27 20:50 ` TwelveEyes
@ 2021-09-28 0:59 ` ericonr
2021-09-28 0:59 ` ericonr
` (35 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-09-28 0:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 254 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#discussion_r717145394
Comment:
Please use `build_style=cmake`. This should allow you to remove most of the functions and the hostmakedeps.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR REVIEW] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (5 preceding siblings ...)
2021-09-28 0:59 ` [PR REVIEW] " ericonr
@ 2021-09-28 0:59 ` ericonr
2021-09-28 2:54 ` [PR PATCH] [Updated] " TwelveEyes
` (34 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-09-28 0:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#discussion_r717145115
Comment:
Please break this line at ~80 columns.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (6 preceding siblings ...)
2021-09-28 0:59 ` ericonr
@ 2021-09-28 2:54 ` TwelveEyes
2021-09-28 3:03 ` TwelveEyes
` (33 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-28 2:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1360 bytes --]
From 981c1e36c85da142cfc6f7a06d9b116d52c68e51 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..c21d22f41406
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,23 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+configure_args="-DBUILD_SERVER=ON"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+
+post_install() {
+ cd ICONS
+ vmkdir /usr/share/applications
+ vmkdir /usr/share/pixmaps
+ vinstall dsda-doom.desktop 644 usr/share/applications
+ vinstall dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (7 preceding siblings ...)
2021-09-28 2:54 ` [PR PATCH] [Updated] " TwelveEyes
@ 2021-09-28 3:03 ` TwelveEyes
2021-09-28 4:11 ` TwelveEyes
` (32 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-28 3:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by TwelveEyes on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-928684670
Comment:
Should be much closer to style standards now.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (8 preceding siblings ...)
2021-09-28 3:03 ` TwelveEyes
@ 2021-09-28 4:11 ` TwelveEyes
2021-09-28 19:26 ` [PR PATCH] [Updated] " TwelveEyes
` (31 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-28 4:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by TwelveEyes on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-928684670
Comment:
@ericonr Should be much closer to style standards now.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (9 preceding siblings ...)
2021-09-28 4:11 ` TwelveEyes
@ 2021-09-28 19:26 ` TwelveEyes
2021-09-28 23:49 ` TwelveEyes
` (30 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-28 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1360 bytes --]
From fba9387541ddf02fe2dfc818917e0d71ae1a26a3 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..84444ac386ea
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,22 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+configure_args="-DBUILD_SERVER=ON"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+
+post_install() {
+ vmkdir /usr/share/applications
+ vmkdir /usr/share/pixmaps
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (10 preceding siblings ...)
2021-09-28 19:26 ` [PR PATCH] [Updated] " TwelveEyes
@ 2021-09-28 23:49 ` TwelveEyes
2021-09-29 22:39 ` ericonr
` (29 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-28 23:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1375 bytes --]
From 61dcc67044c1fac6e1cb5ecdaf4c84a134d90a40 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..641df34b567b
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,23 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+configure_args="-DBUILD_SERVER=ON"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+nocross=yes
+
+post_install() {
+ vmkdir /usr/share/applications
+ vmkdir /usr/share/pixmaps
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (11 preceding siblings ...)
2021-09-28 23:49 ` TwelveEyes
@ 2021-09-29 22:39 ` ericonr
2021-09-30 22:25 ` TwelveEyes
` (28 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-09-29 22:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-930597004
Comment:
Ok, it looks way better. Now the only issue is that it's yet another Doom :/
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (12 preceding siblings ...)
2021-09-29 22:39 ` ericonr
@ 2021-09-30 22:25 ` TwelveEyes
2021-09-30 22:51 ` q66
` (27 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-09-30 22:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 572 bytes --]
New comment by TwelveEyes on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-931746615
Comment:
Even though it is another Doom sourceport, I think it's worth including as it is a prboom-plus based port that is still maintained. The prboom-plus package included in the repository right now is 2.5.1.4, which has discontinued development and has been superseded by prboom-plus-um, which dsda-doom is a fork of.
Dsda-doom also is the port leading MBF21 development, and it has Heretic and Hexen support going for it as well.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (13 preceding siblings ...)
2021-09-30 22:25 ` TwelveEyes
@ 2021-09-30 22:51 ` q66
2021-10-05 20:44 ` [PR PATCH] [Updated] " TwelveEyes
` (26 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: q66 @ 2021-09-30 22:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-931756835
Comment:
maybe let's replace prboom-plus with this one then?
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (14 preceding siblings ...)
2021-09-30 22:51 ` q66
@ 2021-10-05 20:44 ` TwelveEyes
2021-10-22 20:22 ` TwelveEyes
` (25 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-10-05 20:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1375 bytes --]
From 3cd6a1d895e725a64e4d7c9522d59d906eeb8314 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..641df34b567b
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,23 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+configure_args="-DBUILD_SERVER=ON"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+nocross=yes
+
+post_install() {
+ vmkdir /usr/share/applications
+ vmkdir /usr/share/pixmaps
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (15 preceding siblings ...)
2021-10-05 20:44 ` [PR PATCH] [Updated] " TwelveEyes
@ 2021-10-22 20:22 ` TwelveEyes
2021-11-19 5:27 ` TwelveEyes
` (24 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-10-22 20:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1375 bytes --]
From c6aa6000e69a81f7168cdcc190b66bfbc1fd50ca Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.21.3
---
srcpkgs/dsda-doom/template | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..641df34b567b
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,23 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.21.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+configure_args="-DBUILD_SERVER=ON"
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77819c6b4045d281cfdce8c6d5ca558d7b3161121c20aea4cdacdcdd5804b0df
+nocross=yes
+
+post_install() {
+ vmkdir /usr/share/applications
+ vmkdir /usr/share/pixmaps
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (16 preceding siblings ...)
2021-10-22 20:22 ` TwelveEyes
@ 2021-11-19 5:27 ` TwelveEyes
2021-11-19 5:39 ` TwelveEyes
` (23 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-11-19 5:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1275 bytes --]
From 5315f33ed34f16d5c2264f7032a5153bd072d400 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.22.1
---
srcpkgs/dsda-doom/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..b33b7dab8e1b
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.22.1
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_net-devel SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=6a5de45a786b34a478f06ec5121a5117f35506d8fb75c99494be323c0e116daa
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.21.3
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (17 preceding siblings ...)
2021-11-19 5:27 ` TwelveEyes
@ 2021-11-19 5:39 ` TwelveEyes
2021-11-21 19:23 ` New package: dsda-doom-0.22.1 ericonr
` (22 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-11-19 5:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.21.3
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1260 bytes --]
From 29c5aac2a20eede2de5483ab9f189cb1a7743389 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.22.1
---
srcpkgs/dsda-doom/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..02e6e949dbe5
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.22.1
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=6a5de45a786b34a478f06ec5121a5117f35506d8fb75c99494be323c0e116daa
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.22.1
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (18 preceding siblings ...)
2021-11-19 5:39 ` TwelveEyes
@ 2021-11-21 19:23 ` ericonr
2021-11-21 22:44 ` TwelveEyes
` (21 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-11-21 19:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-974878238
Comment:
Why not move prboom to use this upstream?
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.22.1
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (19 preceding siblings ...)
2021-11-21 19:23 ` New package: dsda-doom-0.22.1 ericonr
@ 2021-11-21 22:44 ` TwelveEyes
2021-11-22 18:23 ` ericonr
` (20 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-11-21 22:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
New comment by TwelveEyes on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-974911332
Comment:
Do you mean have the prboom-plus package point to dsda-doom? Or something else?
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.22.1
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (20 preceding siblings ...)
2021-11-21 22:44 ` TwelveEyes
@ 2021-11-22 18:23 ` ericonr
2021-12-02 3:39 ` [PR PATCH] [Updated] " TwelveEyes
` (19 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: ericonr @ 2021-11-22 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-975800389
Comment:
Yes, that would be the idea.
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.1
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (21 preceding siblings ...)
2021-11-22 18:23 ` ericonr
@ 2021-12-02 3:39 ` TwelveEyes
2021-12-08 22:04 ` TwelveEyes
` (18 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-12-02 3:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.1
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1260 bytes --]
From f7b00aeed00e54a3f01a46b4b9d8469d5f8686f3 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.22.2
---
srcpkgs/dsda-doom/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..d67b70167861
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.22.2
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=77274186218771835bf50927d5f00a6368850ae17dee3e8482702840240821ff
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.1
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (22 preceding siblings ...)
2021-12-02 3:39 ` [PR PATCH] [Updated] " TwelveEyes
@ 2021-12-08 22:04 ` TwelveEyes
2021-12-14 2:27 ` TwelveEyes
` (17 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-12-08 22:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.1
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1260 bytes --]
From a4d625856b3bbfefb9289734d2c9b58268e5dc7d Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.22.3
---
srcpkgs/dsda-doom/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..2363dab86848
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.22.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=f5d526510a1e258f316377fb58d20866adebd409826369ccff8ed767ffdff578
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.1
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (23 preceding siblings ...)
2021-12-08 22:04 ` TwelveEyes
@ 2021-12-14 2:27 ` TwelveEyes
2022-01-03 10:38 ` TwelveEyes
` (16 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2021-12-14 2:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.1
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1260 bytes --]
From 40b0bcaaf0a21cdb2a9eafdc9627c66f3cfe057d Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.22.4
---
srcpkgs/dsda-doom/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..4d7e0194836c
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.22.4
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=817a8b65dcc1407958105dd45442210a143d361b5f9a486968a30ca9b32bff00
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.1
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (24 preceding siblings ...)
2021-12-14 2:27 ` TwelveEyes
@ 2022-01-03 10:38 ` TwelveEyes
2022-01-03 20:13 ` TwelveEyes
` (15 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-01-03 10:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.1
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1260 bytes --]
From 87cbe51f61560b75127de831013b7f0b9ead92e7 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.22.5
---
srcpkgs/dsda-doom/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..73c70889f70d
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.22.5
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=b6fc480b344b6953173b479747f6b8322c07e27844d1e032c4ac57281b715caf
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.1
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (25 preceding siblings ...)
2022-01-03 10:38 ` TwelveEyes
@ 2022-01-03 20:13 ` TwelveEyes
2022-01-04 23:24 ` New package: dsda-doom-0.22.5 TwelveEyes
` (14 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-01-03 20:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.1
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1335 bytes --]
From 1ab120310a8c23c709e190de28cd8c8e8e2b0a26 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.22.5
---
srcpkgs/dsda-doom/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..ca6f329a2b46
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,21 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.22.5
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=b6fc480b344b6953173b479747f6b8322c07e27844d1e032c4ac57281b715caf
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+ vinstall ../soundfont/dsda-doom.sf2 644 usr/share/games/doom/soundfonts
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (26 preceding siblings ...)
2022-01-03 20:13 ` TwelveEyes
@ 2022-01-04 23:24 ` TwelveEyes
2022-01-11 20:26 ` [PR PATCH] [Updated] " TwelveEyes
` (13 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-01-04 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
New comment by TwelveEyes on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-1005245949
Comment:
Would this be the correct way to setup the prboom-plus template to pull in dsda-doom?
```
# Template file for 'prboom-plus'
pkgname=prboom-plus
version=0.22.5
revision=1
build_style=meta
depends="dsda-doom"
short_desc="PrBoom+ meta package"
maintainer="Gene <elkaufman5@gmail.com>"
license="GPL-2.0-or-later"
homepage="https://github.com/kraflab/dsda-doom"
```
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (27 preceding siblings ...)
2022-01-04 23:24 ` New package: dsda-doom-0.22.5 TwelveEyes
@ 2022-01-11 20:26 ` TwelveEyes
2022-01-11 20:27 ` TwelveEyes
` (12 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-01-11 20:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1335 bytes --]
From f757b247819786df8790591e157dc7af72aaf3c3 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.22.5
---
srcpkgs/dsda-doom/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..ca6f329a2b46
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,21 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.22.5
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=b6fc480b344b6953173b479747f6b8322c07e27844d1e032c4ac57281b715caf
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+ vinstall ../soundfont/dsda-doom.sf2 644 usr/share/games/doom/soundfonts
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (28 preceding siblings ...)
2022-01-11 20:26 ` [PR PATCH] [Updated] " TwelveEyes
@ 2022-01-11 20:27 ` TwelveEyes
2022-02-11 3:36 ` TwelveEyes
` (11 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-01-11 20:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1335 bytes --]
From 4e203f27ca5b3a6adfdb46590cc32b5e4f7409ef Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.23.0
---
srcpkgs/dsda-doom/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..a1869ceec5c2
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,21 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.23.0
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=ca268b1f641c043abc8408bf95648774ded959bc9075a9a88bbbffe9a39f51aa
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+ vinstall ../soundfont/dsda-doom.sf2 644 usr/share/games/doom/soundfonts
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (29 preceding siblings ...)
2022-01-11 20:27 ` TwelveEyes
@ 2022-02-11 3:36 ` TwelveEyes
2022-02-12 2:47 ` TwelveEyes
` (10 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-02-11 3:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1335 bytes --]
From d01f90099a85965e72f36cadec946b703a2a0fd5 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.0
---
srcpkgs/dsda-doom/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..b0066ac79b2c
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,21 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.0
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=383052130173c5e430bb6c7a0313f81879bac449d7b244cb5d38d2930b936d31
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+ vinstall ../soundfont/dsda-doom.sf2 644 usr/share/games/doom/soundfonts
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (30 preceding siblings ...)
2022-02-11 3:36 ` TwelveEyes
@ 2022-02-12 2:47 ` TwelveEyes
2022-03-25 16:54 ` TwelveEyes
` (9 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-02-12 2:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1335 bytes --]
From 4261b971c701ca48110776001cff5ff6bf4577db Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.1
---
srcpkgs/dsda-doom/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..ff096e83df68
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,21 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.1
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=4cc08913d11e6093181157ca16629ec6b1469c808e59276cc2812512b839a99f
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+ vinstall ../soundfont/dsda-doom.sf2 644 usr/share/games/doom/soundfonts
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (31 preceding siblings ...)
2022-02-12 2:47 ` TwelveEyes
@ 2022-03-25 16:54 ` TwelveEyes
2022-03-25 21:00 ` TwelveEyes
` (8 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-03-25 16:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 1335 bytes --]
From cbea579a6b47fff104d51e03c0a5a2ce3bd3df32 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.1
---
srcpkgs/dsda-doom/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..ff096e83df68
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,21 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.1
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=4cc08913d11e6093181157ca16629ec6b1469c808e59276cc2812512b839a99f
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+ vinstall ../soundfont/dsda-doom.sf2 644 usr/share/games/doom/soundfonts
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (32 preceding siblings ...)
2022-03-25 16:54 ` TwelveEyes
@ 2022-03-25 21:00 ` TwelveEyes
2022-03-30 1:39 ` TwelveEyes
` (7 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-03-25 21:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 6556 bytes --]
From 01aafc01b9b006a163a6656457f852d092ba71ee Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.2
---
srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
srcpkgs/dsda-doom/template | 19 ++
2 files changed, 184 insertions(+)
create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++ set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++ check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++ if(HAVE_SCHED_SETAFFINITY)
++ add_definitions(-D_GNU_SOURCE)
++ endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++ // This was only set for the sdl music backend,
++ // but now the backend changes based on the music type.
++ // Not sure what the consequences are for this...
++ process_affinity_mask = 1;
++
++ // Set the process affinity mask so that all threads
++ // run on the same processor. This is a workaround for a bug in
++ // SDL_mixer that causes occasional crashes.
++ if (process_affinity_mask)
++ {
++ const char *errbuf = NULL;
++#ifdef _WIN32
++ HMODULE kernel32_dll;
++ SetAffinityFunc SetAffinity = NULL;
++ int ok = false;
++
++ // Find the kernel interface DLL.
++ kernel32_dll = LoadLibrary("kernel32.dll");
++
++ if (kernel32_dll)
++ {
++ // Find the SetProcessAffinityMask function.
++ SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++ // If the function was not found, we are on an old (Win9x) system
++ // that doesn't have this function. That's no problem, because
++ // those systems don't support SMP anyway.
++
++ if (SetAffinity)
++ {
++ ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++ }
++ }
++
++ if (!ok)
++ {
++ errbuf = WINError();
++ }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++ // POSIX version:
++ int i;
++ {
++ cpu_set_t set;
++
++ CPU_ZERO(&set);
++
++ for(i = 0; i < 16; i++)
++ {
++ CPU_SET((process_affinity_mask>>i)&1, &set);
++ }
++
++ if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++ {
++ errbuf = strerror(errno);
++ }
++ }
++#else
++ return;
++#endif
++
++ if (errbuf == NULL)
++ {
++ lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++ }
++ else
++ {
++ lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++ }
++ }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+ signal(SIGABRT, I_SignalHandler);
+ #endif
+
++ // Ability to use only the allowed CPUs
++ I_SetAffinityMask();
++
+ // Priority class for the prboom-plus process
+ I_SetProcessPriority();
+
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+ }
+ }
+
++int process_affinity_mask;
+ int process_priority;
+
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void); // Handle potential
+ extern int renderW; // resolution scaling
+ extern int renderH; // - DTIED
+
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..64d632ba4228
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,19 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.2
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=e822a4420357e07cd3e798987b2e570ed53455a580075e1040ce03518e6dd6d2
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (33 preceding siblings ...)
2022-03-25 21:00 ` TwelveEyes
@ 2022-03-30 1:39 ` TwelveEyes
2022-03-31 5:53 ` TwelveEyes
` (6 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-03-30 1:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 6556 bytes --]
From 3e2c943f399aa075af00e6c1ab6faf0f4fe9708f Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.2
---
srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
srcpkgs/dsda-doom/template | 19 ++
2 files changed, 184 insertions(+)
create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++ set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++ check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++ if(HAVE_SCHED_SETAFFINITY)
++ add_definitions(-D_GNU_SOURCE)
++ endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++ // This was only set for the sdl music backend,
++ // but now the backend changes based on the music type.
++ // Not sure what the consequences are for this...
++ process_affinity_mask = 1;
++
++ // Set the process affinity mask so that all threads
++ // run on the same processor. This is a workaround for a bug in
++ // SDL_mixer that causes occasional crashes.
++ if (process_affinity_mask)
++ {
++ const char *errbuf = NULL;
++#ifdef _WIN32
++ HMODULE kernel32_dll;
++ SetAffinityFunc SetAffinity = NULL;
++ int ok = false;
++
++ // Find the kernel interface DLL.
++ kernel32_dll = LoadLibrary("kernel32.dll");
++
++ if (kernel32_dll)
++ {
++ // Find the SetProcessAffinityMask function.
++ SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++ // If the function was not found, we are on an old (Win9x) system
++ // that doesn't have this function. That's no problem, because
++ // those systems don't support SMP anyway.
++
++ if (SetAffinity)
++ {
++ ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++ }
++ }
++
++ if (!ok)
++ {
++ errbuf = WINError();
++ }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++ // POSIX version:
++ int i;
++ {
++ cpu_set_t set;
++
++ CPU_ZERO(&set);
++
++ for(i = 0; i < 16; i++)
++ {
++ CPU_SET((process_affinity_mask>>i)&1, &set);
++ }
++
++ if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++ {
++ errbuf = strerror(errno);
++ }
++ }
++#else
++ return;
++#endif
++
++ if (errbuf == NULL)
++ {
++ lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++ }
++ else
++ {
++ lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++ }
++ }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+ signal(SIGABRT, I_SignalHandler);
+ #endif
+
++ // Ability to use only the allowed CPUs
++ I_SetAffinityMask();
++
+ // Priority class for the prboom-plus process
+ I_SetProcessPriority();
+
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+ }
+ }
+
++int process_affinity_mask;
+ int process_priority;
+
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void); // Handle potential
+ extern int renderW; // resolution scaling
+ extern int renderH; // - DTIED
+
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..64d632ba4228
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,19 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.2
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=e822a4420357e07cd3e798987b2e570ed53455a580075e1040ce03518e6dd6d2
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (34 preceding siblings ...)
2022-03-30 1:39 ` TwelveEyes
@ 2022-03-31 5:53 ` TwelveEyes
2022-03-31 5:59 ` TwelveEyes
` (5 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-03-31 5:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 6556 bytes --]
From 4008f0bfe84d400edbf63472c48c4e37106129c0 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.2
---
srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
srcpkgs/dsda-doom/template | 19 ++
2 files changed, 184 insertions(+)
create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++ set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++ check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++ if(HAVE_SCHED_SETAFFINITY)
++ add_definitions(-D_GNU_SOURCE)
++ endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++ // This was only set for the sdl music backend,
++ // but now the backend changes based on the music type.
++ // Not sure what the consequences are for this...
++ process_affinity_mask = 1;
++
++ // Set the process affinity mask so that all threads
++ // run on the same processor. This is a workaround for a bug in
++ // SDL_mixer that causes occasional crashes.
++ if (process_affinity_mask)
++ {
++ const char *errbuf = NULL;
++#ifdef _WIN32
++ HMODULE kernel32_dll;
++ SetAffinityFunc SetAffinity = NULL;
++ int ok = false;
++
++ // Find the kernel interface DLL.
++ kernel32_dll = LoadLibrary("kernel32.dll");
++
++ if (kernel32_dll)
++ {
++ // Find the SetProcessAffinityMask function.
++ SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++ // If the function was not found, we are on an old (Win9x) system
++ // that doesn't have this function. That's no problem, because
++ // those systems don't support SMP anyway.
++
++ if (SetAffinity)
++ {
++ ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++ }
++ }
++
++ if (!ok)
++ {
++ errbuf = WINError();
++ }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++ // POSIX version:
++ int i;
++ {
++ cpu_set_t set;
++
++ CPU_ZERO(&set);
++
++ for(i = 0; i < 16; i++)
++ {
++ CPU_SET((process_affinity_mask>>i)&1, &set);
++ }
++
++ if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++ {
++ errbuf = strerror(errno);
++ }
++ }
++#else
++ return;
++#endif
++
++ if (errbuf == NULL)
++ {
++ lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++ }
++ else
++ {
++ lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++ }
++ }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+ signal(SIGABRT, I_SignalHandler);
+ #endif
+
++ // Ability to use only the allowed CPUs
++ I_SetAffinityMask();
++
+ // Priority class for the prboom-plus process
+ I_SetProcessPriority();
+
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+ }
+ }
+
++int process_affinity_mask;
+ int process_priority;
+
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void); // Handle potential
+ extern int renderW; // resolution scaling
+ extern int renderH; // - DTIED
+
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..64d632ba4228
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,19 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.2
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=e822a4420357e07cd3e798987b2e570ed53455a580075e1040ce03518e6dd6d2
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (35 preceding siblings ...)
2022-03-31 5:53 ` TwelveEyes
@ 2022-03-31 5:59 ` TwelveEyes
2022-04-01 2:08 ` TwelveEyes
` (4 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-03-31 5:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 6556 bytes --]
From d07cd38031d85f9b59f3033303d34cc749b0a7da Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.3
---
srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
srcpkgs/dsda-doom/template | 19 ++
2 files changed, 184 insertions(+)
create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++ set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++ check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++ if(HAVE_SCHED_SETAFFINITY)
++ add_definitions(-D_GNU_SOURCE)
++ endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++ // This was only set for the sdl music backend,
++ // but now the backend changes based on the music type.
++ // Not sure what the consequences are for this...
++ process_affinity_mask = 1;
++
++ // Set the process affinity mask so that all threads
++ // run on the same processor. This is a workaround for a bug in
++ // SDL_mixer that causes occasional crashes.
++ if (process_affinity_mask)
++ {
++ const char *errbuf = NULL;
++#ifdef _WIN32
++ HMODULE kernel32_dll;
++ SetAffinityFunc SetAffinity = NULL;
++ int ok = false;
++
++ // Find the kernel interface DLL.
++ kernel32_dll = LoadLibrary("kernel32.dll");
++
++ if (kernel32_dll)
++ {
++ // Find the SetProcessAffinityMask function.
++ SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++ // If the function was not found, we are on an old (Win9x) system
++ // that doesn't have this function. That's no problem, because
++ // those systems don't support SMP anyway.
++
++ if (SetAffinity)
++ {
++ ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++ }
++ }
++
++ if (!ok)
++ {
++ errbuf = WINError();
++ }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++ // POSIX version:
++ int i;
++ {
++ cpu_set_t set;
++
++ CPU_ZERO(&set);
++
++ for(i = 0; i < 16; i++)
++ {
++ CPU_SET((process_affinity_mask>>i)&1, &set);
++ }
++
++ if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++ {
++ errbuf = strerror(errno);
++ }
++ }
++#else
++ return;
++#endif
++
++ if (errbuf == NULL)
++ {
++ lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++ }
++ else
++ {
++ lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++ }
++ }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+ signal(SIGABRT, I_SignalHandler);
+ #endif
+
++ // Ability to use only the allowed CPUs
++ I_SetAffinityMask();
++
+ // Priority class for the prboom-plus process
+ I_SetProcessPriority();
+
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+ }
+ }
+
++int process_affinity_mask;
+ int process_priority;
+
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void); // Handle potential
+ extern int renderW; // resolution scaling
+ extern int renderH; // - DTIED
+
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..79ff765c6d5b
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,19 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (36 preceding siblings ...)
2022-03-31 5:59 ` TwelveEyes
@ 2022-04-01 2:08 ` TwelveEyes
2022-04-02 2:17 ` TwelveEyes
` (3 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-04-01 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 6556 bytes --]
From 90a70aaa8a7b184fc4f397ff44158e8fc95df095 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.3
---
srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
srcpkgs/dsda-doom/template | 19 ++
2 files changed, 184 insertions(+)
create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++ set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++ check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++ if(HAVE_SCHED_SETAFFINITY)
++ add_definitions(-D_GNU_SOURCE)
++ endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++ // This was only set for the sdl music backend,
++ // but now the backend changes based on the music type.
++ // Not sure what the consequences are for this...
++ process_affinity_mask = 1;
++
++ // Set the process affinity mask so that all threads
++ // run on the same processor. This is a workaround for a bug in
++ // SDL_mixer that causes occasional crashes.
++ if (process_affinity_mask)
++ {
++ const char *errbuf = NULL;
++#ifdef _WIN32
++ HMODULE kernel32_dll;
++ SetAffinityFunc SetAffinity = NULL;
++ int ok = false;
++
++ // Find the kernel interface DLL.
++ kernel32_dll = LoadLibrary("kernel32.dll");
++
++ if (kernel32_dll)
++ {
++ // Find the SetProcessAffinityMask function.
++ SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++ // If the function was not found, we are on an old (Win9x) system
++ // that doesn't have this function. That's no problem, because
++ // those systems don't support SMP anyway.
++
++ if (SetAffinity)
++ {
++ ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++ }
++ }
++
++ if (!ok)
++ {
++ errbuf = WINError();
++ }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++ // POSIX version:
++ int i;
++ {
++ cpu_set_t set;
++
++ CPU_ZERO(&set);
++
++ for(i = 0; i < 16; i++)
++ {
++ CPU_SET((process_affinity_mask>>i)&1, &set);
++ }
++
++ if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++ {
++ errbuf = strerror(errno);
++ }
++ }
++#else
++ return;
++#endif
++
++ if (errbuf == NULL)
++ {
++ lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++ }
++ else
++ {
++ lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++ }
++ }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+ signal(SIGABRT, I_SignalHandler);
+ #endif
+
++ // Ability to use only the allowed CPUs
++ I_SetAffinityMask();
++
+ // Priority class for the prboom-plus process
+ I_SetProcessPriority();
+
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+ }
+ }
+
++int process_affinity_mask;
+ int process_priority;
+
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void); // Handle potential
+ extern int renderW; // resolution scaling
+ extern int renderH; // - DTIED
+
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..79ff765c6d5b
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,19 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (37 preceding siblings ...)
2022-04-01 2:08 ` TwelveEyes
@ 2022-04-02 2:17 ` TwelveEyes
2022-04-02 16:07 ` TwelveEyes
` (2 subsequent siblings)
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-04-02 2:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 6556 bytes --]
From fb8481192dbb0449529c406360fd0e097779b30f Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.3
---
srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
srcpkgs/dsda-doom/template | 19 ++
2 files changed, 184 insertions(+)
create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++ set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++ check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++ if(HAVE_SCHED_SETAFFINITY)
++ add_definitions(-D_GNU_SOURCE)
++ endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++ // This was only set for the sdl music backend,
++ // but now the backend changes based on the music type.
++ // Not sure what the consequences are for this...
++ process_affinity_mask = 1;
++
++ // Set the process affinity mask so that all threads
++ // run on the same processor. This is a workaround for a bug in
++ // SDL_mixer that causes occasional crashes.
++ if (process_affinity_mask)
++ {
++ const char *errbuf = NULL;
++#ifdef _WIN32
++ HMODULE kernel32_dll;
++ SetAffinityFunc SetAffinity = NULL;
++ int ok = false;
++
++ // Find the kernel interface DLL.
++ kernel32_dll = LoadLibrary("kernel32.dll");
++
++ if (kernel32_dll)
++ {
++ // Find the SetProcessAffinityMask function.
++ SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++ // If the function was not found, we are on an old (Win9x) system
++ // that doesn't have this function. That's no problem, because
++ // those systems don't support SMP anyway.
++
++ if (SetAffinity)
++ {
++ ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++ }
++ }
++
++ if (!ok)
++ {
++ errbuf = WINError();
++ }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++ // POSIX version:
++ int i;
++ {
++ cpu_set_t set;
++
++ CPU_ZERO(&set);
++
++ for(i = 0; i < 16; i++)
++ {
++ CPU_SET((process_affinity_mask>>i)&1, &set);
++ }
++
++ if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++ {
++ errbuf = strerror(errno);
++ }
++ }
++#else
++ return;
++#endif
++
++ if (errbuf == NULL)
++ {
++ lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++ }
++ else
++ {
++ lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++ }
++ }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+ signal(SIGABRT, I_SignalHandler);
+ #endif
+
++ // Ability to use only the allowed CPUs
++ I_SetAffinityMask();
++
+ // Priority class for the prboom-plus process
+ I_SetProcessPriority();
+
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+ }
+ }
+
++int process_affinity_mask;
+ int process_priority;
+
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void); // Handle potential
+ extern int renderW; // resolution scaling
+ extern int renderH; // - DTIED
+
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..79ff765c6d5b
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,19 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Updated] New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (38 preceding siblings ...)
2022-04-02 2:17 ` TwelveEyes
@ 2022-04-02 16:07 ` TwelveEyes
2022-04-03 16:47 ` q66
2022-04-03 16:47 ` [PR PATCH] [Merged]: " q66
41 siblings, 0 replies; 43+ messages in thread
From: TwelveEyes @ 2022-04-02 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
There is an updated pull request by TwelveEyes against master on the void-packages repository
https://github.com/TwelveEyes/void-packages dsda-doom
https://github.com/void-linux/void-packages/pull/32880
New package: dsda-doom-0.22.5
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/32880.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dsda-doom-32880.patch --]
[-- Type: text/x-diff, Size: 6570 bytes --]
From 195895aedb76c49b18426edd613216c99bee71ff Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH] New package: dsda-doom-0.24.3
---
srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
srcpkgs/dsda-doom/template | 20 +++
2 files changed, 185 insertions(+)
create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
create mode 100644 srcpkgs/dsda-doom/template
diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++ set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++ check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++ set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++ if(HAVE_SCHED_SETAFFINITY)
++ add_definitions(-D_GNU_SOURCE)
++ endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++ // This was only set for the sdl music backend,
++ // but now the backend changes based on the music type.
++ // Not sure what the consequences are for this...
++ process_affinity_mask = 1;
++
++ // Set the process affinity mask so that all threads
++ // run on the same processor. This is a workaround for a bug in
++ // SDL_mixer that causes occasional crashes.
++ if (process_affinity_mask)
++ {
++ const char *errbuf = NULL;
++#ifdef _WIN32
++ HMODULE kernel32_dll;
++ SetAffinityFunc SetAffinity = NULL;
++ int ok = false;
++
++ // Find the kernel interface DLL.
++ kernel32_dll = LoadLibrary("kernel32.dll");
++
++ if (kernel32_dll)
++ {
++ // Find the SetProcessAffinityMask function.
++ SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++ // If the function was not found, we are on an old (Win9x) system
++ // that doesn't have this function. That's no problem, because
++ // those systems don't support SMP anyway.
++
++ if (SetAffinity)
++ {
++ ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++ }
++ }
++
++ if (!ok)
++ {
++ errbuf = WINError();
++ }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++ // POSIX version:
++ int i;
++ {
++ cpu_set_t set;
++
++ CPU_ZERO(&set);
++
++ for(i = 0; i < 16; i++)
++ {
++ CPU_SET((process_affinity_mask>>i)&1, &set);
++ }
++
++ if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++ {
++ errbuf = strerror(errno);
++ }
++ }
++#else
++ return;
++#endif
++
++ if (errbuf == NULL)
++ {
++ lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++ }
++ else
++ {
++ lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++ }
++ }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+ signal(SIGABRT, I_SignalHandler);
+ #endif
+
++ // Ability to use only the allowed CPUs
++ I_SetAffinityMask();
++
+ // Priority class for the prboom-plus process
+ I_SetProcessPriority();
+
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+ }
+ }
+
++int process_affinity_mask;
+ int process_priority;
+
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void); // Handle potential
+ extern int renderW; // resolution scaling
+ extern int renderH; // - DTIED
+
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..51dcbbf26d34
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913
+nocross=yes
+
+post_install() {
+ vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+ vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (39 preceding siblings ...)
2022-04-02 16:07 ` TwelveEyes
@ 2022-04-03 16:47 ` q66
2022-04-03 16:47 ` [PR PATCH] [Merged]: " q66
41 siblings, 0 replies; 43+ messages in thread
From: q66 @ 2022-04-03 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/32880#issuecomment-1086905621
Comment:
since nobody seems to feel like merging this, i'll just go ahead
let's not replace prboom-plus yet since this is nocross
^ permalink raw reply [flat|nested] 43+ messages in thread
* Re: [PR PATCH] [Merged]: New package: dsda-doom-0.22.5
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
` (40 preceding siblings ...)
2022-04-03 16:47 ` q66
@ 2022-04-03 16:47 ` q66
41 siblings, 0 replies; 43+ messages in thread
From: q66 @ 2022-04-03 16:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]
There's a merged pull request on the void-packages repository
New package: dsda-doom-0.22.5
https://github.com/void-linux/void-packages/pull/32880
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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] 43+ messages in thread
end of thread, other threads:[~2022-04-03 16:47 UTC | newest]
Thread overview: 43+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-08 20:33 [PR PATCH] New package: dsda-doom-0.21.3 TwelveEyes
2021-09-09 7:52 ` [PR PATCH] [Updated] " TwelveEyes
2021-09-27 20:14 ` TwelveEyes
2021-09-27 20:33 ` TwelveEyes
2021-09-27 20:41 ` TwelveEyes
2021-09-27 20:50 ` TwelveEyes
2021-09-28 0:59 ` [PR REVIEW] " ericonr
2021-09-28 0:59 ` ericonr
2021-09-28 2:54 ` [PR PATCH] [Updated] " TwelveEyes
2021-09-28 3:03 ` TwelveEyes
2021-09-28 4:11 ` TwelveEyes
2021-09-28 19:26 ` [PR PATCH] [Updated] " TwelveEyes
2021-09-28 23:49 ` TwelveEyes
2021-09-29 22:39 ` ericonr
2021-09-30 22:25 ` TwelveEyes
2021-09-30 22:51 ` q66
2021-10-05 20:44 ` [PR PATCH] [Updated] " TwelveEyes
2021-10-22 20:22 ` TwelveEyes
2021-11-19 5:27 ` TwelveEyes
2021-11-19 5:39 ` TwelveEyes
2021-11-21 19:23 ` New package: dsda-doom-0.22.1 ericonr
2021-11-21 22:44 ` TwelveEyes
2021-11-22 18:23 ` ericonr
2021-12-02 3:39 ` [PR PATCH] [Updated] " TwelveEyes
2021-12-08 22:04 ` TwelveEyes
2021-12-14 2:27 ` TwelveEyes
2022-01-03 10:38 ` TwelveEyes
2022-01-03 20:13 ` TwelveEyes
2022-01-04 23:24 ` New package: dsda-doom-0.22.5 TwelveEyes
2022-01-11 20:26 ` [PR PATCH] [Updated] " TwelveEyes
2022-01-11 20:27 ` TwelveEyes
2022-02-11 3:36 ` TwelveEyes
2022-02-12 2:47 ` TwelveEyes
2022-03-25 16:54 ` TwelveEyes
2022-03-25 21:00 ` TwelveEyes
2022-03-30 1:39 ` TwelveEyes
2022-03-31 5:53 ` TwelveEyes
2022-03-31 5:59 ` TwelveEyes
2022-04-01 2:08 ` TwelveEyes
2022-04-02 2:17 ` TwelveEyes
2022-04-02 16:07 ` TwelveEyes
2022-04-03 16:47 ` q66
2022-04-03 16:47 ` [PR PATCH] [Merged]: " q66
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).