[PATCH weston 00/17] Update weston from MIT/X11 to MIT/Expat license

[Bryce Harrington]

On Mon, Jun 15, 2015 at 02:21:09PM +0300, Pekka Paalanen wrote:
> Hi Bryce,
> 
> well handled.
> 
> On Fri, 12 Jun 2015 15:04:37 -0700
> Bryce Harrington <bryce at osg.samsung.com> wrote:
> 
> > Following on from the wayland license switch, do the same for Weston,
> > along with some minor cleanup.
> > 
> > Several files were *not* updated:
> > 
> >   hash.* - These include a no-advertising clause appended to the license
> >   text, which looks strange.  These files probably could be changed to
> >   the MIT Expat license, but I wasn't sure.
> 
> This seems to be like the MIT/X11 licenses mentioned here:
> http://cgit.freedesktop.org/xorg/xserver/tree/COPYING#n49
> 
> I would assume they should stay as is. They came in the Weston commit
> 11d0512ce9d90131fff9fa5b0e9d94736b210e48, but looks like the code was
> first introduced in Wayland:
> 
> commit f52e03ff473a504a9a12a98b68b9b923de664fe2
> Author: Kristian Høgsberg <krh at bitplanet.net>
> Date:   Fri Feb 26 11:42:59 2010 -0500
> 
>     Import Eric Anholts hash table implementation
>     
>     Adapted from git://people.freedesktop.org/~anholt/hash_table.
> 
> ---
> http://cgit.freedesktop.org/~anholt/hash_table/
> 
> >   rpi-bcm-stubs.h - This file is covered by the BSD 3-Clause license,
> >   which looks to me to be similar to MIT/X11.  The file looks like maybe
> >   it's copied directly from elsewhere, so I've left it as-is.
> 
> rpi-bcm-stubs.h was created by copying parts of the "userland"[1] code
> from Broadcom, so that license must remain there as it is the one the
> original source uses. This file exists for the sole purpose of being
> able to build-test the rpi-backend and rpi-renderer on common systems.
> When this file is used, it does not produce working binaries. People
> building for rpi OTOH do not use this file at all, they use the real
> headers coming with "userland".
> 
> I expect that some day we will just remove the rpi-specific code, once
> the upstream kernel DRM and Mesa support for RPi/VC4 are mature enough.
> 
> >   glmatrix.c - Unique license.  Looks like a primitive or simplified
> >   version of a MIT or BSD type license.  Since this file was copied in
> >   from Xscreensaver I left the license as is.
> 
> I'm planning to just delete all sources related to weston-screensaver,
> so glmatrix.c will be removed with that. It should be gone in the 1.9.0
> release, just hadn't had time to finish the patches.
> 
> > I think that covers all the exceptions.  For these, if their license
> > does need changed, I figure it'll be easer to handle those special cases
> > subsequently.
> > 
> > Bryce Harrington (17):
> >   COPYING: Update to MIT Expat License rather than MIT X License
> >   COPYING: Drop special license callout for libbacklight.c
> >   data: Update boilerplate from MIT X11 license to MIT Expat license
> >   clients: Update boilerplate from MIT X11 license to MIT Expat licenses
> >   *-shell: Update boilerplate from MIT X11 license to MIT Expat licenses
> >   protocol: whitespace cleanup
> >   protocol: Update boilerplate from MIT X11 license to MIT Expat license
> >   shared: Update boilerplate from MIT X11 license to MIT Expat license
> >   src: Update boilerplate from MIT X11 license to MIT Expat license
> >   libbacklight: Add missing boilerplate to header
> >   weston-egl-ext.h: Reformat license text
> >   vaapi-recorder: Drop redundant license
> >   tests: Update boilerplate from MIT X11 license to MIT Expat license
> >   wcap: Update boilerplate from MIT X11 license to MIT Expat license
> >   wcap: Prefer quote form of include for config.h
> >   xwayland: Update boilerplate from MIT X11 license to MIT Expat license
> >   xwayland: Fix a couple whitespace errors
> 
> >  166 files changed, 3043 insertions(+), 2691 deletions(-)
> > 
> 
> I like very much about standardising the exact license boilerplate
> formatting, makes it easy to verify it with diff. Looks like things in
> clients/ and desktop-shell/ use a little different line wrapping than
> the rest and libbacklight.[ch] use yet another, but no problem.
> 
> For "vaapi-recorder: Drop redundant license", I'm not really sure what
> it means if a file has two license blurbs. Does it mean it is
> dual-licensed, or does it mean it has some pieces with one license and
> other pieces with the other license? I doubt anyone is going to have a
> problem with that in this case, so I'll let that pass.

At the file level it always means dual-licensed.  I've never seen a case
where parts of a file were one license and parts were another, I'm not
even sure that's legally permitted.

But this is fairly standard.  Cairo, Firefox, and lots of other projects
are dual licensed.  When you use dual-licensed code you always have the
option of selecting one license and just using the code under it, which
is essentially all we're doing here.

> All 17 patches in this series are:
> Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> 
> 
> One missed file: protocol/text.xml

Thanks for the review.  Will catch the wayward one in a follow up.

Bryce

> Thanks,
> pq
> 
> [1] https://github.com/raspberrypi/userland