doomlegacy-devel: Rebase to SVN revision 1545

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Thu Aug 27 13:04:51 2020 +0200
Changeset:	e9df93014f4a971fcf46f7ddbfe3f7011e4b5c2f

Modified Files:
	doomlegacy-devel/Makefile
	doomlegacy-devel/distinfo
	doomlegacy-devel/patches/patch-src_Makefile
	doomlegacy-devel/patches/patch-src_p__setup.c
	doomlegacy-devel/patches/patch-src_r__things.c

Log Message:
doomlegacy-devel: Rebase to SVN revision 1545

pkgsrc:
- Rework patches to apply without offset
- SVN revision 1544 has added a space in front of variable
  COMP_ENVIRONMENT. Modify regular expression in SUBST block
  to work with both variants
- Disable ZIP support introduced in SVN revision 1544
  Currently only for GNU/Linux and should be tested first

Upstream:
- commit revision 1544
  Add zip file reading, for Linux only.
  It is option ZIPWAD.
  This requires lib libzip.
  It will load the wad, deh, bex files in a zip archive.
  If searching for a file, it will also search in
  a zip archive of the same name.
  This has not been totally integrated with net play yet.
  For other ports, will have to find a libzip.

  There is also ZIPWAD_OPTIONAL, which will use dlopen to
  optionally load libzip.  The ZIPWAD_OPTIONAL requires lib dlopen.
  It detects that libzip is loaded, and enables the zip functionality.
  This prevents libzip from being a hard requirement.
  It makes lib dlopen a hard requirement, but that is lib that is
  normally present.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e9df93014f4a971fcf46f7ddbfe3f7011e4b5c2f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 doomlegacy-devel/Makefile                      | 8 +++++---
 doomlegacy-devel/distinfo                      | 6 +++---
 doomlegacy-devel/patches/patch-src_Makefile    | 7 ++++---
 doomlegacy-devel/patches/patch-src_p__setup.c  | 4 ++--
 doomlegacy-devel/patches/patch-src_r__things.c | 4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diffs:
diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index 32249ac617..f0a6cddb0d 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -2,7 +2,7 @@
 
 VERS=		1.48.4
 #PKGNAME=	doomlegacy-${VERS}
-SVNVERS=	1541
+SVNVERS=	1545
 DISTNAME=	doomlegacy-devel-0r${SVNVERS}
 CATEGORIES=	games
 
@@ -60,12 +60,14 @@ LDFLAGS+=		-lz
 DOOMWADDIR=		share/doom
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6 share/doc/doomlegacy ${DOOMWADDIR}
 
-# Configure to honor environment
+# Configure to honor environment and disable ZIP support on GNU/Linux
 SUBST_CLASSES+=		makeopt
 SUBST_STAGE.makeopt=	do-configure
 SUBST_MESSAGE.makeopt=	Preparing make_options file ...
 SUBST_FILES.makeopt=	make_options
-SUBST_SED.makeopt=	-e 's,\#COMP_ENVIRONMENT,COMP_ENVIRONMENT,'
+SUBST_SED.makeopt=	-e 's,\#[ ]*COMP_ENVIRONMENT,COMP_ENVIRONMENT,'
+SUBST_SED.makeopt+=	-e 's,HAVE_LIBZIP,\# HAVE_LIBZIP,'
+SUBST_SED.makeopt+=	-e 's,HAVE_DLOPEN,\# HAVE_DLOPEN,'
 
 # Configure defaults for LEGACYWADDIR and DOOMWADDIR
 SUBST_CLASSES+=		doomdef
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index b3182df46d..4898a2ce33 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -4,7 +4,7 @@ SHA1 (doomlegacy_1.48.4_common.zip) = 14aed4c0091e8c61f46a2303f9316659ab6c0483
 RMD160 (doomlegacy_1.48.4_common.zip) = cca61af6bdda1003032ee117129e07596c8bbfcf
 SHA512 (doomlegacy_1.48.4_common.zip) = f41830b6d3ba7f30d020e887193fedf502d9b0b260bb53f78e888ce4985dfc2a8b744b5add86813e135c9a0ed65c9be42da64437976b7a85992bcc45bbeeb462
 Size (doomlegacy_1.48.4_common.zip) = 1004978 bytes
-SHA1 (patch-src_Makefile) = 40184838a23e00975a5380f18c8c53b3cc2eee47
+SHA1 (patch-src_Makefile) = 34c323bdd96787cb6afe0be5dc99b129ab8f1552
 SHA1 (patch-src_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
 SHA1 (patch-src_doomdata.h) = 8c3186dafbf11a8a75262a06755dd9807cb58612
 SHA1 (patch-src_dstrings.c) = 16e50ac649f76d415b820a0e5093d15af3180e6d
@@ -12,8 +12,8 @@ SHA1 (patch-src_hardware_hw__cache.c) = 66788b64c1cb2008a0de9cddd4c8142269633af0
 SHA1 (patch-src_i__tcp.c) = 13c8bd14cae31b078154f4ef0d2353cf089234b8
 SHA1 (patch-src_mserv.c) = 685ca5028740428ef2579025ca8673d8da526ebe
 SHA1 (patch-src_p__local.h) = 0340c38a80ba4323e4fe7a8c314575a70a246708
-SHA1 (patch-src_p__setup.c) = 3690d253d07a772eeab87f658ebc5cb61ecc000c
+SHA1 (patch-src_p__setup.c) = 6125eb5d05f75079534395f2f81d8f6b2ad7eb24
 SHA1 (patch-src_r__data.c) = cee177a2af8d29c2e78019d17dbd53d256b34529
 SHA1 (patch-src_r__defs.h) = 91e6543674e3474c9afdb0ba19d6869b658d0543
-SHA1 (patch-src_r__things.c) = de1f80d48180783091bd665007a0ea2f4e54af5e
+SHA1 (patch-src_r__things.c) = e0846082f79a3bdbafbec0345268e6ba1baf6f70
 SHA1 (patch-src_t__prepro.h) = 768fc3a87665a75a85ff4ff88b53091b13eab55e
diff --git a/doomlegacy-devel/patches/patch-src_Makefile b/doomlegacy-devel/patches/patch-src_Makefile
index 0f17b336e9..d1b7d14735 100644
--- a/doomlegacy-devel/patches/patch-src_Makefile
+++ b/doomlegacy-devel/patches/patch-src_Makefile
@@ -1,13 +1,14 @@
 $NetBSD$
 
-Add object file for import of extended nodes.
+Add object file for import of extended nodes and internal blockmap creation.
 
-Created upstream feature request:
+Created upstream feature requests:
 https://sourceforge.net/p/doomlegacy/feature-requests/95/
+https://sourceforge.net/p/doomlegacy/feature-requests/96/
 
 --- src/Makefile.orig	2020-05-11 09:40:36.000000000 +0000
 +++ src/Makefile
-@@ -1070,7 +1070,8 @@ screen.o v_video.o \
+@@ -1086,7 +1086,8 @@ screen.o v_video.o \
  r_draw.o r_plane.o r_segs.o r_sky.o r_things.o r_splats.o \
  r_bsp.o r_data.o r_main.o \
  z_zone.o \
diff --git a/doomlegacy-devel/patches/patch-src_p__setup.c b/doomlegacy-devel/patches/patch-src_p__setup.c
index 83687c63fd..5a9029bd8b 100644
--- a/doomlegacy-devel/patches/patch-src_p__setup.c
+++ b/doomlegacy-devel/patches/patch-src_p__setup.c
@@ -70,7 +70,7 @@ Add support to internally create blockmap.
              for (k=0 ; k<4 ; k++)
                  no->bbox[j][k] = LE_SWAP16(mn->bbox[j][k])<<FRACBITS;
          }
-@@ -1840,6 +1860,7 @@ boolean P_SetupLevel (int      to_episod
+@@ -1851,6 +1871,7 @@ boolean P_SetupLevel (int      to_episod
      const char  *errstr;
      char  *sl_mapname = NULL;
      int   i;
@@ -78,7 +78,7 @@ Add support to internally create blockmap.
  
      GenPrintf( (verbose? (EMSG_ver|EMSG_now) : (EMSG_console|EMSG_now)),
                 "Setup Level\n" );
-@@ -1985,18 +2006,69 @@ boolean P_SetupLevel (int      to_episod
+@@ -1999,18 +2020,69 @@ boolean P_SetupLevel (int      to_episod
          goto load_reject;
      }
  
diff --git a/doomlegacy-devel/patches/patch-src_r__things.c b/doomlegacy-devel/patches/patch-src_r__things.c
index 4f52f01a13..ba22bc4b67 100644
--- a/doomlegacy-devel/patches/patch-src_r__things.c
+++ b/doomlegacy-devel/patches/patch-src_r__things.c
@@ -8,7 +8,7 @@ c97a5c1d8054eab46856f71e4998d71760aa3339
 
 --- src/r_things.c.orig	2020-07-07 09:01:40.000000000 +0000
 +++ src/r_things.c
-@@ -1094,15 +1094,27 @@ fixed_t         dm_texturemid;
+@@ -1097,15 +1097,27 @@ fixed_t         dm_texturemid;
  void R_DrawMaskedColumn ( byte * column_data )
  {
      fixed_t     top_post_sc, bottom_post_sc;  // fixed_t screen coord.
@@ -37,7 +37,7 @@ c97a5c1d8054eab46856f71e4998d71760aa3339
          bottom_post_sc = (dm_bottom_patch == FIXED_MAX) ?
              top_post_sc + dm_yscale*column->length
              : dm_bottom_patch + dm_yscale*column->length;
-@@ -1151,7 +1163,10 @@ void R_DrawMaskedColumn ( byte * column_
+@@ -1154,7 +1166,10 @@ void R_DrawMaskedColumn ( byte * column_
  #endif
  
              dc_source = (byte *)column + 3;