Skip to contentSkip to conversation

icu: upgrade 68.2 -> 69.1

PATCH Superseded wangmy 3 participants 6 messages Apr 15, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

wangmy

author
#0 lore raw

PATCH 1/1 icu: upgrade 68.2 -> 69.1

refresh 0001-icu-Added-armeb-support.patch

---
 .../icu/icu/0001-icu-Added-armeb-support.patch              | 6 +++---
 meta/recipes-support/icu/{icu_68.2.bb => icu_69.1.bb}       | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename meta/recipes-support/icu/{icu_68.2.bb => icu_69.1.bb} (95%)
meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +3 -3
index 145efc0e01..c5dc0611c2 100644
@@ -13,7 +13,7 @@ Signed-off-by: Lei Maohui <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h
-index 8c6a0e1..cf89907 100644
+index c937463..feaad0f 100644
 --- a/i18n/double-conversion-utils.h
 +++ b/i18n/double-conversion-utils.h
 @@ -115,7 +115,7 @@ int main(int argc, char** argv) {
@@ -24,7 +24,7 @@ index 8c6a0e1..cf89907 100644
 +    defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
      defined(__hppa__) || defined(__ia64__) || \
      defined(__mips__) || \
-     defined(__nios2__) || \
+     defined(__nios2__) || defined(__ghs) || \
 -- 
-2.7.4
+2.25.1
 
meta/recipes-support/icu/icu_69.1.bb renamed from meta/recipes-support/icu/icu_68.2.bb +2 -3
similarity index 95%
rename from meta/recipes-support/icu/icu_68.2.bb
rename to meta/recipes-support/icu/icu_69.1.bb
index 1ca87feee4..b79acba0cc 100644
@@ -106,14 +106,13 @@ SRC_URI = "${BASE_SRC_URI};name=code \
            ${DATA_SRC_URI};name=data \
            file://filter.json \
            file://fix-install-manx.patch \
-           file://0001-icu-Added-armeb-support.patch \
            "
 
 SRC_URI_append_class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[code.sha256sum] = "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"
-SRC_URI[data.sha256sum] = "2989b466fa010edc41297e12fdd5ae47c2610ad68b63af1a0bd2a1acfaf497f3"
+SRC_URI[code.sha256sum] = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"
+SRC_URI[data.sha256sum] = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"
 
 UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src"
 UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases"
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH 1/1 man-pages: upgrade 5.10 -> 5.11

---
 .../man-pages/{man-pages_5.10.bb => man-pages_5.11.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/man-pages/{man-pages_5.10.bb => man-pages_5.11.bb} (91%)
meta/recipes-extended/man-pages/man-pages_5.11.bb renamed from meta/recipes-extended/man-pages/man-pages_5.10.bb +1 -1
similarity index 91%
rename from meta/recipes-extended/man-pages/man-pages_5.10.bb
rename to meta/recipes-extended/man-pages/man-pages_5.11.bb
index 8874516aa2..3cd0bc5259 100644
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;md5=207f70f56526417514ac46b6680e314f"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz"
 
-SRC_URI[sha256sum] = "f2ce94a7250c49910db91806996699e1deac656097d4d53bdf56bdab4b61f228"
+SRC_URI[sha256sum] = "3759aee7cd4a229173d3cb651fbba438777bee6206da8d75ea04caaa7c8662b0"
 
 inherit manpages
 
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH 1/1 mesa: upgrade 21.0.1 -> 21.0.2

In reply to wangmy
---
 meta/recipes-graphics/mesa/mesa.inc                           | 2 +-
 meta/recipes-graphics/mesa/{mesa_21.0.1.bb => mesa_21.0.2.bb} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/mesa/{mesa_21.0.1.bb => mesa_21.0.2.bb} (100%)
meta/recipes-graphics/mesa/mesa.inc +1 -1
index caf3c62ad8..5705ae0f08 100644
@@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
            "
 
-SRC_URI[sha256sum] = "379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb"
+SRC_URI[sha256sum] = "46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88"
 
 UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
 
meta/recipes-graphics/mesa/mesa_21.0.2.bb renamed from meta/recipes-graphics/mesa/mesa_21.0.1.bb +0 -0
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_21.0.1.bb
rename to meta/recipes-graphics/mesa/mesa_21.0.2.bb
Signature · 1 line
2.25.1
#3 lore raw

Re: [OE-core] [PATCH] mesa: upgrade 21.0.1 -> 21.0.2

Please remember to update mesa-gl version at the same time.

Alex

Quoted 38 lines · wangmy
---
 meta/recipes-graphics/mesa/mesa.inc                           | 2 +-
 meta/recipes-graphics/mesa/{mesa_21.0.1.bb => mesa_21.0.2.bb} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/mesa/{mesa_21.0.1.bb => mesa_21.0.2.bb}

(100%)

meta/recipes-graphics/mesa/mesa.inc +0 -1
index caf3c62ad8..5705ae0f08 100644
@@ -21,7 +21,7 @@ SRC_URI = "
 https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
 
 file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
            "
 
-SRC_URI[sha256sum] =

"379fc984459394f2ab2d84049efdc3a659869dc1328ce72ef0598506611712bb" +SRC_URI[sha256sum] = "46c1dc5bb54a372dee43ec3c067229c299187d5bdadf1402756bbf66a6df5b88"

UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"

meta/recipes-graphics/mesa/mesa_21.0.2.bb renamed from meta/recipes-graphics/mesa/mesa_21.0.1.bb +0 -1
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa_21.0.1.bb
rename to meta/recipes-graphics/mesa/mesa_21.0.2.bb
--

2.25.1

author
#4 lore raw

PATCH 1/1 mpg123: upgrade 1.26.4 -> 1.26.5

In reply to wangmy
---
 .../mpg123/{mpg123_1.26.4.bb => mpg123_1.26.5.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.26.4.bb => mpg123_1.26.5.bb} (96%)
meta/recipes-multimedia/mpg123/mpg123_1.26.5.bb renamed from meta/recipes-multimedia/mpg123/mpg123_1.26.4.bb +1 -1
similarity index 96%
rename from meta/recipes-multimedia/mpg123/mpg123_1.26.4.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.26.5.bb
index 35cad6ffc4..7207bd1dd0 100644
@@ -10,7 +10,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "081991540df7a666b29049ad870f293cfa28863b36488ab4d58ceaa7b5846454"
+SRC_URI[sha256sum] = "502a97e0d935be7e37d987338021d8f301bae35c2884f2a83d59c4b52466ef06"
 
 UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
 
Signature · 1 line
2.25.1
#5 lore raw
In reply to wangmy
Quoted 41 lines · wangmy

refresh 0001-icu-Added-armeb-support.patch

---
 .../icu/icu/0001-icu-Added-armeb-support.patch              | 6 +++---
 meta/recipes-support/icu/{icu_68.2.bb => icu_69.1.bb}       | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename meta/recipes-support/icu/{icu_68.2.bb => icu_69.1.bb} (95%)
meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +3 -3
index 145efc0e01..c5dc0611c2 100644
@@ -13,7 +13,7 @@ Signed-off-by: Lei Maohui <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h
-index 8c6a0e1..cf89907 100644
+index c937463..feaad0f 100644
 --- a/i18n/double-conversion-utils.h
 +++ b/i18n/double-conversion-utils.h
 @@ -115,7 +115,7 @@ int main(int argc, char** argv) {
@@ -24,7 +24,7 @@ index 8c6a0e1..cf89907 100644
 +    defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \
      defined(__hppa__) || defined(__ia64__) || \
      defined(__mips__) || \
-     defined(__nios2__) || \
+     defined(__nios2__) || defined(__ghs) || \
 --
-2.7.4
+2.25.1
 
meta/recipes-support/icu/icu_69.1.bb renamed from meta/recipes-support/icu/icu_68.2.bb +0 -0
similarity index 95%
rename from meta/recipes-support/icu/icu_68.2.bb
rename to meta/recipes-support/icu/icu_69.1.bb
index 1ca87feee4..b79acba0cc 100644

meta/recipes-support/icu/icu_69.1.bb SRC_URI = "${BASE_SRC_URI};name=code \ · line 109

Quoted 4 lines
meta/recipes-support/icu/icu_69.1.bb renamed from meta/recipes-support/icu/icu_68.2.bb +0 -1
@@ -106,14 +106,13 @@ SRC_URI = "${BASE_SRC_URI};name=code \
            ${DATA_SRC_URI};name=data \
            file://filter.json \
            file://fix-install-manx.patch \
-           file://0001-icu-Added-armeb-support.patch \

I think we should not be deleting the patch from SRC_URI

Quoted 18 lines
meta/recipes-support/icu/icu_69.1.bb renamed from meta/recipes-support/icu/icu_68.2.bb +2 -3
            "
 
 SRC_URI_append_class-target = "\
            file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \
           "
-SRC_URI[code.sha256sum] = "c79193dee3907a2199b8296a93b52c5cb74332c26f3d167269487680d479d625"
-SRC_URI[data.sha256sum] = "2989b466fa010edc41297e12fdd5ae47c2610ad68b63af1a0bd2a1acfaf497f3"
+SRC_URI[code.sha256sum] = "4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745"
+SRC_URI[data.sha256sum] = "4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf"
 
 UPSTREAM_CHECK_REGEX = "icu4c-(?P<pver>\d+(_\d+)+)-src"
 UPSTREAM_CHECK_URI = "https://github.com/unicode-org/icu/releases"
--

2.25.1