[gnome-build-meta/mcatanzaro/revert-fdsk-21.08beta2: 11/11] Revert "sdk{-platform}.bst: sync with freedesktop-sdk"

[Marge Bot <marge-bot src gnome org>]

commit d318ae73c819c6f50144724c4ebf340d4927e877
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Sun Jul 25 12:50:33 2021 -0500

    Revert "sdk{-platform}.bst: sync with freedesktop-sdk"
    
    This reverts commit d7b9efbcd386455971f1d6f1b11bfa552641bdbc.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1238>

 elements/sdk-platform.bst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index f4c44b02..9108b05a 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -133,7 +133,6 @@ depends:
 - freedesktop-sdk.bst:components/libksba.bst
 - freedesktop-sdk.bst:components/libnice.bst
 - freedesktop-sdk.bst:components/libogg.bst
-- freedesktop-sdk.bst:components/libp11.bst
 - freedesktop-sdk.bst:components/libpng.bst
 - freedesktop-sdk.bst:components/libproxy.bst
 - freedesktop-sdk.bst:components/libpsl.bst
@@ -155,6 +154,7 @@ depends:
 - freedesktop-sdk.bst:components/libxkbcommon.bst
 - freedesktop-sdk.bst:components/libxml2.bst
 - freedesktop-sdk.bst:components/libxslt.bst
+- freedesktop-sdk.bst:components/llvm.bst
 - freedesktop-sdk.bst:components/locales.bst
 - freedesktop-sdk.bst:components/lz4.bst
 - freedesktop-sdk.bst:components/lzip.bst
@@ -171,7 +171,6 @@ depends:
 - freedesktop-sdk.bst:components/opencl.bst
 - freedesktop-sdk.bst:components/openjpeg.bst
 - freedesktop-sdk.bst:components/openssh.bst
-- freedesktop-sdk.bst:components/openssl.bst
 - freedesktop-sdk.bst:components/opus.bst
 - freedesktop-sdk.bst:components/orc.bst
 - freedesktop-sdk.bst:components/p11-kit.bst
@@ -198,8 +197,8 @@ depends:
 - freedesktop-sdk.bst:components/unzip.bst
 - freedesktop-sdk.bst:components/util-linux.bst
 - freedesktop-sdk.bst:components/v4l-utils.bst
+- freedesktop-sdk.bst:components/vulkan-headers.bst
 - freedesktop-sdk.bst:components/vulkan-icd-loader.bst
-- freedesktop-sdk.bst:components/vulkan-validation-layers.bst
 - freedesktop-sdk.bst:components/wayland.bst
 - freedesktop-sdk.bst:components/webrtc-audio-processing.bst
 - freedesktop-sdk.bst:components/wget.bst
@@ -243,3 +242,9 @@ depends:
 - freedesktop-sdk.bst:components/zip.bst
 - freedesktop-sdk.bst:components/zstd.bst
 - freedesktop-sdk.bst:integration/mtab.bst
+
+(?):
+- arch != "i686":
+    depends:
+      (>):
+      - freedesktop-sdk.bst:components/vulkan-validation-layers.bst