Import pentagram-20161127

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Import pentagram-20161127
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sat, 13 May 2017 16:04:53 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat May 13 18:04:53 2017 +0200
Changeset:	c30ea55e0652e1335aa09ecc145a20829defde52

Modified Files:
	Makefile
Added Files:
	pentagram/DESCR
	pentagram/MESSAGE
	pentagram/Makefile
	pentagram/PLIST
	pentagram/distinfo
	pentagram/patches/patch-configure.ac
	pentagram/patches/patch-sudio_midi_FluidSynthMidiDriver.cpp

Log Message:
Import pentagram-20161127

Pentagram is a game engine for running Ultima 8 on modern operating systems.
Since a modified version of the Ultima 8 engine also powered the two Crusader
games (Crusader: No Remorse and Crusader: No Regret) the ultimate goal of
pentagram is to be able to run those two as well.

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

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

diffstat:
 Makefile                                           |  1 +
 pentagram/DESCR                                    |  4 ++
 pentagram/MESSAGE                                  |  7 +++
 pentagram/Makefile                                 | 36 +++++++++++
 pentagram/PLIST                                    |  3 +
 pentagram/distinfo                                 |  8 +++
 pentagram/patches/patch-configure.ac               | 72 ++++++++++++++++++++++
 .../patch-sudio_midi_FluidSynthMidiDriver.cpp      | 25 ++++++++
 8 files changed, 156 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 55bc7f7b1e..79831bae47 100644
--- a/Makefile
+++ b/Makefile
@@ -2559,6 +2559,7 @@ SUBDIR+=	pear-phpcpd
 SUBDIR+=	pear-phpdcd
 SUBDIR+=	pear-phploc
 SUBDIR+=	peercoin
+SUBDIR+=	pentagram
 SUBDIR+=	pessulus
 SUBDIR+=	petsc
 SUBDIR+=	pgp6
diff --git a/pentagram/DESCR b/pentagram/DESCR
new file mode 100644
index 0000000000..b337b7e824
--- /dev/null
+++ b/pentagram/DESCR
@@ -0,0 +1,4 @@
+Pentagram is a game engine for running Ultima 8 on modern operating systems.
+Since a modified version of the Ultima 8 engine also powered the two Crusader
+games (Crusader: No Remorse and Crusader: No Regret) the ultimate goal of
+pentagram is to be able to run those two as well.
diff --git a/pentagram/MESSAGE b/pentagram/MESSAGE
new file mode 100644
index 0000000000..928e044df7
--- /dev/null
+++ b/pentagram/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD$
+You will need the data files from the original Ultima 8 game.
+Set the path variable to point to the data files in pentagram.ini.
+More information is available in ${PREFIX}/share/doc/pentagram/README.
+
+===========================================================================
diff --git a/pentagram/Makefile b/pentagram/Makefile
new file mode 100644
index 0000000000..bf4e3a1978
--- /dev/null
+++ b/pentagram/Makefile
@@ -0,0 +1,36 @@
+# $NetBSD$
+#
+
+PKGNAME=	${GITHUB_PROJECT}-20161127
+DISTNAME=	${GITHUB_TAG}
+GITHUB_PROJECT=	pentagram
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_GITHUB:=pentagram-u8/}
+DIST_SUBDIR=	${GITHUB_PROJECT}
+GITHUB_TAG=	e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://pentagram.sf.net/
+COMMENT=	A reimplementation of the Ultima 8 game engine
+LICENSE=	gnu-gpl-v2
+
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	autoconf automake gmake perl
+REPLACE_PERL+=	system/auto/genrules.pl
+
+INSTALLATION_DIRS+=	share/doc/pentagram
+
+pre-configure:
+	cd ${WRKSRC} && ${SH} ./bootstrap
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/pentagram
+
+.include "../../audio/fluidsynth/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL_ttf/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXxf86dga/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/pentagram/PLIST b/pentagram/PLIST
new file mode 100644
index 0000000000..f2e96fa490
--- /dev/null
+++ b/pentagram/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+bin/pentagram
+share/doc/pentagram/README
diff --git a/pentagram/distinfo b/pentagram/distinfo
new file mode 100644
index 0000000000..ae10394a94
--- /dev/null
+++ b/pentagram/distinfo
@@ -0,0 +1,8 @@
+$NetBSD$
+
+SHA1 (pentagram/e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5-e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5.tar.gz) = 82cd4eab64861a492532fff81cb14063d12115bd
+RMD160 (pentagram/e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5-e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5.tar.gz) = 98c158f87c2bd00a5e792e94073db21431bd23a1
+SHA512 (pentagram/e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5-e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5.tar.gz) = 3253f5466fcf45a82fdf84e360eda7c877f1f9818e3517fbb4154c79f2a56322f0cac61c15f8677872046ed0185b58dcad4f3eb86aad50eabda0e8d04a21b9c8
+Size (pentagram/e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5-e90df6d82b9e8eaf5725a2d4cc117121ce39f5a5.tar.gz) = 5864250 bytes
+SHA1 (patch-configure.ac) = 1e20998d480f3776460c868305ebeae347b8d71e
+SHA1 (patch-sudio_midi_FluidSynthMidiDriver.cpp) = f09a792bceaaebb610265a868e1e57e93974b04a
diff --git a/pentagram/patches/patch-configure.ac b/pentagram/patches/patch-configure.ac
new file mode 100644
index 0000000000..312a115238
--- /dev/null
+++ b/pentagram/patches/patch-configure.ac
@@ -0,0 +1,72 @@
+$NetBSD$
+
+--- configure.ac.orig	2012-08-19 04:00:51.000000000 +0200
++++ configure.ac	2013-01-04 23:33:47.000000000 +0200
+@@ -96,6 +96,13 @@
+ 		AC_MSG_RESULT(UNIX (OpenBSD))
+ 		GUI_LIBS="$GUI_LIBS -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXxf86dga"
+ 		;;
++	netbsd* )
++		AC_DEFINE(UNIX, 1, [UNIX-variant])
++		AC_DEFINE(HAVE_HOME, 1, [HOME env.var exists])
++		AC_DEFINE(NETBSD, 1, [NetBSD])
++		AC_MSG_RESULT(UNIX (NetBSD))
++		GUI_LIBS="$GUI_LIBS -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXxf86dga"
++		;;
+ 	solaris* )
+ 		AC_DEFINE(UNIX, 1, [UNIX-variant])
+ 		AC_DEFINE(HAVE_HOME, 1, [HOME env.var exists])
+@@ -220,7 +227,7 @@
+ # SDL
+ # ---------------------------------------------------------------------
+ PENT_CHECK_SDL(:,AC_MSG_ERROR([[*** SDL version >= 1.2.0 not found!]]))
+-if test x$with_macosx_static_lib_path == x -o x$HOST_SYSTEM != xMACOSX; then
++if test x$with_macosx_static_lib_path = x -o x$HOST_SYSTEM != xMACOSX; then
+ 		GUI_LIBS="$GUI_LIBS $SDL_LIBS"
+ 	fi
+ 
+@@ -230,7 +237,7 @@
+ 
+ AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR([*** zlib not found!]))
+ AC_CHECK_LIB(z,deflate,,AC_MSG_ERROR([*** zlib not found!]))
+-if test x$with_macosx_static_lib_path == x -o x$HOST_SYSTEM != xMACOSX; then
++if test x$with_macosx_static_lib_path = x -o x$HOST_SYSTEM != xMACOSX; then
+ 		SYS_LIBS="$SYS_LIBS -lz"
+ 	fi
+ 
+@@ -239,7 +246,7 @@
+ # --------
+ 
+ PENT_CHECK_SDLTTF(:,AC_MSG_ERROR([*** SDL_ttf version >= 2.0.7 not found!]))
+-if test x$with_macosx_static_lib_path == x -o x$HOST_SYSTEM != xMACOSX; then
++if test x$with_macosx_static_lib_path = x -o x$HOST_SYSTEM != xMACOSX; then
+ 		GUI_LIBS="$GUI_LIBS $SDLTTF_LIBS"
+ 	fi
+ 
+@@ -249,7 +256,7 @@
+ 
+ AC_CHECK_HEADER(png.h,,AC_MSG_ERROR([*** libpng not found!]))
+ AC_CHECK_LIB(png,png_create_read_struct,,AC_MSG_ERROR([*** libpng not found!]))
+-if test x$with_macosx_static_lib_path == x -o x$HOST_SYSTEM != xMACOSX; then
++if test x$with_macosx_static_lib_path = x -o x$HOST_SYSTEM != xMACOSX; then
+ 		GUI_LIBS="$GUI_LIBS -lpng"
+ 	fi
+ 
+@@ -276,7 +283,7 @@
+ # ---------------------------------------------------------------------
+ # Black magic for static linking on OS X
+ # ---------------------------------------------------------------------
+-if test x$HOST_SYSTEM == xMACOSX; then
++if test x$HOST_SYSTEM = xMACOSX; then
+ 	AC_ARG_WITH(macosx-static-lib-path,
+ 		AS_HELP_STRING([--with-macosx-static-lib-path=path], [path to location of static library files (Mac OS X bundles only)]),
+ 		[with_macosx_static_lib_path="$withval"],
+@@ -316,7 +323,7 @@
+ 	AS_HELP_STRING([--with-macosx-code-signature=identity], [identity for code signing (Mac OS X bundles only) @<:@default "Developer ID Application"@:>@]),
+ 	[with_macosx_code_signature="$withval"],
+ 	[with_macosx_code_signature=""])
+-if test x$HOST_SYSTEM == xMACOSX; then
++if test x$HOST_SYSTEM = xMACOSX; then
+ 	if test x"$with_macosx_code_signature" != x; then
+ 		if test x"$with_macosx_code_signature" = xyes; then
+ 			with_macosx_code_signature="Developer ID Application"
diff --git a/pentagram/patches/patch-sudio_midi_FluidSynthMidiDriver.cpp b/pentagram/patches/patch-sudio_midi_FluidSynthMidiDriver.cpp
new file mode 100644
index 0000000000..2a25da98b6
--- /dev/null
+++ b/pentagram/patches/patch-sudio_midi_FluidSynthMidiDriver.cpp
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- audio/midi/FluidSynthMidiDriver.cpp.orig	2006-11-14 20:13:50.000000000 +0200
++++ audio/midi/FluidSynthMidiDriver.cpp	2006-11-15 00:08:31.000000000 +0200
+@@ -21,6 +21,8 @@
+ #include "pent_include.h"
+ #include "FluidSynthMidiDriver.h"
+ 
++#include <cstdlib>
++
+ #ifdef USE_FLUIDSYNTH_MIDI
+ 
+ //#include <cstring>
+@@ -81,7 +83,10 @@
+ 	// The default gain setting is ridiculously low, but we can't set it
+ 	// too high either or sound will be clipped. This may need tuning...
+ 
+-	setNum("synth.gain", 2.1);
++	std::string synthgain = getConfigSetting("fluidsynth_gain", "2.1");
++        double gain = atof(synthgain.c_str());
++	setNum("synth.gain", gain);
++
+ 	setNum("synth.sample-rate", sample_rate);
+ 
+ 	_synth = new_fluid_synth(_settings);
Prev by Date: conkeror: add some patches from upstream
Next by Date: libretro-mednafen-psx: Import libretro-mednafen-psx-20170507 as wip/libretro-mednafen-psx
Previous by Thread: conkeror: add some patches from upstream
Next by Thread: libretro-mednafen-psx: Import libretro-mednafen-psx-20170507 as wip/libretro-mednafen-psx
Indexes:
Home | Main Index | Thread Index | Old Index