[Scummvm-cvs-logs] scummvm branch-1-3-0 -> 92d0216db18c96c97bb4b57ada76cf532838cf5b

Sat May 21 19:31:56 CEST 2011

Neil,

so now all your changes are on the branch, once more, but not on trunk. I hope you'll be able to backport them to master shortly after the release. Else with 1.4 we'll once more have the same negative cycle of changes having been in the neglected release branch, while the master branch is still on the same level as 1.2 -- in fact, evern worse, master would be on the same level as 1.1, since as you write, you never merged the changes from 1.2 back into master.

The "git cherry pick" command should make it *really* simple for you to transfer your commits below into the master branch, too.

Hopefully with the next release cycle this problem won't be as severe, though, as I envision that we'll use a model that involves merging the release branch back into the master branch *instead* of making commits to both the release branch and the master branch; in that model, and fix or improvement made on the release branch is automatically integrated into master...

Alas, until then, I really have to urge you to do what all other developers do, and put your changes on both the release branch and master. This should really amount to only 10 minutes of work (you don't even have to test your work on master -- sure would be better if you did, but even untested, I am pretty sure that this will save us *tons* of headaches when the 1.4.0 release cycle starts).

Cheers,
Max

Am 21.05.2011 um 17:02 schrieb agent-q:

> This automated email contains information about 8 new commits which have been
> pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
> 
> Summary:
> 92a71f7452 DS: Port of changes from branch-1-2-0 that I should really have moved into the trunk.
> a9b5d5e2bb DS: Fix some OPL data which was incorrectly freed from the main heap on the DS port
> 987d966acc DS: Prevent arrays from growing by 32 elements inside 'operator='.  I'm concerned that this could increase memory usage 
> 6fdec4dfac DS: Various changes
> 3ce4b76b0d DS/SAGA: Due to what looks like a compiler bug, having one Common::Array template inside another causes the DS build to 
> f1903004c0 GUI: Prevent the GUI code from incorrectly reloading the theme when the builtin theme is used.
> 4076a0466d GUI/DS: Make 99 the maximum number of save slots displayed on the GMM load/save screens on the DS port.
> 92d0216db1 Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0
> 
> 
> Commit: 92a71f7452b83b5491ba0862d8da9f23055fd5bd
>    https://github.com/scummvm/scummvm/commit/92a71f7452b83b5491ba0862d8da9f23055fd5bd
> Author: agent-q (neil at millstone.demon.co.uk)
> Date: 2011-05-21T07:45:51-07:00
> 
> Commit Message:
> DS: Port of changes from branch-1-2-0 that I should really have moved into the trunk.
> 
> "DS: Prevent the command line help string from being included in the binary."
> 5f3a90a5f6911188b8d1ded08dbdf6d233e9eb7b
> 
> "GUI: Allow disabling of Mass Add dialog.  Saves a few Kb of binary size on the DS, and is not particularly useful on that platform."
> 240ff87cf4472538d25a1c5628c8d15f1791ab1c
> 
> "GUI: Don't search for theme zip files on startup when running on the DS.  Themes aren't supported anyway, and the search severely delays startup."
> fe3b18ce0df03117081e83d99f4a2cbd864d3286
> 
> Changed paths:
>    base/commandLine.cpp
>    gui/gui-manager.cpp
>    gui/launcher.cpp
>    gui/massadd.cpp
> 
> 
> 
> 
> Commit: a9b5d5e2bb2109b4ae08971421623c60df67a223
>    https://github.com/scummvm/scummvm/commit/a9b5d5e2bb2109b4ae08971421623c60df67a223
> Author: agent-q (neil at millstone.demon.co.uk)
> Date: 2011-05-21T07:46:59-07:00
> 
> Commit Message:
> DS: Fix some OPL data which was incorrectly freed from the main heap on the DS port
> 
> Changed paths:
>    audio/softsynth/opl/mame.cpp
> 
> 
> 
> 
> Commit: 987d966acc72083d1c63926e719ee3198e24ec83
>    https://github.com/scummvm/scummvm/commit/987d966acc72083d1c63926e719ee3198e24ec83
> Author: agent-q (neil at millstone.demon.co.uk)
> Date: 2011-05-21T07:48:44-07:00
> 
> Commit Message:
> DS: Prevent arrays from growing by 32 elements inside 'operator='.  I'm concerned that this could increase memory usage on the DS, but too scared to make the change for all builds of ScummVM.
> 
> Changed paths:
>    common/array.h
> 
> 
> 
> 
> Commit: 6fdec4dfac164fd131c4e36a67a789b4b17878a7
>    https://github.com/scummvm/scummvm/commit/6fdec4dfac164fd131c4e36a67a789b4b17878a7
> Author: agent-q (neil at millstone.demon.co.uk)
> Date: 2011-05-21T07:51:13-07:00
> 
> Commit Message:
> DS: Various changes
> - Enable libmad
> - Remove forced include of scummsys.h, it caused problems in the forbidden symbols code.
> 
> Changed paths:
>    backends/platform/ds/arm9/makefile
>    backends/platform/ds/arm9/source/dsmain.cpp
> 
> 
> 
> 
> Commit: 3ce4b76b0db10fe878305ed1c8b84c6bb1ad4883
>    https://github.com/scummvm/scummvm/commit/3ce4b76b0db10fe878305ed1c8b84c6bb1ad4883
> Author: agent-q (neil at millstone.demon.co.uk)
> Date: 2011-05-21T07:54:20-07:00
> 
> Commit Message:
> DS/SAGA: Due to what looks like a compiler bug, having one Common::Array template inside another causes the DS build to crash during Common::Array::resize().  The only fix I can find is to make the internal byte array a normal malloc'ed() buffer.  This way, the code runs fine.  Need to dig into the assembly output for this to find out what's truly going on with the original code.
> 
> Changed paths:
>    engines/saga/font.cpp
>    engines/saga/font.h
> 
> 
> 
> 
> Commit: f1903004c06de13e15d3b338986dc0212485f09f
>    https://github.com/scummvm/scummvm/commit/f1903004c06de13e15d3b338986dc0212485f09f
> Author: agent-q (neil at millstone.demon.co.uk)
> Date: 2011-05-21T07:55:36-07:00
> 
> Commit Message:
> GUI: Prevent the GUI code from incorrectly reloading the theme when the builtin theme is used.
> 
> Changed paths:
>    gui/options.cpp
> 
> 
> 
> 
> Commit: 4076a0466d67d42f093e3e73a30ea48e1e1d59e9
>    https://github.com/scummvm/scummvm/commit/4076a0466d67d42f093e3e73a30ea48e1e1d59e9
> Author: agent-q (neil at millstone.demon.co.uk)
> Date: 2011-05-21T07:56:42-07:00
> 
> Commit Message:
> GUI/DS: Make 99 the maximum number of save slots displayed on the GMM load/save screens on the DS port.
> 
> Changed paths:
>    gui/saveload.cpp
> 
> 
> 
> 
> Commit: 92d0216db18c96c97bb4b57ada76cf532838cf5b
>    https://github.com/scummvm/scummvm/commit/92d0216db18c96c97bb4b57ada76cf532838cf5b
> Author: agent-q (neil at millstone.demon.co.uk)
> Date: 2011-05-21T08:01:26-07:00
> 
> Commit Message:
> Merge branch 'branch-1-3-0' of https://github.com/scummvm/scummvm into branch-1-3-0
> 
> Changed paths:
>    backends/platform/iphone/iphone_video.m
>    backends/platform/iphone/osys_events.cpp
>    backends/platform/iphone/osys_main.cpp
>    backends/platform/iphone/osys_main.h
>    backends/vkeybd/packs/vkeybd_default.zip
>    configure
>    engines/sci/console.cpp
>    engines/sci/engine/gc.cpp
>    engines/sci/engine/kscripts.cpp
>    engines/sci/engine/script.cpp
>    engines/sci/event.cpp
>    engines/sci/parser/vocabulary.cpp
>    engines/scumm/actor.cpp
>    po/ru_RU.po
>    po/uk_UA.po
> 
> 
> 
> 
> 
> ------------------------------------------------------------------------------
> What Every C/C++ and Fortran developer Should Know!
> Read this article and learn how Intel has extended the reach of its 
> next-generation tools to help Windows* and Linux* C/C++ and Fortran 
> developers boost performance applications - including clusters. 
> http://p.sf.net/sfu/intel-dev2devmay
> _______________________________________________
> Scummvm-cvs-logs mailing list
> Scummvm-cvs-logs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-cvs-logs
> 