eduke32: update to eduke32-5974

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: eduke32: update to eduke32-5974
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Wed, 04 Jan 2017 15:32:35 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Wed Jan 4 17:32:35 2017 +0200
Changeset:	838184205c5882b9161c6166522a02258c82c178

Modified Files:
	eduke32/Makefile
	eduke32/PLIST
	eduke32/distinfo
	eduke32/patches/patch-build_include_compat.h
	eduke32/patches/patch-source_m32exec.c

Log Message:
eduke32: update to eduke32-5974

Update patches to fix building on NetBSD.

SVN commits:

------------------------------------------------------------------------
r5974 | hendricks266 | 2016-12-25 22:03:00 -0800 (Sun, 25 Dec 2016) | 1 line

Extend SE 26 to use the value provided by a GPSPEED, if any.
------------------------------------------------------------------------
r5973 | hendricks266 | 2016-12-25 22:02:56 -0800 (Sun, 25 Dec 2016) | 1 line

CON: Remove bounds check on rotatesprite coordinates.
------------------------------------------------------------------------
r5972 | hendricks266 | 2016-12-25 22:02:53 -0800 (Sun, 25 Dec 2016) | 1 line

Windows: Perform keyboard layout switching whenever window focus is gained or lost.
------------------------------------------------------------------------
r5971 | hendricks266 | 2016-12-25 22:02:49 -0800 (Sun, 25 Dec 2016) | 1 line

Windows: Make layout switch duplicate guard bidirectional.
------------------------------------------------------------------------
r5970 | hendricks266 | 2016-12-25 22:02:45 -0800 (Sun, 25 Dec 2016) | 1 line

Windows: Refactor keyboard layout switching code into winbits.c and clean it up. No functional changes.
------------------------------------------------------------------------
r5969 | hendricks266 | 2016-12-25 22:02:41 -0800 (Sun, 25 Dec 2016) | 3 lines

sdlayer: Call SDL_StopTextInput immediately after initialization so IMEs do not interfere with gameplay keypresses.

An example of is on Mac, where holding the 'A' key caused a small overlay with accented forms of the character to appear.
------------------------------------------------------------------------
r5968 | hendricks266 | 2016-12-25 22:02:38 -0800 (Sun, 25 Dec 2016) | 5 lines

sdlayer: Place SDL_KEYDOWN events into keyasciififo[] when SDL_TEXTINPUT events are disabled.

This way, SDL_StopTextInput() does not break text entry for code that uses keyasciififo[] but does not currently call SDL_StartTextInput(), or if it cannot, such as Duke's cheat entry.

Technically we could revert r5326 and r5331, but since we only currently have support for showing ASCII text glyphs as bitmap fonts in ART tiles, there is no point to showing an IME on platforms that don't need an on-screen keyboard.
------------------------------------------------------------------------
r5967 | hendricks266 | 2016-12-25 22:02:34 -0800 (Sun, 25 Dec 2016) | 1 line

Mac: Make the startup windows responsive and actively updating while in "show message log, the program is working" mode.
------------------------------------------------------------------------
r5966 | hendricks266 | 2016-12-25 22:02:31 -0800 (Sun, 25 Dec 2016) | 1 line

Mac: Programmatically create the primary program menu since we no longer have a nib or a modal window to do it for us.
------------------------------------------------------------------------
r5965 | hendricks266 | 2016-12-25 22:02:27 -0800 (Sun, 25 Dec 2016) | 3 lines

Mac: Change the startup windows display the window normally and start a mini runloop instead of calling using runModalForWindow.

This way, the Quit function works.
------------------------------------------------------------------------
r5964 | hendricks266 | 2016-12-25 22:02:22 -0800 (Sun, 25 Dec 2016) | 1 line

Mac: Port the startup window to entirely programmatic code. Death to nibs!
------------------------------------------------------------------------
r5963 | hendricks266 | 2016-12-25 22:02:14 -0800 (Sun, 25 Dec 2016) | 1 line

Mac: Remove more vestiges of SDLMain from SDL 2.0 builds.
------------------------------------------------------------------------
r5962 | hendricks266 | 2016-12-25 22:02:10 -0800 (Sun, 25 Dec 2016) | 1 line

sdlayer: Disable a missed instance of sysgamma under EDUKE32_GLES, not just __ANDROID__.
------------------------------------------------------------------------
r5961 | hendricks266 | 2016-12-25 22:02:06 -0800 (Sun, 25 Dec 2016) | 1 line

Address a number of harmless instances of "code never reached" identified by Xcode.
------------------------------------------------------------------------
r5960 | hendricks266 | 2016-12-25 22:02:01 -0800 (Sun, 25 Dec 2016) | 1 line

Add newlines at EOF to files that need them.
------------------------------------------------------------------------
r5959 | hendricks266 | 2016-12-25 22:01:57 -0800 (Sun, 25 Dec 2016) | 3 lines

Fix an error introduced in cleanup of the WWII GI Devastator weapon reload animation, as pointed out by Xcode.

Also perform similar cleanup on a similar line elsewhere.
------------------------------------------------------------------------
r5958 | hendricks266 | 2016-12-25 22:01:54 -0800 (Sun, 25 Dec 2016) | 1 line

Apple: Fix Xcode build due to accumulated file additions and moves.
------------------------------------------------------------------------
r5957 | hendricks266 | 2016-12-25 22:01:51 -0800 (Sun, 25 Dec 2016) | 1 line

Apple: Accept Xcode's suggestions for changes to our project file.
------------------------------------------------------------------------
r5956 | hendricks266 | 2016-12-25 22:01:48 -0800 (Sun, 25 Dec 2016) | 1 line

Change the type of functions touching vsync setting back to int32_t. Since it is serialized to disk, an explicit size type is important.
------------------------------------------------------------------------
r5955 | hendricks266 | 2016-12-25 22:01:44 -0800 (Sun, 25 Dec 2016) | 1 line

Fix a warning with SDL_TARGET=1 builds.
------------------------------------------------------------------------
r5954 | hendricks266 | 2016-12-25 22:01:40 -0800 (Sun, 25 Dec 2016) | 1 line

Fix USE_OPENGL=0 RENDERTYPE=WIN and USE_OPENGL=0 SDL_TARGET=1 builds.
------------------------------------------------------------------------
r5953 | hendricks266 | 2016-12-25 22:01:36 -0800 (Sun, 25 Dec 2016) | 1 line

Rename vsync_render and "sdl_vsync" to vsync_renderlayer. An "sdl_" prefix should be used sparingly.
------------------------------------------------------------------------
r5952 | hendricks266 | 2016-12-25 22:01:32 -0800 (Sun, 25 Dec 2016) | 1 line

Rename E_PostInitTables back to E_PostInit and move it back to where it belongs in engine.c (i.e. preinitengine, initengine, "postinitengine"). It should not have been changed.
------------------------------------------------------------------------
r5951 | hendricks266 | 2016-12-25 22:01:28 -0800 (Sun, 25 Dec 2016) | 1 line

Win32 Startup Window: This should be tokenized.
------------------------------------------------------------------------
r5950 | hendricks266 | 2016-12-25 22:01:24 -0800 (Sun, 25 Dec 2016) | 1 line

Fix problems with handling of the default crosshair color.
------------------------------------------------------------------------
r5949 | hendricks266 | 2016-12-25 22:01:18 -0800 (Sun, 25 Dec 2016) | 1 line

Restore pre-r5821 floor glass behavior: nothing.
------------------------------------------------------------------------

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

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

diffstat:
 eduke32/Makefile                             |  5 +++--
 eduke32/PLIST                                |  1 +
 eduke32/distinfo                             | 12 ++++++------
 eduke32/patches/patch-build_include_compat.h | 17 ++++++++++++-----
 eduke32/patches/patch-source_m32exec.c       | 15 +++++++++++----
 5 files changed, 33 insertions(+), 17 deletions(-)

diffs:
diff --git a/eduke32/Makefile b/eduke32/Makefile
index cd842ec..0424675 100644
--- a/eduke32/Makefile
+++ b/eduke32/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.1 2015/08/19 20:36:32 yhardy Exp $
 #
 
-EDUKE_SVN=	5948
-EDUKE_DATE=	20161204
+EDUKE_SVN=	5974
+EDUKE_DATE=	20161225
 DISTNAME=	eduke32_src_${EDUKE_DATE}-${EDUKE_SVN}
 PKGNAME=	eduke32-${EDUKE_SVN}
 CATEGORIES=	games
@@ -28,6 +28,7 @@ INSTALLATION_DIRS+=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/eduke32 ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mapster32 ${DESTDIR}${PREFIX}/bin
 
 .include "../../audio/SDL2_mixer/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
diff --git a/eduke32/PLIST b/eduke32/PLIST
index 6628dfc..6e25ad0 100644
--- a/eduke32/PLIST
+++ b/eduke32/PLIST
@@ -1,2 +1,3 @@
 @comment $NetBSD: PLIST,v 1.1 2015/08/19 20:36:32 yhardy Exp $
 bin/eduke32
+bin/mapster32
diff --git a/eduke32/distinfo b/eduke32/distinfo
index 3a7ce59..803eafe 100644
--- a/eduke32/distinfo
+++ b/eduke32/distinfo
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.1 2015/08/19 20:36:32 yhardy Exp $
 
-SHA1 (eduke32_src_20161204-5948.tar.xz) = aedf02ea3c6136a30336c3b8f239d37169d2bf2b
-RMD160 (eduke32_src_20161204-5948.tar.xz) = ec94f849a4fde700e38992663b6835e9613f4d4e
-SHA512 (eduke32_src_20161204-5948.tar.xz) = 0bfc0ef0c141918eb1923491ada6cdd3d421d8c606000ff84a10e2e5484425692a134e6d34c115b205f738524e8f9441db87a96f4b38de0889eb52e2839f87d8
-Size (eduke32_src_20161204-5948.tar.xz) = 14574972 bytes
-SHA1 (patch-build_include_compat.h) = 61f3bc58aafafa5b710b8dc5a69b839da080a317
+SHA1 (eduke32_src_20161225-5974.tar.xz) = 266e7faefc632fafe2071a5603a206782a33f52d
+RMD160 (eduke32_src_20161225-5974.tar.xz) = a41cf9b3575778088844c621ae6352c6f25fc168
+SHA512 (eduke32_src_20161225-5974.tar.xz) = a0af8f76b46aa9be494d45cb2ecd30e6249940f305b43e6bcb5d6bd27abdf8e291c7f005391a7628d60d0248001750bd9989357ff8f02528e1b942424cf579fa
+Size (eduke32_src_20161225-5974.tar.xz) = 14567240 bytes
+SHA1 (patch-build_include_compat.h) = 2a3f4f3e5f8e0fa92249cb6136a8734bbc6a09c1
 SHA1 (patch-build_src_glbuild.c) = 26eb91f06cbcfeaf6a53ad39055d7c78f6e006d1
-SHA1 (patch-source_m32exec.c) = 0e4a452c1920c6d1a5237775f97d9654ba7cb6b5
+SHA1 (patch-source_m32exec.c) = 1e755affe64bc54fb9d237a1b815fd353a41ecf9
diff --git a/eduke32/patches/patch-build_include_compat.h b/eduke32/patches/patch-build_include_compat.h
index 04bdd8b..dfb4d4b 100644
--- a/eduke32/patches/patch-build_include_compat.h
+++ b/eduke32/patches/patch-build_include_compat.h
@@ -2,16 +2,23 @@ $NetBSD: patch-build_include_compat.h,v 1.1 2015/08/19 20:36:32 yhardy Exp $
 
 Use the correct bswap functions on NetBSD.
 
---- build/include/compat.h.orig	2015-05-27 08:48:07.000000000 +0000
+--- build/include/compat.h.orig	2016-05-22 21:01:12.000000000 +0000
 +++ build/include/compat.h
-@@ -288,6 +288,11 @@
- # define B_SWAP64(x) __bswap64(x)
- # define B_SWAP32(x) __bswap32(x)
- # define B_SWAP16(x) __bswap16(x)
+@@ -287,9 +287,15 @@
+ #  define B_LITTLE_ENDIAN 0
+ #  define B_BIG_ENDIAN    1
+ # endif
+-# define B_SWAP64(x) __bswap64(x)
+-# define B_SWAP32(x) __bswap32(x)
+-# define B_SWAP16(x) __bswap16(x)
 +# ifdef __NetBSD__
 +#  define B_SWAP64(x) bswap64(x)
 +#  define B_SWAP32(x) bswap32(x)
 +#  define B_SWAP16(x) bswap16(x)
++# else
++#  define B_SWAP64(x) __bswap64(x)
++#  define B_SWAP32(x) __bswap32(x)
++#  define B_SWAP16(x) __bswap16(x)
 +# endif
  
  #elif defined(__APPLE__)
diff --git a/eduke32/patches/patch-source_m32exec.c b/eduke32/patches/patch-source_m32exec.c
index 482dcac..7ff4ad7 100644
--- a/eduke32/patches/patch-source_m32exec.c
+++ b/eduke32/patches/patch-source_m32exec.c
@@ -1,14 +1,21 @@
 $NetBSD$
 
-Include limits.h for INT32_MAX.
+Define __STDC_LIMIT_MACROS before stdint.h is included. This code segment
+appears in build/include/compat.h, but that is too late on NetBSD.
 
---- source/m32exec.c.orig	2015-07-10 07:56:48.000000000 +0000
+--- source/m32exec.c.orig	2016-12-26 06:02:56.000000000 +0000
 +++ source/m32exec.c
-@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fi
+@@ -20,6 +20,13 @@ Foundation, Inc., 51 Franklin Street, Fi
  */
  //-------------------------------------------------------------------------
  
-+#include <limits.h>
++#ifndef __STDC_FORMAT_MACROS
++# define __STDC_FORMAT_MACROS
++#endif
++#ifndef __STDC_LIMIT_MACROS
++# define __STDC_LIMIT_MACROS
++#endif
++
  #include <time.h>
  #include <stdlib.h>
Prev by Date: TODO: + gitlab-8.15, py-pygit2-0.25.0.
Next by Date: Update beats to 5.1.1. Add SMF manifest.
Previous by Thread: TODO: + gitlab-8.15, py-pygit2-0.25.0.
Next by Thread: Update beats to 5.1.1. Add SMF manifest.
Indexes:
Home | Main Index | Thread Index | Old Index