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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 91264a4641563fb9ac5f896a06fb05846fd71dbe
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.

 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 3d71fe0d..65fdd14f 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -130,7 +130,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
@@ -152,6 +151,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
@@ -168,7 +168,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
@@ -195,8 +194,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
@@ -240,3 +239,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