Fix the version command

[GoogleCodeExporter]

Actually the LiveForIt binary have this wrong format:

"MPlayer for AmigaOS4-SVN-rSVN-r32634-4.2.4"

But it should have this format instead:

"MPlayer for AmigaOS4-SVN-r32634-4.2.4"

Original issue reported on code.google.com by s.hawam...@gmail.com on 21 May 2014 at 11:26

[GoogleCodeExporter]

No, this correct format I explain.

SVN is r32634
rSVN is 4.2.4

But there are only two numbers in Amiga version numbers, so rSVN should be: 
4.24 for AmigaOS.

Correct format for AmigaOS should be.

Mplayer 4.24 (dd.m.yyy)

or 

LiveForIt-Mplayer 5.1 (dd.m.yy)

As the rSVN number does not increase so often on AmigaOS, as its the offical 
version of mplayer number or some thing like that, its not so often we merge 
whit the offical Mplayer SVN.

Original comment by kjetil.h...@gmail.com on 28 May 2014 at 3:16

[GoogleCodeExporter]

Fixed in R79

Original comment by kjetil.h...@gmail.com on 28 May 2014 at 5:18

• Changed state: Fixed

[GoogleCodeExporter]

@LiveForIt

> No, this correct format I explain.
> SVN is r32634
> rSVN is 4.2.4

Yes, the "SVN" is the current MPlayer revision and it's ok, but the "rSVN" for 
the GCC version used is incorrect because it isn't an SVN release at all !

GCC 4.2.4 is a "final" version

> But there are only two numbers in Amiga version
> numbers, so rSVN should be: 4.24 for AmigaOS.

Again this will be plain wrong and even worse than before, because "4.24" means 
nothing and will only got more confusion to the users, GCC is currently at 
version 4.2.4 and this will be 100% understable as is, but refer to it as 
"4.24" will be not clear at all

> Correct format for AmigaOS should be.
> Mplayer 4.24 (dd.m.yyy)

You right on this, adding a date would be better
Altrough it would be better to use an extended date like this: (dd.mm.yyyy)

> LiveForIt-Mplayer 5.1 (dd.m.yy)

But the target wasn't to merge all the MPlayer in just one ??
If you add a "LiveForIt" reference into it, it means you will separate your 
version to the others .. mate it's a nonsense !

> As the rSVN number does not increase so often on AmigaOS, as its the offical
> version of mplayer number or some thing like that, its not so often we merge 
whit > the offical Mplayer SVN.

Yep, current official MPlayer is more or less referred as 1.1 or similar, so in 
most case we mostly refer to it with its revision number instead, for example 
"r32634" and so on ..

In our case we also added (in internal version) the CGG compiler used to 
compile it and the term "AmigaOS"

So let's refrain again :-))

How about use this combination ?

"MPlayer for AmigaOS4-SVN-r32634-4.2.4 (dd.mm.yyyy)"

Original comment by s.hawam...@gmail.com on 28 May 2014 at 6:26

[GoogleCodeExporter]

> How about use this combination ?
>
> "MPlayer for AmigaOS4-SVN-r32634-4.2.4 (dd.mm.yyyy)"

That's no valid AmigaOS version string at all.
http://wiki.amigaos.net/wiki/UI_Style_Guide_Shell#Embedded_Version_IDs

Spaces in the name are not allowed, and there has to be a version.revision.

The SVN revision could be put into the comment part (everything after the date 
and a new line char) of the version string which is displayed by "Version 
MPlayer FULL", for example
"$VER: MPlayer 5.1 (dd.mm.yyyy)\nAmigaOS4-SVN-r32634-4.2.4" or "$VER: 
MPlayer-AmigaOS4 5.1 (dd.mm.yyyy)\nSVN-r32634-4.2.4".

Original comment by strohma...@gmail.com on 28 May 2014 at 7:20

[GoogleCodeExporter]

@Samo79

>But the target wasn't to merge all the MPlayer in just one ??

Ka1e has made comment saying he can't commit any of code to repo because he 
respects FAB.

>If you add a "LiveForIt" reference into it, 
>it means you will separate your version to the others .. mate it's a nonsense !

Its just a “prefix” so you can see hows responsible for the build, all my 
changes are going into the REPO, any one can build there own version of this 
mplayer.

Lets say that Jon, Peter and Jesus builds there own versions, how are you going 
to know what version your using?

And if they do build there own version I hope they change the version number 
and the “prefix”, so we know who compiled it.
Strohmayer has been compiling from a different REPO for long time now.

Original comment by kjetil.h...@gmail.com on 28 May 2014 at 8:51

• Changed state: Started

[GoogleCodeExporter]

@strohmayer 

Yes that looks like a better idea.

Original comment by kjetil.h...@gmail.com on 28 May 2014 at 8:55

[GoogleCodeExporter]

Original comment by kjetil.h...@gmail.com on 28 May 2014 at 9:15

[GoogleCodeExporter]

[deleted comment]

[GoogleCodeExporter]

@LiveForIt

> Kas1e has made comment saying he can't commit any of
> code to repo because he respects FAB.

I didn't count the MUI version (i know that Fab doesn't want it), I meant a 
merge with the old Andrea version and of course with the latest driver from 
Joerg ..
That's why i suggest you to don't use any "LiveForIt" nor any "number" 
reference in your version command

> Its just a “prefix” so you can see hows responsible for the build, all my 
changes > are going into the REPO, any one can build there own version of this 
mplayer.

But it's exactly what we should avoid :-)
We doesn't need a new version whenever a programmer wakes up in the morning, we 
need a unique version (just 1 !) when eventually others can collaborate to 
improve it and nothing else

We already have a second version and it's the MUI one developed by Fab, it's a 
shame we can have it into the current repository, but that's the life and we 
can't force him to do so ... but atleast we can have a unique release for all 
the other codes 

@Joerg

> That's no valid AmigaOS version string at all.
> http://wiki.amigaos.net/wiki/UI_Style_Guide_Shell#Embedded_Version_IDs

Ok right.

LiveForIt, Joerg, what do you think about this:

"$VER: MPlayer for AmigaOS4 (dd.mm.yyyy)\nSVN-r32634-4.2.4"

Original comment by s.hawam...@gmail.com on 2 Jun 2014 at 7:52

[GoogleCodeExporter]

I have a couple of comments:

- I agree with Joerg to not use spaces in the project's name, and in general to 
follow the Amiga guideline for the embedded versioning. I'd suggest to name the 
program as the project's name, i.e. "MPlayer-AmigaOS", so that anyone will find 
out that if an MPlayer binary has that name it means it has been compiled from 
the sources on this repository. I wouldn't put any reference on the AmigaOS 
version, as my intention for this repository was to merge all the work done for 
AmigaOS-like systems as well, especially AROS. "MPlayer-AmigaOS" under AROS 
would make sense, "MPlayer-AmigaOS4" not IMHO.

- If anyone would really like to make its own custom version, he's free to do 
so, he should add his prefix to "MPlayer". On the repository I'd anyway keep 
the official name without any prefix: for the official compiles, available 
here, it shouldn't matter who has done the compile.

- For the versioning, I'd start with 1.00, since that would be the first 
version of MPlayer-AmigaOS. I'd raise the major revision number for *major* 
revisions, e.g. when/if all the video drivers will have to be rewritten (for 
any reason).

Original comment by varthal...@gmail.com on 3 Jun 2014 at 11:52

[GoogleCodeExporter]

I don't know how to detect AROS/AmigaOS in the SH script, there are no AROS 
version merged in this SVN yet, and its not a issue unless some starts to build 
nightly builds and some how files get mixed up.

In any case mplayer for AROS should be called mplayer-aros v.v (n.n) nn.n.nnnn 
not mplayer-amigaos v.v (n.n) nn.n.nnnn

Unless someone else is going to change it, I consider this thing solved.
I suggest starting from the last version Andrea used, when all features are 
added.

See R82 for changes.

Original comment by kjetil.h...@gmail.com on 13 Jun 2014 at 5:06

[GoogleCodeExporter]

Original comment by kjetil.h...@gmail.com on 13 Jun 2014 at 5:06

• Changed state: Fixed