[SCM] gmerlin-avdecoder/master: Update copyright (still BSD-4 flaws to workout, though).

[Burkhard Plaum]

Hi,

Am 10.12.2010 11:30, schrieb IOhannes m zmölnig:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 12/10/2010 09:53 AM, Jonas Smedegaard wrote:
>>
>>> Much better would be if upstream (Burkhard) used one of the New BSD or
>>> GPL'ed version of this file, like:
>>> http://svn.freebsd.org/viewvc/base/head/sys/libkern/inet_aton.c
>>> http://doxygen.postgresql.org/inet__aton_8c-source.html
>>
>> Yes.
>
> definitely.
>
>>
>> We _must_ rip out the BSD-4 licensed code from our source.  We _can_
>> simply rip it out, and then add a Debian-specific patch reapplying one
>> of those alternative files,
>
>
> i don't see the need for that, as this file is only needed if and only
> if the system does not provide an inet_aton itself (currently i can only
> check on linux (not kFreeBSD or hurd), and libc6 does come with an
> implementation.
>
> so the file is not needed, and no replacement is needed.
> we need not ship the file, and be save and happy.
>
>> but would be much better if upstream did it.
>
>
> which still holds true, as in this case we won't even need to exclude an
> offending file, but just take upstream as it is.
>
>
> the main problem i do see now is, that the offending code has been
> copied into a separate file but not moved (it still exists in a cre
> component that we cannot exclude)

Well, I deleted the inet_aton() code from os.c yesterday:

http://gmerlin.cvs.sourceforge.net/viewvc/gmerlin/gmerlin_avdecoder/lib/os.c?r1=1.3&r2=1.4

And also os.c can be kicked out as well since it contains only a poll() implementation,
which is available in glibc.

I think just patching 2 files out of Makefile.am should already do the trick.

Burkhard