pkgsrc-WIP-changes archive

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

gzdoom: import gzdoom-4.8.2 as wip/gzdoom



Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu Sep 8 22:58:51 2022 +0200
Changeset:	20047b28a62091bd9b35208ed9e6849e24dfd0c0

Modified Files:
	Makefile
Added Files:
	gzdoom/DESCR
	gzdoom/Makefile
	gzdoom/PLIST
	gzdoom/distinfo
	gzdoom/patches/patch-src_d__main.cpp
	gzdoom/patches/patch-src_gameconfigfile.cpp

Log Message:
gzdoom: import gzdoom-4.8.2 as wip/gzdoom

GZDoom is a modder-friendly OpenGL and Vulkan source port based on
the DOOM engine.

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

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

diffstat:
 Makefile                                    |  1 +
 gzdoom/DESCR                                |  2 ++
 gzdoom/Makefile                             | 31 +++++++++++++++++++++++++++++
 gzdoom/PLIST                                | 28 ++++++++++++++++++++++++++
 gzdoom/distinfo                             |  7 +++++++
 gzdoom/patches/patch-src_d__main.cpp        | 24 ++++++++++++++++++++++
 gzdoom/patches/patch-src_gameconfigfile.cpp | 14 +++++++++++++
 7 files changed, 107 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 0663b49067..fb0702cffc 100644
--- a/Makefile
+++ b/Makefile
@@ -1469,6 +1469,7 @@ SUBDIR+=	gwhois
 SUBDIR+=	gwyddion
 SUBDIR+=	gxconsole
 SUBDIR+=	gxmms2
+SUBDIR+=	gzdoom
 SUBDIR+=	gzip
 SUBDIR+=	h323plus
 SUBDIR+=	h8300-elf-binutils
diff --git a/gzdoom/DESCR b/gzdoom/DESCR
new file mode 100644
index 0000000000..be8027265f
--- /dev/null
+++ b/gzdoom/DESCR
@@ -0,0 +1,2 @@
+GZDoom is a modder-friendly OpenGL and Vulkan source port based on
+the DOOM engine.
diff --git a/gzdoom/Makefile b/gzdoom/Makefile
new file mode 100644
index 0000000000..03121242d6
--- /dev/null
+++ b/gzdoom/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD$
+
+DISTNAME=	g4.8.2
+PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S/^g//}
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ZDoom/}
+GITHUB_PROJECT=	gzdoom
+GITHUB_TAG=	g4.8.2
+DIST_SUBDIR=	${GITHUB_PROJECT}
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://zdoom.org/
+COMMENT=	Zdoom game engine
+LICENSE=	gnu-gpl-v3
+
+WRKSRC=		${WRKDIR}/gzdoom-g4.8.2
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
+CXXFLAGS+=	-D PKGSRC_DOOM_PATH='"${PREFIX}/share/games/doom"'
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../multimedia/libvpx/buildlink3.mk"
+# .include "../../parallel/openmp/buildlink3.mk"
+.include "../../wip/ZMusic/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/gzdoom/PLIST b/gzdoom/PLIST
new file mode 100644
index 0000000000..f31d5c215f
--- /dev/null
+++ b/gzdoom/PLIST
@@ -0,0 +1,28 @@
+@comment $NetBSD$
+bin/gzdoom
+share/doc/gzdoom/console.css
+share/doc/gzdoom/console.html
+share/doc/gzdoom/licenses/README.TXT
+share/doc/gzdoom/licenses/bsd.txt
+share/doc/gzdoom/licenses/bzip2.txt
+share/doc/gzdoom/licenses/dumb.txt
+share/doc/gzdoom/licenses/fxaa.txt
+share/doc/gzdoom/licenses/gdtoa.txt
+share/doc/gzdoom/licenses/gpl.txt
+share/doc/gzdoom/licenses/lgpl.txt
+share/doc/gzdoom/rh-log.txt
+share/doc/gzdoom/skins.txt
+share/games/doom/brightmaps.pk3
+share/games/doom/fm_banks/GENMIDI-readme.txt
+share/games/doom/fm_banks/GENMIDI.GS.wopl
+share/games/doom/fm_banks/fmmidi-readme.txt
+share/games/doom/fm_banks/fmmidi.wopn
+share/games/doom/fm_banks/gems-fmlib-gmize-readme.txt
+share/games/doom/fm_banks/gems-fmlib-gmize.wopn
+share/games/doom/fm_banks/gs-by-papiezak-and-sneakernets-readme.txt
+share/games/doom/fm_banks/gs-by-papiezak-and-sneakernets.wopn
+share/games/doom/game_support.pk3
+share/games/doom/game_widescreen_gfx.pk3
+share/games/doom/gzdoom.pk3
+share/games/doom/lights.pk3
+share/games/doom/soundfonts/gzdoom.sf2
diff --git a/gzdoom/distinfo b/gzdoom/distinfo
new file mode 100644
index 0000000000..b8184d6499
--- /dev/null
+++ b/gzdoom/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+BLAKE2s (gzdoom/g4.8.2.tar.gz) = df424df1b3dffefb8bd9642eaefe5fa1322e99c9e14c338771aad1bab41b7824
+SHA512 (gzdoom/g4.8.2.tar.gz) = 5f94aca016e87c8284b41d5c3beaeb752a4201e4562a528375addc976c7d7163d23a4885a223e4377856a2b75b71179efa80e99baf3edfe87fa19cf1e8bbfa42
+Size (gzdoom/g4.8.2.tar.gz) = 24247668 bytes
+SHA1 (patch-src_d__main.cpp) = 74b13c286d6dc1509a37cf66d54bdf149e379d43
+SHA1 (patch-src_gameconfigfile.cpp) = 4c30c413e7d4bc3b25e940f8d5cb7e5dabbc8092
diff --git a/gzdoom/patches/patch-src_d__main.cpp b/gzdoom/patches/patch-src_d__main.cpp
new file mode 100644
index 0000000000..bae763470d
--- /dev/null
+++ b/gzdoom/patches/patch-src_d__main.cpp
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix "Cannot find gzdoom.pk3" -- https://github.com/ZDoom/gzdoom/pull/1665
+
+--- src/d_main.cpp.orig	2022-07-04 08:31:18.000000000 +0000
++++ src/d_main.cpp
+@@ -3535,6 +3535,8 @@ static int D_DoomMain_Internal (void)
+ 	std::set_new_handler(NewFailure);
+ 	const char *batchout = Args->CheckValue("-errorlog");
+ 	
++	D_DoomInit();
++
+ 	// [RH] Make sure zdoom.pk3 is always loaded,
+ 	// as it contains magic stuff we need.
+ 	wad = BaseFileSearch(BASEWAD, NULL, true, GameConfig);
+@@ -3568,8 +3570,6 @@ static int D_DoomMain_Internal (void)
+ 
+ 	if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString());
+ 
+-	D_DoomInit();
+-
+ 	extern void D_ConfirmSendStats();
+ 	D_ConfirmSendStats();
+ 
diff --git a/gzdoom/patches/patch-src_gameconfigfile.cpp b/gzdoom/patches/patch-src_gameconfigfile.cpp
new file mode 100644
index 0000000000..72c450eb05
--- /dev/null
+++ b/gzdoom/patches/patch-src_gameconfigfile.cpp
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add the pkgsrc search path for game files.
+
+--- src/gameconfigfile.cpp.orig	2022-07-04 08:31:18.000000000 +0000
++++ src/gameconfigfile.cpp
+@@ -149,6 +149,7 @@ FGameConfigFile::FGameConfigFile ()
+ 		SetValueForKey ("Path", "/usr/share/games/doom", true);
+ #endif
+ 		SetValueForKey ("Path", "$DOOMWADDIR", true);
++		SetValueForKey ("Path", PKGSRC_DOOM_PATH, true);
+ 	}
+ 
+ 	// Set default search paths if none present


Home | Main Index | Thread Index | Old Index