On Fri, Sep 07 2018, Solene Rapenne <sol...@perso.pw> wrote: > Stuart Henderson <s...@spacehopper.org> wrote: >> On 2018/08/08 10:46, Solene Rapenne wrote: >> > while testing prboom I found this message in the console output: >> > >> > Couldn't load MIDI from /tmp/prboom-music-IaDpVf: /etc/timidity.cfg: No >> > such file or directory >> > >> > and in fact the game had no music, only sounds. >> > >> > The following patch add audio/timidity as a LIB_DEPENDS, once >> > timidity is installed, prboom plays the music as expected.
This is documented in DESCR, so please also amend that file. Also in DESCR, ftp://ftp.idsoftware.com/idstuff/doom/doom-1.8.wad.gz times out for me. My attempts at testing patches for games have mostly failed so far. :) >> > Index: Makefile >> > =================================================================== >> > RCS file: /cvs/ports/games/prboom/Makefile,v >> > retrieving revision 1.25 >> > diff -u -p -r1.25 Makefile >> > --- Makefile 28 Sep 2017 23:12:48 -0000 1.25 >> > +++ Makefile 8 Aug 2018 08:45:51 -0000 >> > @@ -15,7 +15,8 @@ PERMIT_PACKAGE_CDROM= Yes >> > >> > WANTLIB = SDL c m pthread z GL GLU SDL_mixer>=3 SDL_net>=1 png>=4 >> > >> > -LIB_DEPENDS = devel/sdl-mixer \ >> > +LIB_DEPENDS = audio/timidity \ >> > + devel/sdl-mixer \ >> > devel/sdl-net \ >> > graphics/png >> > >> >> That change is a noop, LIB_DEPENDS is stripped unless there is a >> matching WANTLIB - see "LIB_DEPENDS <spec> not needed for <FULLPKGPATH>" >> in DIAGNOSTICS in bsd.port.mk(5). >> >> (If it wasn't a noop, it would need a REVISION bump as well). > > here is a new patch which add audio/timidity correctly as a RUN_DEPENDS > > also, when running make port-lib-depends-check, it seems that WANTLIB = z is > not needed. > > prboom-2.5.0p2(games/prboom): > Extra: z.5 > > I assume removing this WANTLIB requires a REVISION bump? Yep. One way to know whether a bump is required is to make package, modify the port, make clean repackage without changing REVISION. If pkg_create detects a missing bump for whatever reason you'll get an error. But here's an easier way to know quickly if a bump is needed: does the content of the resulting package changes? If so, bump REVISION. And if you're not sure, bump REVISION. :) > Index: Makefile > =================================================================== > RCS file: /cvs/ports/games/prboom/Makefile,v > retrieving revision 1.25 > diff -u -p -r1.25 Makefile > --- Makefile 28 Sep 2017 23:12:48 -0000 1.25 > +++ Makefile 7 Sep 2018 15:51:03 -0000 > @@ -2,7 +2,7 @@ > > COMMENT= enhanced clone of Id Software's Doom game; multiplayer#' > DISTNAME= prboom-2.5.0 > -REVISION= 1 > +REVISION= 2 > > CATEGORIES= games x11 > > @@ -13,7 +13,9 @@ HOMEPAGE= http://prboom.sourceforge.net/ > # GPLv2+ > PERMIT_PACKAGE_CDROM= Yes > > -WANTLIB = SDL c m pthread z GL GLU SDL_mixer>=3 SDL_net>=1 png>=4 > +WANTLIB = SDL c m pthread GL GLU SDL_mixer>=3 SDL_net>=1 png>=4 > + > +RUN_DEPENDS = audio/timidity Nitpicking: I prefer to list BUILD/LIB/TEST_RUN_DEPENDS in that order (same as Makefile.template) > LIB_DEPENDS = devel/sdl-mixer \ > devel/sdl-net \ > -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
