[gnome-build-meta/abderrahim/fdsdk-master: 6/15] freedesktop-sdk.bst: update to a snapshot of git master

[Abderrahim Kitouni <akitouni src gnome org>]

commit af91d9c7fc4d67df6877f04919f573a05e91dd95
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Tue Mar 8 20:37:41 2022 +0100

    freedesktop-sdk.bst: update to a snapshot of git master

 .gitlab-ci.yml                           |  2 +-
 elements/core-deps/libcap-ng.bst         | 16 ----------------
 elements/core-deps/spice-gtk.bst         |  2 +-
 elements/flatpak-platform-extensions.bst |  7 ++++++-
 elements/freedesktop-sdk.bst             |  3 +--
 elements/sdk-platform.bst                |  4 +++-
 elements/vm/cleanup-debug.bst            | 11 ++++-------
 junction.refs                            |  2 +-
 8 files changed, 17 insertions(+), 30 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 880cdac51..bc480e5de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 
   # Docker Images
   DOCKER_REGISTRY: "registry.gitlab.com/freedesktop-sdk/infrastructure/freedesktop-sdk-docker-images"
-  DOCKER_IMAGE_ID: "cb2f2be871659a4136244ae9ee65c4d8571575b0"
+  DOCKER_IMAGE_ID: "543571583e6271ede4c706aff60d389cf26a13e9"
 
 stages:
 - track
diff --git a/elements/core-deps/spice-gtk.bst b/elements/core-deps/spice-gtk.bst
index 0d7fdda76..93e3b3b4c 100644
--- a/elements/core-deps/spice-gtk.bst
+++ b/elements/core-deps/spice-gtk.bst
@@ -12,7 +12,6 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/libcap-ng.bst
 - core-deps/usbredir.bst
 - core-deps/phodav.bst
 - core-deps/spice-protocol.bst
@@ -23,6 +22,7 @@ depends:
 - sdk/vala.bst
 - freedesktop-sdk.bst:components/cyrus-sasl.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
+- freedesktop-sdk.bst:components/libcap-ng.bst
 - freedesktop-sdk.bst:components/libdrm.bst
 - freedesktop-sdk.bst:components/polkit.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/flatpak-platform-extensions.bst b/elements/flatpak-platform-extensions.bst
index fe11c87d4..f2a8c7c40 100644
--- a/elements/flatpak-platform-extensions.bst
+++ b/elements/flatpak-platform-extensions.bst
@@ -3,7 +3,12 @@ kind: flatpak_repo
 build-depends:
 - core-deps/flatpak.bst
 - freedesktop-sdk.bst:flatpak-images/mesa.bst
-- freedesktop-sdk.bst:flatpak-images/platform-vaapi.bst
+
+(?):
+- arch in ("i686", "x86_64"):
+    build-depends:
+      (>):
+      - freedesktop-sdk.bst:flatpak-images/platform-vaapi-intel.bst
 
 variables:
   # Obtain the versions of the flatpak extensions
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 2f8e879aa..8f4d24103 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -2,8 +2,7 @@ kind: junction
 sources:
 - kind: git_tag
   url: gitlab:freedesktop-sdk/freedesktop-sdk.git
-  track: release/21.08
-  track-tags: true
+  track: master
 config:
   options:
     target_arch: '%{arch}'
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index dcbe165dd..2aeef7b7c 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -78,6 +78,7 @@ depends:
 - freedesktop-sdk.bst:components/cups.bst
 - freedesktop-sdk.bst:components/curl.bst
 - freedesktop-sdk.bst:components/cyrus-sasl.bst
+- freedesktop-sdk.bst:components/dbus-tools.bst
 - freedesktop-sdk.bst:components/dejavu-fonts.bst
 - freedesktop-sdk.bst:components/dictionaries.bst
 - freedesktop-sdk.bst:components/dummy-gbm.bst
@@ -165,13 +166,13 @@ depends:
 - freedesktop-sdk.bst:components/nano.bst
 - freedesktop-sdk.bst:components/nettle.bst
 - freedesktop-sdk.bst:components/noopenh264.bst
+- freedesktop-sdk.bst:components/noto-emoji.bst
 - freedesktop-sdk.bst:components/npth.bst
 - freedesktop-sdk.bst:components/nspr.bst
 - freedesktop-sdk.bst:components/nss.bst
 - freedesktop-sdk.bst:components/openal.bst
 - freedesktop-sdk.bst:components/opencl.bst
 - freedesktop-sdk.bst:components/openjpeg.bst
-- freedesktop-sdk.bst:components/openmoji.bst
 - freedesktop-sdk.bst:components/openssh.bst
 - freedesktop-sdk.bst:components/openssl.bst
 - freedesktop-sdk.bst:components/opus.bst
@@ -195,6 +196,7 @@ depends:
 - freedesktop-sdk.bst:components/sqlite.bst
 - freedesktop-sdk.bst:components/systemd-libs.bst
 - freedesktop-sdk.bst:components/tar.bst
+- freedesktop-sdk.bst:components/tex-gyre-fonts.bst
 - freedesktop-sdk.bst:components/tzdata.bst
 - freedesktop-sdk.bst:components/unzip.bst
 - freedesktop-sdk.bst:components/util-linux.bst
diff --git a/elements/vm/cleanup-debug.bst b/elements/vm/cleanup-debug.bst
index c37ad5e9e..7d5cb44fb 100644
--- a/elements/vm/cleanup-debug.bst
+++ b/elements/vm/cleanup-debug.bst
@@ -14,10 +14,7 @@ public:
     - rm -r '%{debugdir}%{libdir}/samba'
     - rm -r '%{debugdir}%{libdir}/sane'
 
-    # gjs deps on mozjs91, polkit only deps on 78
-    - rm '%{debugdir}%{libdir}/libmozjs-78.so.debug'
-
-    - rm '%{debugdir}%{libdir}/libaom.so.3.2.0.debug'
+    - rm '%{debugdir}%{libdir}/libaom.so.3.3.0.debug'
     - rm '%{debugdir}%{libdir}/libVkLayer_khronos_validation.so.debug'
     - rm '%{debugdir}%{libdir}/libprotoc.so.26.0.8.debug'
     - rm '%{debugdir}%{libdir}/libprotobuf.so.26.0.8.debug'
@@ -48,9 +45,9 @@ public:
     - rm '%{debugdir}%{bindir}/gdb.debug'
     - rm '%{debugdir}%{bindir}/dwp.debug'
     - rm '%{debugdir}%{bindir}/ccache.debug'
-    - rm '%{debugdir}%{libdir}/libLLVM-12.so.debug'
-    - rm '%{debugdir}%{libdir}/libclang.so.12.debug'
-    - rm '%{debugdir}%{libdir}/libclang-cpp.so.12.debug'
+    - rm '%{debugdir}%{libdir}/libLLVM-14.so.debug'
+    - rm '%{debugdir}%{libdir}/libclang.so.14.0.5.debug'
+    - rm '%{debugdir}%{libdir}/libclang-cpp.so.14.debug'
     - rm '%{debugdir}%{bindir}/doxygen.debug'
     - rm '%{debugdir}%{bindir}/podman.debug'
     - rm '%{debugdir}%{bindir}/podman-remote.debug'
diff --git a/junction.refs b/junction.refs
index 50e9a6631..26ac09525 100644
--- a/junction.refs
+++ b/junction.refs
@@ -1,4 +1,4 @@
 projects:
   gnome:
     freedesktop-sdk.bst:
-    - ref: freedesktop-sdk-21.08.12-0-ge6c396ab53fb0920c05bbc703d83ce4180642fb0
+    - ref: 21.08-branchpoint-1770-g5ca28e920a363d5c87ba7842f7c2c08412baf691