[PATCH v3 1/2] common-licenses: Add GPL-3.0-with-bison-exception

[PATCH v3 1/2] common-licenses: Add GPL-3.0-with-bison-exception

[Jose Quaresma]

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
 meta/files/common-licenses/GPL-3-with-bison-exception | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 meta/files/common-licenses/GPL-3-with-bison-exception

diff --git a/meta/files/common-licenses/GPL-3-with-bison-exception b/meta/files/common-licenses/GPL-3-with-bison-exception
new file mode 100644
index 0000000000..d48c6241ac
--- /dev/null
+++ b/meta/files/common-licenses/GPL-3-with-bison-exception
@@ -0,0 +1,7 @@
+
+insert GPL v3 text here
+
+Bison Exception
+As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn`t itself a parser generator using the skeleton or a modified version thereof as a parser skeleton. Alternatively, if you modify or redistribute the parser skeleton itself, you may (at your option) remove this special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception.
+This special exception was added by the Free Software Foundation in version 2.2 of Bison.
+
-- 
2.30.0

[PATCH v3 2/2] glslang: upgrade 8.13.3743 -> 11.1.0

[Jose Quaresma]

License-Update: Add additional licenses

- [1] BSD-2-Clause & MIT & Apache-2.0
- [2] GPL-3-with-bison-exception

[1] https://github.com/KhronosGroup/glslang/commit/2962be40baff69848fd786c609289666b60741b8
[2] https://github.com/KhronosGroup/glslang/commit/14a2cfbc72f2bb2e060fdfe3fbe6a4d54e3817a8

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
 .../glslang/{glslang_8.13.3743.bb => glslang_11.1.0.bb}   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/glslang/{glslang_8.13.3743.bb => glslang_11.1.0.bb} (73%)

diff --git a/meta/recipes-graphics/glslang/glslang_8.13.3743.bb b/meta/recipes-graphics/glslang/glslang_11.1.0.bb
similarity index 73%
rename from meta/recipes-graphics/glslang/glslang_8.13.3743.bb
rename to meta/recipes-graphics/glslang/glslang_11.1.0.bb
index 2c4f4be5a2..eb37683abf 100644
--- a/meta/recipes-graphics/glslang/glslang_8.13.3743.bb
+++ b/meta/recipes-graphics/glslang/glslang_11.1.0.bb
@@ -5,15 +5,15 @@ of the specifications for these languages. It is open and free for anyone to use
 either from a command line or programmatically."
 SECTION = "graphics"
 HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=918e668376010a04448a312fb37ae69b"
+LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229"
 
-SRCREV = "e05cc20ec20a154d94256c744a3837c23719c0f9"
+SRCREV = "c594de23cdd790d64ad5f9c8b059baae0ee2941d"
 SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
 S = "${WORKDIR}/git"
 
-PV = "8.13.3743+git${SRCPV}"
+PV = "11.1.0"
 
 inherit cmake python3native
 
-- 
2.30.0

Re: [OE-core] [PATCH v3 2/2] glslang: upgrade 8.13.3743 -> 11.1.0

[Richard Purdie]

On Fri, 2021-01-22 at 09:30 +0000, Jose Quaresma wrote:
> License-Update: Add additional licenses
> 
> - [1] BSD-2-Clause & MIT & Apache-2.0
> - [2] GPL-3-with-bison-exception
> 
> [1] https://github.com/KhronosGroup/glslang/commit/2962be40baff69848fd786c609289666b60741b8
> [2] https://github.com/KhronosGroup/glslang/commit/14a2cfbc72f2bb2e060fdfe3fbe6a4d54e3817a8
> 
> Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
> ---
>  .../glslang/{glslang_8.13.3743.bb => glslang_11.1.0.bb}   | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>  rename meta/recipes-graphics/glslang/{glslang_8.13.3743.bb => glslang_11.1.0.bb} (73%)

I think this may be breaking shaderc-natve:

https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/2982
and many more

(see
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1776
)

Cheers,

Richard

Re: [OE-core] [PATCH v3 2/2] glslang: upgrade 8.13.3743 -> 11.1.0

[Jose Quaresma]

[-- Attachment #1: Type: text/plain, Size: 1163 bytes --]

Sorry for that!

I need to look more deeply on that.

Richard Purdie <richard.purdie@linuxfoundation.org> escreveu no dia sexta,
22/01/2021 à(s) 11:30:

> On Fri, 2021-01-22 at 09:30 +0000, Jose Quaresma wrote:
> > License-Update: Add additional licenses
> >
> > - [1] BSD-2-Clause & MIT & Apache-2.0
> > - [2] GPL-3-with-bison-exception
> >
> > [1]
> https://github.com/KhronosGroup/glslang/commit/2962be40baff69848fd786c609289666b60741b8
> > [2]
> https://github.com/KhronosGroup/glslang/commit/14a2cfbc72f2bb2e060fdfe3fbe6a4d54e3817a8
> >
> > Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
> > ---
> >  .../glslang/{glslang_8.13.3743.bb => glslang_11.1.0.bb}   | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >  rename meta/recipes-graphics/glslang/{glslang_8.13.3743.bb =>
> glslang_11.1.0.bb} (73%)
>
> I think this may be breaking shaderc-natve:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/2982
> and many more
>
> (see
> https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1776
> )
>
> Cheers,
>
> Richard
>
>

-- 
best regards,
José Quaresma

[-- Attachment #2: Type: text/html, Size: 2549 bytes --]

Re: [OE-core] [PATCH v3 2/2] glslang: upgrade 8.13.3743 -> 11.1.0

[Jose Quaresma]

[-- Attachment #1: Type: text/plain, Size: 1464 bytes --]

I have send a V4 with the fixes for the shaderc-natve.

Jose Quaresma via lists.openembedded.org <quaresma.jose=
gmail.com@lists.openembedded.org> escreveu no dia sexta, 22/01/2021 à(s)
11:55:

> Sorry for that!
>
> I need to look more deeply on that.
>
> Richard Purdie <richard.purdie@linuxfoundation.org> escreveu no dia
> sexta, 22/01/2021 à(s) 11:30:
>
>> On Fri, 2021-01-22 at 09:30 +0000, Jose Quaresma wrote:
>> > License-Update: Add additional licenses
>> >
>> > - [1] BSD-2-Clause & MIT & Apache-2.0
>> > - [2] GPL-3-with-bison-exception
>> >
>> > [1]
>> https://github.com/KhronosGroup/glslang/commit/2962be40baff69848fd786c609289666b60741b8
>> > [2]
>> https://github.com/KhronosGroup/glslang/commit/14a2cfbc72f2bb2e060fdfe3fbe6a4d54e3817a8
>> >
>> > Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
>> > ---
>> >  .../glslang/{glslang_8.13.3743.bb => glslang_11.1.0.bb}   | 8 ++++----
>> >  1 file changed, 4 insertions(+), 4 deletions(-)
>> >  rename meta/recipes-graphics/glslang/{glslang_8.13.3743.bb =>
>> glslang_11.1.0.bb} (73%)
>>
>> I think this may be breaking shaderc-natve:
>>
>> https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/2982
>> and many more
>>
>> (see
>> https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/1776
>> )
>>
>> Cheers,
>>
>> Richard
>>
>>
>
> --
> best regards,
> José Quaresma
>
> 
>
>

-- 
best regards,
José Quaresma

[-- Attachment #2: Type: text/html, Size: 3318 bytes --]