diff mbox series

[10/15] glslang: mark 0001-generate-glslang-pkg-config.patch as Inappropriate

Message ID 20240619085957.2787700-10-alex.kanavin@gmail.com
State Accepted, archived
Commit e65af6571ad49d914c788b73f678e3565faac69e
Headers show
Series [01/15] perf: drop newt from tui build requirements | expand

Commit Message

Alexander Kanavin June 19, 2024, 8:59 a.m. UTC
From: Alexander Kanavin <alex@linutronix.de>

Issue is already being independently fixed upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../glslang/glslang/0001-generate-glslang-pkg-config.patch      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jose Quaresma June 19, 2024, 9:33 a.m. UTC | #1
Hi Alex

Alexander Kanavin via lists.openembedded.org <alex.kanavin=
gmail.com@lists.openembedded.org> escreveu (quarta, 19/06/2024 à(s) 10:00):

> From: Alexander Kanavin <alex@linutronix.de>
>
> Issue is already being independently fixed upstream.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../glslang/glslang/0001-generate-glslang-pkg-config.patch      | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git
> a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
> b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
> index e6bb6ec8e3c..5001d631443 100644
> ---
> a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
> +++
> b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
> @@ -5,7 +5,7 @@ Subject: [PATCH] generate glslang pkg-config
>
>  Based on
> https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch
>
> -Upstream-Status: Pending
> +Upstream-Status: Inappropriate [independently developed patch submitted
> at https://github.com/KhronosGroup/glslang/pull/3371]
>

Maybe we can switch to the upstream submission. It is mostly the same with
the exception of the -lHLSL -lSPVRemapper we have in yocto.

Jose


>
>  Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
>  ---
> --
> 2.39.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#200896):
> https://lists.openembedded.org/g/openembedded-core/message/200896
> Mute This Topic: https://lists.openembedded.org/mt/106757095/5052612
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Alexander Kanavin June 19, 2024, 9:37 a.m. UTC | #2
On Wed, 19 Jun 2024 at 11:34, Jose Quaresma <quaresma.jose@gmail.com> wrote:
>> -Upstream-Status: Pending
>> +Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371]
>
>
> Maybe we can switch to the upstream submission. It is mostly the same with the exception of the -lHLSL -lSPVRemapper we have in yocto.

We can't because it hardcodes usr/lib and usr/include. I left a
comment in the PR asking to fix that.

Alex
Ross Burton June 19, 2024, 3:35 p.m. UTC | #3
> On 19 Jun 2024, at 10:37, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote:
> 
> On Wed, 19 Jun 2024 at 11:34, Jose Quaresma <quaresma.jose@gmail.com> wrote:
>>> -Upstream-Status: Pending
>>> +Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371]
>> 
>> 
>> Maybe we can switch to the upstream submission. It is mostly the same with the exception of the -lHLSL -lSPVRemapper we have in yocto.
> 
> We can't because it hardcodes usr/lib and usr/include. I left a
> comment in the PR asking to fix that.

I can’t see that comment in the PR…

Ross
Alexander Kanavin June 19, 2024, 3:40 p.m. UTC | #4
On Wed, 19 Jun 2024 at 17:35, Ross Burton <Ross.Burton@arm.com> wrote:
> >>> +Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371]
> >>
> >>
> >> Maybe we can switch to the upstream submission. It is mostly the same with the exception of the -lHLSL -lSPVRemapper we have in yocto.
> >
> > We can't because it hardcodes usr/lib and usr/include. I left a
> > comment in the PR asking to fix that.
>
> I can’t see that comment in the PR…

It's right at the bottom. Visible here as well:
https://github.com/KhronosGroup/glslang/pull/3371/files


Alex
Jose Quaresma June 19, 2024, 3:51 p.m. UTC | #5
Alexander Kanavin via lists.openembedded.org <alex.kanavin=
gmail.com@lists.openembedded.org> escreveu (quarta, 19/06/2024 à(s) 16:40):

> On Wed, 19 Jun 2024 at 17:35, Ross Burton <Ross.Burton@arm.com> wrote:
> > >>> +Upstream-Status: Inappropriate [independently developed patch
> submitted at https://github.com/KhronosGroup/glslang/pull/3371]
> > >>
> > >>
> > >> Maybe we can switch to the upstream submission. It is mostly the same
> with the exception of the -lHLSL -lSPVRemapper we have in yocto.
> > >
> > > We can't because it hardcodes usr/lib and usr/include. I left a
> > > comment in the PR asking to fix that.
> >
> > I can’t see that comment in the PR…
>
> It's right at the bottom. Visible here as well:
> https://github.com/KhronosGroup/glslang/pull/3371/files


I can't see it either, maybe it's in private mode


>
>
>
> Alex
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#200918):
> https://lists.openembedded.org/g/openembedded-core/message/200918
> Mute This Topic: https://lists.openembedded.org/mt/106757095/5052612
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Ross Burton June 19, 2024, 4:35 p.m. UTC | #6
> On 19 Jun 2024, at 16:40, Alexander Kanavin <alex.kanavin@gmail.com> wrote:
> 
> On Wed, 19 Jun 2024 at 17:35, Ross Burton <Ross.Burton@arm.com> wrote:
>>>>> +Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371]
>>>> 
>>>> 
>>>> Maybe we can switch to the upstream submission. It is mostly the same with the exception of the -lHLSL -lSPVRemapper we have in yocto.
>>> 
>>> We can't because it hardcodes usr/lib and usr/include. I left a
>>> comment in the PR asking to fix that.
>> 
>> I can’t see that comment in the PR…
> 
> It's right at the bottom. Visible here as well:
> https://github.com/KhronosGroup/glslang/pull/3371/files

Did you press Start a Review?  You need to submit the review (this is so you can incrementally review a PR and send all the comments in one go, instead of spamming people’s inbox).

Ross
Alexander Kanavin June 19, 2024, 4:51 p.m. UTC | #7
On Wed, 19 Jun 2024 at 18:35, Ross Burton <Ross.Burton@arm.com> wrote:
> > It's right at the bottom. Visible here as well:
> > https://github.com/KhronosGroup/glslang/pull/3371/files
>
> Did you press Start a Review?  You need to submit the review (this is so you can incrementally review a PR and send all the comments in one go, instead of spamming people’s inbox).


Done now.

Alex
diff mbox series

Patch

diff --git a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
index e6bb6ec8e3c..5001d631443 100644
--- a/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
+++ b/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch
@@ -5,7 +5,7 @@  Subject: [PATCH] generate glslang pkg-config
 
 Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch
 
-Upstream-Status: Pending
+Upstream-Status: Inappropriate [independently developed patch submitted at https://github.com/KhronosGroup/glslang/pull/3371]
 
 Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
 ---