pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/exult Update to 1.4.9rc1. Provided by Nikolay Bu...
details: https://anonhg.NetBSD.org/pkgsrc/rev/13bbed78cbb1
branches: trunk
changeset: 650236:13bbed78cbb1
user: wiz <wiz%pkgsrc.org@localhost>
date: Sun Apr 19 19:30:12 2015 +0000
description:
Update to 1.4.9rc1. Provided by Nikolay Burkov in PR 49800.
Changes:
10/21/10 v1.4.9rc1
Compatible with the stricter permissions of Windows Vista and
Windows 7
Rewrite of the Graphics system to allow switching to full screen
on modern systems
Better integration into Mac OS X with default location for the
supported games
Smooth scrolling (disabled by default, though)
Aspect correction is now supported
More data from the original has been decoded and thus improved
gameplay and combat
Two mods developed by our team member Marzo
- Keyring for BG which adds a large quest to obtain a SI-style
keyring, as well as a lot of other enhancements such as meditating
in the shrines and viewing the Codex
- SIfixes for SI which corrects many mistakes in the game, for
example
you can now cure Cantra when you play with this mod
In-game Notebook with support for automatic notes (notes created
by usecode)
Integrated Pentagram(tm) Audio system which means
- Real Roland MT32 device support
- Roland MT32 Emulation support
- Fluidsynth support
Removed dependency of the Audio system on SDL_Mixer
New shapes for paperdoll
Multi-map support for new games
Increased limits on resource sizes (shapes, frames, etc)
Moved hard-coded information to datafiles
Greatly improved compiler tools to ease new game development
Tons of work on our map editor Exult Studio and the ability to
develop new games and mods
Tons of bugfixes
diffstat:
games/exult/DESCR | 31 ++-----
games/exult/Makefile | 33 ++++----
games/exult/PLIST | 6 +-
games/exult/distinfo | 49 +-----------
games/exult/patches/patch-aa | 15 ---
games/exult/patches/patch-ab | 15 ---
games/exult/patches/patch-ac | 29 -------
games/exult/patches/patch-actions.cc | 13 ---
games/exult/patches/patch-ad | 13 ---
games/exult/patches/patch-ae | 13 ---
games/exult/patches/patch-af | 13 ---
games/exult/patches/patch-ag | 14 ---
games/exult/patches/patch-args.cc | 12 ---
games/exult/patches/patch-audio_xmidi.cc | 12 ---
games/exult/patches/patch-conf_Configuration.cc | 12 ---
games/exult/patches/patch-conf_xmain.cc | 12 ---
games/exult/patches/patch-configure | 24 ++++++
games/exult/patches/patch-files_Flex.h | 12 ---
games/exult/patches/patch-files_IFF.h | 12 ---
games/exult/patches/patch-files_Table.cc | 12 ---
games/exult/patches/patch-files_U7file.cc | 12 ---
games/exult/patches/patch-files_listfiles.cc | 12 ---
games/exult/patches/patch-files_msgfile.cc | 12 ---
games/exult/patches/patch-files_utils.h | 76 -------------------
games/exult/patches/patch-imagewin_ibuf8.cc | 13 ---
games/exult/patches/patch-objs_chunkter.cc | 12 ---
games/exult/patches/patch-party.cc | 12 ---
games/exult/patches/patch-server_objserial.cc | 12 ---
games/exult/patches/patch-server_server.cc | 13 ---
games/exult/patches/patch-shapes_shapeinf.cc | 12 ---
games/exult/patches/patch-shapes_shapewrite.cc | 12 ---
games/exult/patches/patch-tools_cmanip.cc | 12 ---
games/exult/patches/patch-tools_splitshp.cc | 12 ---
games/exult/patches/patch-usecode_compiler_ucfun.cc | 12 ---
games/exult/patches/patch-usecode_compiler_uclex.ll | 12 ---
games/exult/patches/patch-usecode_compiler_ucloc.cc | 24 ------
games/exult/patches/patch-usecode_compiler_ucloc.h | 15 ---
games/exult/patches/patch-usecode_compiler_ucmain.cc | 24 ------
games/exult/patches/patch-usecode_compiler_ucparse.yy | 25 ------
games/exult/patches/patch-usecode_compiler_ucsym.cc | 12 ---
games/exult/patches/patch-usecode_ucmachine.cc | 12 ---
games/exult/patches/patch-usecode_ucxt_head2data.cc | 12 ---
games/exult/patches/patch-usecode_ucxt_include_ops.h | 12 ---
games/exult/patches/patch-usecode_useval.h | 12 ---
games/exult/patches/patch-vec.h | 42 ----------
45 files changed, 62 insertions(+), 726 deletions(-)
diffs (truncated from 996 to 300 lines):
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/DESCR
--- a/games/exult/DESCR Sun Apr 19 19:29:44 2015 +0000
+++ b/games/exult/DESCR Sun Apr 19 19:30:12 2015 +0000
@@ -1,22 +1,13 @@
-Ultima 7, an RPG from the early 1990's, still has a huge following.
-But, being a DOS game with a very nonstandard memory manager, it
-is difficult to run it on the latest computers. Exult is a project
-to create an Ultima 7 game engine that runs on modern operating
-systems, capable of using the data and graphics files that come
-with the game.
+As computers evolve, we risk losing classic games from the
+not-so-distant past. One of these, Ultima 7, an RPG from the early
+1990's, still has a huge following, and many consider it to be one of
+the most immersive games ever produced.
-Exult is written in C++ and runs on, at least, Linux, Mac OS X and
-Windows using the SDL library to make porting to other platforms
-relatively easy. The current version supports all of "Ultima 7:
-The Black Gate" and "Ultima 7 part 2: The Serpent Isle", allowing
-you to finish both games. This is only possible due to the work
-done by other fans who have decoded the various Ultima 7 data files,
-especially Gary Thompson, Maxim Shatskih, Jakob Shonberg, and Wouter
-Dijkslag.
+Exult is a project to recreate Ultima 7 for modern operating systems,
+using the game's original plot, data, and graphics files. It enables
+play of Ultima VII: The Black Gate and Ultima VII Part Two: Serpent
+Isle, and their corresponding expansion disks Forge of Virtue and
+Silver Seed, on modern machines.
-Exult aims to let those people who own Ultima 7 (copyright 1993)
-play the game on modern hardware, in as close to (or perhaps even
-surpassing) its original splendor as is possible. You need to own
-"Ultima 7: The Black Gate" and/or "Ultima 7: Serpent Isle" and
-optionally the add-ons (not required to run) in order to use Exult,
-and we encourage you to buy a legal copy.
+In order to play these games, data files from the original games are
+needed.
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/Makefile
--- a/games/exult/Makefile Sun Apr 19 19:29:44 2015 +0000
+++ b/games/exult/Makefile Sun Apr 19 19:30:12 2015 +0000
@@ -1,25 +1,26 @@
-# $NetBSD: Makefile,v 1.19 2013/06/04 22:16:04 tron Exp $
-#
+# $NetBSD: Makefile,v 1.20 2015/04/19 19:30:12 wiz Exp $
-DISTNAME= exult-1.2
-PKGREVISION= 10
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=exult/}
+DISTNAME= exult-1.4.9rc1
+CATEGORIES= games
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=exult/exult-all-versions/}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://exult.sourceforge.net/
-COMMENT= Open-source Ultima 7 engine
-
-MAKE_JOBS_SAFE= no
+MAINTAINER= nikkohigashi%gmail.com@localhost
+HOMEPAGE= http://exult.sourceforge.net/
+COMMENT= Open-source Ultima 7 engine
+LICENSE= gnu-gpl-v2
-USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= yacc
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
+CFLAGS+= -fpermissive
+LDFLAGS+= -lz
+CONFIGURE_ARGS+= --disable-sdltest --disable-oggtest --disable-vorbistest
+
+.include "../../devel/zlib/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/PLIST
--- a/games/exult/PLIST Sun Apr 19 19:29:44 2015 +0000
+++ b/games/exult/PLIST Sun Apr 19 19:30:12 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 19:10:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/19 19:30:12 wiz Exp $
bin/expack
bin/exult
bin/shp2pcx
@@ -7,12 +7,16 @@
bin/ucc
bin/ucxt
man/man1/expack.1
+man/man1/exult_studio.1
man/man1/ipack.1
man/man1/shp2pcx.1
man/man1/splitshp.1
man/man1/textpack.1
+man/man1/ucc.1
man/man6/exult.6
share/applications/exult.desktop
+share/exult/bg_mr_faces.vga
+share/exult/bg_paperdol.vga
share/exult/exult.flx
share/exult/exult_bg.flx
share/exult/exult_si.flx
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/distinfo
--- a/games/exult/distinfo Sun Apr 19 19:29:44 2015 +0000
+++ b/games/exult/distinfo Sun Apr 19 19:30:12 2015 +0000
@@ -1,45 +1,6 @@
-$NetBSD: distinfo,v 1.7 2012/07/03 18:42:31 joerg Exp $
+$NetBSD: distinfo,v 1.8 2015/04/19 19:30:12 wiz Exp $
-SHA1 (exult-1.2.tar.gz) = 81f9d3d428c80990b8e970a4dee5c85a7236dace
-RMD160 (exult-1.2.tar.gz) = 339231edf84507f05115ab3189875cb15be9c04f
-Size (exult-1.2.tar.gz) = 1722259 bytes
-SHA1 (patch-aa) = 2acecb0c4e2da2769559d9603a08930c30b38c72
-SHA1 (patch-ab) = 039fd49b570ad5796a43d86fb679b517c4149f13
-SHA1 (patch-ac) = b92df8fa9c0663b8e37b25b7c3a59e5d58de051a
-SHA1 (patch-actions.cc) = 3844af60c445e8b1c88a59815daf164012175d3b
-SHA1 (patch-ad) = fbb34ab21468afd91caccc35354fbd23df800ca5
-SHA1 (patch-ae) = 3b863379cef2948ff92e9971ffbc37d6b1b0276f
-SHA1 (patch-af) = 43b2369d9dff1fc1aa387c174b3fe7c3e467c2e8
-SHA1 (patch-ag) = 2c8b385bb2346f0e7d11bd8e721a901ec361bb61
-SHA1 (patch-args.cc) = a6f66039c7fdf1396000078b1c28927c0cd0d5e0
-SHA1 (patch-audio_xmidi.cc) = 4b7944fad3fbc3685f0a3edbff013a03feff3f10
-SHA1 (patch-conf_Configuration.cc) = 4c49e9b3ee2f66d77fab32e8cb25c8bf3ac05c3e
-SHA1 (patch-conf_xmain.cc) = e1bc9f77f9642390795d2d8183578f508027a127
-SHA1 (patch-files_Flex.h) = 67c971321cab01286f7398d72274cc575fc39172
-SHA1 (patch-files_IFF.h) = 9dea7c166ebe48c8843be6a0114cb993e18dffb6
-SHA1 (patch-files_Table.cc) = b4379ee2be657c158c0b7d750ac1417d8343ab0a
-SHA1 (patch-files_U7file.cc) = 2147ee8cc5ead5cb06a9823cfb380006ae06a4ba
-SHA1 (patch-files_listfiles.cc) = 3c7ebeba5d64f3c9f758406c1b944e3a289a245e
-SHA1 (patch-files_msgfile.cc) = 8219ffe692b79cad2f9db19adc1e0591d404f315
-SHA1 (patch-files_utils.h) = d170f0afa05f7fb71166c7c01dd6d713411dd680
-SHA1 (patch-imagewin_ibuf8.cc) = d1172573e542e5d0f280049a6c31765005974dcd
-SHA1 (patch-objs_chunkter.cc) = d20c70fae5b61246defe26095113c85b62f9bf32
-SHA1 (patch-party.cc) = e0bba8a1ca0638cc885b2c6363d316feffe5c11b
-SHA1 (patch-server_objserial.cc) = 213b455a213ce538027d2501494c175ebe6dd9c5
-SHA1 (patch-server_server.cc) = 0bdd9e268fe7c87eb5e7abac783bc3c62514af28
-SHA1 (patch-shapes_shapeinf.cc) = a62f192f989c4be0d5d757dc74a5e268216c5a01
-SHA1 (patch-shapes_shapewrite.cc) = 30e33617e5f42b7794b523da1ac5817751f68fc6
-SHA1 (patch-tools_cmanip.cc) = 3bb7231dc1a4bddf430222888b7d83893b9efd1f
-SHA1 (patch-tools_splitshp.cc) = 1eb810b609c5ae5b0b4cae5e043e376c0d6ebd84
-SHA1 (patch-usecode_compiler_ucfun.cc) = aa7d0248b46685c1af42d1114a8f92637bab6b6d
-SHA1 (patch-usecode_compiler_uclex.ll) = 791e55539ebd09011ee5024f6f576bc3a50f87ab
-SHA1 (patch-usecode_compiler_ucloc.cc) = 28e27090fc9a161a49ffa0d570ea1d665d8c40fe
-SHA1 (patch-usecode_compiler_ucloc.h) = a2ed46a6ae96a6634bc5709bba14929a5774d98c
-SHA1 (patch-usecode_compiler_ucmain.cc) = 9f124c0113497f3132f66646aebc21a2e92fce38
-SHA1 (patch-usecode_compiler_ucparse.yy) = 4caa0927da5846b24df3a78af0ea5350064d6080
-SHA1 (patch-usecode_compiler_ucsym.cc) = a68b476a9aa1362051176ad4de5352b6ce610f55
-SHA1 (patch-usecode_ucmachine.cc) = 01db5ff3f6d9c23271dfbd15c50e1c78d9af28a1
-SHA1 (patch-usecode_ucxt_head2data.cc) = 1bb92845f2c7b2368ca6849031e0c9d35affc7e5
-SHA1 (patch-usecode_ucxt_include_ops.h) = aca520d3b8d0d72ae918935f11f164ca0e633a81
-SHA1 (patch-usecode_useval.h) = 101dfb391a00bd99bbdacd4f71f6b22b9c38a214
-SHA1 (patch-vec.h) = 368d369fada797f90ea22919c1410f5b726eae0c
+SHA1 (exult-1.4.9rc1.tar.gz) = 259f778d6b8b5e9c9466e2f4967b6352435b6792
+RMD160 (exult-1.4.9rc1.tar.gz) = 8c6fce2bc17ff59709c5827c5dd70f2e2a473914
+Size (exult-1.4.9rc1.tar.gz) = 5452640 bytes
+SHA1 (patch-configure) = 0812526182ffa1746c45fd5a005ca8b10fd50093
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/patches/patch-aa
--- a/games/exult/patches/patch-aa Sun Apr 19 19:29:44 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/12/26 18:53:31 wiz Exp $
-
---- files/zip/unzip.h.orig 2003-09-20 17:02:02.000000000 +0200
-+++ files/zip/unzip.h
-@@ -54,6 +54,10 @@ extern "C" {
- #include "zlib.h"
- #endif
-
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
- from (void*) without cast */
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/patches/patch-ab
--- a/games/exult/patches/patch-ab Sun Apr 19 19:29:44 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/12/26 18:53:31 wiz Exp $
-
---- files/zip/zip.h.orig 2003-09-20 17:02:02.000000000 +0200
-+++ files/zip/zip.h
-@@ -58,6 +58,10 @@ extern "C" {
- #include "zlib.h"
- #endif
-
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- #if defined(STRICTZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
- from (void*) without cast */
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/patches/patch-ac
--- a/games/exult/patches/patch-ac Sun Apr 19 19:29:44 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/11/25 21:53:26 joerg Exp $
-
---- hash_utils.h.orig 2003-08-31 17:32:24.000000000 +0000
-+++ hash_utils.h
-@@ -20,13 +20,14 @@
- #define _HASH_UTILS_H_
-
- #include "exult_types.h"
-+#include <cstring>
-
- #ifdef DONT_HAVE_HASH_MAP
- # include <map>
- #else
- #if HAVE_EXT_HASH_MAP
- # include <ext/hash_map>
--# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
-+# if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ > 3)
- using __gnu_cxx::hash_map;
- # else
- using std::hash_map;
-@@ -44,7 +45,7 @@ using std::hash_map;
- #else
- #if HAVE_EXT_HASH_SET
- # include <ext/hash_set>
--# if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
-+# if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ > 3)
- using __gnu_cxx::hash_set;
- # else
- using std::hash_set;
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/patches/patch-actions.cc
--- a/games/exult/patches/patch-actions.cc Sun Apr 19 19:29:44 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-actions.cc,v 1.1 2011/11/25 21:53:26 joerg Exp $
-
---- actions.cc.orig 2011-11-25 18:01:36.000000000 +0000
-+++ actions.cc
-@@ -21,6 +21,8 @@
- #ifdef HAVE_CONFIG_H
- # include <config.h>
- #endif
-+#include <cstring>
-+#include <cstdlib>
-
- #include "gamewin.h"
- #include "actions.h"
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/patches/patch-ad
--- a/games/exult/patches/patch-ad Sun Apr 19 19:29:44 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2009/08/24 11:39:21 obache Exp $
-
---- mouse.h.orig 2003-08-31 17:32:24.000000000 +0000
-+++ mouse.h
-@@ -27,6 +27,8 @@
- #include "vgafile.h"
- #include "glshape.h"
-
-+class Game_window;
-+
- /*
- * Handle custom mouse pointers.
- */
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/patches/patch-ae
--- a/games/exult/patches/patch-ae Sun Apr 19 19:29:44 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/07/27 20:14:14 dholland Exp $
-
---- audio/midi_drivers/fmopldrv.h~ 2002-08-06 14:10:31.000000000 -0400
-+++ audio/midi_drivers/fmopldrv.h 2008-07-27 14:03:16.000000000 -0400
-@@ -76,7 +76,7 @@
- /* output a packed midi command to the midi stream
- * valid only if mode is MO_SIMPLE
- */
-- void OplDriver::send(uint32 b);
-+ void send(uint32 b);
-
- /* retrieve a string representation of an error code */
- static const char *get_error_name(int error_code);
diff -r 1e8918260ba0 -r 13bbed78cbb1 games/exult/patches/patch-af
--- a/games/exult/patches/patch-af Sun Apr 19 19:29:44 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2008/07/27 20:14:14 dholland Exp $
-
---- usecode/ucxt/include/ucfunc.h~ 2003-08-31 13:32:28.000000000 -0400
-+++ usecode/ucxt/include/ucfunc.h 2008-07-27 14:07:35.000000000 -0400
-@@ -206,7 +206,7 @@
- bool output_list(std::ostream &o, unsigned int funcno, const UCOptions &options);
-
- bool output_ucs(std::ostream &o, const FuncMap &funcmap, const std::map<unsigned int, std::string> &intrinsics, const UCOptions &options);
-- std::ostream &UCFunc::output_ucs_funcname(std::ostream &o, const FuncMap &funcmap);
-+ std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap);
- std::ostream &output_ucs_funcname(std::ostream &o, const FuncMap &funcmap,
Home |
Main Index |
Thread Index |
Old Index