Update to 0.7.2. Upstream merged patches, yay.

GemRB v0.7.2 (2012-11-20):
  New features:
    - configuration changes are now saved to gem-baldur.ini (or equivalent)
    - GemRB now asks for confirmation when exiting
    - output can now be shown in the ingame message window (run debug(5))
    - ToBEx flags for effect damage: bypass mirror image, ignore difficulty
    - SDL2 software keyboard

  Improved features:
    - custom dialog.tlk encoding support
    - fonts, effect icons, initials, chapter text
    - option windows
    - actions, triggers, effects, invisibility handling
    - assorted bugfixes
This commit is contained in:
Thomas Klausner 2013-04-10 11:23:54 +00:00
parent 25ffd5e616
commit 959ddf5853
5 changed files with 17 additions and 54 deletions

View File

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.8 2012/09/29 00:50:34 asau Exp $
# $NetBSD: Makefile,v 1.9 2013/04/10 11:23:54 thomasklausner Exp $
#
DISTNAME= gemrb-0.7.1
DISTNAME= gemrb-0.7.2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gemrb/}
@ -20,8 +20,8 @@ REPLACE_PYTHON= admin/extend2da.py
CMAKE_ARGS+= -DDISABLE_WERROR=1
CMAKE_ARGS+= -DINSOURCEBUILD=1
CMAKE_ARGS+= -DMAN_DIR:PATH=${PREFIX}/${PKGMANDIR}/man6
CMAKE_ARGS+= -DEXAMPLE_CONF_DIR:PATH=${PREFIX}/share/examples/gemrb
CMAKE_ARGS+= -DSDLMIXER_INCLUDE_DIR=${BUILDLINK_PREFIX.SDL_mixer}/include
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/gemrb
#.include "../../audio/freealut/buildlink3.mk"
.include "../../audio/openal/buildlink3.mk"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2012/09/13 12:38:01 thomasklausner Exp $
@comment $NetBSD: PLIST,v 1.5 2013/04/10 11:23:54 thomasklausner Exp $
bin/extend2da.py
bin/gemrb
lib/gemrb/libgemrb_core.so
@ -261,6 +261,7 @@ share/doc/gemrb/en/GUIScript/LoadWindow.txt
share/doc/gemrb/en/GUIScript/LoadWindowFrame.txt
share/doc/gemrb/en/GUIScript/LoadWindowPack.txt
share/doc/gemrb/en/GUIScript/MemorizeSpell.txt
share/doc/gemrb/en/GUIScript/MessageWindowDebug.txt
share/doc/gemrb/en/GUIScript/ModifyEffect.txt
share/doc/gemrb/en/GUIScript/MoveTAText.txt
share/doc/gemrb/en/GUIScript/MoveToArea.txt
@ -491,6 +492,7 @@ share/doc/gemrb/en/Tables/wssingle.txt
share/doc/gemrb/en/Tables/wstwohnd.txt
share/doc/gemrb/en/Tables/wstwowpn.txt
share/doc/gemrb/en/cmake_install.cmake
share/doc/gemrb/en/default_ini.txt
share/doc/gemrb/en/gemrb_ini.txt
share/examples/gemrb/GemRB.cfg.noinstall.sample
share/examples/gemrb/GemRB.cfg.sample
@ -504,6 +506,8 @@ share/gemrb/GUIScripts/GUIClasses.py
share/gemrb/GUIScripts/GUICommon.py
share/gemrb/GUIScripts/GUICommonWindows.py
share/gemrb/GUIScripts/GUIDefines.py
share/gemrb/GUIScripts/GUIOPT.py
share/gemrb/GUIScripts/GUIOPTControls.py
share/gemrb/GUIScripts/GUIREC.py
share/gemrb/GUIScripts/GUIRECCommon.py
share/gemrb/GUIScripts/GUISAVE.py
@ -546,7 +550,6 @@ share/gemrb/GUIScripts/bg1/GUIMA.py
share/gemrb/GUIScripts/bg1/GUIMG.py
share/gemrb/GUIScripts/bg1/GUIMOVIE.py
share/gemrb/GUIScripts/bg1/GUIMP.py
share/gemrb/GUIScripts/bg1/GUIOPT.py
share/gemrb/GUIScripts/bg1/GUIPR.py
share/gemrb/GUIScripts/bg1/GUISONGS.py
share/gemrb/GUIScripts/bg1/ImportFile.py
@ -591,13 +594,6 @@ share/gemrb/GUIScripts/bg2/GUILOAD.py
share/gemrb/GUIScripts/bg2/GUIMA.py
share/gemrb/GUIScripts/bg2/GUIMG.py
share/gemrb/GUIScripts/bg2/GUIMOVIE.py
share/gemrb/GUIScripts/bg2/GUIOPT.py
share/gemrb/GUIScripts/bg2/GUIOPT10.py
share/gemrb/GUIScripts/bg2/GUIOPT12.py
share/gemrb/GUIScripts/bg2/GUIOPT6.py
share/gemrb/GUIScripts/bg2/GUIOPT7.py
share/gemrb/GUIScripts/bg2/GUIOPT8.py
share/gemrb/GUIScripts/bg2/GUIOPT9.py
share/gemrb/GUIScripts/bg2/GUIPR.py
share/gemrb/GUIScripts/bg2/GUISONGS.py
share/gemrb/GUIScripts/bg2/ImportFile.py
@ -626,7 +622,6 @@ share/gemrb/GUIScripts/iwd/GUILOAD.py
share/gemrb/GUIScripts/iwd/GUIMA.py
share/gemrb/GUIScripts/iwd/GUIMG.py
share/gemrb/GUIScripts/iwd/GUIMOVIE.py
share/gemrb/GUIScripts/iwd/GUIOPT.py
share/gemrb/GUIScripts/iwd/GUIPR.py
share/gemrb/GUIScripts/iwd/LoadScreen.py
share/gemrb/GUIScripts/iwd/MessageWindow.py
@ -636,7 +631,6 @@ share/gemrb/GUIScripts/iwd/Start.py
share/gemrb/GUIScripts/iwd2/Abilities.py
share/gemrb/GUIScripts/iwd2/Alignment.py
share/gemrb/GUIScripts/iwd2/Appearance.py
share/gemrb/GUIScripts/iwd2/AutoPause.py
share/gemrb/GUIScripts/iwd2/Autodetect.py
share/gemrb/GUIScripts/iwd2/CGPortrait.py
share/gemrb/GUIScripts/iwd2/CSound.py
@ -650,26 +644,20 @@ share/gemrb/GUIScripts/iwd2/CharGen7.py
share/gemrb/GUIScripts/iwd2/CharGen8.py
share/gemrb/GUIScripts/iwd2/CharGen9.py
share/gemrb/GUIScripts/iwd2/CharOverview.py
share/gemrb/GUIScripts/iwd2/CharSound.py
share/gemrb/GUIScripts/iwd2/Class.py
share/gemrb/GUIScripts/iwd2/Enemy.py
share/gemrb/GUIScripts/iwd2/Feats.py
share/gemrb/GUIScripts/iwd2/Feedback.py
share/gemrb/GUIScripts/iwd2/GUIINV.py
share/gemrb/GUIScripts/iwd2/GUIJRNL.py
share/gemrb/GUIScripts/iwd2/GUILOAD.py
share/gemrb/GUIScripts/iwd2/GUIMA.py
share/gemrb/GUIScripts/iwd2/GUIOPT.py
share/gemrb/GUIScripts/iwd2/GUIREC.py
share/gemrb/GUIScripts/iwd2/GUISPL.py
share/gemrb/GUIScripts/iwd2/GUIWORLD.py
share/gemrb/GUIScripts/iwd2/GamePlay.py
share/gemrb/GUIScripts/iwd2/Gender.py
share/gemrb/GUIScripts/iwd2/Graphics.py
share/gemrb/GUIScripts/iwd2/ImportFile.py
share/gemrb/GUIScripts/iwd2/LoadScreen.py
share/gemrb/GUIScripts/iwd2/MessageWindow.py
share/gemrb/GUIScripts/iwd2/Movies.py
share/gemrb/GUIScripts/iwd2/Name.py
share/gemrb/GUIScripts/iwd2/Options.py
share/gemrb/GUIScripts/iwd2/QuitGame.py
@ -679,7 +667,6 @@ share/gemrb/GUIScripts/iwd2/SPParty2.py
share/gemrb/GUIScripts/iwd2/SPPartyFormation.py
share/gemrb/GUIScripts/iwd2/Skills.py
share/gemrb/GUIScripts/iwd2/Songs.py
share/gemrb/GUIScripts/iwd2/Sound.py
share/gemrb/GUIScripts/iwd2/Start.py
share/gemrb/GUIScripts/iwd2/SubRaces.py
share/gemrb/GUIScripts/maze_defs.py
@ -754,6 +741,7 @@ share/gemrb/override/bg1/avprefc.2da
share/gemrb/override/bg1/avprefr.2da
share/gemrb/override/bg1/axe.pro
share/gemrb/override/bg1/axeex.pro
share/gemrb/override/bg1/bios.2da
share/gemrb/override/bg1/bloodclr.2da
share/gemrb/override/bg1/bolt.pro
share/gemrb/override/bg1/boltex.pro
@ -818,6 +806,7 @@ share/gemrb/override/bg1/overlay.2da
share/gemrb/override/bg1/pathfind.2da
share/gemrb/override/bg1/pdolls.2da
share/gemrb/override/bg1/pictures.2da
share/gemrb/override/bg1/polish.ini
share/gemrb/override/bg1/proftype.2da
share/gemrb/override/bg1/qslots.2da
share/gemrb/override/bg1/races.2da
@ -1111,6 +1100,7 @@ share/gemrb/override/how/ddoorh.pro
share/gemrb/override/how/defsound.2da
share/gemrb/override/how/destruh.pro
share/gemrb/override/how/dfog.pro
share/gemrb/override/how/difflvls.2da
share/gemrb/override/how/disint.pro
share/gemrb/override/how/disinth.pro
share/gemrb/override/how/dispel.pro
@ -2450,6 +2440,8 @@ share/gemrb/override/shared/bardsong.spl
share/gemrb/override/shared/comment.2da
share/gemrb/override/shared/containr.2da
share/gemrb/override/shared/cow.pro
share/gemrb/override/shared/czech.ini
share/gemrb/override/shared/default.ini
share/gemrb/override/shared/demoend.chu
share/gemrb/override/shared/detect.spl
share/gemrb/override/shared/difflvls.2da

View File

@ -1,7 +1,5 @@
$NetBSD: distinfo,v 1.9 2012/09/13 12:38:01 thomasklausner Exp $
$NetBSD: distinfo,v 1.10 2013/04/10 11:23:54 thomasklausner Exp $
SHA1 (gemrb-0.7.1.tar.gz) = c280b562130ba4c12a937bb37880726120a4bd5a
RMD160 (gemrb-0.7.1.tar.gz) = 399e0b25d58cacb4293e8e076fbba28d581aa1a5
Size (gemrb-0.7.1.tar.gz) = 2079721 bytes
SHA1 (patch-aa) = 33a8fb98d3bf703fe538bad3ed84a5e7fe3eda18
SHA1 (patch-ab) = c912a4f134ed3b26a1ad782b694dc910612ab4ee
SHA1 (gemrb-0.7.2.tar.gz) = 53aacb95961c6b2637596d663e2988a798c67938
RMD160 (gemrb-0.7.2.tar.gz) = a3d9c7f703fdf658a3e4cfe1168784baa5b60bf2
Size (gemrb-0.7.2.tar.gz) = 2066407 bytes

View File

@ -1,15 +0,0 @@
$NetBSD: patch-aa,v 1.2 2011/01/24 14:26:24 thomasklausner Exp $
Unportable test(1) construct.
--- autogen.sh.orig 2010-11-20 22:45:02.000000000 +0000
+++ autogen.sh
@@ -19,7 +19,7 @@ future versions! Please switch to using
if [ "$1" = "" ]; then
dest=$HOME/GemRB
else
- if [ "${1:0:1}" == "/" ]; then
+ if [ "${1:0:1}" = "/" ]; then
dest=$1
else
dest=$PWD/$1

View File

@ -1,12 +0,0 @@
$NetBSD: patch-ab,v 1.2 2011/01/24 14:26:24 thomasklausner Exp $
Install sample config into share/examples.
--- gemrb/CMakeLists.txt.orig 2010-11-20 22:45:02.000000000 +0000
+++ gemrb/CMakeLists.txt
@@ -31,4 +30,4 @@ CONFIGURE_FILE(
)
INSTALL( TARGETS gemrb DESTINATION ${BIN_DIR} )
-INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/GemRB.cfg.sample" GemRB.cfg.noinstall.sample DESTINATION ${SYSCONF_DIR} )
+INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/GemRB.cfg.sample" GemRB.cfg.noinstall.sample DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/gemrb )