[core22] Switch from core18 to core22.

5 files changed, 17 insertions, 19 deletions

diff --git a/build/108372/patches/series b/build/108372/patches/series
index eb72c4e..462d8d6 100644
--- a/build/108372/patches/series
+++ b/build/108372/patches/series
@@ -1,3 +1,2 @@
 use-clang-versioned.patch
-suppress-newer-clang-warning-flags.patch
 allow-building-on-x86.patch
diff --git a/build/108372/patches/use-clang-versioned.patch b/build/108372/patches/use-clang-versioned.patch
index 2e3d263..4781119 100644
--- a/build/108372/patches/use-clang-versioned.patch
+++ b/build/108372/patches/use-clang-versioned.patch
@@ -9,15 +9,15 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 
 - cc = "${prefix}/clang"
 - cxx = "${prefix}/clang++"
-+ cc = "${prefix}/clang-10"
-+ cxx = "${prefix}/clang++-10"
++ cc = "${prefix}/clang-15"
++ cxx = "${prefix}/clang++-15"
 ld = cxx
 - readelf = "${prefix}/llvm-readelf"
 - ar = "${prefix}/llvm-ar"
 - nm = "${prefix}/llvm-nm"
-+ readelf = "${prefix}/llvm-readelf-10"
-+ ar = "${prefix}/llvm-ar-10"
-+ nm = "${prefix}/llvm-nm-10"
++ readelf = "${prefix}/llvm-readelf-15"
++ ar = "${prefix}/llvm-ar-15"
++ nm = "${prefix}/llvm-nm-15"
 
 forward_variables_from(invoker,
 [
diff --git a/build/111306/patches/series b/build/111306/patches/series
index 1deff7d..6e8d329 100644
--- a/build/111306/patches/series
+++ b/build/111306/patches/series
@@ -1,4 +1,3 @@
 use-clang-versioned.patch
 fix-init-priority-max.patch
-suppress-newer-clang-warning-flags.patch
 allow-building-on-x86.patch
diff --git a/build/111306/patches/use-clang-versioned.patch b/build/111306/patches/use-clang-versioned.patch
index 2e3d263..4781119 100644
--- a/build/111306/patches/use-clang-versioned.patch
+++ b/build/111306/patches/use-clang-versioned.patch
@@ -9,15 +9,15 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 
 - cc = "${prefix}/clang"
 - cxx = "${prefix}/clang++"
-+ cc = "${prefix}/clang-10"
-+ cxx = "${prefix}/clang++-10"
++ cc = "${prefix}/clang-15"
++ cxx = "${prefix}/clang++-15"
 ld = cxx
 - readelf = "${prefix}/llvm-readelf"
 - ar = "${prefix}/llvm-ar"
 - nm = "${prefix}/llvm-nm"
-+ readelf = "${prefix}/llvm-readelf-10"
-+ ar = "${prefix}/llvm-ar-10"
-+ nm = "${prefix}/llvm-nm-10"
++ readelf = "${prefix}/llvm-readelf-15"
++ ar = "${prefix}/llvm-ar-15"
++ nm = "${prefix}/llvm-nm-15"
 
 forward_variables_from(invoker,
 [
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 37f4703..cb5fe7a 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -6,7 +6,7 @@ description: |
 browser snaps can connect to to get access to a host of proprietary codecs for
 web content that they might not be allowed to redistribute themselves.
 confinement: strict
-base: core18
+base: core22
 
 slots:
 chromium-ffmpeg-108372: # chromium 105.0.5191.2
@@ -38,7 +38,7 @@ parts:
 source: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-105.0.5191.2.tar.xz
 source-checksum: sha512/3a6f98c1a2b5378cf859db8c4c7b20e7eabb39f177ce4e31363b0529003b5b26e78bf438d225db8929fc7b1188c7ebe2f17aa43f68d63fedd96d831ece65cb36
 build-packages:
- - clang-10
+ - clang-15
 - libatk1.0-dev
 - libatk-bridge2.0-dev
 - libcups2-dev
@@ -47,7 +47,7 @@ parts:
 - libgtk-3-dev
 - libnss3-dev
 - libpango1.0-dev
- - llvm-10
+ - llvm-15
 - mesa-common-dev
 - ninja-build
 - python3
@@ -57,7 +57,7 @@ parts:
 rm -rf $SNAPCRAFT_PART_SRC/*
 VERSION=108372
 QUILT_PATCHES=$SNAPCRAFT_STAGE/build/$VERSION/patches quilt push -a
- CC=clang-10 CXX=clang++-10 AR=llvm-ar-10 python3 tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
+ CC=clang-15 CXX=clang++-15 AR=llvm-ar-15 python3 tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
 OUT=out/ffmpeg
 mkdir -p $OUT
 cp $SNAPCRAFT_STAGE/build/$VERSION/args.gn $OUT/
@@ -73,7 +73,7 @@ parts:
 source: https://commondatastorage.googleapis.com/chromium-browser-official/chromium-114.0.5720.4.tar.xz
 source-checksum: sha512/c064c612564ae3d92b9e2ff8398a2a3d05e1db7ece8024d3af2c1f2f7e4a085b58d28cde21f2ba7c6e6248fe185beea99115c884d2abf35a98e6512e73ca902e
 build-packages:
- - clang-10
+ - clang-15
 - libatk1.0-dev
 - libatk-bridge2.0-dev
 - libcups2-dev
@@ -83,7 +83,7 @@ parts:
 - libgtk-3-dev
 - libnss3-dev
 - libpango1.0-dev
- - llvm-10
+ - llvm-15
 - mesa-common-dev
 - ninja-build
 - python3
@@ -93,7 +93,7 @@ parts:
 rm -rf $SNAPCRAFT_PART_SRC/*
 VERSION=111306
 QUILT_PATCHES=$SNAPCRAFT_STAGE/build/$VERSION/patches quilt push -a
- CC=clang-10 CXX=clang++-10 AR=llvm-ar-10 python3 tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
+ CC=clang-15 CXX=clang++-15 AR=llvm-ar-15 python3 tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles
 OUT=out/ffmpeg
 mkdir -p $OUT
 cp $SNAPCRAFT_STAGE/build/$VERSION/args.gn $OUT/