On Thu, Feb 11, 2021 at 08:35:29AM +0100, Landry Breuil wrote:
> On Wed, Feb 10, 2021 at 05:39:42PM -0800, Ryan Freeman wrote:
> > Hey,
> >
> > Attached is a patch for prboom-plus, which takes it to a new repo that is
> > receiving 'cleanups', but some other assorted improvements.
> > https://github.com/coelckers/prboom-plus/
> >
> > One thing I'm unsure of is the version scheme chosen, they use 'um' as a
> > suffix. The port packages up just fine, passes port-lib-depends-check
> > and lib-depends-check.
>
> um isnt a valid suffix, only beta/alpha/rc/pre/pl are allowed, per
> packages-specs(7). Maybe pl0 ?
>
Thanks! I'll use pl0. New diff, opted to use V to let one spot be changed
for future updates, and had to rejig the WRKDIST fix at the bottom.
Also snuck in a cleaned up DESCR (some duplicate information is already in
README), and removed remark about timidity in place of whats actually in
here now. OPL2 emulator is close to the original game on old hardware.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/prboom-plus/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 10 Feb 2021 03:18:48 -0000 1.8
+++ Makefile 11 Feb 2021 22:35:14 -0000
@@ -1,9 +1,14 @@
-# $OpenBSD: Makefile,v 1.8 2021/02/10 03:18:48 jeremy Exp $
+# $OpenBSD: Makefile,v 1.7 2019/07/12 20:46:23 sthen Exp $
COMMENT = enhanced version the PrBoom Doom engine
-DISTNAME = prboom-plus-2.5.1.4
CATEGORIES = games x11
-REVISION = 1
+V = 2.6
+
+GH_TAGNAME = v${V}um
+GH_ACCOUNT = coelckers
+GH_PROJECT = prboom-plus
+
+DISTNAME = ${GH_PROJECT}-${V}pl0
HOMEPAGE = http://prboom-plus.sourceforge.net/
@@ -19,18 +24,24 @@ COMPILER_LANGS = c
BUILD_DEPENDS = archivers/unzip
-WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net
+MODULES = devel/cmake
-LIB_DEPENDS = devel/sdl-mixer \
- devel/sdl-net
+WANTLIB += SDL2 c m z pthread GL GLU SDL2_mixer SDL2_net SDL2_image fluidsynth
+WANTLIB += ${COMPILER_LIBCXX} vorbisfile pcreposix mad portmidi
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom-plus/}
+LIB_DEPENDS = devel/sdl2-mixer \
+ devel/sdl2-net \
+ devel/sdl2-image \
+ audio/fluidsynth \
+ audio/libvorbis \
+ audio/libmad \
+ audio/portmidi
-CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --with-waddir=${TRUEPREFIX}/share/doom
-CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
+CONFIGURE_ARGS += -DCMAKE_C_FLAGS=-I${X11BASE}/include
FAKE_FLAGS += gamesdir=${PREFIX}/bin \
docdir=${PREFIX}/share/doc/prboom-plus
+
+WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/v//}/prboom2
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/prboom-plus/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 12 Jun 2018 06:07:29 -0000 1.3
+++ distinfo 11 Feb 2021 22:35:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (prboom-plus-2.5.1.4.tar.gz) =
4OIkHRdIObEH8aQrGRqpiV3GdJ5HfLyFCtUg+6I1O5Q=
-SIZE (prboom-plus-2.5.1.4.tar.gz) = 1627558
+SHA256 (prboom-plus-2.6pl0.tar.gz) =
/tVVNQnF5yEaAtFZwhLGEDDbx+i7HtCt/s+tVzB0GRs=
+SIZE (prboom-plus-2.6pl0.tar.gz) = 1526732
Index: patches/patch-data_Makefile_in
===================================================================
RCS file: patches/patch-data_Makefile_in
diff -N patches/patch-data_Makefile_in
--- patches/patch-data_Makefile_in 12 Jun 2018 06:07:29 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-data_Makefile_in,v 1.3 2018/06/12 06:07:29 bentley Exp $
-
-fix accidental inclusion of SDL_Mixer for wad creation
-
-Index: data/Makefile.in
---- data/Makefile.in.orig
-+++ data/Makefile.in
-@@ -689,7 +689,7 @@ clean-noinstPROGRAMS:
-
- rdatawad$(EXEEXT): $(rdatawad_OBJECTS) $(rdatawad_DEPENDENCIES)
$(EXTRA_rdatawad_DEPENDENCIES)
- @rm -f rdatawad$(EXEEXT)
-- $(AM_V_CCLD)$(LINK) $(rdatawad_OBJECTS) $(rdatawad_LDADD) $(LIBS)
-+ $(AM_V_CCLD)$(LINK) $(rdatawad_OBJECTS) $(rdatawad_LDADD)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
Index: patches/patch-src_doomstat_c
===================================================================
RCS file: patches/patch-src_doomstat_c
diff -N patches/patch-src_doomstat_c
--- patches/patch-src_doomstat_c 10 Feb 2021 03:18:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_doomstat_c,v 1.1 2021/02/10 03:18:48 jeremy Exp $
-
-Index: src/doomstat.c
---- src/doomstat.c.orig
-+++ src/doomstat.c
-@@ -54,7 +54,7 @@ complevel_t compatibility_level, default_compatibility
-
- // e6y
- // it's required for demos recorded in "demo compatibility" mode by boom201
for example
--int demover;
-+extern int demover;
-
- int comp[COMP_TOTAL], default_comp[COMP_TOTAL]; // killough 10/98
- int /*comperr[COMPERR_NUM], */default_comperr[COMPERR_NUM];
Index: patches/patch-src_gl_intern_h
===================================================================
RCS file: patches/patch-src_gl_intern_h
diff -N patches/patch-src_gl_intern_h
--- patches/patch-src_gl_intern_h 10 Feb 2021 03:18:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-src_gl_intern_h,v 1.1 2021/02/10 03:18:48 jeremy Exp $
-
-Index: src/gl_intern.h
---- src/gl_intern.h.orig
-+++ src/gl_intern.h
-@@ -453,8 +453,8 @@ void gld_StaticLightAlpha(float light, float alpha);
- void gld_InitLightTable(void);
- typedef float (*gld_CalcLightLevel_f)(int lightlevel);
- typedef float (*gld_Calc2DLightLevel_f)(int lightlevel);
--gld_CalcLightLevel_f gld_CalcLightLevel;
--gld_Calc2DLightLevel_f gld_Calc2DLightLevel;
-+extern gld_CalcLightLevel_f gld_CalcLightLevel;
-+extern gld_Calc2DLightLevel_f gld_Calc2DLightLevel;
-
- //fog
- extern int gl_fog;
-@@ -462,7 +462,7 @@ extern int gl_use_fog;
- void gl_EnableFog(int on);
- void gld_SetFog(float fogdensity);
- typedef float (*gld_CalcFogDensity_f)(sector_t *sector, int lightlevel,
GLDrawItemType type);
--gld_CalcFogDensity_f gld_CalcFogDensity;
-+extern gld_CalcFogDensity_f gld_CalcFogDensity;
-
- //HQ resize
- unsigned char* gld_HQResize(GLTexture *gltexture, unsigned char *inputBuffer,
int inWidth, int inHeight, int *outWidth, int *outHeight);
Index: patches/patch-src_gl_light_c
===================================================================
RCS file: patches/patch-src_gl_light_c
diff -N patches/patch-src_gl_light_c
--- patches/patch-src_gl_light_c 10 Feb 2021 03:18:48 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_gl_light_c,v 1.1 2021/02/10 03:18:48 jeremy Exp $
-
-Index: src/gl_light.c
---- src/gl_light.c.orig
-+++ src/gl_light.c
-@@ -78,6 +78,8 @@ static float lighttable_glboom[5][256];
- static float lighttable_gzdoom[256];
- static float lighttable_fogbased[256];
-
-+gld_Calc2DLightLevel_f gld_Calc2DLightLevel;
-+
- static void gld_InitLightTable_glboom(void);
- static void gld_InitLightTable_gzdoom(void);
- static void gld_InitLightTable_fogbased(void);
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/games/prboom-plus/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 1 Apr 2013 22:02:15 -0000 1.1.1.1
+++ pkg/DESCR 11 Feb 2021 22:35:14 -0000
@@ -2,10 +2,6 @@ Modified PrBoom port with uncapped frame
re-record, walkcam, chasecam, full mouselook, fov and other features
without loss of compatibility with original DOOM.
-Not intended to replace the prboom package, this port has additional
-features particularly interesting to fans of demo recording/playback.
-
-A registered IWAD from one of the original Doom games may be placed in
-${PREFIX}/share/doom/.
-
-Music is available with the timidity package.
+This version is a cleaned up fork mostly intended to provide a clean
+base in the event someone wants to fork it further, but some additional
+features have been added.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/prboom-plus/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:13 -0000 1.2
+++ pkg/PLIST 11 Feb 2021 22:35:14 -0000
@@ -6,17 +6,17 @@
@man man/man6/prboom-plus.6
share/doc/pkg-readmes/${PKGSTEM}
share/doc/prboom-plus/
-share/doc/prboom-plus/AUTHORS
-share/doc/prboom-plus/COPYING
+share/doc/prboom-plus/DeePBSPV4specs.txt
share/doc/prboom-plus/MBF.txt
share/doc/prboom-plus/MBFFAQ.txt
-share/doc/prboom-plus/NEWS
-share/doc/prboom-plus/README
+share/doc/prboom-plus/README.command-line
share/doc/prboom-plus/README.compat
share/doc/prboom-plus/README.demos
share/doc/prboom-plus/boom.txt
share/doc/prboom-plus/prboom-plus-history.html
share/doc/prboom-plus/prboom-plus-history.txt
share/doc/prboom-plus/prboom-plus-usage.txt
-share/doom/
-share/doom/prboom-plus.wad
+share/doc/prboom-plus/umapinfo.txt
+share/games/
+share/games/doom/
+share/games/doom/prboom-plus.wad
Index: pkg/README
===================================================================
RCS file: /cvs/ports/games/prboom-plus/pkg/README,v
retrieving revision 1.2
diff -u -p -r1.2 README
--- pkg/README 4 Sep 2018 12:46:13 -0000 1.2
+++ pkg/README 11 Feb 2021 22:35:14 -0000
@@ -17,4 +17,6 @@ play via the -iwad command-line paramete
$ prboom-plus -iwad doom.wad
-Music is available with the timidity package.
+Music is available with multiple backends, OPL2 emulator is close to
+original style of AdLib or classic SoundBlaster. These settings are
+found in Options->General.
