pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

commandergenius: update to Commander-Genius-2.0.0

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Mon Jan 1 17:57:48 2018 +0200
Changeset:	86d110c83d0b6f5588891e92aab842121d23d7d2

Modified Files:
	commandergenius/Makefile
	commandergenius/PLIST
	commandergenius/distinfo
	commandergenius/patches/patch-src_install.cmake
Added Files:
	commandergenius/patches/patch-GsKit_base_video_scaler_scalebit.cpp
	commandergenius/patches/patch-src_engine_unzip_ioapi.h
Removed Files:
	commandergenius/patches/patch-lib_GsKit_base_video_scaler_scalebit.cpp

Log Message:
commandergenius: update to Commander-Genius-2.0.0

Changelog:

v2.0.0.0:
---------
- Many AI fixes in keen 4, 5 and 6
- Platform sprite corrections in Keen 5
- New Application logo
- Many collision fixes
- Smoother scrolling with vsync
- GUI improvements
- Multiplayer improvements
- Sprite class now uses GsSurface in order to increase performance
  and reduce crashes

v1.9.9.9:
---------
- More errors messages, better checking of resources files (Special thanks to Mewingtree)
- Keen 10 Mod: Mirror Menace starting to finally work!
- Berkaloid AI fixes
- Bipship AI fixes
- Simplification of options
- Added option for turning off frame skipping

v1.9.9.8:
---------
- Keen 6 Demo working now (Special thanks to Mewingtree)
- Graphical artifacts fixed in SDL 1.2
- HUD in Vorticon Keen with SDL 1.2 displayed correctly again

v1.9.9.7:
---------
- Improved Progress bar when downloading games, fancier animation, better feedback
- More warnings and error handling
- Improved Keen dreams performance a bit when lower resolutions are used
- better handling with Mods and defective offsets.

v1.9.9.6:
---------
- Better feedback for the user, more error messages and warnings,
  especially for misconfigured CG and first time user

v1.9.9.5:
---------
- Code cleanups (SaveController)
- Mouse scrolling improved. It seems to work again in most of the mice.
  Also horizontal scrolling is implemented now.

v1.9.9.4:
---------
- Fixes for better mod support
- Standard Resolution is now at 800x600
- Added instructions for building under Fedora

v1.9.9.3:
---------
- Improved log responsiveness
- More error messages are now logged in minizip code
- Tidied up code in general
- More C++ use

v1.9.9.2:
---------
- Menu UI Fixes.
- Removed Dosbox Fusion code
- Bug fixes

v1.9.9.1:
---------
- More improvements on the story and finales texts of the galaxy games.

v1.9.9.0:
---------
- Mod and engine fixes

v1.9.8.8:
---------
- New Horizontal borders
- Screen now occupy colors
- Bug fixes

v1.9.8.7:
---------
-  Modern style option finally does something (translucent Keen in hidden areas)
-  A lot of more and improved error catching
-  Lots of bug fixes
-  Improved mods compatibility

v1.9.8.3:
---------
- Hackable Lindsey Messages through python3
- Problems with doors and ship levels fixed

v1.9.8.2:
----------
- More python support. Oracle Member Texts are fully hackable
- More Computer Wrist and Page stuff to read within the game

v1.9.7:
----------
- More python support
- Bug Fixes

v1.9.6:
----------
- Keen learns to run in the galaxy engine
- Bug fixes in Dreams and much better timer
- Basic Python3 support
- Patcher fixes for better mod compatibility

v1.9.5 Beta:
------------
- Game Center added
- Sandwich Menu that a lot of android users will make happy
- Now there is a cheat menu made mobile devices that can not use keyboard shortcuts
- Updated Readme

v1.9.2 Beta:
------------
- Graphical bug fixes
- Improved physics, especially collision detection
- More and improved sounds effects, especial when keen on the map is
using the swim suit

v1.9 Beta:
----------
- Integrated RefKeen to CG so Keen Dreams runs as the last planned game. It's fully playable now
- Minor fixes

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

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

diffstat:
 commandergenius/Makefile                           |  19 +-
 commandergenius/PLIST                              | 217 ++++-----------------
 commandergenius/distinfo                           |  16 +-
 .../patch-GsKit_base_video_scaler_scalebit.cpp     |  15 ++
 .../patch-lib_GsKit_base_video_scaler_scalebit.cpp |  15 --
 .../patches/patch-src_engine_unzip_ioapi.h         |  15 ++
 commandergenius/patches/patch-src_install.cmake    |  12 +-
 7 files changed, 98 insertions(+), 211 deletions(-)

diffs:
diff --git a/commandergenius/Makefile b/commandergenius/Makefile
index c00ad61df9..0beab694b0 100644
--- a/commandergenius/Makefile
+++ b/commandergenius/Makefile
@@ -2,19 +2,22 @@
 
 GITHUB_PROJECT=	Commander-Genius
 DISTNAME=	${GITHUB_TAG}
-PKGNAME=	${GITHUB_PROJECT}-1822
+PKGNAME=	${GITHUB_PROJECT}-2.0.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=gerstrong/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
-EXTRACT_USING=	gtar
-GITHUB_TAG=	v${PKGVERSION_NOREV}release
+GITHUB_TAG=	v200Release
+DISTFILES=	${DEFAULT_DISTFILES} GsKit-${GSKIT_VER}.tar.gz
+GSKIT_VER=	f925d1362f0bc99598141a97d5a200d5e6a41391
+SITES.GsKit-${GSKIT_VER}.tar.gz= \
+-https://github.com/gerstrong/GsKit/archive/${GSKIT_VER}.tar.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://clonekeenplus.sourceforge.net/
 COMMENT=	The ultimate Commander Keen interpreter
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/Commander-Genius-${PKGVERSION_NOREV}release
+WRKSRC=		${WRKDIR}/Commander-Genius-${GITHUB_TAG:S/^v//}
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
@@ -26,6 +29,11 @@ CMAKE_ARGS+=	-DDOCDIR=${PREFIX}/share/doc/commandergenius
 
 INSTALLATION_DIRS=	bin share/doc/commandergenius
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+post-extract:
+	${MV} ${WRKDIR}/GsKit-${GSKIT_VER}/* ${WRKSRC}/GsKit/
+
 post-install:
 	cd ${WRKSRC}/vfsroot && ${FIND} . -type d | while read d; do \
 		${INSTALL_DATA_DIR} "${DESTDIR}${PREFIX}/share/commandergenius/$$d" || exit 1; \
@@ -35,9 +43,10 @@ post-install:
 	done
 
 .include "options.mk"
-
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../graphics/SDL2_image/buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/commandergenius/PLIST b/commandergenius/PLIST
index 4d9fb95e36..65b53bcf54 100644
--- a/commandergenius/PLIST
+++ b/commandergenius/PLIST
@@ -1,187 +1,24 @@
 @comment $NetBSD: PLIST,v 1.1 2015/08/19 21:21:53 yhardy Exp $
 bin/CGeniusExe
 share/applications/cgenius.desktop
+share/commandergenius/CGLogo.svg
+share/commandergenius/cache/K6DEMO.png
+share/commandergenius/cache/eightacc.png
+share/commandergenius/cache/kdreams.png
+share/commandergenius/cache/kdreamsplus.png
+share/commandergenius/cache/keen1special.png
+share/commandergenius/cache/keen4special.png
+share/commandergenius/cache/keen7.png
+share/commandergenius/cache/perilous.bmp
+share/commandergenius/cache/perilous.png
+share/commandergenius/cache/silcar1.bmp
 share/commandergenius/cglogo512.png
-share/commandergenius/games/Aliens/AAMBA.BAT
-share/commandergenius/games/Aliens/AAMBA.PAT
-share/commandergenius/games/Aliens/AUDIO.CK6
-share/commandergenius/games/Aliens/AUDIODCT.CK6
-share/commandergenius/games/Aliens/AUDIOHED.CK6
-share/commandergenius/games/Aliens/CK6LOAD.BIN
-share/commandergenius/games/Aliens/CK6PATCH.EXE
-share/commandergenius/games/Aliens/CUSTMAPS.CK6
-share/commandergenius/games/Aliens/EGAGRAPH.CK6
-share/commandergenius/games/Aliens/EGAHEAD.CK6
-share/commandergenius/games/Aliens/FAQ.TXT
-share/commandergenius/games/Aliens/HINTS.TXT
-share/commandergenius/games/Aliens/Keen6.tli
-share/commandergenius/games/Aliens/MAPHEAD.CK6
-share/commandergenius/games/Aliens/STORY.CK6
-share/commandergenius/games/BadDreams/CK1PATCH.EXE
-share/commandergenius/games/BadDreams/CTLPANEL.CK1
-share/commandergenius/games/BadDreams/Cookie.PAT
-share/commandergenius/games/BadDreams/EGAHEAD.CK1
-share/commandergenius/games/BadDreams/EGALATCH.CK1
-share/commandergenius/games/BadDreams/EGASPRIT.CK1
-share/commandergenius/games/BadDreams/ENDTEXT.CK1
-share/commandergenius/games/BadDreams/FINALE.CK1
-share/commandergenius/games/BadDreams/HELPTEXT.CK1
-share/commandergenius/games/BadDreams/KEEN1.EXE
-share/commandergenius/games/BadDreams/LEVEL01.CK1
-share/commandergenius/games/BadDreams/LEVEL02.CK1
-share/commandergenius/games/BadDreams/LEVEL03.CK1
-share/commandergenius/games/BadDreams/LEVEL04.CK1
-share/commandergenius/games/BadDreams/LEVEL04.CK2
-share/commandergenius/games/BadDreams/LEVEL05.CK1
-share/commandergenius/games/BadDreams/LEVEL06.CK1
-share/commandergenius/games/BadDreams/LEVEL07.CK1
-share/commandergenius/games/BadDreams/LEVEL08.CK1
-share/commandergenius/games/BadDreams/LEVEL09.CK1
-share/commandergenius/games/BadDreams/LEVEL10.CK1
-share/commandergenius/games/BadDreams/LEVEL11.CK1
-share/commandergenius/games/BadDreams/LEVEL12.CK1
-share/commandergenius/games/BadDreams/LEVEL13.CK1
-share/commandergenius/games/BadDreams/LEVEL14.CK1
-share/commandergenius/games/BadDreams/LEVEL15.CK1
-share/commandergenius/games/BadDreams/LEVEL16.CK1
-share/commandergenius/games/BadDreams/LEVEL80.CK1
-share/commandergenius/games/BadDreams/LEVEL81.CK1
-share/commandergenius/games/BadDreams/LEVEL90.CK1
-share/commandergenius/games/BadDreams/LEVEL94.CK1
-share/commandergenius/games/BadDreams/Normalgraph/EGAHEAD.CK1
-share/commandergenius/games/BadDreams/Normalgraph/EGALATCH.CK1
-share/commandergenius/games/BadDreams/Normalgraph/EGASPRIT.CK1
-share/commandergenius/games/BadDreams/PREVIEW2.CK1
-share/commandergenius/games/BadDreams/PREVIEW3.CK1
-share/commandergenius/games/BadDreams/PREVIEWS.CK1
-share/commandergenius/games/BadDreams/Poorgraph/EGAHEAD.CK1
-share/commandergenius/games/BadDreams/Poorgraph/EGALATCH.CK1
-share/commandergenius/games/BadDreams/Poorgraph/EGASPRIT.CK1
-share/commandergenius/games/BadDreams/SCORES.CK1
-share/commandergenius/games/BadDreams/SOUNDS.CK1
-share/commandergenius/games/BadDreams/STATUS.CK1
-share/commandergenius/games/BadDreams/STORYTXT.CK1
-share/commandergenius/games/BadDreams/set.tli
-share/commandergenius/games/EightAcummulators/AUDIO.CK4
-share/commandergenius/games/EightAcummulators/CK4LOAD.BIN
-share/commandergenius/games/EightAcummulators/CK4PATCH.EXE
-share/commandergenius/games/EightAcummulators/CONFIG.CK4
-share/commandergenius/games/EightAcummulators/CWSDPMI.EXE
-share/commandergenius/games/EightAcummulators/DOPEFISH.ANS
-share/commandergenius/games/EightAcummulators/EGAHEAD.CK4
-share/commandergenius/games/EightAcummulators/Egagraph.ck4
-share/commandergenius/games/EightAcummulators/Gamemaps.ck4
-share/commandergenius/games/EightAcummulators/KEEN4E.EXE
-share/commandergenius/games/EightAcummulators/Keen4.tli
-share/commandergenius/games/EightAcummulators/Mymod.PAT
-share/commandergenius/games/EightAcummulators/Play.bat
-share/commandergenius/games/EightAcummulators/STORY.CK4
-share/commandergenius/games/EightAcummulators/maphead.ck4
-share/commandergenius/games/Perilous/CK1PATCH.EXE
-share/commandergenius/games/Perilous/EGAHEAD.CK1
-share/commandergenius/games/Perilous/EGALATCH.CK1
-share/commandergenius/games/Perilous/EGASPRIT.CK1
-share/commandergenius/games/Perilous/ENDTEXT.CK1
-share/commandergenius/games/Perilous/FINALE.CK1
-share/commandergenius/games/Perilous/HELPTEXT.CK1
-share/commandergenius/games/Perilous/KEEN1.EXE
-share/commandergenius/games/Perilous/LEVEL01.CK1
-share/commandergenius/games/Perilous/LEVEL02.CK1
-share/commandergenius/games/Perilous/LEVEL03.CK1
-share/commandergenius/games/Perilous/LEVEL04.CK1
-share/commandergenius/games/Perilous/LEVEL05.CK1
-share/commandergenius/games/Perilous/LEVEL06.CK1
-share/commandergenius/games/Perilous/LEVEL07.CK1
-share/commandergenius/games/Perilous/LEVEL08.CK1
-share/commandergenius/games/Perilous/LEVEL09.CK1
-share/commandergenius/games/Perilous/LEVEL10.CK1
-share/commandergenius/games/Perilous/LEVEL11.CK1
-share/commandergenius/games/Perilous/LEVEL12.CK1
-share/commandergenius/games/Perilous/LEVEL13.CK1
-share/commandergenius/games/Perilous/LEVEL14.CK1
-share/commandergenius/games/Perilous/LEVEL15.CK1
-share/commandergenius/games/Perilous/LEVEL16.CK1
-share/commandergenius/games/Perilous/LEVEL81.CK1
-share/commandergenius/games/Perilous/LEVEL90.CK1
-share/commandergenius/games/Perilous/PREVIEWS.CK1
-share/commandergenius/games/Perilous/SOUNDS.CK1
-share/commandergenius/games/Perilous/STORYTXT.CK1
-share/commandergenius/games/Perilous/level80.ck1
-share/commandergenius/games/Perilous/preview2.ck1
-share/commandergenius/games/Perilous/preview3.ck1
-share/commandergenius/games/Perilous/pursuit.bat
-share/commandergenius/games/Perilous/pursuit.pat
-share/commandergenius/games/Perilous/status.ck1
-share/commandergenius/games/Perilous/tiles.tli
-share/commandergenius/games/keen1/EGAHEAD.CK1
-share/commandergenius/games/keen1/EGALATCH.CK1
-share/commandergenius/games/keen1/EGASPRIT.CK1
-share/commandergenius/games/keen1/ENDTEXT.CK1
-share/commandergenius/games/keen1/FINALE.CK1
-share/commandergenius/games/keen1/HELPTEXT.CK1
-share/commandergenius/games/keen1/KEEN1.EXE
-share/commandergenius/games/keen1/LEVEL01.CK1
-share/commandergenius/games/keen1/LEVEL02.CK1
-share/commandergenius/games/keen1/LEVEL03.CK1
-share/commandergenius/games/keen1/LEVEL04.CK1
-share/commandergenius/games/keen1/LEVEL05.CK1
-share/commandergenius/games/keen1/LEVEL06.CK1
-share/commandergenius/games/keen1/LEVEL07.CK1
-share/commandergenius/games/keen1/LEVEL08.CK1
-share/commandergenius/games/keen1/LEVEL09.CK1
-share/commandergenius/games/keen1/LEVEL10.CK1
-share/commandergenius/games/keen1/LEVEL11.CK1
-share/commandergenius/games/keen1/LEVEL12.CK1
-share/commandergenius/games/keen1/LEVEL13.CK1
-share/commandergenius/games/keen1/LEVEL14.CK1
-share/commandergenius/games/keen1/LEVEL15.CK1
-share/commandergenius/games/keen1/LEVEL16.CK1
-share/commandergenius/games/keen1/LEVEL80.CK1
-share/commandergenius/games/keen1/LEVEL81.CK1
-share/commandergenius/games/keen1/LEVEL90.CK1
-share/commandergenius/games/keen1/ORDER.FRM
-share/commandergenius/games/keen1/PREVIEW2.CK1
-share/commandergenius/games/keen1/PREVIEW3.CK1
-share/commandergenius/games/keen1/PREVIEWS.CK1
-share/commandergenius/games/keen1/SCORES.CK1
-share/commandergenius/games/keen1/SOUNDS.CK1
-share/commandergenius/games/keen1/STORYTXT.CK1
-share/commandergenius/games/keen1/VENDOR.DOC
-share/commandergenius/games/keen4/AUDIO.CK4
-share/commandergenius/games/keen4/CHKLIST.MS
-share/commandergenius/games/keen4/CONFIG.CK4
-share/commandergenius/games/keen4/EGAGRAPH.CK4
-share/commandergenius/games/keen4/GAMEMAPS.CK4
-share/commandergenius/games/keen4/KEEN4E.EXE
-share/commandergenius/games/keen4/ORDER.FRM
-share/commandergenius/games/keen4/SAVEGAM0.CK4
-share/commandergenius/games/keen4/SAVEGAM1.CK4
-share/commandergenius/games/keen4/SAVEGAM2.CK4
-share/commandergenius/games/keen4/gfx/4TIL0000.png
-share/commandergenius/games/keen4/gfx/4TIL0001.png
-share/commandergenius/games/keen4/music/slot0.ogg
-share/commandergenius/games/keen4/music/slot1.ogg
-share/commandergenius/games/keen4/music/slot2.ogg
-share/commandergenius/games/keen4/music/slot3.ogg
-share/commandergenius/games/keen4/music/slot4.ogg
-share/commandergenius/games/keen4/music/slot5.ogg
-share/commandergenius/games/keen7/AUDIO.CK4
-share/commandergenius/games/keen7/AUDIODCT.CK4
-share/commandergenius/games/keen7/AUDIOHED.CK4
-share/commandergenius/games/keen7/CK4LOAD.BIN
-share/commandergenius/games/keen7/CONFIG.CK4
-share/commandergenius/games/keen7/Commander Keen Episode 7 Hints Sheet.txt
-share/commandergenius/games/keen7/EGADICT.CK4
-share/commandergenius/games/keen7/EGAHEAD.CK4
-share/commandergenius/games/keen7/Egagraph.ck4
-share/commandergenius/games/keen7/Gamemaps.ck4
-share/commandergenius/games/keen7/KEEN4E.EXE
-share/commandergenius/games/keen7/KEEN7.bat
-share/commandergenius/games/keen7/KEEN7.pat
-share/commandergenius/games/keen7/Keen4.tli
-share/commandergenius/games/keen7/Read Me.txt
-share/commandergenius/games/keen7/editmaps.ck4
-share/commandergenius/games/keen7/maphead.ck4
+share/commandergenius/cglogo512old.png
+share/commandergenius/gameCatalogue.xml
+share/commandergenius/global/1.png
+share/commandergenius/global/2.png
+share/commandergenius/global/3.png
+share/commandergenius/global/4.png
 share/commandergenius/global/HELPTEXT.CKP
 share/commandergenius/global/confirm.png
 share/commandergenius/global/dpad.png
@@ -192,5 +29,25 @@ share/commandergenius/global/gfx/fontsx2.bmp
 share/commandergenius/global/gfx/menufonts.bmp
 share/commandergenius/global/gfx/sliders.bmp
 share/commandergenius/global/start.png
+share/commandergenius/scripts/Keen9/ai/ampton.py
+share/commandergenius/scripts/Keen9/ai/korath.py
+share/commandergenius/scripts/Keen9/ai/qed.py
+share/commandergenius/scripts/Keen9/ai/robored.py
+share/commandergenius/scripts/Keen9/ai/shikadimaster.py
+share/commandergenius/scripts/Keen9/ai/shockshound.py
+share/commandergenius/scripts/Keen9/ai/sparky.py
+share/commandergenius/scripts/Keen9/ai/sphereful.py
+share/commandergenius/scripts/Oblivion/exitToLevel.py
+share/commandergenius/scripts/Oblivion/extraSpawn.py
+share/commandergenius/scripts/Oblivion/messageMap.py
 share/doc/commandergenius/README
+share/doc/commandergenius/cache/K6DEMO.png
+share/doc/commandergenius/cache/eightacc.png
+share/doc/commandergenius/cache/kdreams.png
+share/doc/commandergenius/cache/kdreamsplus.png
+share/doc/commandergenius/cache/keen1special.png
+share/doc/commandergenius/cache/keen4special.png
+share/doc/commandergenius/cache/keen7.png
+share/doc/commandergenius/cache/perilous.png
 share/doc/commandergenius/changelog.txt
+share/doc/commandergenius/gameCatalogue.xml
diff --git a/commandergenius/distinfo b/commandergenius/distinfo
index ac2248a28e..3cba4ff5a6 100644
--- a/commandergenius/distinfo
+++ b/commandergenius/distinfo
@@ -1,7 +1,13 @@
 $NetBSD: distinfo,v 1.1 2015/08/19 21:21:53 yhardy Exp $
 
-SHA1 (Commander-Genius/v1822release.tar.gz) = c1ff103059686f5b9a0880289f56b6c076fd752c
-RMD160 (Commander-Genius/v1822release.tar.gz) = 2c705bd4e6dc9cd90d56e90493cb0319064bf812
-Size (Commander-Genius/v1822release.tar.gz) = 71019673 bytes
-SHA1 (patch-lib_GsKit_base_video_scaler_scalebit.cpp) = 003196f19690e0f0fbe4c2d2ab9390e475a42d01
-SHA1 (patch-src_install.cmake) = 67078bc0922aecc941a76680607ab076f5ced71f
+SHA1 (Commander-Genius/GsKit-f925d1362f0bc99598141a97d5a200d5e6a41391.tar.gz) = 9f3985033da709ea704814d32da40f7c9a8fb5c5
+RMD160 (Commander-Genius/GsKit-f925d1362f0bc99598141a97d5a200d5e6a41391.tar.gz) = 7719e5c889337e8135eb67fb76bddb3640060134
+SHA512 (Commander-Genius/GsKit-f925d1362f0bc99598141a97d5a200d5e6a41391.tar.gz) = e13784f2fd2f3f21ce9b0bd6123168df47f02958155ca4f1d77d3bc4c6805d46caa9ae15e067c692e38befbb68e5be45bfbd429ae4f7b8d3e07353a8e08e6740
+Size (Commander-Genius/GsKit-f925d1362f0bc99598141a97d5a200d5e6a41391.tar.gz) = 182611 bytes
+SHA1 (Commander-Genius/v200Release.tar.gz) = 704a791ffdac7c4671f384e4723e8f9f4582b086
+RMD160 (Commander-Genius/v200Release.tar.gz) = a8600a64878b537993e7d5e0a44ce9d8f8f96f06
+SHA512 (Commander-Genius/v200Release.tar.gz) = 09ecab0af219c58a3611a1ad7563da863f050861b124eb4c53e19c8d7929d5f3eb58f42f5754f893b0df54c56b427d5bafcec491a74b511f26d6e8183649d6f9
+Size (Commander-Genius/v200Release.tar.gz) = 60764172 bytes
+SHA1 (patch-GsKit_base_video_scaler_scalebit.cpp) = 390a892f4bdece12bcb6b36f84dee5ac2cec0c90
+SHA1 (patch-src_engine_unzip_ioapi.h) = 80366fc999aae516da6ce0279e8049532c3df247
+SHA1 (patch-src_install.cmake) = d40e5bf407429eb54c6cb6970a5b23963e55d2a3
diff --git a/commandergenius/patches/patch-GsKit_base_video_scaler_scalebit.cpp b/commandergenius/patches/patch-GsKit_base_video_scaler_scalebit.cpp
new file mode 100644
index 0000000000..1ce07a85e2
--- /dev/null
+++ b/commandergenius/patches/patch-GsKit_base_video_scaler_scalebit.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_GsKit_base_video_scaler_scalebit.cpp,v 1.1 2015/08/19 21:21:53 yhardy Exp $
+
+Use malloc.h on NetBSD, not alloca.h.
+
+--- ./GsKit/base/video/scaler/scalebit.cpp.orig	2014-05-10 15:16:02.000000000 +0000
++++ ./GsKit/base/video/scaler/scalebit.cpp
+@@ -42,6 +42,8 @@
+ 
+ #ifdef __MINGW32__
+ 	#include <malloc.h>
++#elif defined(__NetBSD__)
++	#include <malloc.h>
+ #else
+ 	#include <alloca.h>
+ #endif
diff --git a/commandergenius/patches/patch-lib_GsKit_base_video_scaler_scalebit.cpp b/commandergenius/patches/patch-lib_GsKit_base_video_scaler_scalebit.cpp
deleted file mode 100644
index 347bbd83f3..0000000000
--- a/commandergenius/patches/patch-lib_GsKit_base_video_scaler_scalebit.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_GsKit_base_video_scaler_scalebit.cpp,v 1.1 2015/08/19 21:21:53 yhardy Exp $
-
-Use malloc.h on NetBSD, not alloca.h.
-
---- ./lib/GsKit/base/video/scaler/scalebit.cpp.orig	2014-05-10 15:16:02.000000000 +0000
-+++ ./lib/GsKit/base/video/scaler/scalebit.cpp
-@@ -42,6 +42,8 @@
- 
- #ifdef __MINGW32__
- 	#include <malloc.h>
-+#elif defined(__NetBSD__)
-+	#include <malloc.h>
- #else
- 	#include <alloca.h>
- #endif
diff --git a/commandergenius/patches/patch-src_engine_unzip_ioapi.h b/commandergenius/patches/patch-src_engine_unzip_ioapi.h
new file mode 100644
index 0000000000..96757ef52b
--- /dev/null
+++ b/commandergenius/patches/patch-src_engine_unzip_ioapi.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use fopen on NetBSD as well.
+
+--- ./src/engine/unzip/ioapi.h.orig	2017-12-31 18:47:24.000000000 +0000
++++ ./src/engine/unzip/ioapi.h
+@@ -50,7 +50,7 @@
+ #define ftello64 ftell
+ #define fseeko64 fseek
+ #else
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #define fopen64 fopen
+ #define ftello64 ftello
+ #define fseeko64 fseeko
diff --git a/commandergenius/patches/patch-src_install.cmake b/commandergenius/patches/patch-src_install.cmake
index be5eeca302..5ed1151e97 100644
--- a/commandergenius/patches/patch-src_install.cmake
+++ b/commandergenius/patches/patch-src_install.cmake
@@ -2,14 +2,14 @@ $NetBSD: patch-src_install.cmake,v 1.1 2015/08/19 21:21:53 yhardy Exp $
 
 Install binary to "bin" directory instead of "games".
 
---- src/install.cmake.orig	2015-08-12 11:53:24.000000000 +0000
+--- src/install.cmake.orig	2017-10-18 19:06:51.000000000 +0000
 +++ src/install.cmake
-@@ -14,7 +14,7 @@ SET(SHAREDIR share CACHE PATH "System sh
- #SET(GAMES_SHAREDIR "${SHAREDIR}" CACHE PATH "Game data root dir")
- SET(GAMES_SHAREDIR "share/games/" CACHE PATH "Game data root dir")
+@@ -10,7 +10,7 @@ ELSE(WIN32)
+ SET(SHAREDIR "/usr/share" CACHE PATH "System share dir location")
+ SET(GAMES_SHAREDIR "${SHAREDIR}/games/" CACHE PATH "Game data root dir")
  SET(DATADIR "${GAMES_SHAREDIR}/commandergenius")
 -SET(APPDIR games CACHE PATH "Binary destination")
 +SET(APPDIR bin CACHE PATH "Binary destination")
  SET(DOCDIR ${DATADIR} CACHE PATH "Docs destination")
- ENDIF(WIN32)
- 
+ SET(ICONDIR "${SHAREDIR}/icons/hicolor" CACHE PATH "Standard icon installation dir")
+ SET(DESKTOPFILESDIR "${SHAREDIR}/applications" CACHE PATH "Application installation dir")
Home | Main Index | Thread Index | Old Index