pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/scummvm-tools scummvm-tools: updated to 2.1.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/36f51e6ff09b
branches: trunk
changeset: 415803:36f51e6ff09b
user: adam <adam%pkgsrc.org@localhost>
date: Mon Oct 14 19:18:15 2019 +0000
description:
scummvm-tools: updated to 2.1.0
2.1.0 (2019-10-13)
- Fix bug 10559: Add workaround to compress_scumm_sou for non-VOC speech
sample in monster.sou of Indiana Jones and the Fate of Atlantis.
- Improve endianness handling of internal FLAC encoder.
- Add tool to create HDFRAMES.DAT file for Blade Runner game.
- Major rewrite of extract_prince tool.
- Implement decompiler for Prince game scripts.
- Rework the Mohawk engine tools.
- Add tool to extract Hyperspace Delivery Boy! game archives.
2.0.0 (2017-12-17)
- Fix handling of output path for the compress_touche tool.
- Fix handling of input path for the extract_cine tool. It was only working
when run from the directory that contains the game data.
- Fix memory corruption that could cause random errors during extraction when
using the extract_cine tool.
1.9.0 (2016-10-27)
- Fix random crashes in the tool to convert Broken Sword 1 speech files.
1.8.0 (2016-03-04)
- Add a tool to compress Tony Tough's ADP files.
- Add extraction and packing tools for The Prince and the Coward.
- Fix detection and decoding of BS1 big endian speech data in compress_sword1.
- Fix inputs handling for extract_gob_stk.
1.7.0 (2014-07-21)
- Add support for CGE 2 (Sfinx) in extract_cge and pack_cge tools.
- Add option to run some of the tools in the GUI on all the files with the same
extension (e.g. run compress_scumm_san on all *.san files).
- Improve support for sub-directory structure in Broken Sword 1 (e.g. when the
files are in the Clusters, Music and Speech sub-directories).
- Fix issue with output file name in compress_sword2 tool when specifying an
output directory (the output file name was empty with only an extension).
- Fix issue when trying to use compress_scumm_san more than once in the GUI
tool.
1.6.0 (2013-05-31)
- Fix crash when compiling with wxWidgets 2.9.
- Add two tools to extract and repackage the Soltys game data.
- Fix bug 3093138: "compress_tucker with ScummVM CLI Tools not working".
- Fix bug 3280674: "ScummTools do not compress monster.sou of german fdd-version"
- Fix various issues on case sensitive systems when looking for input files
(e.g. in compress_tucker or compress_sword1 the sub-directories and input
files needed to be all uppercase).
- Improve tool detection and inputs handling for tools that require multiple
input files or an input directory (in both the GUI and command line).
- Add signature to compressed Tinsel .smp to match the one at the start of
the .idx file. This ensures that no sound starts at offset 0, since that is
interpreted as the sound missing. This fixes the first line of speech when
Rincewind wakes up at the beginning of Discworld 1.
- Fix too long help string for compression tools in the extra input file
selection which made the file selection impossible because the widgets
were outside the window.
- Respect given output directory in compress_tinsel.
diffstat:
games/scummvm-tools/Makefile | 25 ++--
games/scummvm-tools/PLIST | 4 +-
games/scummvm-tools/distinfo | 15 +-
games/scummvm-tools/patches/patch-Makefile.common | 26 -----
games/scummvm-tools/patches/patch-configure | 47 ++++++++-
games/scummvm-tools/patches/patch-decompiler_refcounted.h | 41 --------
games/scummvm-tools/patches/patch-engines_gob_degob__script.cpp | 13 --
7 files changed, 62 insertions(+), 109 deletions(-)
diffs (233 lines):
diff -r f09e40558d1f -r 36f51e6ff09b games/scummvm-tools/Makefile
--- a/games/scummvm-tools/Makefile Mon Oct 14 19:16:54 2019 +0000
+++ b/games/scummvm-tools/Makefile Mon Oct 14 19:18:15 2019 +0000
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.52 2019/08/22 12:23:14 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.53 2019/10/14 19:18:15 adam Exp $
-DISTNAME= scummvm-tools-1.4.0
-PKGREVISION= 38
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scummvm/}
-EXTRACT_SUFX= .tar.bz2
+DISTNAME= scummvm-tools-2.1.0
+CATEGORIES= games
+MASTER_SITES= https://www.scummvm.org/frs/scummvm-tools/${PKGVERSION_NOREV}/
+EXTRACT_SUFX= .tar.xz
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://scummvm.sourceforge.net/
-COMMENT= Conversion and compression tools for ScummVM
-LICENSE= gnu-gpl-v2
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://scummvm.sourceforge.net/
+COMMENT= Conversion and compression tools for ScummVM
+LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
HAS_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --with-wx-prefix=${PREFIX}
INSTALLATION_DIRS= bin
@@ -27,5 +26,5 @@
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f09e40558d1f -r 36f51e6ff09b games/scummvm-tools/PLIST
--- a/games/scummvm-tools/PLIST Mon Oct 14 19:16:54 2019 +0000
+++ b/games/scummvm-tools/PLIST Mon Oct 14 19:18:15 2019 +0000
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/12 22:00:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/10/14 19:18:15 adam Exp $
bin/construct_mohawk
bin/create_sjisfnt
bin/decine
bin/decompile
bin/degob
bin/dekyra
-bin/deriven
+bin/deprince
bin/descumm
bin/desword2
bin/extract_mohawk
diff -r f09e40558d1f -r 36f51e6ff09b games/scummvm-tools/distinfo
--- a/games/scummvm-tools/distinfo Mon Oct 14 19:16:54 2019 +0000
+++ b/games/scummvm-tools/distinfo Mon Oct 14 19:18:15 2019 +0000
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.8 2016/12/15 23:53:38 joerg Exp $
+$NetBSD: distinfo,v 1.9 2019/10/14 19:18:15 adam Exp $
-SHA1 (scummvm-tools-1.4.0.tar.bz2) = 44a422872180f8aea3eb57e0462d930e22c533ba
-RMD160 (scummvm-tools-1.4.0.tar.bz2) = baabb1d8fb99be72c5eafb186aa132b797edc58d
-SHA512 (scummvm-tools-1.4.0.tar.bz2) = 0997bf4f7cea27af6fd8821303fc08029cb6c57d4291eede9b7e2bcddff3512c101f886b1b776217b231efd12a6828593a592915690ea724f33348345bdff0a4
-Size (scummvm-tools-1.4.0.tar.bz2) = 943697 bytes
-SHA1 (patch-Makefile.common) = d296c951793facfc35835a250b652cedc25b949b
-SHA1 (patch-configure) = cf5da2584ec2fa05fb81faa115f8de0616dd04f7
-SHA1 (patch-decompiler_refcounted.h) = 509b95e42fa52a1f2c1892dbcfae829a9b7c92f6
-SHA1 (patch-engines_gob_degob__script.cpp) = 6bd377ea818076bc12da69b4d1c2588fa5ead449
+SHA1 (scummvm-tools-2.1.0.tar.xz) = 8ce9007d7fe6797339c85958cdb6e76048688005
+RMD160 (scummvm-tools-2.1.0.tar.xz) = d87c8ed99cc87fa312ce5c6ddad3456b7b8f54a5
+SHA512 (scummvm-tools-2.1.0.tar.xz) = 40e0b1a545257922dd1846d520ef0c18ef7a2682a3d7bb1709bcd49b1338ed7cefea438958941586329271d84e01bf189a14e31f5758e500df607d162ee9cc15
+Size (scummvm-tools-2.1.0.tar.xz) = 710124 bytes
+SHA1 (patch-configure) = 5e6054f9a998d7cdf8522e449199b91f6e58392b
diff -r f09e40558d1f -r 36f51e6ff09b games/scummvm-tools/patches/patch-Makefile.common
--- a/games/scummvm-tools/patches/patch-Makefile.common Mon Oct 14 19:16:54 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-Makefile.common,v 1.1 2013/12/15 19:37:41 joerg Exp $
-
---- Makefile.common.orig 2011-11-03 18:13:41.000000000 +0000
-+++ Makefile.common
-@@ -360,17 +360,19 @@ ifdef CXX_UPDATE_DEP_FLAG
- # dependency tracking.
- %.o: %.cpp
- $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
-- $(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-+ $(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(CXXFLAGS.$(subst /,_,$(<)))
-
- else
-
- # Dumb compile rule, for C++ compilers that don't allow dependency tracking or
- # where it is broken (such as GCC 2.95).
- .cpp.o:
-- $(QUIET_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
-+ $(QUIET_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(CXXFLAGS.$(subst /,_,$(<)))
-
- endif
-
-+CXXFLAGS.decompiler_scummv6_disassembler.cpp= ${CLANG_NO_OPT}
-+
- # Include the dependency tracking files.
- -include $(wildcard $(addsuffix /*.d,$(DEPDIRS)))
-
diff -r f09e40558d1f -r 36f51e6ff09b games/scummvm-tools/patches/patch-configure
--- a/games/scummvm-tools/patches/patch-configure Mon Oct 14 19:16:54 2019 +0000
+++ b/games/scummvm-tools/patches/patch-configure Mon Oct 14 19:18:15 2019 +0000
@@ -1,11 +1,37 @@
-$NetBSD: patch-configure,v 1.1 2012/08/18 07:42:29 marino Exp $
+$NetBSD: patch-configure,v 1.2 2019/10/14 19:18:15 adam Exp $
-Add DragonFly support
+Fix wx detection.
+Add DragonFly support.
---- configure.orig 2011-11-03 18:13:41.000000000 +0000
+--- configure.orig 2019-10-04 21:44:09.000000000 +0000
+++ configure
-@@ -886,6 +886,9 @@ case $_host_os in
- android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
+@@ -365,6 +365,7 @@ Optional Libraries:
+ --disable-png disable libpng (compression) support [autodetect]
+
+ --with-wx-prefix=DIR Prefix where wxwidgets is installed (optional)
++ --with-wx-config=DIR Prefix where wx-config is installed (optional)
+ --disable-wxwidgets disable wxwidgets (GUI) support [autodetect]
+
+ --disable-iconv disable iconv (Japanese font) support [autodetect]
+@@ -447,7 +448,15 @@ for ac_option in $@; do
+ ;;
+ --with-wx-prefix=*)
+ arg=`echo $ac_option | cut -d '=' -f 2`
+- _wxpath="$arg:$arg/bin"
++ _wxpath="$arg"
++ ;;
++ --with-wx-config=*)
++ arg=`echo $ac_option | cut -d '=' -f 2`
++ _wxconfig="$arg"
++ ;;
++ --with-wx-version=*)
++ arg=`echo $ac_option | cut -d '=' -f 2`
++ # ignore
+ ;;
+ --with-boost-prefix=*)
+ arg=`echo $ac_option | cut -d '=' -f 2`
+@@ -1326,6 +1335,9 @@ case $_host_os in
+ android | beos* | bsd* | darwin* | freebsd* | gph-linux | haiku* | hpux* | iphone | irix* | linux* | mint* | netbsd* | openbsd* | riscos | solaris* | sunos* | uclinux* | webos)
_posix=yes
;;
+ dragonfly*)
@@ -14,3 +40,14 @@
os2-emx*)
_posix=yes # FIXME: Really???
;;
+@@ -1665,7 +1677,9 @@ echo "$_iconv"
+ #
+ if test "$_wxwidgets" = auto ; then
+ _wxwidgets=no
+- find_wxconfig
++ if test -z "$_wxconfig"; then
++ find_wxconfig
++ fi
+ if test -n "$_wxconfig"; then
+ _wxwidgets=yes
+ fi
diff -r f09e40558d1f -r 36f51e6ff09b games/scummvm-tools/patches/patch-decompiler_refcounted.h
--- a/games/scummvm-tools/patches/patch-decompiler_refcounted.h Mon Oct 14 19:16:54 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-decompiler_refcounted.h,v 1.1 2012/11/16 00:51:36 joerg Exp $
-
---- decompiler/refcounted.h.orig 2012-11-15 15:46:47.000000000 +0000
-+++ decompiler/refcounted.h
-@@ -25,10 +25,8 @@
-
- class RefCounted;
-
--namespace boost {
- inline void intrusive_ptr_add_ref(RefCounted *p);
- inline void intrusive_ptr_release(RefCounted *p);
--} // End of namespace boost
-
- /**
- * Provides a base implementation of reference counting for use with boost::intrusive_ptr.
-@@ -36,16 +34,14 @@ inline void intrusive_ptr_release(RefCou
- class RefCounted {
- private:
- long _refCount; ///< Reference count used for boost::intrusive_ptr.
-- friend void ::boost::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods in boost namespace.
-- friend void ::boost::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods in boost namespace.
-+ friend void ::intrusive_ptr_add_ref(RefCounted *p); ///< Allow access by reference counting methods in boost namespace.
-+ friend void ::intrusive_ptr_release(RefCounted *p); ///< Allow access by reference counting methods in boost namespace.
-
- protected:
- RefCounted() : _refCount(0) { }
- virtual ~RefCounted() { }
- };
-
--namespace boost {
--
- /**
- * Add a reference to a pointer.
- */
-@@ -61,6 +57,4 @@ inline void intrusive_ptr_release(RefCou
- delete p;
- }
-
--} // End of namespace boost
--
- #endif
diff -r f09e40558d1f -r 36f51e6ff09b games/scummvm-tools/patches/patch-engines_gob_degob__script.cpp
--- a/games/scummvm-tools/patches/patch-engines_gob_degob__script.cpp Mon Oct 14 19:16:54 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-engines_gob_degob__script.cpp,v 1.1 2016/12/15 23:53:38 joerg Exp $
-
---- engines/gob/degob_script.cpp.orig 2016-12-15 16:41:44.458856760 +0000
-+++ engines/gob/degob_script.cpp
-@@ -182,7 +182,7 @@ byte *ExtTable::unpack(const byte *packe
- Script::Script(byte *totData, uint32 totSize, ExtTable *extTable) :
- _totData(totData), _ptr(totData), _totSize(totSize), _extTable(extTable) {
-
-- assert((totData > 0) && (totSize > 128));
-+ assert(totData && (totSize > 128));
-
- _indent = 0;
-
Home |
Main Index |
Thread Index |
Old Index