pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

doomlegacy-devel: Update to SVN revision 1591

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <>
Pushed By:	micha
Date:		Fri Oct 15 13:04:03 2021 +0200
Changeset:	12968b3884a8acba91f9479fe0e6cc66051bc5fa

Modified Files:
Added Files:

Log Message:
doomlegacy-devel: Update to SVN revision 1591

Added patch to fix label at end of block.

- The changes of w109_046_bsp [incremental performance revision of bsp]
  applied to the hardware render bsp.
- Preparation for hw data to be independent of Glide.
  Made macros for hw data and format.
  Improved some of the loop code found in hw_cache and r_opengl.
  Made the allocation of mip blocks keep the previous data allocation
  block if it was the right size.  This happens at run-time, so
  it can save significant time in opengl.
- Fix broken drawing mode select string.
- Make Compile option for Voodoo card support and Glide: USE_VOODOO_GLIDE.
  Disable the option, as there are not likely any Voodoo cards in use.
- Make the hardware sky draw use the extended textures from r_sky.
  Fix the hardware sky draw scaling, which was off.
  The hardware sky has only one colormap, so it does not change when
  Invulnerable.  Fixing the sky Invulnerable bug will require multiple
  mipmaps for the sky, which is not supported right now.

To see a diff of this commit:;a=commitdiff;h=12968b3884a8acba91f9479fe0e6cc66051bc5fa

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

 doomlegacy-devel/Makefile                              |  2 +-
 doomlegacy-devel/distinfo                              |  1 +
 doomlegacy-devel/patches/patch-src_hardware_hw__main.c | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doomlegacy-devel/Makefile b/doomlegacy-devel/Makefile
index 3a1fa2891a..13db5cf55f 100644
--- a/doomlegacy-devel/Makefile
+++ b/doomlegacy-devel/Makefile
@@ -2,7 +2,7 @@
 VERS=		1.48.8
 #PKGNAME=	doomlegacy-${VERS}
-SVNVERS=	1586
+SVNVERS=	1591
 DISTNAME=	doomlegacy-devel-0r${SVNVERS}
diff --git a/doomlegacy-devel/distinfo b/doomlegacy-devel/distinfo
index acad6f26fe..0703f7f665 100644
--- a/doomlegacy-devel/distinfo
+++ b/doomlegacy-devel/distinfo
@@ -6,5 +6,6 @@ Size ( = 1011350 bytes
 SHA1 (patch-src_Makefile) = a5f42fcf91d516271942d82d574bc25291e987af
 SHA1 (patch-src_am__map.c) = 14b3c8b70c63778ad043827ab2f0b6f4fe07bcde
 SHA1 (patch-src_dstrings.c) = 9c3f8418a25684de72e9ad980f0390b58db12d58
+SHA1 (patch-src_hardware_hw__main.c) = ef04b52ace6a5fdf2935d88a692a335574ea0593
 SHA1 (patch-src_p__local.h) = ad6c770b95e87fb06e34ec7643e98f59d41e71f4
 SHA1 (patch-src_p__setup.c) = b89ff33339c9fb32eec5da774e9a3692ef5d6f62
diff --git a/doomlegacy-devel/patches/patch-src_hardware_hw__main.c b/doomlegacy-devel/patches/patch-src_hardware_hw__main.c
new file mode 100644
index 0000000000..a2fd5a324c
--- /dev/null
+++ b/doomlegacy-devel/patches/patch-src_hardware_hw__main.c
@@ -0,0 +1,17 @@
+Add null statement in #else branch. Otherwise a label is located at the end of
+a block.
+--- src/hardware/hw_main.c.orig	2021-10-15 10:34:51.000000000 +0000
++++ src/hardware/hw_main.c
+@@ -3079,6 +3079,9 @@ bad_subsector:
+         // Error situations, should not get here.
+ #ifdef PARANOIA
+         GenPrintf( EMSG_warn, "Bad BSP subsector: %i\n", subsecnum );
++       // [MB] Required for the label "bad_subsector" (block ends here)
++       ;  // [MB] null statement as defined in C99 Section 6.8.3
+ #endif
+     }
+     return;

Home | Main Index | Thread Index | Old Index