ScummVM bump version to 1.9.0

[Begasus]

No description provided.

[fbrosson]

I think that adding a .in suffix to the template rdef file might be a good idea.
Of course, you would need to change the last line of the sed command to:

        $portDir/additional-files/scummvm.rdef.in > scummvm.rdef

and update:

ADDITIONAL_FILES="scummvm.rdef.in"

For your convenience, here are the steps to rename the rdef file:

cd /path/to/haikuports/games-engines/scummvm/additional-files
git mv scummvm.rdef scummvm.rdef.in
git commit --amend scummvm.rdef scummvm.rdef.in

What about a last tiny change:

HOMEPAGE="https://www.scummvm.org/"

(Please don't forget the trailing slash ;-)
Thanks!

[Begasus]

Thanks for the reply, will try to change it today, ps, do I also need to "git add" the recipe before committing?

[fbrosson]

Thanks for the reply, will try to change it today,

Cool!

ps, do I also need to "git add" the recipe before committing?

No, you don't need to "git add" because you have already run:

git mv scummvm_tools-1.8.0.recipe scummvm_tools-1.9.0.recipe

which has the same effect of:

cp scummvm_tools-1.8.0.recipe foobar
git rm scummvm_tools-1.8.0.recipe
mv foobar scummvm_tools-1.9.0.recipe
git add scummvm_tools-1.9.0.recipe

Of course, in all cases one still needs to:

git commit --amend scummvm_tools-1.8.0.recipe scummvm_tools-1.9.0.recipe

(which you did, correctly.)

[fbrosson]

Oops, you don't need to "git add" the recipe, but you still need to "git commit" it (after every change).

[Begasus]

@fbrosson I got the emails from you over github in regards to my master branch (but I can't see them here in the list) :)
To start with, I have one checkout "haikuports" where I do my work in, then I have a checkout for "haikuports_games" where copy the files that have been changed into before pushing them to git.
My master on "haikuports_games" isn't uptodate I know, and as you mentioned that was probably what went wrong here.
I'll try to update with the guideliness you mentioned in the email, I just checked your first line:
both give me the same output:

~/haikuports> git remote -v | grep haikuports/haikuports
origin https://github.com/haikuports/haikuports.git (fetch)
origin https://github.com/haikuports/haikuports.git (push)

~/haikuport_games> git remote -v | grep haikuports/haikuports
origin https://github.com/haikuports/haikuports.git (fetch)
origin https://github.com/haikuports/haikuports.git (push)

[fbrosson]

OK, I see. You have cloned your repo twice. Having two copies of a repo won't break anything, but you should really drop one of them and refresh the other one. Git will never require that you have more than one clone for a given repo. Doing so will only make things harder to track and require more work.

[fbrosson]

The second grep I was interested in was:

git remote -v | grep Begasus/haikuports

Your "origin" alias should point to your copy, not to the main repo.
To fix this you should:

git remote set-url origin https://github.com/Begasus/haikuports.git

(EDIT: Sorry, I had previously written haikuporter.git instead of haikuports.git !!! It's fixed now.)

After that,

git remote -v | grep Begasus/haikuports

should yeld:

origin https://github.com/Begasus/haikuports.git (fetch)
origin https://github.com/Begasus/haikuports.git (push)

You will also need to:

git remote add upstream https://github.com/haikuports/haikuports.git

(EDIT: Sorry, I had previously written haikuporter.git instead of haikuports.git !!! It's fixed now.)

in order to pull what other contributors push to the main repo.
And to refresh your local master:

git checkout master
git pull upstream master

Then, to push your local master to your remote clone:

git checkout master
git push

(of course, if you are already on your master branch, you can skip the "git checkout master".)

[fbrosson]

To summarize, if you are inside your haikuports tree, then

git remote -v

should yeld:

origin  https://github.com/Begasus/haikuports.git (fetch)
origin  https://github.com/Begasus/haikuports.git (push)
upstream    https://github.com/haikuports/haikuports.git (fetch)
upstream    https://github.com/haikuports/haikuports.git (push)

If you don't get this then you should follow the instructions in the previous message.

[fbrosson]

I got the emails from you over github in regards to my master branch (but I can't see them here in the list) :)

Sorry, I was feeling guilty for having added so much crap to this PR, so I removed my comments after I fixed the conflict.
BTW, the steps to fix the conflict on your side would have been:

1. to revert the change about the renaming of the rdef file, probably with "git reset scummvm.rdef" and "git rm scummvm.rdef.in".
2. then merge master and rebase:

git fetch upstream master
git merge --no-edit upstream/master
git rebase upstream/master

3. Redo the rename and then push your local branch to your remote branch:

git mv scummvm.rdef scummvm.rdef.in
git commit --amend --no-edit scummvm.rdef scummvm.rdef.in
git push -f

This would only have worked, however, if you had your origin and upstream alias correctly set.

[Begasus]

Updated, hope things are ok now :-)

[fbrosson]

@Begasus, I've fixed the conflict because it was partially my fault: it would not have happened if I had not suggested to rename scummvm.rdef to scummvm.rdef.in.
So sorry for the trouble and thanks for your update.
(I've removed all the noise I had added to this PR ;-)

BTW, please don't delete your remote branch on GitHub yet, because the PR is not merged yet.
(I tried to build it but it has too many dependencies which I have not built yet, so I hope someone else will test your recipe and merge this PR ;-)

[Begasus]

@fbrosson most of them are on the recipes on haikuporter (dependencies) if you are missing one please let me know :) ps, thanks for the help so far!

[Begasus]

@fbrosson checked again with your comments ...

~/haikuport_games> git remote -v | grep Begasus/haikuports
github https://github.com/Begasus/haikuports.git (fetch)
github https://github.com/Begasus/haikuports.git (push)
I know that I had to use github to "push" upstream if that makes sense ...

[Begasus]

PS, not going to mess around in git before things are settled here ;)

[fbrosson]

most of them are on the recipes on haikuporter (dependencies) if you are missing one please let me know :) ps, thanks for the help so far!

I'm quite sure nothing is missing. What I meant (in one of my previous messages) was that I had not taken the time to build (from their haikuports recipes) all the dependencies required by scummvm or scummvm-tools.

~/haikuport_games> git remote -v | grep Begasus/haikuports
github https://github.com/Begasus/haikuports.git (fetch)
github https://github.com/Begasus/haikuports.git (push)

OK, I understand now. You call your GitHub remote repo "github" while I call mine "origin". I think most users call theirs "origin", but I guess this does not make much difference.

PS, not going to mess around in git before things are settled here ;)

No problem ;-)
BTW, I'm not going to merge this PR myself because I haven't tested it yet. That said, the commit looks good to me.
If anyone else has already tested (or is willing to), then please do not hesitate to merge ;-)
Thanks!

[humdingerb]

The first two times I had haikuporter build scummvm, it stopped with an error (see http://sprunge.us/DNIU and http://sprunge.us/BUHA). The third time worked. Then I did a "-c" and the forth build also worked...
I guess it's OK.

[Begasus]

ScummVM is already on their website (https://www.scummvm.org), if someone gets a chance to check it out ... (would be great) :)