Re: NEW: games/crispy-doom
Ryan Freeman wrote (2023-08-18 03:09 CEST):
> On Thu, Aug 17, 2023 at 08:08:12PM -0400, Thomas Frohwein wrote:
> > On Thu, Aug 17, 2023 at 02:08:09PM -0700, Ryan Freeman wrote:
> > > On Thu, Aug 17, 2023 at 03:24:38PM -0400, Thomas Frohwein wrote:
> > > > On Thu, Aug 17, 2023 at 11:18:29AM -0700, Ryan Freeman wrote:
> > > >
> > > > [...]
> > > >
> > > > > Bubbling this one back up, I'd love to see it go in. I've went ahead
> > > > > and
> > > > > taken MAINTAINER anyway, adjusted HOMEPAGE to
> > > > > https://crispy-doom.org/ as
> > > > > it has a real website since some time.
> > > > >
> > > > > portcheck,port-lib-depends-check,lib-depends-check all seem to pass
> > > > > and the
> > > > > games still play good on -current on my amd64 laptop.
> > > > >
> > > > > Hoping this one gets an OK and a friendly committer can get it in
> > > > > before
> > > > > ports lock. :-) Thanks!
> > > > >
> > > > > -Ryan
> > > >
> > > > - $ crispy-hexen -iwad hexen.wad
> > > >
> > > > Is there a problem with crispy-hexen? It's still in the PLIST, but this
> > > > line removes it from the README.
> > > >
> > >
> > > Nope, no issue. That must be from when I synced it with the
> > > chocolate-doom
> > > pkg/README. I would have to guess I decided that listing just a couple
> > > examples was sufficient rather than listing an example for every game.
> > > Hexen also AFAIK only ever had hexen.wad, whereas heretic and doom
> > > versions
> > > may have had either doom1.wad or heretic1.wad for shareware vs full game.
> > >
> > > https://doomwiki.org/wiki/HEXEN.WAD
> > >
> > > IWADs installed in ${PREFIX}/share/doom (all games) also automatically get
> > > used, the remark about multiple IWADs is mostly for the games that had
> > > multiple options. For Doom, both crispy-doom and chocolate-doom err to
> > > choosing doom2.wad first, whereas you might want to use -iwad to specify
> > > doom.wad, plutonia.wad, or tnt.wad.
> > >
> > > There could be a case for showing an example for Strife, as strife0.wad is
> > > shareware and strife1.wad/voices.wad is from full version.
> > >
> > > What do you think?
> >
> > I don't think that's necessary. This is already a very detailed README
> > (which is great!).
> >
> > > Thanks for the feedback!
> > > -Ryan
> >
> > I just tested it with:
> >
> > $ $ crispy-doom freedoom1.wad
You forgot -iwad here. Called like this, it will ignore the parameter.
And load a supported file from /usr/local/share/doom or $CWD.
> > and that also worked. As this is the easiest to install doom, add it to
> > the README?
Good for me. I like the detailed readme.
> I think that is a great idea. Not sure why I never considered it for
> chocolate-doom too. Let me know how this looks and I'll adapt a diff
> for chocolate as well. Also, easiest to install? You can also pkg_add
> doomdata for the shareware. :-)
>
> >
> > Either way, this is ok thfr@. If there's another developer ok, I can go
> > ahead and commit this.
ok sdk@ for import
nit: sort LIB_DEPENDS
> Reattached with modified pkg/README mentioning freedoom/freedm packages,
> and their IWAD names. Just a quick note after the IWAD examples.
>
> Thanks!
> -Ryan
Re: NEW: games/crispy-doom
On Thu, Aug 17, 2023 at 08:08:12PM -0400, Thomas Frohwein wrote:
> On Thu, Aug 17, 2023 at 02:08:09PM -0700, Ryan Freeman wrote:
> > On Thu, Aug 17, 2023 at 03:24:38PM -0400, Thomas Frohwein wrote:
> > > On Thu, Aug 17, 2023 at 11:18:29AM -0700, Ryan Freeman wrote:
> > >
> > > [...]
> > >
> > > > Bubbling this one back up, I'd love to see it go in. I've went ahead
> > > > and
> > > > taken MAINTAINER anyway, adjusted HOMEPAGE to https://crispy-doom.org/
> > > > as
> > > > it has a real website since some time.
> > > >
> > > > portcheck,port-lib-depends-check,lib-depends-check all seem to pass and
> > > > the
> > > > games still play good on -current on my amd64 laptop.
> > > >
> > > > Hoping this one gets an OK and a friendly committer can get it in before
> > > > ports lock. :-) Thanks!
> > > >
> > > > -Ryan
> > >
> > > - $ crispy-hexen -iwad hexen.wad
> > >
> > > Is there a problem with crispy-hexen? It's still in the PLIST, but this
> > > line removes it from the README.
> > >
> >
> > Nope, no issue. That must be from when I synced it with the chocolate-doom
> > pkg/README. I would have to guess I decided that listing just a couple
> > examples was sufficient rather than listing an example for every game.
> > Hexen also AFAIK only ever had hexen.wad, whereas heretic and doom versions
> > may have had either doom1.wad or heretic1.wad for shareware vs full game.
> >
> > https://doomwiki.org/wiki/HEXEN.WAD
> >
> > IWADs installed in ${PREFIX}/share/doom (all games) also automatically get
> > used, the remark about multiple IWADs is mostly for the games that had
> > multiple options. For Doom, both crispy-doom and chocolate-doom err to
> > choosing doom2.wad first, whereas you might want to use -iwad to specify
> > doom.wad, plutonia.wad, or tnt.wad.
> >
> > There could be a case for showing an example for Strife, as strife0.wad is
> > shareware and strife1.wad/voices.wad is from full version.
> >
> > What do you think?
>
> I don't think that's necessary. This is already a very detailed README
> (which is great!).
>
> > Thanks for the feedback!
> > -Ryan
>
> I just tested it with:
>
> $ $ crispy-doom freedoom1.wad
>
> and that also worked. As this is the easiest to install doom, add it to
> the README?
I think that is a great idea. Not sure why I never considered it for
chocolate-doom too. Let me know how this looks and I'll adapt a diff
for chocolate as well. Also, easiest to install? You can also pkg_add
doomdata for the shareware. :-)
>
> Either way, this is ok thfr@. If there's another developer ok, I can go
> ahead and commit this.
>
Reattached with modified pkg/README mentioning freedoom/freedm packages,
and their IWAD names. Just a quick note after the IWAD examples.
Thanks!
-Ryan
crispy-doom-6.0-take2.tar.gz
Description: application/tar-gz
Re: NEW: games/crispy-doom
On Thu, Aug 17, 2023 at 02:08:09PM -0700, Ryan Freeman wrote:
> On Thu, Aug 17, 2023 at 03:24:38PM -0400, Thomas Frohwein wrote:
> > On Thu, Aug 17, 2023 at 11:18:29AM -0700, Ryan Freeman wrote:
> >
> > [...]
> >
> > > Bubbling this one back up, I'd love to see it go in. I've went ahead and
> > > taken MAINTAINER anyway, adjusted HOMEPAGE to https://crispy-doom.org/ as
> > > it has a real website since some time.
> > >
> > > portcheck,port-lib-depends-check,lib-depends-check all seem to pass and
> > > the
> > > games still play good on -current on my amd64 laptop.
> > >
> > > Hoping this one gets an OK and a friendly committer can get it in before
> > > ports lock. :-) Thanks!
> > >
> > > -Ryan
> >
> > - $ crispy-hexen -iwad hexen.wad
> >
> > Is there a problem with crispy-hexen? It's still in the PLIST, but this
> > line removes it from the README.
> >
>
> Nope, no issue. That must be from when I synced it with the chocolate-doom
> pkg/README. I would have to guess I decided that listing just a couple
> examples was sufficient rather than listing an example for every game.
> Hexen also AFAIK only ever had hexen.wad, whereas heretic and doom versions
> may have had either doom1.wad or heretic1.wad for shareware vs full game.
>
> https://doomwiki.org/wiki/HEXEN.WAD
>
> IWADs installed in ${PREFIX}/share/doom (all games) also automatically get
> used, the remark about multiple IWADs is mostly for the games that had
> multiple options. For Doom, both crispy-doom and chocolate-doom err to
> choosing doom2.wad first, whereas you might want to use -iwad to specify
> doom.wad, plutonia.wad, or tnt.wad.
>
> There could be a case for showing an example for Strife, as strife0.wad is
> shareware and strife1.wad/voices.wad is from full version.
>
> What do you think?
I don't think that's necessary. This is already a very detailed README
(which is great!).
> Thanks for the feedback!
> -Ryan
I just tested it with:
$ $ crispy-doom freedoom1.wad
and that also worked. As this is the easiest to install doom, add it to
the README?
Either way, this is ok thfr@. If there's another developer ok, I can go
ahead and commit this.
Re: NEW: games/crispy-doom
On Thu, Aug 17, 2023 at 03:24:38PM -0400, Thomas Frohwein wrote:
> On Thu, Aug 17, 2023 at 11:18:29AM -0700, Ryan Freeman wrote:
>
> [...]
>
> > Bubbling this one back up, I'd love to see it go in. I've went ahead and
> > taken MAINTAINER anyway, adjusted HOMEPAGE to https://crispy-doom.org/ as
> > it has a real website since some time.
> >
> > portcheck,port-lib-depends-check,lib-depends-check all seem to pass and the
> > games still play good on -current on my amd64 laptop.
> >
> > Hoping this one gets an OK and a friendly committer can get it in before
> > ports lock. :-) Thanks!
> >
> > -Ryan
>
> - $ crispy-hexen -iwad hexen.wad
>
> Is there a problem with crispy-hexen? It's still in the PLIST, but this
> line removes it from the README.
>
Nope, no issue. That must be from when I synced it with the chocolate-doom
pkg/README. I would have to guess I decided that listing just a couple
examples was sufficient rather than listing an example for every game.
Hexen also AFAIK only ever had hexen.wad, whereas heretic and doom versions
may have had either doom1.wad or heretic1.wad for shareware vs full game.
https://doomwiki.org/wiki/HEXEN.WAD
IWADs installed in ${PREFIX}/share/doom (all games) also automatically get
used, the remark about multiple IWADs is mostly for the games that had
multiple options. For Doom, both crispy-doom and chocolate-doom err to
choosing doom2.wad first, whereas you might want to use -iwad to specify
doom.wad, plutonia.wad, or tnt.wad.
There could be a case for showing an example for Strife, as strife0.wad is
shareware and strife1.wad/voices.wad is from full version.
What do you think?
Thanks for the feedback!
-Ryan
Re: NEW: games/crispy-doom
On Thu, Aug 17, 2023 at 11:18:29AM -0700, Ryan Freeman wrote: [...] > Bubbling this one back up, I'd love to see it go in. I've went ahead and > taken MAINTAINER anyway, adjusted HOMEPAGE to https://crispy-doom.org/ as > it has a real website since some time. > > portcheck,port-lib-depends-check,lib-depends-check all seem to pass and the > games still play good on -current on my amd64 laptop. > > Hoping this one gets an OK and a friendly committer can get it in before > ports lock. :-) Thanks! > > -Ryan - $ crispy-hexen -iwad hexen.wad Is there a problem with crispy-hexen? It's still in the PLIST, but this line removes it from the README.
Re: NEW: games/crispy-doom
On Thu, May 04, 2023 at 11:37:02PM -0700, Ryan Freeman wrote: > On Wed, May 03, 2023 at 07:24:11PM -0400, Thomas Frohwein wrote: > > On Mon, Sep 19, 2022 at 02:53:41PM -0700, Ryan Freeman wrote: > > > Hi, > > > > > > Attached is a new port for crispy-doom. > > > last thread here: https://marc.info/?l=openbsd-ports&m=163917053508968&w=2 > > > Hexen has the crispy treatment since the last preliminary port was posted. > > > > Follow-up on this with latest version 6.0. Since last email, Strife has also > > been added to the line-up of supported games. > > > > New tarball attached; someone should take maintainer. If Ryan isn't > > interested, I will take maintainer. > > Beat me to it :-) > > Go ahead and take maintainer. Attached tarball is the same as yours, but > with the pkg/README synced up with the Strife bits I have in the > chocolate-doom pkg/README. > > Builds and works fine on my amd64 laptop, thanks! > > -Ryan > > > > > The only hiccup I see is that `make package` leads to some complaints about > > several section 6 manpages not having a NAME section. Turns out they all > > just have an invocation of docgen in there. I sampled most of the other man > > pages and the remaining ones seem to be fine. > > > > ok? > > > > > > Crispy Doom is a friendly fork of Chocolate Doom that provides a higher > > > > display resolution, removes the static limits of the Doom engine and > > > > offers further optional visual, tactical and physical enhancements > > > > while remaining entirely config file, savegame, netplay and demo > > > > compatible with the original. > > > > > > Tthe Doom/Heretic/Hexen games all seem to work good here on amd64. > > > > > > -Ryan > > Bubbling this one back up, I'd love to see it go in. I've went ahead and taken MAINTAINER anyway, adjusted HOMEPAGE to https://crispy-doom.org/ as it has a real website since some time. portcheck,port-lib-depends-check,lib-depends-check all seem to pass and the games still play good on -current on my amd64 laptop. Hoping this one gets an OK and a friendly committer can get it in before ports lock. :-) Thanks! -Ryan crispy-doom-6.0.tgz Description: application/tar-gz
Re: NEW: games/crispy-doom
On Wed, May 03, 2023 at 07:24:11PM -0400, Thomas Frohwein wrote: > On Mon, Sep 19, 2022 at 02:53:41PM -0700, Ryan Freeman wrote: > > Hi, > > > > Attached is a new port for crispy-doom. > > last thread here: https://marc.info/?l=openbsd-ports&m=163917053508968&w=2 > > Hexen has the crispy treatment since the last preliminary port was posted. > > Follow-up on this with latest version 6.0. Since last email, Strife has also > been added to the line-up of supported games. > > New tarball attached; someone should take maintainer. If Ryan isn't > interested, I will take maintainer. Beat me to it :-) Go ahead and take maintainer. Attached tarball is the same as yours, but with the pkg/README synced up with the Strife bits I have in the chocolate-doom pkg/README. Builds and works fine on my amd64 laptop, thanks! -Ryan > > The only hiccup I see is that `make package` leads to some complaints about > several section 6 manpages not having a NAME section. Turns out they all > just have an invocation of docgen in there. I sampled most of the other man > pages and the remaining ones seem to be fine. > > ok? > > > > Crispy Doom is a friendly fork of Chocolate Doom that provides a higher > > > display resolution, removes the static limits of the Doom engine and > > > offers further optional visual, tactical and physical enhancements > > > while remaining entirely config file, savegame, netplay and demo > > > compatible with the original. > > > > Tthe Doom/Heretic/Hexen games all seem to work good here on amd64. > > > > -Ryan crispy-doom-6.0-tweak.tgz Description: application/tar-gz
Re: NEW: games/crispy-doom
On Mon, Sep 19, 2022 at 02:53:41PM -0700, Ryan Freeman wrote: > Hi, > > Attached is a new port for crispy-doom. > last thread here: https://marc.info/?l=openbsd-ports&m=163917053508968&w=2 > Hexen has the crispy treatment since the last preliminary port was posted. Follow-up on this with latest version 6.0. Since last email, Strife has also been added to the line-up of supported games. New tarball attached; someone should take maintainer. If Ryan isn't interested, I will take maintainer. The only hiccup I see is that `make package` leads to some complaints about several section 6 manpages not having a NAME section. Turns out they all just have an invocation of docgen in there. I sampled most of the other man pages and the remaining ones seem to be fine. ok? > > Crispy Doom is a friendly fork of Chocolate Doom that provides a higher > > display resolution, removes the static limits of the Doom engine and > > offers further optional visual, tactical and physical enhancements > > while remaining entirely config file, savegame, netplay and demo > > compatible with the original. > > Tthe Doom/Heretic/Hexen games all seem to work good here on amd64. > > -Ryan crispy-doom-6.0.tgz Description: application/tar-gz
Re: NEW: games/crispy-doom
On Fri, Feb 12, 2021 at 10:33:30AM -0800, Ryan Freeman wrote: > On Fri, Feb 12, 2021 at 09:39:26AM -0800, Ryan Freeman wrote: > > Hold off on this, it seems the CMake-based build process does in fact > > still build crispy-hexen and crispy-strife games. I mistakenly assumed > > the autotools build system was still sufficient here. > > > > I will restart this with CMake instead, apologies for the noise. > > > > Well, this got a bit more complicated than I anticipated. **snip** I was on the right path the first time, autotools is definitely preferred. I've reattached the port with one minor change: rename default.cfg.5 and heretic.cfg.5 to crispy_default.cfg.5 and crispy_heretic.cfg.5. I've made a note in the README about this. OK? crispy-doom.tar.gz Description: application/tar-gz
Re: NEW: games/crispy-doom
On Fri, Feb 12, 2021 at 09:39:26AM -0800, Ryan Freeman wrote: > Hold off on this, it seems the CMake-based build process does in fact > still build crispy-hexen and crispy-strife games. I mistakenly assumed > the autotools build system was still sufficient here. > > I will restart this with CMake instead, apologies for the noise. > Well, this got a bit more complicated than I anticipated. Seems while CMake builds all the binaries including Hexen and Strife, it omitts everything else the autotools build normally provides -- desktop files, icons, docs, etc. I've opened an issue upstream just asking for clarification on what would be preferred, as it looks like I might be able to just uncomment the Hexen/Strife bits in the various Makefile.am files. https://github.com/fabiangreffrath/crispy-doom/issues/717 Debian appears to just use autotools as-is, and not distribute the Hexen/Strife binaries https://packages.debian.org/sid/amd64/crispy-doom/filelist FWIW -- the collision in manpage names for default.cfg.5 and heretic.cfg.5 were handled by the Debian maintainer by just adding a crispy_ prefix. I've also thought of just not installing them at all, and making a note in the package README that these man pages are available if you also install chocolate-doom. Thoughts? -ryan
Re: NEW: games/crispy-doom
Hold off on this, it seems the CMake-based build process does in fact still build crispy-hexen and crispy-strife games. I mistakenly assumed the autotools build system was still sufficient here. I will restart this with CMake instead, apologies for the noise.
Re: NEW: games/crispy-doom
On Thu, Feb 11, 2021 at 07:34:24PM +1100, Jonathan Gray wrote: > On Wed, Feb 10, 2021 at 11:12:17PM -0800, Ryan Freeman wrote: > > Here is a shot at a port for crispy-doom, I adapted off the > > chocolate-doom port. builds and runs fine here on amd64. > > > > provides a 'medium-ground' Doom experience: > > - can double the resolution for a 640x400 'crisp' experience > > - has support for non-4:3 screens, even in low resolution mode > > - new fullscreen hud options > > - static limit removal, play larger maps without crashing > > - various other 'crisp' features > > > > Also supports Heretic. > > > > Comments? OK? > > > > -ryan > > The python usage does not require python2 so we should use python3. > It seems some parts are missing from the PLIST? Thanks. No idea what went on with the PLIST, I had run it several times while trying to figure out the x11/gtk+3,-guic dependency that was holding me back. I added your suggestions and the updated PLIST matches what you see. Also noticed I mucked up by using a github /archive URL, so I've changed it to use the GH_ variables. One thing I am unsure how to neatly solve now though is a collision in manpage names -- crispy-doom also ships heretic.cfg.5 where chocolate-doom does the same. Warning: crispy-doom-5.10.0 conflicts with chocolate-doom-3.0.1p0 (games/chocolate-doom):/usr/local/man/man5/default.cfg.5 /usr/local/man/man5/heretic.cfg.5 This prevents crispy-doom from installing if one also has chocolate-doom installed. the manpage is identical though. Should I just omit that manpage from crispy-doom? Reattached tar archive with changes. -ryan crispy-doom.tar.gz Description: application/tar-gz
Re: NEW: games/crispy-doom
On Wed, Feb 10, 2021 at 11:12:17PM -0800, Ryan Freeman wrote:
> Here is a shot at a port for crispy-doom, I adapted off the
> chocolate-doom port. builds and runs fine here on amd64.
>
> provides a 'medium-ground' Doom experience:
> - can double the resolution for a 640x400 'crisp' experience
> - has support for non-4:3 screens, even in low resolution mode
> - new fullscreen hud options
> - static limit removal, play larger maps without crashing
> - various other 'crisp' features
>
> Also supports Heretic.
>
> Comments? OK?
>
> -ryan
The python usage does not require python2 so we should use python3.
It seems some parts are missing from the PLIST?
--- Makefile.orig Thu Feb 11 18:20:06 2021
+++ MakefileThu Feb 11 18:56:50 2021
@@ -11,8 +11,6 @@ MAINTAINER = Ryan Freeman
# GPLv2+
PERMIT_PACKAGE = Yes
-#MODULES = devel/cmake
-
WANTLIB += SDL2 SDL2_mixer SDL2_net c m png samplerate z
LIB_DEPENDS = devel/sdl2-mixer \
@@ -31,21 +29,16 @@ AUTOCONF_VERSION = 2.69
CONFIGURE_ARGS += --mandir="${LOCALBASE}/man"
# python just used for generating manpages
-BUILD_DEPENDS =lang/python/2.7
+MODULES = lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP = No
WRKDIST = ${WRKDIR}/crispy-doom-${DISTNAME}
post-extract:
# set correct data directory
@sed -i 's,"/games/doom","/doom",g' ${WRKSRC}/src/d_iwad.c
- # set correct python binary name
- @sed -i 's/HAVE_PYTHON, python/HAVE_PYTHON, python2/' \
- ${WRKSRC}/configure.ac
- @sed -i 's,/usr/bin/env python,/usr/bin/env python2,' \
- ${WRKSRC}/man/docgen
- @sed -i 's,/usr/bin/env python,/usr/bin/env python2,' \
- ${WRKSRC}/man/simplecpp
-
+
post-install:
# Data files get installed to this directory.
${INSTALL_DATA_DIR} ${PREFIX}/share/doom/
--- pkg/PLIST.orig Thu Feb 11 17:16:21 2021
+++ pkg/PLIST Thu Feb 11 18:47:17 2021
@@ -4,19 +4,34 @@
@bin bin/crispy-heretic
@bin bin/crispy-heretic-setup
@bin bin/crispy-server
+@man man/man5/crispy-doom.cfg.5
+@man man/man5/crispy-heretic.cfg.5
+@man man/man5/default.cfg.5
+@man man/man5/heretic.cfg.5
+@man man/man6/crispy-doom-setup.6
+@man man/man6/crispy-doom.6
+@man man/man6/crispy-heretic-setup.6
+@man man/man6/crispy-heretic.6
share/applications/io.github.fabiangreffrath.Doom.desktop
share/applications/io.github.fabiangreffrath.Heretic.desktop
share/applications/io.github.fabiangreffrath.Setup.desktop
share/applications/screensavers/
share/applications/screensavers/io.github.fabiangreffrath.Doom_Screensaver.desktop
+share/bash-completion/completions/crispy-doom
+share/bash-completion/completions/crispy-heretic
share/doc/crispy-doom/
+share/doc/crispy-doom/CMDLINE.doom
share/doc/crispy-doom/COPYING.md
share/doc/crispy-doom/ChangeLog
+share/doc/crispy-doom/INSTALL.doom
share/doc/crispy-doom/NEWS.md
share/doc/crispy-doom/NOT-BUGS.md
share/doc/crispy-doom/PHILOSOPHY.md
share/doc/crispy-doom/README.Music.md
share/doc/crispy-doom/README.md
+share/doc/crispy-heretic/
+share/doc/crispy-heretic/CMDLINE.heretic
+share/doc/crispy-heretic/INSTALL.heretic
share/doc/pkg-readmes/${PKGSTEM}
share/doom/
share/icons/hicolor/128x128/apps/crispy-doom.png
