slade: Import version 3.1.12a

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: slade: Import version 3.1.12a
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Thu, 27 Aug 2020 16:19:20 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Thu Aug 27 18:19:20 2020 +0200
Changeset:	4ff1b8d2dfc5cbe17e095d19d49f5a848d1e11c4

Added Files:
	SLADE/COMMIT_MSG
	SLADE/DESCR
	SLADE/Makefile
	SLADE/PLIST
	SLADE/TODO
	SLADE/distinfo
	SLADE/files/INSTALL.pkgsrc
	SLADE/patches/patch-src_External_zreaders_m__alloc.cpp
	SLADE/patches/patch-src_External_zreaders_portable__endian.h

Log Message:
slade: Import version 3.1.12a

SLADE3 is a modern editor for Doom-engine based games and source ports.
It has the ability to view, modify, and write many different game-specific
formats, and even convert between some of them, or from/to other generic
formats such as PNG.

SLADE3 can be considered a successor to both SLumpEd and SLADE - it combines
the features of both, to create an all-in-one editor. Why does it keep the
name of what was previously just a map editor? Because it fits :)

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

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

diffstat:
 SLADE/COMMIT_MSG                                   | 10 +++++
 SLADE/DESCR                                        |  2 +
 SLADE/Makefile                                     | 35 ++++++++++++++++
 SLADE/PLIST                                        |  2 +
 SLADE/TODO                                         |  3 ++
 SLADE/distinfo                                     |  8 ++++
 SLADE/files/INSTALL.pkgsrc                         |  6 +++
 .../patch-src_External_zreaders_m__alloc.cpp       | 48 ++++++++++++++++++++++
 .../patch-src_External_zreaders_portable__endian.h | 20 +++++++++
 9 files changed, 134 insertions(+)

diffs:
diff --git a/SLADE/COMMIT_MSG b/SLADE/COMMIT_MSG
new file mode 100644
index 0000000000..7c77890d74
--- /dev/null
+++ b/SLADE/COMMIT_MSG
@@ -0,0 +1,10 @@
+games/slade: Import version 3.1.12a
+
+SLADE3 is a modern editor for Doom-engine based games and source ports.
+It has the ability to view, modify, and write many different game-specific
+formats, and even convert between some of them, or from/to other generic
+formats such as PNG.
+
+SLADE3 can be considered a successor to both SLumpEd and SLADE - it combines
+the features of both, to create an all-in-one editor. Why does it keep the
+name of what was previously just a map editor? Because it fits :)
diff --git a/SLADE/DESCR b/SLADE/DESCR
new file mode 100644
index 0000000000..35f9af3ab0
--- /dev/null
+++ b/SLADE/DESCR
@@ -0,0 +1,2 @@
+Crispy Doom is a limit-removing enhanced-resolution Doom source port
+based on Chocolate Doom.
diff --git a/SLADE/Makefile b/SLADE/Makefile
new file mode 100644
index 0000000000..77786d7712
--- /dev/null
+++ b/SLADE/Makefile
@@ -0,0 +1,35 @@
+# $NetBSD$
+
+DISTNAME=	SLADE-3.1.12a
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GITHUB:=sirjuddington/}
+GITHUB_TAG=	${DISTNAME:S/SLADE-//}
+
+MAINTAINER=	micha%NetBSD.org@localhost
+HOMEPAGE=	https://slade.mancubus.net/
+COMMENT=	It's a Doom Editor
+LICENSE=	gnu-gpl-v2
+
+.include "../../mk/bsd.prefs.mk"
+
+USE_LANGUAGES=	c c++14
+USE_TOOLS+=	pkg-config
+USE_CMAKE=	yes
+CMAKE_ARGS+=	-Wno-dev
+CMAKE_ARGS+=	-DNO_COTIRE=ON  # cmake has similar functionality since 3.16
+CMAKE_ARGS+=	-DNO_WEBVIEW=ON
+
+.include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/freeimage/buildlink3.mk"
+.include "../../graphics/ftgl/buildlink3.mk"
+.include "../../multimedia/sfml/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.wxGTK30:Mgtk2}
+CMAKE_ARGS+=	-DWX_GTK3=OFF
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/SLADE/PLIST b/SLADE/PLIST
new file mode 100644
index 0000000000..1a8522c9b3
--- /dev/null
+++ b/SLADE/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+bin/slade
diff --git a/SLADE/TODO b/SLADE/TODO
new file mode 100644
index 0000000000..ce345a67d5
--- /dev/null
+++ b/SLADE/TODO
@@ -0,0 +1,3 @@
+[X] Fix pkglint errors
+[ ] Unbreak installation
+[ ] Create PLIST
diff --git a/SLADE/distinfo b/SLADE/distinfo
new file mode 100644
index 0000000000..4495292871
--- /dev/null
+++ b/SLADE/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (SLADE-3.1.12a.tar.gz) = 0f8f7048b9cec0a7000d9fe4f52ab57996c96e04
+RMD160 (SLADE-3.1.12a.tar.gz) = a2e64e9f9030d81df39de4a90ae26e6cbd3af433
+SHA512 (SLADE-3.1.12a.tar.gz) = ecedec880b8ebed921e152d016a451164efd4de90ae69963be077d1ef39326670254ca8eb03e1045ca7ae5b02f7512dbbe712f83c845cbbd4ed787a90899ad13
+Size (SLADE-3.1.12a.tar.gz) = 5883702 bytes
+SHA1 (patch-src_External_zreaders_m__alloc.cpp) = 7c42fa1ca0add5c2b6b147fdd7dfa3f21e7fb0a9
+SHA1 (patch-src_External_zreaders_portable__endian.h) = df66b810b2a6a9272d8c668d7d4debd78bba95b5
diff --git a/SLADE/files/INSTALL.pkgsrc b/SLADE/files/INSTALL.pkgsrc
new file mode 100644
index 0000000000..d077a196a0
--- /dev/null
+++ b/SLADE/files/INSTALL.pkgsrc
@@ -0,0 +1,6 @@
+The location of the crispy-doom WAD directory has been set to:
+
+   DOOMWADDIR
+
+This is the pkgsrc standard Doom WAD directory location (shared with other
+Doom packages).
diff --git a/SLADE/patches/patch-src_External_zreaders_m__alloc.cpp b/SLADE/patches/patch-src_External_zreaders_m__alloc.cpp
new file mode 100644
index 0000000000..57d3b413ad
--- /dev/null
+++ b/SLADE/patches/patch-src_External_zreaders_m__alloc.cpp
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Explicitly check for FreeBSD, Linux, macOS and Windows.
+Use the generic algorithm for all other OS (formerly only for "__sun").
+
+--- src/External/zreaders/m_alloc.cpp.orig	2020-05-27 23:08:34.000000000 +0000
++++ src/External/zreaders/m_alloc.cpp
+@@ -57,14 +57,18 @@ namespace GC
+ #endif
+ #if defined(__APPLE__)
+ #define _msize(p)				malloc_size(p)
+-#elif defined(__sun)
+-#define _msize(p)				(*((size_t*)(p)-1))
+-#elif !defined(_WIN32)
++#elif defined(__FreeBSD__) || defined(__linux__)
+ #define _msize(p)				malloc_usable_size(p)	// from glibc/FreeBSD
++#elif !defined(_WIN32)
++// For all other OS not handled above
++#define M_ALLOC_GENERIC  1
++#define _msize(p)				(*((size_t*)(p)-1))
+ #endif
+ 
++
++
+ #ifndef _DEBUG
+-#if !defined(__sun)
++#if !M_ALLOC_GENERIC
+ void *M_Malloc(size_t size)
+ {
+ 	void *block = malloc(size);
+@@ -134,7 +138,7 @@ void *M_Realloc(void *memblock, size_t s
+ #include <crtdbg.h>
+ #endif
+ 
+-#if !defined(__sun)
++#if !M_ALLOC_GENERIC
+ void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
+ {
+ 	void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
+@@ -202,7 +206,7 @@ void *M_Realloc_Dbg(void *memblock, size
+ #endif
+ #endif
+ 
+-#if !defined(__sun)
++#if !M_ALLOC_GENERIC
+ void M_Free (void *block)
+ {
+ 	if (block != NULL)
diff --git a/SLADE/patches/patch-src_External_zreaders_portable__endian.h b/SLADE/patches/patch-src_External_zreaders_portable__endian.h
new file mode 100644
index 0000000000..d20c7a73ec
--- /dev/null
+++ b/SLADE/patches/patch-src_External_zreaders_portable__endian.h
@@ -0,0 +1,20 @@
+$NetBSD$
+
+NetBSD already has defined beXXtoh() and leXXtoh(x) in "sys/endian.h".
+
+--- src/External/zreaders/portable_endian.h.orig	2020-05-27 23:08:34.000000000 +0000
++++ src/External/zreaders/portable_endian.h
+@@ -48,11 +48,11 @@
+ #	define __LITTLE_ENDIAN LITTLE_ENDIAN
+ #	define __PDP_ENDIAN    PDP_ENDIAN
+ 
+-#elif defined(__OpenBSD__)
++#elif defined(__NetBSD__) || defined(__OpenBSD__)
+ 
+ #	include <sys/endian.h>
+ 
+-#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #	include <sys/endian.h>
+
Prev by Date: crispy-doom: Fix man page names
Next by Date: cluster-admin: Update to work with last commit
Previous by Thread: crispy-doom: Fix man page names
Next by Thread: cluster-admin: Update to work with last commit
Indexes:
Home | Main Index | Thread Index | Old Index