[libcamera-devel] [PATCH v5 6/9] qcam: viewfinder_gl: use SPDX-License-Identifier in bayer_8.* shaders

[Andrey Konovalov]

Hi Paul,

Thank you for reviewing the patchset!

On 28.06.2021 13:27, paul.elder at ideasonboard.com wrote:
> Hi Andrey,
> 
> I think there should still be some changelog, even if just one line
> that's practically the same as the subject.

OK. I'll send the v5.1 version of this patch with a commit description.

Thanks,
Andrey

> On Tue, Jun 22, 2021 at 04:46:49PM +0300, Andrey Konovalov wrote:
>> Signed-off-by: Andrey Konovalov <andrey.konovalov at linaro.org>
>> ---
>>   src/qcam/assets/shader/bayer_8.frag | 25 +------------------------
>>   src/qcam/assets/shader/bayer_8.vert | 25 +------------------------
>>   2 files changed, 2 insertions(+), 48 deletions(-)
>>
>> diff --git a/src/qcam/assets/shader/bayer_8.frag b/src/qcam/assets/shader/bayer_8.frag
>> index 74a6322f..a7d65e1d 100644
>> --- a/src/qcam/assets/shader/bayer_8.frag
>> +++ b/src/qcam/assets/shader/bayer_8.frag
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: BSD-2-Clause */
>>   /*
>>   From http://jgt.akpeters.com/papers/McGuire08/
>>   
>> @@ -8,30 +9,6 @@ Morgan McGuire
>>   This paper appears in issue Volume 13, Number 4.
>>   ---------------------------------------------------------
>>   Copyright (c) 2008, Morgan McGuire. All rights reserved.
>> -
>> -Redistribution and use in source and binary forms, with or without
>> -modification, are permitted provided that the following conditions are
>> -met:
>> -
>> -    * Redistributions of source code must retain the above copyright
>> -      notice, this list of conditions and the following disclaimer.
>> -
>> -    * 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.
>> -
>> -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
>> -OWNER 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.
>>   */
>>   
>>   //Pixel Shader
>> diff --git a/src/qcam/assets/shader/bayer_8.vert b/src/qcam/assets/shader/bayer_8.vert
>> index 3354860f..347c15f7 100644
>> --- a/src/qcam/assets/shader/bayer_8.vert
>> +++ b/src/qcam/assets/shader/bayer_8.vert
>> @@ -1,3 +1,4 @@
>> +/* SPDX-License-Identifier: BSD-2-Clause */
>>   /*
>>   From http://jgt.akpeters.com/papers/McGuire08/
>>   
>> @@ -8,30 +9,6 @@ Morgan McGuire
>>   This paper appears in issue Volume 13, Number 4.
>>   ---------------------------------------------------------
>>   Copyright (c) 2008, Morgan McGuire. All rights reserved.
>> -
>> -Redistribution and use in source and binary forms, with or without
>> -modification, are permitted provided that the following conditions are
>> -met:
>> -
>> -    * Redistributions of source code must retain the above copyright
>> -      notice, this list of conditions and the following disclaimer.
>> -
>> -    * 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.
>> -
>> -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
>> -OWNER 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.
>>   */
>>   
>>   //Vertex Shader
>> -- 
>> 2.25.1
>>