[PATCH 1/3] libsndfile1: correct upstream version check

[PATCH 1/3] libsndfile1: correct upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb
index 8430dee103..9f1a106600 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.31.bb
@@ -10,6 +10,7 @@ LICENSE = "LGPL-2.1-only"
 
 SRC_URI = "https://github.com/libsndfile/libsndfile/releases/download/${PV}/libsndfile-${PV}.tar.bz2 \
           "
+UPSTREAM_CHECK_URI = "https://github.com/libsndfile/libsndfile/releases/"
 
 SRC_URI[md5sum] = "3f3b2a86a032f064ef922a2c8c191f7b"
 SRC_URI[sha256sum] = "a8cfb1c09ea6e90eff4ca87322d4168cdbe5035cb48717b40bf77e751cc02163"
-- 
2.30.2

[PATCH 2/3] libarchive: correct upstream version check

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-extended/libarchive/libarchive_3.6.0.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-extended/libarchive/libarchive_3.6.0.bb b/meta/recipes-extended/libarchive/libarchive_3.6.0.bb
index 31bc82515a..f078c8ad03 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.6.0.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.6.0.bb
@@ -33,6 +33,7 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd,"
 EXTRA_OECONF += "--enable-largefile"
 
 SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
+UPSTREAM_CHECK_URI = "http://libarchive.org/"
 
 SRC_URI[sha256sum] = "a36613695ffa2905fdedc997b6df04a3006ccfd71d747a339b78aa8412c3d852"
 
-- 
2.30.2

[PATCH 3/3] glslang/spirv: synchronize with the rest of vulkan items

[Alexander Kanavin]

These components are now versioned in sync with vulkan releases.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../glslang/{glslang_11.8.0.bb => glslang_1.3.204.0.bb}    | 5 +++--
 .../{spirv-headers_1.5.4.bb => spirv-headers_1.3.204.0.bb} | 4 ++--
 .../{spirv-tools_2022.1.bb => spirv-tools_1.3.204.0.bb}    | 7 ++++---
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename meta/recipes-graphics/glslang/{glslang_11.8.0.bb => glslang_1.3.204.0.bb} (90%)
 rename meta/recipes-graphics/spir/{spirv-headers_1.5.4.bb => spirv-headers_1.3.204.0.bb} (88%)
 rename meta/recipes-graphics/spir/{spirv-tools_2022.1.bb => spirv-tools_1.3.204.0.bb} (89%)

diff --git a/meta/recipes-graphics/glslang/glslang_11.8.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.204.0.bb
similarity index 90%
rename from meta/recipes-graphics/glslang/glslang_11.8.0.bb
rename to meta/recipes-graphics/glslang/glslang_1.3.204.0.bb
index a77d8bdf88..2af406212f 100644
--- a/meta/recipes-graphics/glslang/glslang_11.8.0.bb
+++ b/meta/recipes-graphics/glslang/glslang_1.3.204.0.bb
@@ -8,10 +8,11 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
 LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
 
-SRCREV = "c34bb3b6c55f6ab084124ad964be95a699700d34"
+SRCREV = "2742e959347ae2fac58acd0d022c92a0ff1f24bf"
 SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \
            file://0001-generate-glslang-pkg-config.patch"
-UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
+PE = "1"
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"
 
 inherit cmake python3native
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.204.0.bb
similarity index 88%
rename from meta/recipes-graphics/spir/spirv-headers_1.5.4.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.3.204.0.bb
index 3144b1eb42..72416b441f 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.204.0.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
 SRCREV = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
-UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
+PE = "1"
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"
-PV .= "+git${SRCPV}"
 
 inherit cmake
 
diff --git a/meta/recipes-graphics/spir/spirv-tools_2022.1.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.204.0.bb
similarity index 89%
rename from meta/recipes-graphics/spir/spirv-tools_2022.1.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.3.204.0.bb
index 24142a4fe0..dc78073717 100644
--- a/meta/recipes-graphics/spir/spirv-tools_2022.1.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.204.0.bb
@@ -7,9 +7,10 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "b1877de5cd776117050bd42f08d04b52bce16099"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
-UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
+SRCREV = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=stable;protocol=https"
+PE = "1"
+UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"
 
 inherit cmake python3native
-- 
2.30.2

Re: [OE-core] [PATCH 3/3] glslang/spirv: synchronize with the rest of vulkan items

[Jose Quaresma]

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

Hi Alexander,

Is it possible to add a reference on the commit message for this change?

Jose

Alexander Kanavin <alex.kanavin@gmail.com> escreveu no dia quinta,
3/03/2022 à(s) 09:33:

> These components are now versioned in sync with vulkan releases.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../glslang/{glslang_11.8.0.bb => glslang_1.3.204.0.bb}    | 5 +++--
>  .../{spirv-headers_1.5.4.bb => spirv-headers_1.3.204.0.bb} | 4 ++--
>  .../{spirv-tools_2022.1.bb => spirv-tools_1.3.204.0.bb}    | 7 ++++---
>  3 files changed, 9 insertions(+), 7 deletions(-)
>  rename meta/recipes-graphics/glslang/{glslang_11.8.0.bb =>
> glslang_1.3.204.0.bb} (90%)
>  rename meta/recipes-graphics/spir/{spirv-headers_1.5.4.bb =>
> spirv-headers_1.3.204.0.bb} (88%)
>  rename meta/recipes-graphics/spir/{spirv-tools_2022.1.bb =>
> spirv-tools_1.3.204.0.bb} (89%)
>
> diff --git a/meta/recipes-graphics/glslang/glslang_11.8.0.bb
> b/meta/recipes-graphics/glslang/glslang_1.3.204.0.bb
> similarity index 90%
> rename from meta/recipes-graphics/glslang/glslang_11.8.0.bb
> rename to meta/recipes-graphics/glslang/glslang_1.3.204.0.bb
> index a77d8bdf88..2af406212f 100644
> --- a/meta/recipes-graphics/glslang/glslang_11.8.0.bb
> +++ b/meta/recipes-graphics/glslang/glslang_1.3.204.0.bb
> @@ -8,10 +8,11 @@ HOMEPAGE = "
> https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
>  LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 &
> GPL-3-with-bison-exception"
>  LIC_FILES_CHKSUM =
> "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
>
> -SRCREV = "c34bb3b6c55f6ab084124ad964be95a699700d34"
> +SRCREV = "2742e959347ae2fac58acd0d022c92a0ff1f24bf"
>  SRC_URI = "git://
> github.com/KhronosGroup/glslang.git;protocol=https;branch=master \
>             file://0001-generate-glslang-pkg-config.patch"
> -UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
> +PE = "1"
> +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
>  S = "${WORKDIR}/git"
>
>  inherit cmake python3native
> diff --git a/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb
> b/meta/recipes-graphics/spir/spirv-headers_1.3.204.0.bb
> similarity index 88%
> rename from meta/recipes-graphics/spir/spirv-headers_1.5.4.bb
> rename to meta/recipes-graphics/spir/spirv-headers_1.3.204.0.bb
> index 3144b1eb42..72416b441f 100644
> --- a/meta/recipes-graphics/spir/spirv-headers_1.5.4.bb
> +++ b/meta/recipes-graphics/spir/spirv-headers_1.3.204.0.bb
> @@ -9,9 +9,9 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
>
>  SRCREV = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78"
>  SRC_URI = "git://
> github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
> -UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$"
> +PE = "1"
> +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
>  S = "${WORKDIR}/git"
> -PV .= "+git${SRCPV}"
>
>  inherit cmake
>
> diff --git a/meta/recipes-graphics/spir/spirv-tools_2022.1.bb
> b/meta/recipes-graphics/spir/spirv-tools_1.3.204.0.bb
> similarity index 89%
> rename from meta/recipes-graphics/spir/spirv-tools_2022.1.bb
> rename to meta/recipes-graphics/spir/spirv-tools_1.3.204.0.bb
> index 24142a4fe0..dc78073717 100644
> --- a/meta/recipes-graphics/spir/spirv-tools_2022.1.bb
> +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.204.0.bb
> @@ -7,9 +7,10 @@ SECTION = "graphics"
>  LICENSE  = "Apache-2.0"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
>
> -SRCREV = "b1877de5cd776117050bd42f08d04b52bce16099"
> -SRC_URI = "git://
> github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
> -UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
> +SRCREV = "45dd184c790d6bfc78a5a74a10c37e888b1823fa"
> +SRC_URI = "git://
> github.com/KhronosGroup/SPIRV-Tools.git;branch=stable;protocol=https"
> +PE = "1"
> +UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
>  S = "${WORKDIR}/git"
>
>  inherit cmake python3native
> --
> 2.30.2
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#162640):
> https://lists.openembedded.org/g/openembedded-core/message/162640
> Mute This Topic: https://lists.openembedded.org/mt/89522063/5052612
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> quaresma.jose@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

-- 
Best regards,

José Quaresma

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

Re: [OE-core] [PATCH 3/3] glslang/spirv: synchronize with the rest of vulkan items

[Alexander Kanavin]

On Thu, 3 Mar 2022 at 10:45, Jose Quaresma <quaresma.jose@gmail.com> wrote:

> Is it possible to add a reference on the commit message for this change?

What kind of reference, like a link to some kind of upstream statement?

Alex

Re: [OE-core] [PATCH 3/3] glslang/spirv: synchronize with the rest of vulkan items

[Jose Quaresma]

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

Alexander Kanavin <alex.kanavin@gmail.com> escreveu no dia quinta,
3/03/2022 à(s) 09:53:

> On Thu, 3 Mar 2022 at 10:45, Jose Quaresma <quaresma.jose@gmail.com>
> wrote:
>
> > Is it possible to add a reference on the commit message for this change?
>
> What kind of reference, like a link to some kind of upstream statement?
>

Yes, I think a link is useful.
I only found these issues but nothing official in release notes or
somewhere else.
https://github.com/KhronosGroup/SPIRV-Headers/issues/252
https://github.com/KhronosGroup/SPIRV-Headers/issues/266

Jose


> Alex
>


-- 
Best regards,

José Quaresma

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

Re: [OE-core] [PATCH 3/3] glslang/spirv: synchronize with the rest of vulkan items

[Alexander Kanavin]

On Thu, 3 Mar 2022 at 10:58, Jose Quaresma <quaresma.jose@gmail.com> wrote:
>> What kind of reference, like a link to some kind of upstream statement?
>
>
> Yes, I think a link is useful.
> I only found these issues but nothing official in release notes or somewhere else.
> https://github.com/KhronosGroup/SPIRV-Headers/issues/252
> https://github.com/KhronosGroup/SPIRV-Headers/issues/266

"We'll continue tagging the repos contributing with SDK releases, as
that is when all the testing of the various projects is performed
together." is the critical bit in there, so I'll just add these and
resend.

Alex