* [PR PATCH] New package: OpenJK
@ 2021-09-26 18:15 kedodrill
2021-09-26 18:45 ` [PR REVIEW] " q66
` (43 more replies)
0 siblings, 44 replies; 45+ messages in thread
From: kedodrill @ 2021-09-26 18:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1891 bytes --]
There is a new pull request by kedodrill against master on the void-packages repository
https://github.com/kedodrill/void-packages openjk
https://github.com/void-linux/void-packages/pull/33137
New package: OpenJK
<!-- 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)
Possible Issue: OpenJK does not have tags or releases on GitHub, [and I don't think they will](https://github.com/JACoders/OpenJK/issues/1102). :/
#### 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.)
- [x] 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
-->
x86_64-musl fails immediately when trying to build from my x86_64 system.
I have built this successfully for i686.
https://github.com/JACoders/OpenJK
A patch file from https://github.com/void-linux/void-packages/pull/33137.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjk-33137.patch --]
[-- Type: text/x-diff, Size: 5161 bytes --]
From d813b8f2df0397aa30165edc4166133ead7514f8 Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <kmdodrill@protonmail.com>
Date: Sun, 26 Sep 2021 12:59:13 -0500
Subject: [PATCH] New package: OpenJK-0.0.20210922
---
srcpkgs/OpenJK/INSTALL.msg | 1 +
srcpkgs/OpenJK/files/OpenJK.desktop | 10 ++++++
srcpkgs/OpenJK/files/OpenJKMP.desktop | 10 ++++++
srcpkgs/OpenJK/files/OpenJO.desktop | 10 ++++++
srcpkgs/OpenJK/files/README.voidlinux | 11 +++++++
srcpkgs/OpenJK/template | 47 +++++++++++++++++++++++++++
6 files changed, 89 insertions(+)
create mode 100644 srcpkgs/OpenJK/INSTALL.msg
create mode 100644 srcpkgs/OpenJK/files/OpenJK.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJKMP.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJO.desktop
create mode 100644 srcpkgs/OpenJK/files/README.voidlinux
create mode 100644 srcpkgs/OpenJK/template
diff --git a/srcpkgs/OpenJK/INSTALL.msg b/srcpkgs/OpenJK/INSTALL.msg
new file mode 100644
index 000000000000..185292bd3736
--- /dev/null
+++ b/srcpkgs/OpenJK/INSTALL.msg
@@ -0,0 +1 @@
+Consult /usr/share/doc/OpenJK/README.voidlinux for further installation instructions.
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJK.desktop b/srcpkgs/OpenJK/files/OpenJK.desktop
new file mode 100644
index 000000000000..e5c13c5c85d2
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJK.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Academy Single Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Academy Single Player"
+Exec=openjk_sp
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJKMP.desktop b/srcpkgs/OpenJK/files/OpenJKMP.desktop
new file mode 100644
index 000000000000..04c25842f89e
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJKMP.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Multi Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Multi Player"
+Exec=openjk
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJO.desktop b/srcpkgs/OpenJK/files/OpenJO.desktop
new file mode 100644
index 000000000000..de1076371d3c
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJO.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Outcast
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Outcast"
+Exec=openjo
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/README.voidlinux b/srcpkgs/OpenJK/files/README.voidlinux
new file mode 100644
index 000000000000..ee5f3751949a
--- /dev/null
+++ b/srcpkgs/OpenJK/files/README.voidlinux
@@ -0,0 +1,11 @@
+OpenJK requires a copy of Jedi Knight: Jedi Academy.
+You can also use this for Jedi Outcast (singleplayer only), which requires a copy as well.
+The default folder that the game will search for files is
+
+ ~/.local/share/openjk
+
+You can easily link your game files by doing the following:
+
+ cd ~/.local/share/openjk
+ mkdir base
+ ln -s /path/to/game/GameData/base/* base
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/template b/srcpkgs/OpenJK/template
new file mode 100644
index 000000000000..ce6c29973440
--- /dev/null
+++ b/srcpkgs/OpenJK/template
@@ -0,0 +1,47 @@
+# Template file for 'OpenJK'
+pkgname=OpenJK
+version=0.0.20210922
+revision=1
+archs="i686 x86_64"
+_gitrev=43e9a3da555a487e23081bbd03101e7c926a1e83
+wrksrc="${pkgname}-${_gitrev}"
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/${pkgname} -DBuildJK2SPEngine=on -DBuildJK2SPGame=on -DBuildJK2SPRdVanilla=on"
+makedepends="libjpeg-turbo-devel libpng-devel zlib-devel SDL2-devel"
+depends="SDL2"
+short_desc="Open Source Implementation of Jedi Knight II and III Engine"
+maintainer="Kenneth Dodrill <kmdodrill@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/JACoders/OpenJK"
+distfiles="https://github.com/JACoders/OpenJK/archive/${_gitrev}.tar.gz"
+checksum=efd2e3d96fe449819c4276dfea7ae7d591591ee0e651167844110e073f2edb3c
+
+post_install() {
+ vmkdir usr/bin
+ for _bin in 'openjk' 'openjk_sp' 'openjkded'; do
+ touch "${DESTDIR}/usr/bin/${_bin}"
+ cat > "${DESTDIR}/usr/bin/${_bin}" << EOF
+#! /bin/bash
+cd /opt/${pkgname}/JediAcademy
+exec ./${_bin}.${XBPS_MACHINE} \s@
+EOF
+ chmod +x "${DESTDIR}/usr/bin/${_bin}"
+ done
+
+ cat > "${DESTDIR}/usr/bin/openjo" << EOF
+#! /bin/bash
+cd /opt/${pkgname}/JediOutcast
+exec ./openjo_sp.${XBPS_MACHINE} \s@
+EOF
+ chmod +x ${DESTDIR}/usr/bin/openjo
+
+ vinstall "${FILESDIR}/OpenJK.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJKMP.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJO.desktop" 644 usr/share/applications
+
+ for size in 16 32 64 128 1024; do
+ vinstall shared/icons/${pkgname}_Icon_${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps/ OpenJK.png
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
@ 2021-09-26 18:45 ` q66
2021-09-26 18:52 ` kedodrill
` (42 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 18:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 147 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716244714
Comment:
why?
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
2021-09-26 18:45 ` [PR REVIEW] " q66
@ 2021-09-26 18:52 ` kedodrill
2021-09-26 18:53 ` q66
` (41 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-26 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 397 bytes --]
New review comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716245408
Comment:
As far as I know, they only target i686 and x86_64. I'm also sorta new to packaging and building packages in general so feel free to correct me. :)
This may be helpful but not sure: https://github.com/JACoders/OpenJK/tree/master/cmake/Toolchains
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
2021-09-26 18:45 ` [PR REVIEW] " q66
2021-09-26 18:52 ` kedodrill
@ 2021-09-26 18:53 ` q66
2021-09-26 18:53 ` Johnnynator
` (40 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716245495
Comment:
remove this
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (2 preceding siblings ...)
2021-09-26 18:53 ` q66
@ 2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
` (39 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716243224
Comment:
Just remove this line and let it fail in CI for now.
Musl should be easy to fix (I did so at least for myself 3 years ago, can do it again)
Also OpenJK runs fine on non x86 systems, I tested it some time ago on aarch64.
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (3 preceding siblings ...)
2021-09-26 18:53 ` Johnnynator
@ 2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
` (38 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716243835
Comment:
```suggestion
#!/bin/sh
```
No need for bash
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (4 preceding siblings ...)
2021-09-26 18:53 ` Johnnynator
@ 2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
` (37 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 350 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716243430
Comment:
Please add a line break after ~70 chars or smth.
Also change the prefix to smth like `/usr/lib/OpenJK` instead of `/opt`, `/opt` is for all kind of weird Third Party stuff, not packages in the repo.
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (6 preceding siblings ...)
2021-09-26 18:53 ` Johnnynator
@ 2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
` (35 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716243462
Comment:
Not needed, `xbps-src` does autodetect it
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (5 preceding siblings ...)
2021-09-26 18:53 ` Johnnynator
@ 2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
` (36 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716243731
Comment:
`\s@` should be `\$@`?
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (8 preceding siblings ...)
2021-09-26 18:53 ` Johnnynator
@ 2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` q66
` (33 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716244133
Comment:
Also you shouldn't have to add a `CMAKE_BUILD_TYPE`
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (7 preceding siblings ...)
2021-09-26 18:53 ` Johnnynator
@ 2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
` (34 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716244895
Comment:
Add this in do_install and replace your occurrences of XBPS_MACHINE with arch, this is mainly what we set in the cmake build-style, but i686 changed to i366 instead of x86
```
case $XBPS_TARGET_ARCH in
arm*) arch=arm;;
aarch64*) arch=aarch64;;
i686*) arch=x86;;
mips*) arch=mips;;
x86_64*) arch=x86_64;;
ppc64le*) arch=ppc64le;;
ppc64*) arch=ppc64;;
ppcle*) arch=ppcle
ppc*) arch=ppc
*) arch="generic"
esac
```
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (9 preceding siblings ...)
2021-09-26 18:53 ` Johnnynator
@ 2021-09-26 18:53 ` q66
2021-09-26 18:53 ` q66
` (32 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716245610
Comment:
this should not use XBPS_MACHINE, instead it should ask for `uname -m` when the script is run
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (10 preceding siblings ...)
2021-09-26 18:53 ` q66
@ 2021-09-26 18:53 ` q66
2021-09-26 18:56 ` kedodrill
` (31 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716245630
Comment:
ditto
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (11 preceding siblings ...)
2021-09-26 18:53 ` q66
@ 2021-09-26 18:56 ` kedodrill
2021-09-26 18:57 ` kedodrill
` (30 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-26 18:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716245931
Comment:
Will do, is the readme okay to keep in there?
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (12 preceding siblings ...)
2021-09-26 18:56 ` kedodrill
@ 2021-09-26 18:57 ` kedodrill
2021-09-26 18:58 ` q66
` (29 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-26 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New review comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246076
Comment:
good to know, thank you
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (13 preceding siblings ...)
2021-09-26 18:57 ` kedodrill
@ 2021-09-26 18:58 ` q66
2021-09-26 18:58 ` Johnnynator
` (28 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 18:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246105
Comment:
```
index: added `OpenJK-0.0.20210922_1' (ppc64le-musl)
```
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (14 preceding siblings ...)
2021-09-26 18:58 ` q66
@ 2021-09-26 18:58 ` Johnnynator
2021-09-26 18:58 ` q66
` (27 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 586 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716244895
Comment:
Add this in do_install and replace your occurrences of XBPS_MACHINE with arch, this is mainly what we set in the cmake build-style, but i686 changed to i366 instead of x86
```
case $XBPS_TARGET_ARCH in
arm*) arch=arm;;
aarch64*) arch=aarch64;;
i686*) arch=i386;;
mips*) arch=mips;;
x86_64*) arch=x86_64;;
ppc64le*) arch=ppc64le;;
ppc64*) arch=ppc64;;
ppcle*) arch=ppcle
ppc*) arch=ppc
*) arch="generic"
esac
```
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (15 preceding siblings ...)
2021-09-26 18:58 ` Johnnynator
@ 2021-09-26 18:58 ` q66
2021-09-26 18:59 ` Johnnynator
` (26 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 18:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246177
Comment:
no, they should just do what i said there (ask for `uname -m` at runtime)
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (16 preceding siblings ...)
2021-09-26 18:58 ` q66
@ 2021-09-26 18:59 ` Johnnynator
2021-09-26 18:59 ` q66
` (25 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246212
Comment:
Or the shorter version as by q66 comment,
```
case $XBPS_TARGET_ARCH in
i686*) arch=i386
*) arch=$(uname -m)
esac
```
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (17 preceding siblings ...)
2021-09-26 18:59 ` Johnnynator
@ 2021-09-26 18:59 ` q66
2021-09-26 19:00 ` Johnnynator
` (24 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246257
Comment:
that means musl actually builds fine, and it also means other architectures also build fine
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (18 preceding siblings ...)
2021-09-26 18:59 ` q66
@ 2021-09-26 19:00 ` Johnnynator
2021-09-26 19:02 ` q66
` (23 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 19:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246331
Comment:
> no, they should just do what i said there (ask for `uname -m` at runtime)
The cmake stuff overwrites some names, but for us only the i686 -> i386 is important.
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (19 preceding siblings ...)
2021-09-26 19:00 ` Johnnynator
@ 2021-09-26 19:02 ` q66
2021-09-26 19:03 ` q66
` (22 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 19:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246525
Comment:
the readme is fine to keep, but nobody reads `INSTALL` messages
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (20 preceding siblings ...)
2021-09-26 19:02 ` q66
@ 2021-09-26 19:03 ` q66
2021-09-26 19:03 ` q66
` (21 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246177
Comment:
~~no, they should just do what i said there (ask for `uname -m` at runtime)~~ oh, you're talking about the arguments after, yeah that needs changing too
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (21 preceding siblings ...)
2021-09-26 19:03 ` q66
@ 2021-09-26 19:03 ` q66
2021-09-26 19:03 ` kedodrill
` (20 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246177
Comment:
~~no, they should just do what i said there (ask for `uname -m` at runtime)~~ oh, you're talking about the arguments after, yeah that needs changing too (it needs quoting in addition to what you said, too)
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (22 preceding siblings ...)
2021-09-26 19:03 ` q66
@ 2021-09-26 19:03 ` kedodrill
2021-09-26 19:04 ` Johnnynator
` (19 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-26 19:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246714
Comment:
is 80 characters for the line break cool?
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (23 preceding siblings ...)
2021-09-26 19:03 ` kedodrill
@ 2021-09-26 19:04 ` Johnnynator
2021-09-26 19:05 ` q66
` (18 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246769
Comment:
Yeah, 80 is also fine
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (24 preceding siblings ...)
2021-09-26 19:04 ` Johnnynator
@ 2021-09-26 19:05 ` q66
2021-09-26 19:07 ` Johnnynator
` (17 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 19:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716246177
Comment:
no, they should just do what i said there (ask for `uname -m` at runtime) - but the arguments passing afterwards needs changing too (it needs quoting in addition to what you said, too)
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (25 preceding siblings ...)
2021-09-26 19:05 ` q66
@ 2021-09-26 19:07 ` Johnnynator
2021-09-26 19:15 ` q66
` (16 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 19:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New review comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716247142
Comment:
I would be more verbose about what game does use what directory in `~/.local/share` like Jedi Academy -> `openjk` and Jedi Outcast -> `openjo` (If I remember correctly)
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (26 preceding siblings ...)
2021-09-26 19:07 ` Johnnynator
@ 2021-09-26 19:15 ` q66
2021-09-26 19:18 ` q66
` (15 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 19:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716248179
Comment:
as a matter of fact it appears to work fine too https://0x0.st/-YOU.png
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (27 preceding siblings ...)
2021-09-26 19:15 ` q66
@ 2021-09-26 19:18 ` q66
2021-09-26 19:18 ` q66
` (14 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 19:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716248511
Comment:
actually looks like more might be important
so the script should do something like
```
OJ_ARCH=$(uname -m)
case "$OJ_ARCH" in
arm*) OJ_ARCH=arm;;
i*86*) OJ_ARCH=i386;;
esac
```
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (28 preceding siblings ...)
2021-09-26 19:18 ` q66
@ 2021-09-26 19:18 ` q66
2021-09-26 19:30 ` Johnnynator
` (13 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 19:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716248511
Comment:
actually looks like more might be important
so the script should do something like
```
OJ_ARCH=$(uname -m)
case "$OJ_ARCH" in
arm*) OJ_ARCH=arm;;
i*86*) OJ_ARCH=i386;;
esac
```
which should cover all those that we have
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (29 preceding siblings ...)
2021-09-26 19:18 ` q66
@ 2021-09-26 19:30 ` Johnnynator
2021-09-26 19:57 ` [PR PATCH] [Updated] " kedodrill
` (12 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-09-26 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#issuecomment-927357982
Comment:
You can add this patch http://0x0.st/-YOD.patch to `srcpkgs/OpenJK/patchhes/fix-cross.patch` and add `pkg-config` to `hostmakedepends` should fix the cross compiling issues.
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR PATCH] [Updated] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (30 preceding siblings ...)
2021-09-26 19:30 ` Johnnynator
@ 2021-09-26 19:57 ` kedodrill
2021-09-26 20:18 ` [PR REVIEW] " q66
` (11 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-26 19:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1907 bytes --]
There is an updated pull request by kedodrill against master on the void-packages repository
https://github.com/kedodrill/void-packages openjk
https://github.com/void-linux/void-packages/pull/33137
New package: OpenJK
<!-- 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)
Possible Issue: OpenJK does not have tags or releases on GitHub, [and I don't think they will](https://github.com/JACoders/OpenJK/issues/1102). :/
#### 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.)
- [x] 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
-->
x86_64-musl fails immediately when trying to build from my x86_64 system.
I have built this successfully for i686 and x86_64.
https://github.com/JACoders/OpenJK
A patch file from https://github.com/void-linux/void-packages/pull/33137.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjk-33137.patch --]
[-- Type: text/x-diff, Size: 6542 bytes --]
From cf046b02f735d28bc84c216f88adf8f726c7ac1b Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <kmdodrill@protonmail.com>
Date: Sun, 26 Sep 2021 12:59:13 -0500
Subject: [PATCH] New package: OpenJK-0.0.20210922
* Review fixes
---
srcpkgs/OpenJK/files/OpenJK.desktop | 10 ++++
srcpkgs/OpenJK/files/OpenJKMP.desktop | 10 ++++
srcpkgs/OpenJK/files/OpenJO.desktop | 10 ++++
srcpkgs/OpenJK/files/README.voidlinux | 12 +++++
.../patches/fix-sdl2-cross-compile.patch | 34 ++++++++++++
srcpkgs/OpenJK/template | 53 +++++++++++++++++++
6 files changed, 129 insertions(+)
create mode 100644 srcpkgs/OpenJK/files/OpenJK.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJKMP.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJO.desktop
create mode 100644 srcpkgs/OpenJK/files/README.voidlinux
create mode 100644 srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
create mode 100644 srcpkgs/OpenJK/template
diff --git a/srcpkgs/OpenJK/files/OpenJK.desktop b/srcpkgs/OpenJK/files/OpenJK.desktop
new file mode 100644
index 000000000000..e5c13c5c85d2
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJK.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Academy Single Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Academy Single Player"
+Exec=openjk_sp
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJKMP.desktop b/srcpkgs/OpenJK/files/OpenJKMP.desktop
new file mode 100644
index 000000000000..04c25842f89e
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJKMP.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Multi Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Multi Player"
+Exec=openjk
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJO.desktop b/srcpkgs/OpenJK/files/OpenJO.desktop
new file mode 100644
index 000000000000..de1076371d3c
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJO.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Outcast
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Outcast"
+Exec=openjo
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/README.voidlinux b/srcpkgs/OpenJK/files/README.voidlinux
new file mode 100644
index 000000000000..01d847cddab7
--- /dev/null
+++ b/srcpkgs/OpenJK/files/README.voidlinux
@@ -0,0 +1,12 @@
+OpenJK requires a copy of Jedi Knight: Jedi Academy.
+You can also use this for Jedi Outcast (singleplayer only), which requires a copy as well.
+The default folder that the game will search for files is
+
+ Jedi Academy: ~/.local/share/openjk
+ Jedi Outcast: ~/.local/share/openjo
+
+You can easily link your game files by doing the following:
+
+ cd ~/.local/share/openjk
+ mkdir base
+ ln -s /path/to/game/GameData/base/* base
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch b/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
new file mode 100644
index 000000000000..2b7a8c387acf
--- /dev/null
+++ b/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
@@ -0,0 +1,34 @@
+--- a/code/CMakeLists.txt 2021-07-31 22:39:10.000000000 +0200
++++ - 2021-09-26 21:18:25.041345027 +0200
+@@ -90,12 +90,8 @@
+ ${OpenJKLibDir}/SDL2/include
+ )
+ else()
+- find_package(SDL2 REQUIRED CONFIG)
+- if (TARGET SDL2::SDL2)
+- set(SDL2_INCLUDE_DIRS "")
+- set(SDL2_LIBRARIES SDL2::SDL2)
+- endif()
+- string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
++ include(FindPkgConfig)
++ pkg_search_module(SDL2 REQUIRED sdl2)
+ set(SPEngineIncludeDirectories ${SPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ set(SPEngineLibraries ${SPEngineLibraries} ${SDL2_LIBRARIES})
+ endif()
+--- a/codemp/CMakeLists.txt 2021-07-31 22:39:10.000000000 +0200
++++ - 2021-09-26 21:24:38.194600747 +0200
+@@ -396,12 +396,8 @@
+ ${OpenJKLibDir}/SDL2/include
+ )
+ else()
+- find_package(SDL2 REQUIRED CONFIG)
+- if (TARGET SDL2::SDL2)
+- set(SDL2_INCLUDE_DIRS "")
+- set(SDL2_LIBRARIES SDL2::SDL2)
+- endif()
+- string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
++ include(FindPkgConfig)
++ pkg_search_module(SDL2 REQUIRED sdl2)
+ set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ set(MPEngineLibraries ${MPEngineLibraries} ${SDL2_LIBRARIES})
+ endif()
diff --git a/srcpkgs/OpenJK/template b/srcpkgs/OpenJK/template
new file mode 100644
index 000000000000..3e474b073b1b
--- /dev/null
+++ b/srcpkgs/OpenJK/template
@@ -0,0 +1,53 @@
+# Template file for 'OpenJK'
+pkgname=OpenJK
+version=0.0.20210922
+revision=1
+_gitrev=43e9a3da555a487e23081bbd03101e7c926a1e83
+wrksrc="${pkgname}-${_gitrev}"
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DBuildJK2SPEngine=on
+ -DBuildJK2SPGame=on -DBuildJK2SPRdVanilla=on"
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel zlib-devel SDL2-devel"
+short_desc="Open Source Implementation of Jedi Knight II and III Engine"
+maintainer="Kenneth Dodrill <kmdodrill@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/JACoders/OpenJK"
+distfiles="https://github.com/JACoders/OpenJK/archive/${_gitrev}.tar.gz"
+checksum=efd2e3d96fe449819c4276dfea7ae7d591591ee0e651167844110e073f2edb3c
+
+post_install() {
+ OJ_ARCH=$(uname -m)
+ case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+ esac
+
+ vmkdir usr/bin
+ for _bin in 'openjk' 'openjk_sp' 'openjkded'; do
+ touch "${DESTDIR}/usr/bin/${_bin}"
+ cat > "${DESTDIR}/usr/bin/${_bin}" << EOF
+#! /bin/sh
+cd /usr/lib/${pkgname}/JediAcademy
+exec ./${_bin}.${OJ_ARCH} \$@
+EOF
+ chmod +x "${DESTDIR}/usr/bin/${_bin}"
+ done
+
+ cat > "${DESTDIR}/usr/bin/openjo" << EOF
+#! /bin/sh
+cd /usr/lib/${pkgname}/JediOutcast
+exec ./openjo_sp.${OJ_ARCH} \$@
+EOF
+ chmod +x ${DESTDIR}/usr/bin/openjo
+
+ vinstall "${FILESDIR}/OpenJK.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJKMP.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJO.desktop" 644 usr/share/applications
+
+ for size in 16 32 64 128 1024; do
+ vinstall shared/icons/${pkgname}_Icon_${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps/ OpenJK.png
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (31 preceding siblings ...)
2021-09-26 19:57 ` [PR PATCH] [Updated] " kedodrill
@ 2021-09-26 20:18 ` q66
2021-09-26 21:07 ` [PR PATCH] [Updated] " kedodrill
` (10 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 20:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716255727
Comment:
no, that's not how this works
it should be the *script* doing it, not the template
and at that point you can just make them files in files/ and copy them over
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR PATCH] [Updated] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (32 preceding siblings ...)
2021-09-26 20:18 ` [PR REVIEW] " q66
@ 2021-09-26 21:07 ` kedodrill
2021-09-26 22:02 ` [PR REVIEW] " q66
` (9 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-26 21:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1832 bytes --]
There is an updated pull request by kedodrill against master on the void-packages repository
https://github.com/kedodrill/void-packages openjk
https://github.com/void-linux/void-packages/pull/33137
New package: OpenJK
<!-- 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)
Possible Issue: OpenJK does not have tags or releases on GitHub, [and I don't think they will](https://github.com/JACoders/OpenJK/issues/1102). :/
#### 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.)
- [x] 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
-->
I have built this successfully for i686 and x86_64.
https://github.com/JACoders/OpenJK
A patch file from https://github.com/void-linux/void-packages/pull/33137.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjk-33137.patch --]
[-- Type: text/x-diff, Size: 8022 bytes --]
From 91f443daf9f76eb24b632b9fbfba316b2174d3ca Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <kmdodrill@protonmail.com>
Date: Sun, 26 Sep 2021 12:59:13 -0500
Subject: [PATCH] New package: OpenJK-0.0.20210922
* Review fixes
---
srcpkgs/OpenJK/files/OpenJK.desktop | 10 ++++++
srcpkgs/OpenJK/files/OpenJKMP.desktop | 10 ++++++
srcpkgs/OpenJK/files/OpenJO.desktop | 10 ++++++
srcpkgs/OpenJK/files/README.voidlinux | 12 +++++++
srcpkgs/OpenJK/files/openjk | 9 +++++
srcpkgs/OpenJK/files/openjk_sp | 9 +++++
srcpkgs/OpenJK/files/openjkded | 9 +++++
srcpkgs/OpenJK/files/openjo | 9 +++++
.../patches/fix-sdl2-cross-compile.patch | 34 +++++++++++++++++++
srcpkgs/OpenJK/template | 34 +++++++++++++++++++
10 files changed, 146 insertions(+)
create mode 100644 srcpkgs/OpenJK/files/OpenJK.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJKMP.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJO.desktop
create mode 100644 srcpkgs/OpenJK/files/README.voidlinux
create mode 100644 srcpkgs/OpenJK/files/openjk
create mode 100644 srcpkgs/OpenJK/files/openjk_sp
create mode 100644 srcpkgs/OpenJK/files/openjkded
create mode 100644 srcpkgs/OpenJK/files/openjo
create mode 100644 srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
create mode 100644 srcpkgs/OpenJK/template
diff --git a/srcpkgs/OpenJK/files/OpenJK.desktop b/srcpkgs/OpenJK/files/OpenJK.desktop
new file mode 100644
index 000000000000..e5c13c5c85d2
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJK.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Academy Single Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Academy Single Player"
+Exec=openjk_sp
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJKMP.desktop b/srcpkgs/OpenJK/files/OpenJKMP.desktop
new file mode 100644
index 000000000000..04c25842f89e
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJKMP.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Multi Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Multi Player"
+Exec=openjk
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJO.desktop b/srcpkgs/OpenJK/files/OpenJO.desktop
new file mode 100644
index 000000000000..de1076371d3c
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJO.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Outcast
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Outcast"
+Exec=openjo
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/README.voidlinux b/srcpkgs/OpenJK/files/README.voidlinux
new file mode 100644
index 000000000000..01d847cddab7
--- /dev/null
+++ b/srcpkgs/OpenJK/files/README.voidlinux
@@ -0,0 +1,12 @@
+OpenJK requires a copy of Jedi Knight: Jedi Academy.
+You can also use this for Jedi Outcast (singleplayer only), which requires a copy as well.
+The default folder that the game will search for files is
+
+ Jedi Academy: ~/.local/share/openjk
+ Jedi Outcast: ~/.local/share/openjo
+
+You can easily link your game files by doing the following:
+
+ cd ~/.local/share/openjk
+ mkdir base
+ ln -s /path/to/game/GameData/base/* base
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/openjk b/srcpkgs/OpenJK/files/openjk
new file mode 100644
index 000000000000..a39114411eb4
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjk
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjk.${OJ_ARCH} \$@
diff --git a/srcpkgs/OpenJK/files/openjk_sp b/srcpkgs/OpenJK/files/openjk_sp
new file mode 100644
index 000000000000..8ed5321f6b6c
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjk_sp
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjk_sp.${OJ_ARCH} \$@
diff --git a/srcpkgs/OpenJK/files/openjkded b/srcpkgs/OpenJK/files/openjkded
new file mode 100644
index 000000000000..1a1faee6a2ad
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjkded
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjkded.${OJ_ARCH} \$@
diff --git a/srcpkgs/OpenJK/files/openjo b/srcpkgs/OpenJK/files/openjo
new file mode 100644
index 000000000000..bd6c9bbc0980
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjo
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediOutcast
+exec ./openjo_sp.${OJ_ARCH} \$@
diff --git a/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch b/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
new file mode 100644
index 000000000000..2b7a8c387acf
--- /dev/null
+++ b/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
@@ -0,0 +1,34 @@
+--- a/code/CMakeLists.txt 2021-07-31 22:39:10.000000000 +0200
++++ - 2021-09-26 21:18:25.041345027 +0200
+@@ -90,12 +90,8 @@
+ ${OpenJKLibDir}/SDL2/include
+ )
+ else()
+- find_package(SDL2 REQUIRED CONFIG)
+- if (TARGET SDL2::SDL2)
+- set(SDL2_INCLUDE_DIRS "")
+- set(SDL2_LIBRARIES SDL2::SDL2)
+- endif()
+- string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
++ include(FindPkgConfig)
++ pkg_search_module(SDL2 REQUIRED sdl2)
+ set(SPEngineIncludeDirectories ${SPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ set(SPEngineLibraries ${SPEngineLibraries} ${SDL2_LIBRARIES})
+ endif()
+--- a/codemp/CMakeLists.txt 2021-07-31 22:39:10.000000000 +0200
++++ - 2021-09-26 21:24:38.194600747 +0200
+@@ -396,12 +396,8 @@
+ ${OpenJKLibDir}/SDL2/include
+ )
+ else()
+- find_package(SDL2 REQUIRED CONFIG)
+- if (TARGET SDL2::SDL2)
+- set(SDL2_INCLUDE_DIRS "")
+- set(SDL2_LIBRARIES SDL2::SDL2)
+- endif()
+- string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
++ include(FindPkgConfig)
++ pkg_search_module(SDL2 REQUIRED sdl2)
+ set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ set(MPEngineLibraries ${MPEngineLibraries} ${SDL2_LIBRARIES})
+ endif()
diff --git a/srcpkgs/OpenJK/template b/srcpkgs/OpenJK/template
new file mode 100644
index 000000000000..02175e5dceaf
--- /dev/null
+++ b/srcpkgs/OpenJK/template
@@ -0,0 +1,34 @@
+# Template file for 'OpenJK'
+pkgname=OpenJK
+version=0.0.20210922
+revision=1
+_gitrev=43e9a3da555a487e23081bbd03101e7c926a1e83
+wrksrc="${pkgname}-${_gitrev}"
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DBuildJK2SPEngine=on
+ -DBuildJK2SPGame=on -DBuildJK2SPRdVanilla=on"
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel zlib-devel SDL2-devel"
+short_desc="Open Source Implementation of Jedi Knight II and III Engine"
+maintainer="Kenneth Dodrill <kmdodrill@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/JACoders/OpenJK"
+distfiles="https://github.com/JACoders/OpenJK/archive/${_gitrev}.tar.gz"
+checksum=efd2e3d96fe449819c4276dfea7ae7d591591ee0e651167844110e073f2edb3c
+
+post_install() {
+ vbin "${FILESDIR}/openjk"
+ vbin "${FILESDIR}/openjk_sp"
+ vbin "${FILESDIR}/openjkded"
+ vbin "${FILESDIR}/openjo"
+
+ vinstall "${FILESDIR}/OpenJK.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJKMP.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJO.desktop" 644 usr/share/applications
+
+ for size in 16 32 64 128 1024; do
+ vinstall shared/icons/${pkgname}_Icon_${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps/ OpenJK.png
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (33 preceding siblings ...)
2021-09-26 21:07 ` [PR PATCH] [Updated] " kedodrill
@ 2021-09-26 22:02 ` q66
2021-09-26 22:02 ` q66
` (8 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 22:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716268550
Comment:
should be `"$@"`
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (34 preceding siblings ...)
2021-09-26 22:02 ` [PR REVIEW] " q66
@ 2021-09-26 22:02 ` q66
2021-09-26 22:03 ` q66
` (7 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 22:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716268563
Comment:
ditto here
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (35 preceding siblings ...)
2021-09-26 22:02 ` q66
@ 2021-09-26 22:03 ` q66
2021-09-26 22:03 ` q66
` (6 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 22:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716268577
Comment:
ditto here
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (36 preceding siblings ...)
2021-09-26 22:03 ` q66
@ 2021-09-26 22:03 ` q66
2021-09-26 22:11 ` [PR PATCH] [Updated] " kedodrill
` (5 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-26 22:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716268616
Comment:
same here
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR PATCH] [Updated] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (37 preceding siblings ...)
2021-09-26 22:03 ` q66
@ 2021-09-26 22:11 ` kedodrill
2021-09-27 0:41 ` [PR REVIEW] " q66
` (4 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-26 22:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1832 bytes --]
There is an updated pull request by kedodrill against master on the void-packages repository
https://github.com/kedodrill/void-packages openjk
https://github.com/void-linux/void-packages/pull/33137
New package: OpenJK
<!-- 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)
Possible Issue: OpenJK does not have tags or releases on GitHub, [and I don't think they will](https://github.com/JACoders/OpenJK/issues/1102). :/
#### 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.)
- [x] 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
-->
I have built this successfully for i686 and x86_64.
https://github.com/JACoders/OpenJK
A patch file from https://github.com/void-linux/void-packages/pull/33137.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjk-33137.patch --]
[-- Type: text/x-diff, Size: 8018 bytes --]
From f4504683d2a42b3279e3d2c1cbccf78e988f5497 Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <kmdodrill@protonmail.com>
Date: Sun, 26 Sep 2021 12:59:13 -0500
Subject: [PATCH] New package: OpenJK-0.0.20210922
* Review fixes
---
srcpkgs/OpenJK/files/OpenJK.desktop | 10 ++++++
srcpkgs/OpenJK/files/OpenJKMP.desktop | 10 ++++++
srcpkgs/OpenJK/files/OpenJO.desktop | 10 ++++++
srcpkgs/OpenJK/files/README.voidlinux | 12 +++++++
srcpkgs/OpenJK/files/openjk | 9 +++++
srcpkgs/OpenJK/files/openjk_sp | 9 +++++
srcpkgs/OpenJK/files/openjkded | 9 +++++
srcpkgs/OpenJK/files/openjo | 9 +++++
.../patches/fix-sdl2-cross-compile.patch | 34 +++++++++++++++++++
srcpkgs/OpenJK/template | 34 +++++++++++++++++++
10 files changed, 146 insertions(+)
create mode 100644 srcpkgs/OpenJK/files/OpenJK.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJKMP.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJO.desktop
create mode 100644 srcpkgs/OpenJK/files/README.voidlinux
create mode 100644 srcpkgs/OpenJK/files/openjk
create mode 100644 srcpkgs/OpenJK/files/openjk_sp
create mode 100644 srcpkgs/OpenJK/files/openjkded
create mode 100644 srcpkgs/OpenJK/files/openjo
create mode 100644 srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
create mode 100644 srcpkgs/OpenJK/template
diff --git a/srcpkgs/OpenJK/files/OpenJK.desktop b/srcpkgs/OpenJK/files/OpenJK.desktop
new file mode 100644
index 000000000000..e5c13c5c85d2
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJK.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Academy Single Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Academy Single Player"
+Exec=openjk_sp
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJKMP.desktop b/srcpkgs/OpenJK/files/OpenJKMP.desktop
new file mode 100644
index 000000000000..04c25842f89e
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJKMP.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Multi Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Multi Player"
+Exec=openjk
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJO.desktop b/srcpkgs/OpenJK/files/OpenJO.desktop
new file mode 100644
index 000000000000..de1076371d3c
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJO.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Outcast
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Outcast"
+Exec=openjo
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/README.voidlinux b/srcpkgs/OpenJK/files/README.voidlinux
new file mode 100644
index 000000000000..01d847cddab7
--- /dev/null
+++ b/srcpkgs/OpenJK/files/README.voidlinux
@@ -0,0 +1,12 @@
+OpenJK requires a copy of Jedi Knight: Jedi Academy.
+You can also use this for Jedi Outcast (singleplayer only), which requires a copy as well.
+The default folder that the game will search for files is
+
+ Jedi Academy: ~/.local/share/openjk
+ Jedi Outcast: ~/.local/share/openjo
+
+You can easily link your game files by doing the following:
+
+ cd ~/.local/share/openjk
+ mkdir base
+ ln -s /path/to/game/GameData/base/* base
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/openjk b/srcpkgs/OpenJK/files/openjk
new file mode 100644
index 000000000000..421946d626f9
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjk
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjk.${OJ_ARCH} $@
diff --git a/srcpkgs/OpenJK/files/openjk_sp b/srcpkgs/OpenJK/files/openjk_sp
new file mode 100644
index 000000000000..2ab12e515cf7
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjk_sp
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjk_sp.${OJ_ARCH} $@
diff --git a/srcpkgs/OpenJK/files/openjkded b/srcpkgs/OpenJK/files/openjkded
new file mode 100644
index 000000000000..62edaded7255
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjkded
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjkded.${OJ_ARCH} $@
diff --git a/srcpkgs/OpenJK/files/openjo b/srcpkgs/OpenJK/files/openjo
new file mode 100644
index 000000000000..5a5315acb899
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjo
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediOutcast
+exec ./openjo_sp.${OJ_ARCH} $@
diff --git a/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch b/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
new file mode 100644
index 000000000000..2b7a8c387acf
--- /dev/null
+++ b/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
@@ -0,0 +1,34 @@
+--- a/code/CMakeLists.txt 2021-07-31 22:39:10.000000000 +0200
++++ - 2021-09-26 21:18:25.041345027 +0200
+@@ -90,12 +90,8 @@
+ ${OpenJKLibDir}/SDL2/include
+ )
+ else()
+- find_package(SDL2 REQUIRED CONFIG)
+- if (TARGET SDL2::SDL2)
+- set(SDL2_INCLUDE_DIRS "")
+- set(SDL2_LIBRARIES SDL2::SDL2)
+- endif()
+- string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
++ include(FindPkgConfig)
++ pkg_search_module(SDL2 REQUIRED sdl2)
+ set(SPEngineIncludeDirectories ${SPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ set(SPEngineLibraries ${SPEngineLibraries} ${SDL2_LIBRARIES})
+ endif()
+--- a/codemp/CMakeLists.txt 2021-07-31 22:39:10.000000000 +0200
++++ - 2021-09-26 21:24:38.194600747 +0200
+@@ -396,12 +396,8 @@
+ ${OpenJKLibDir}/SDL2/include
+ )
+ else()
+- find_package(SDL2 REQUIRED CONFIG)
+- if (TARGET SDL2::SDL2)
+- set(SDL2_INCLUDE_DIRS "")
+- set(SDL2_LIBRARIES SDL2::SDL2)
+- endif()
+- string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
++ include(FindPkgConfig)
++ pkg_search_module(SDL2 REQUIRED sdl2)
+ set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ set(MPEngineLibraries ${MPEngineLibraries} ${SDL2_LIBRARIES})
+ endif()
diff --git a/srcpkgs/OpenJK/template b/srcpkgs/OpenJK/template
new file mode 100644
index 000000000000..02175e5dceaf
--- /dev/null
+++ b/srcpkgs/OpenJK/template
@@ -0,0 +1,34 @@
+# Template file for 'OpenJK'
+pkgname=OpenJK
+version=0.0.20210922
+revision=1
+_gitrev=43e9a3da555a487e23081bbd03101e7c926a1e83
+wrksrc="${pkgname}-${_gitrev}"
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DBuildJK2SPEngine=on
+ -DBuildJK2SPGame=on -DBuildJK2SPRdVanilla=on"
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel zlib-devel SDL2-devel"
+short_desc="Open Source Implementation of Jedi Knight II and III Engine"
+maintainer="Kenneth Dodrill <kmdodrill@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/JACoders/OpenJK"
+distfiles="https://github.com/JACoders/OpenJK/archive/${_gitrev}.tar.gz"
+checksum=efd2e3d96fe449819c4276dfea7ae7d591591ee0e651167844110e073f2edb3c
+
+post_install() {
+ vbin "${FILESDIR}/openjk"
+ vbin "${FILESDIR}/openjk_sp"
+ vbin "${FILESDIR}/openjkded"
+ vbin "${FILESDIR}/openjo"
+
+ vinstall "${FILESDIR}/OpenJK.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJKMP.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJO.desktop" 644 usr/share/applications
+
+ for size in 16 32 64 128 1024; do
+ vinstall shared/icons/${pkgname}_Icon_${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps/ OpenJK.png
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (38 preceding siblings ...)
2021-09-26 22:11 ` [PR PATCH] [Updated] " kedodrill
@ 2021-09-27 0:41 ` q66
2021-09-27 1:41 ` kedodrill
` (3 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: q66 @ 2021-09-27 0:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716291033
Comment:
you forgot to quote it, read up on shell semantics for $@ with double quotes vs not
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR REVIEW] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (39 preceding siblings ...)
2021-09-27 0:41 ` [PR REVIEW] " q66
@ 2021-09-27 1:41 ` kedodrill
2021-09-27 1:42 ` [PR PATCH] [Updated] " kedodrill
` (2 subsequent siblings)
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-27 1:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New review comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#discussion_r716304300
Comment:
ah, I was not aware that it is basically $* without the quotes. thank you for the note :)
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR PATCH] [Updated] New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (40 preceding siblings ...)
2021-09-27 1:41 ` kedodrill
@ 2021-09-27 1:42 ` kedodrill
2021-10-02 16:53 ` [PR PATCH] [Merged]: " Johnnynator
2021-10-02 16:55 ` kedodrill
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-09-27 1:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1832 bytes --]
There is an updated pull request by kedodrill against master on the void-packages repository
https://github.com/kedodrill/void-packages openjk
https://github.com/void-linux/void-packages/pull/33137
New package: OpenJK
<!-- 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)
Possible Issue: OpenJK does not have tags or releases on GitHub, [and I don't think they will](https://github.com/JACoders/OpenJK/issues/1102). :/
#### 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.)
- [x] 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
-->
I have built this successfully for i686 and x86_64.
https://github.com/JACoders/OpenJK
A patch file from https://github.com/void-linux/void-packages/pull/33137.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjk-33137.patch --]
[-- Type: text/x-diff, Size: 8026 bytes --]
From 756312c85269e251654819a93bad26a41ef6b547 Mon Sep 17 00:00:00 2001
From: Kenneth Dodrill <kmdodrill@protonmail.com>
Date: Sun, 26 Sep 2021 12:59:13 -0500
Subject: [PATCH] New package: OpenJK-0.0.20210922
* Review fixes
---
srcpkgs/OpenJK/files/OpenJK.desktop | 10 ++++++
srcpkgs/OpenJK/files/OpenJKMP.desktop | 10 ++++++
srcpkgs/OpenJK/files/OpenJO.desktop | 10 ++++++
srcpkgs/OpenJK/files/README.voidlinux | 12 +++++++
srcpkgs/OpenJK/files/openjk | 9 +++++
srcpkgs/OpenJK/files/openjk_sp | 9 +++++
srcpkgs/OpenJK/files/openjkded | 9 +++++
srcpkgs/OpenJK/files/openjo | 9 +++++
.../patches/fix-sdl2-cross-compile.patch | 34 +++++++++++++++++++
srcpkgs/OpenJK/template | 34 +++++++++++++++++++
10 files changed, 146 insertions(+)
create mode 100644 srcpkgs/OpenJK/files/OpenJK.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJKMP.desktop
create mode 100644 srcpkgs/OpenJK/files/OpenJO.desktop
create mode 100644 srcpkgs/OpenJK/files/README.voidlinux
create mode 100644 srcpkgs/OpenJK/files/openjk
create mode 100644 srcpkgs/OpenJK/files/openjk_sp
create mode 100644 srcpkgs/OpenJK/files/openjkded
create mode 100644 srcpkgs/OpenJK/files/openjo
create mode 100644 srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
create mode 100644 srcpkgs/OpenJK/template
diff --git a/srcpkgs/OpenJK/files/OpenJK.desktop b/srcpkgs/OpenJK/files/OpenJK.desktop
new file mode 100644
index 000000000000..e5c13c5c85d2
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJK.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Academy Single Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Academy Single Player"
+Exec=openjk_sp
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJKMP.desktop b/srcpkgs/OpenJK/files/OpenJKMP.desktop
new file mode 100644
index 000000000000..04c25842f89e
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJKMP.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Multi Player
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Multi Player"
+Exec=openjk
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/OpenJO.desktop b/srcpkgs/OpenJK/files/OpenJO.desktop
new file mode 100644
index 000000000000..de1076371d3c
--- /dev/null
+++ b/srcpkgs/OpenJK/files/OpenJO.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=OpenJK Jedi Outcast
+Comment="Open Source Implementation of Jedi Knight II and III Engine - Jedi Outcast"
+Exec=openjo
+Icon=OpenJK
+Terminal=false
+StartupNotify=false
+Categories=Game
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/README.voidlinux b/srcpkgs/OpenJK/files/README.voidlinux
new file mode 100644
index 000000000000..01d847cddab7
--- /dev/null
+++ b/srcpkgs/OpenJK/files/README.voidlinux
@@ -0,0 +1,12 @@
+OpenJK requires a copy of Jedi Knight: Jedi Academy.
+You can also use this for Jedi Outcast (singleplayer only), which requires a copy as well.
+The default folder that the game will search for files is
+
+ Jedi Academy: ~/.local/share/openjk
+ Jedi Outcast: ~/.local/share/openjo
+
+You can easily link your game files by doing the following:
+
+ cd ~/.local/share/openjk
+ mkdir base
+ ln -s /path/to/game/GameData/base/* base
\ No newline at end of file
diff --git a/srcpkgs/OpenJK/files/openjk b/srcpkgs/OpenJK/files/openjk
new file mode 100644
index 000000000000..c1ec24d3c55f
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjk
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjk.${OJ_ARCH} "$@"
diff --git a/srcpkgs/OpenJK/files/openjk_sp b/srcpkgs/OpenJK/files/openjk_sp
new file mode 100644
index 000000000000..78f6a756a185
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjk_sp
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjk_sp.${OJ_ARCH} "$@"
diff --git a/srcpkgs/OpenJK/files/openjkded b/srcpkgs/OpenJK/files/openjkded
new file mode 100644
index 000000000000..a9cc159803e7
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjkded
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediAcademy
+exec ./openjkded.${OJ_ARCH} "$@"
diff --git a/srcpkgs/OpenJK/files/openjo b/srcpkgs/OpenJK/files/openjo
new file mode 100644
index 000000000000..7d831d4701c7
--- /dev/null
+++ b/srcpkgs/OpenJK/files/openjo
@@ -0,0 +1,9 @@
+#! /bin/sh
+OJ_ARCH=$(uname -m)
+case "$OJ_ARCH" in
+ arm*) OJ_ARCH=arm;;
+ i*86*) OJ_ARCH=i386;;
+esac
+
+cd /usr/lib/OpenJK/JediOutcast
+exec ./openjo_sp.${OJ_ARCH} "$@"
diff --git a/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch b/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
new file mode 100644
index 000000000000..2b7a8c387acf
--- /dev/null
+++ b/srcpkgs/OpenJK/patches/fix-sdl2-cross-compile.patch
@@ -0,0 +1,34 @@
+--- a/code/CMakeLists.txt 2021-07-31 22:39:10.000000000 +0200
++++ - 2021-09-26 21:18:25.041345027 +0200
+@@ -90,12 +90,8 @@
+ ${OpenJKLibDir}/SDL2/include
+ )
+ else()
+- find_package(SDL2 REQUIRED CONFIG)
+- if (TARGET SDL2::SDL2)
+- set(SDL2_INCLUDE_DIRS "")
+- set(SDL2_LIBRARIES SDL2::SDL2)
+- endif()
+- string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
++ include(FindPkgConfig)
++ pkg_search_module(SDL2 REQUIRED sdl2)
+ set(SPEngineIncludeDirectories ${SPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ set(SPEngineLibraries ${SPEngineLibraries} ${SDL2_LIBRARIES})
+ endif()
+--- a/codemp/CMakeLists.txt 2021-07-31 22:39:10.000000000 +0200
++++ - 2021-09-26 21:24:38.194600747 +0200
+@@ -396,12 +396,8 @@
+ ${OpenJKLibDir}/SDL2/include
+ )
+ else()
+- find_package(SDL2 REQUIRED CONFIG)
+- if (TARGET SDL2::SDL2)
+- set(SDL2_INCLUDE_DIRS "")
+- set(SDL2_LIBRARIES SDL2::SDL2)
+- endif()
+- string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
++ include(FindPkgConfig)
++ pkg_search_module(SDL2 REQUIRED sdl2)
+ set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${SDL2_INCLUDE_DIRS})
+ set(MPEngineLibraries ${MPEngineLibraries} ${SDL2_LIBRARIES})
+ endif()
diff --git a/srcpkgs/OpenJK/template b/srcpkgs/OpenJK/template
new file mode 100644
index 000000000000..02175e5dceaf
--- /dev/null
+++ b/srcpkgs/OpenJK/template
@@ -0,0 +1,34 @@
+# Template file for 'OpenJK'
+pkgname=OpenJK
+version=0.0.20210922
+revision=1
+_gitrev=43e9a3da555a487e23081bbd03101e7c926a1e83
+wrksrc="${pkgname}-${_gitrev}"
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr/lib/${pkgname} -DBuildJK2SPEngine=on
+ -DBuildJK2SPGame=on -DBuildJK2SPRdVanilla=on"
+hostmakedepends="pkg-config"
+makedepends="libjpeg-turbo-devel libpng-devel zlib-devel SDL2-devel"
+short_desc="Open Source Implementation of Jedi Knight II and III Engine"
+maintainer="Kenneth Dodrill <kmdodrill@protonmail.com>"
+license="GPL-2.0-only"
+homepage="https://github.com/JACoders/OpenJK"
+distfiles="https://github.com/JACoders/OpenJK/archive/${_gitrev}.tar.gz"
+checksum=efd2e3d96fe449819c4276dfea7ae7d591591ee0e651167844110e073f2edb3c
+
+post_install() {
+ vbin "${FILESDIR}/openjk"
+ vbin "${FILESDIR}/openjk_sp"
+ vbin "${FILESDIR}/openjkded"
+ vbin "${FILESDIR}/openjo"
+
+ vinstall "${FILESDIR}/OpenJK.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJKMP.desktop" 644 usr/share/applications
+ vinstall "${FILESDIR}/OpenJO.desktop" 644 usr/share/applications
+
+ for size in 16 32 64 128 1024; do
+ vinstall shared/icons/${pkgname}_Icon_${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps/ OpenJK.png
+ done
+
+ vdoc "${FILESDIR}/README.voidlinux"
+}
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: [PR PATCH] [Merged]: New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (41 preceding siblings ...)
2021-09-27 1:42 ` [PR PATCH] [Updated] " kedodrill
@ 2021-10-02 16:53 ` Johnnynator
2021-10-02 16:55 ` kedodrill
43 siblings, 0 replies; 45+ messages in thread
From: Johnnynator @ 2021-10-02 16:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1673 bytes --]
There's a merged pull request on the void-packages repository
New package: OpenJK
https://github.com/void-linux/void-packages/pull/33137
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)
Possible Issue: OpenJK does not have tags or releases on GitHub, [and I don't think they will](https://github.com/JACoders/OpenJK/issues/1102). :/
#### 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.)
- [x] 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
-->
I have built this successfully for i686 and x86_64.
https://github.com/JACoders/OpenJK
^ permalink raw reply [flat|nested] 45+ messages in thread
* Re: New package: OpenJK
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
` (42 preceding siblings ...)
2021-10-02 16:53 ` [PR PATCH] [Merged]: " Johnnynator
@ 2021-10-02 16:55 ` kedodrill
43 siblings, 0 replies; 45+ messages in thread
From: kedodrill @ 2021-10-02 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by kedodrill on void-packages repository
https://github.com/void-linux/void-packages/pull/33137#issuecomment-932783659
Comment:
Thanks to everyone who helped me with this template! 🎉
^ permalink raw reply [flat|nested] 45+ messages in thread
end of thread, other threads:[~2021-10-02 16:55 UTC | newest]
Thread overview: 45+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-26 18:15 [PR PATCH] New package: OpenJK kedodrill
2021-09-26 18:45 ` [PR REVIEW] " q66
2021-09-26 18:52 ` kedodrill
2021-09-26 18:53 ` q66
2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` Johnnynator
2021-09-26 18:53 ` q66
2021-09-26 18:53 ` q66
2021-09-26 18:56 ` kedodrill
2021-09-26 18:57 ` kedodrill
2021-09-26 18:58 ` q66
2021-09-26 18:58 ` Johnnynator
2021-09-26 18:58 ` q66
2021-09-26 18:59 ` Johnnynator
2021-09-26 18:59 ` q66
2021-09-26 19:00 ` Johnnynator
2021-09-26 19:02 ` q66
2021-09-26 19:03 ` q66
2021-09-26 19:03 ` q66
2021-09-26 19:03 ` kedodrill
2021-09-26 19:04 ` Johnnynator
2021-09-26 19:05 ` q66
2021-09-26 19:07 ` Johnnynator
2021-09-26 19:15 ` q66
2021-09-26 19:18 ` q66
2021-09-26 19:18 ` q66
2021-09-26 19:30 ` Johnnynator
2021-09-26 19:57 ` [PR PATCH] [Updated] " kedodrill
2021-09-26 20:18 ` [PR REVIEW] " q66
2021-09-26 21:07 ` [PR PATCH] [Updated] " kedodrill
2021-09-26 22:02 ` [PR REVIEW] " q66
2021-09-26 22:02 ` q66
2021-09-26 22:03 ` q66
2021-09-26 22:03 ` q66
2021-09-26 22:11 ` [PR PATCH] [Updated] " kedodrill
2021-09-27 0:41 ` [PR REVIEW] " q66
2021-09-27 1:41 ` kedodrill
2021-09-27 1:42 ` [PR PATCH] [Updated] " kedodrill
2021-10-02 16:53 ` [PR PATCH] [Merged]: " Johnnynator
2021-10-02 16:55 ` kedodrill
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).