omnispeak: fix omnispeak hangs by updating snapshot

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat May 23 22:23:19 2020 +0200
Changeset:	3ac8a66cd5d47559b87bce73dd97922d4d24a096

Modified Files:
	omnispeak/Makefile
	omnispeak/distinfo
	omnispeak/patches/patch-Makefile
	omnispeak/patches/patch-src_ck6_misc.c
	omnispeak/patches/patch-src_id_ca.c

Log Message:
omnispeak: fix omnispeak hangs by updating snapshot

Version 1.0 was just a git snapshot, released only as binaries on
the author's website, and no releases have been made since.
Pkgsrc onispeak-1.0 was taken from the same snapshot.

The latest git snapshot seems to fix some issues, so call it
omnispeak-1.0nb1. No changelog provided.

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

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

diffstat:
 omnispeak/Makefile                     |  3 ++-
 omnispeak/distinfo                     | 14 ++++++-------
 omnispeak/patches/patch-Makefile       | 20 +++++++++----------
 omnispeak/patches/patch-src_ck6_misc.c | 36 +++++++++++++++++-----------------
 omnispeak/patches/patch-src_id_ca.c    | 22 ++++++++++-----------
 5 files changed, 48 insertions(+), 47 deletions(-)

diffs:
diff --git a/omnispeak/Makefile b/omnispeak/Makefile
index 9991a575e3..2555cddb94 100644
--- a/omnispeak/Makefile
+++ b/omnispeak/Makefile
@@ -3,9 +3,10 @@
 GITHUB_PROJECT=	omnispeak
 DISTNAME=	${GITHUB_TAG}
 PKGNAME=	${GITHUB_PROJECT}-1.0
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sulix/}
-GITHUB_TAG=	5bfa6102d24e0fa06d577063d2a2f83d435ba20f
+GITHUB_TAG=	27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b
 DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
diff --git a/omnispeak/distinfo b/omnispeak/distinfo
index 1f2c2a98ef..41a619d5e2 100644
--- a/omnispeak/distinfo
+++ b/omnispeak/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (omnispeak/5bfa6102d24e0fa06d577063d2a2f83d435ba20f-5bfa6102d24e0fa06d577063d2a2f83d435ba20f.tar.gz) = a16d9e3017361bd9a42259863cd89e6e6897ba2f
-RMD160 (omnispeak/5bfa6102d24e0fa06d577063d2a2f83d435ba20f-5bfa6102d24e0fa06d577063d2a2f83d435ba20f.tar.gz) = 59fe51cdbd2d430cfd2213a100a4c92f12f06b8f
-SHA512 (omnispeak/5bfa6102d24e0fa06d577063d2a2f83d435ba20f-5bfa6102d24e0fa06d577063d2a2f83d435ba20f.tar.gz) = 5b996b3115f938438c01a33577c0e5d76bdd02ef10e5f8666afa59ee247706ca2bd2f22ccc3af65440a12b8e53075b2fdeb071e050957bfed3e3b2476bafde7b
-Size (omnispeak/5bfa6102d24e0fa06d577063d2a2f83d435ba20f-5bfa6102d24e0fa06d577063d2a2f83d435ba20f.tar.gz) = 362089 bytes
-SHA1 (patch-Makefile) = 73ef750fd0389785e84f50a025bbf06b37a1b77d
-SHA1 (patch-src_ck6_misc.c) = 4edb4800960462e35f5f1034e713c2dffae724d9
-SHA1 (patch-src_id_ca.c) = a7603be7438a29b3a24256362df3038f020acd93
+SHA1 (omnispeak/27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b-27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b.tar.gz) = 4658454a3fbdcbb04cb0be38555fc0f6d4c0ad8c
+RMD160 (omnispeak/27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b-27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b.tar.gz) = daf1ccd26313b0cbc66efb691536e73a05c6de2e
+SHA512 (omnispeak/27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b-27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b.tar.gz) = 8f0618c6c88301aa01c7d2ee46a1e3023c98177b45a46f9bd7d3db693ea0bc085470f8d6c1c3197333196f8e967909d5edb1f317f1264bdd9292fcd9a8df62d2
+Size (omnispeak/27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b-27d7041ec353f9a8ff60bd7837e9558e2e5d6a2b.tar.gz) = 380394 bytes
+SHA1 (patch-Makefile) = 08ac01bcfe30c22cddf501c83d2ddb737e21cc96
+SHA1 (patch-src_ck6_misc.c) = 8f069f65737229458cc81163b40d0fe94b39c4cc
+SHA1 (patch-src_id_ca.c) = 69c342c7dcabfa3345b634405f866f4d9ded300f
diff --git a/omnispeak/patches/patch-Makefile b/omnispeak/patches/patch-Makefile
index 333f6290ae..dd23cf068b 100644
--- a/omnispeak/patches/patch-Makefile
+++ b/omnispeak/patches/patch-Makefile
@@ -2,14 +2,14 @@ $NetBSD$
 
 Use X11_LDFLAGS to fix linking.
 
---- src/Makefile.orig	2017-07-15 21:27:56.000000000 +0000
+--- src/Makefile.orig	2020-05-04 04:33:47.000000000 +0000
 +++ src/Makefile
-@@ -63,7 +63,7 @@ ifeq ($(WITH_SDL2), 1)
- 		ifeq ($(PLATFORM), WINDOWS)
- 			LIBS+= -lopengl32
- 		else
--			LIBS+= -lGL
-+			LIBS+= -lGL $(X11_LDFLAGS)
- 		endif
- 		IDOBJECTS+= id_vl_sdl2gl.o 
- 	endif
+@@ -258,7 +258,7 @@ endif
+ 
+ ifeq ($(RENDERER), sdl2gl)
+ 	RENDER_OBJS = id_vl_sdl2gl.o id_sd_sdl.o id_in_sdl.o
+-	LIBS += $(LIBGL)
++	LIBS += $(LIBGL) $(X11_LDFLAGS)
+ endif
+ 
+ ifeq ($(RENDERER), sdl2vk)
diff --git a/omnispeak/patches/patch-src_ck6_misc.c b/omnispeak/patches/patch-src_ck6_misc.c
index db61d077c6..89540518c2 100644
--- a/omnispeak/patches/patch-src_ck6_misc.c
+++ b/omnispeak/patches/patch-src_ck6_misc.c
@@ -2,22 +2,22 @@ $NetBSD$
 
 Part of a patch set to search for data files in PREFIX.
 
---- src/ck6_misc.c.orig	2017-07-15 21:27:56.000000000 +0000
+--- src/ck6_misc.c.orig	2020-05-04 04:33:47.000000000 +0000
 +++ src/ck6_misc.c
-@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- #include "ck_def.h"
- #include "ck_act.h"
- #include "ck6_ep.h"
-+#include <limits.h>
- #include <stdio.h>
- 
- CK_EpisodeDef *ck6_episode;
-@@ -106,7 +107,7 @@ bool CK6_IsPresent()
- 	if (!CA_IsFilePresent("AUDIO.CK6"))
- 		return false;
- 	
--	char egaGraphName[] = "EGAGRAPH.CK6";
-+	char egaGraphName[PATH_MAX] = "EGAGRAPH.CK6";
- 	CAL_AdjustFilenameCase(egaGraphName);
- 	size_t egaGraphSize = CA_GetFileSize(egaGraphName);
- 	if (egaGraphSize == 464662)
+@@ -17,6 +17,7 @@ along with this program; if not, write t
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  */
+ 
++#include <limits.h>
+ #include <stdio.h>
+ #include "id_ca.h"
+ #include "id_in.h"
+@@ -117,7 +118,7 @@ bool CK6_IsPresent()
+ 	if (!CA_IsFilePresent("AUDIO.CK6"))
+ 		return false;
+ 
+-	char egaGraphName[] = "EGAGRAPH.CK6";
++	char egaGraphName[PATH_MAX] = "EGAGRAPH.CK6";
+ 	CAL_AdjustFilenameCase(egaGraphName);
+ 	size_t egaGraphSize = CA_GetFileSize(egaGraphName);
+ 	if (egaGraphSize == 464662)
diff --git a/omnispeak/patches/patch-src_id_ca.c b/omnispeak/patches/patch-src_id_ca.c
index 72bb55e66a..b7fa2e6866 100644
--- a/omnispeak/patches/patch-src_id_ca.c
+++ b/omnispeak/patches/patch-src_id_ca.c
@@ -2,16 +2,16 @@ $NetBSD$
 
 Search for data files in PREFIX.
 
---- src/id_ca.c.orig	2017-07-15 21:27:56.000000000 +0000
+--- src/id_ca.c.orig	2020-05-04 04:33:47.000000000 +0000
 +++ src/id_ca.c
-@@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fi
- #include "ck_cross.h"
+@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fi
  #include "ck_def.h"
+ #include "ck_ep.h"
  
 +#include <limits.h>
- #include <string.h>
  #include <stdio.h>
- #include "SDL_endian.h"
+ #include <string.h>
+ #ifdef WITH_SDL
 @@ -85,6 +86,25 @@ bool CAL_AdjustFilenameCase(char *filena
  
  	// We didn't find a matching file.
@@ -38,21 +38,21 @@ Search for data files in PREFIX.
  	return false;
  }
  #else
-@@ -161,7 +181,7 @@ void	(*ca_finishCacheBox)	(void);
+@@ -164,7 +184,7 @@ void (*ca_finishCacheBox)(void);
  // Does a file exist (with filename case correction)
  bool CA_IsFilePresent(const char *filename)
  {
 -	static char newname[16];
 +	static char newname[PATH_MAX];
- 	strcpy(newname,filename);
+ 	strcpy(newname, filename);
  	if (!CAL_AdjustFilenameCase(newname))
  	{
-@@ -175,7 +195,7 @@ bool CA_IsFilePresent(const char *filena
+@@ -178,7 +198,7 @@ bool CA_IsFilePresent(const char *filena
  // valid until the NEXT invocation of this function.
- char* CAL_AdjustExtension(const char *filename)
+ char *CAL_AdjustExtension(const char *filename)
  {
 -	static char newname[16];
 +	static char newname[PATH_MAX];
- 	strcpy(newname,filename);
+ 	strcpy(newname, filename);
  	size_t fnamelen = strlen(filename);
- 	newname[fnamelen-3] = ck_currentEpisode->ext[0];
+ 	newname[fnamelen - 3] = ck_currentEpisode->ext[0];