[Beignet] [PATCH] Update LunarGLASS copyright.
Matt Turner
mattst88 at gmail.com
Thu Sep 4 21:19:33 PDT 2014
On Thu, Sep 4, 2014 at 7:25 PM, Yang Rong <rong.r.yang at intel.com> wrote:
> LunarGLASS have update his copyright, so update the copyright in llvm_scalarize.cpp.
>
> Signed-off-by: Yang Rong <rong.r.yang at intel.com>
> ---
> backend/src/llvm/llvm_scalarize.cpp | 44 ++++++++++++++++++++++++-------------
> 1 file changed, 29 insertions(+), 15 deletions(-)
>
> diff --git a/backend/src/llvm/llvm_scalarize.cpp b/backend/src/llvm/llvm_scalarize.cpp
> index 5c14012..030939a 100644
> --- a/backend/src/llvm/llvm_scalarize.cpp
> +++ b/backend/src/llvm/llvm_scalarize.cpp
> @@ -1,4 +1,4 @@
> -;/*
> +/*
> * Copyright © 2012 Intel Corporation
> *
> * This library is free software; you can redistribute it and/or
> @@ -20,28 +20,42 @@
> * \author Yang Rong <rong.r.yang at intel.com>
> *
> * This file is derived from:
> - * https://code.google.com/p/lunarglass/source/browse/trunk/Core/Passes/Transforms/Scalarize.cpp?r=605
> + * https://code.google.com/p/lunarglass/source/browse/trunk/Core/Passes/Transforms/Scalarize.cpp?r=903
> */
>
> //===- Scalarize.cpp - Scalarize LunarGLASS IR ----------------------------===//
> //
> // LunarGLASS: An Open Modular Shader Compiler Architecture
> -// Copyright (C) 2010-2011 LunarG, Inc.
> +// Copyright (C) 2010-2014 LunarG, Inc.
> //
> -// This program is free software; you can redistribute it and/or
> -// modify it under the terms of the GNU General Public License
> -// as published by the Free Software Foundation; version 2 of the
> -// License.
> +// Redistribution and use in source and binary forms, with or without
> +// modification, are permitted provided that the following conditions
> +// are met:
> //
> -// This program is distributed in the hope that it will be useful,
> -// but WITHOUT ANY WARRANTY; without even the implied warranty of
> -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> -// GNU General Public License for more details.
> +// Redistributions of source code must retain the above copyright
> +// notice, this list of conditions and the following disclaimer.
> //
> -// You should have received a copy of the GNU General Public License
> -// along with this program; if not, write to the Free Software
> -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> -// 02110-1301, USA.
> +// Redistributions in binary form must reproduce the above
> +// copyright notice, this list of conditions and the following
> +// disclaimer in the documentation and/or other materials provided
> +// with the distribution.
> +//
> +// Neither the name of LunarG Inc. nor the names of its
> +// contributors may be used to endorse or promote products derived
> +// from this software without specific prior written permission.
> +//
> +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
> +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
> +// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
> +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
> +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
> +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
> +// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
> +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> +// POSSIBILITY OF SUCH DAMAGE.
> //
> //===----------------------------------------------------------------------===//
> //
> --
I don't know that this is sufficient. The version of the code you
imported was GPLv2. They've updated the code since then and changed
the license. I don't think you can just take the old code under the
new license, more permissive or not.
Just reimport the new BSD licensed code.
More information about the Beignet
mailing list