[gnome-build-meta/jjardon/clutter: 4/4] Revert "sdk: move clutter and friends to core-deps"

[Javier Jardón Cabezas <jjardon src gnome org>]

commit f843a2dbc9766389b4d969718ebdad874fadfb96
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Jul 24 20:56:01 2021 +0100

    Revert "sdk: move clutter and friends to core-deps"
    
    We will deprecate this in GNOME 41; plan to remove it for GNOME 42
    
    This reverts commit 479fbe83e40b9cb319f3cbabf0c33766a298415b.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1239>

 elements/core-deps/libchamplain.bst         | 4 ++--
 elements/core/cheese.bst                    | 4 ++--
 elements/core/gnome-maps.bst                | 2 +-
 elements/core/sushi.bst                     | 3 ---
 elements/core/totem.bst                     | 6 +++---
 elements/sdk-platform.bst                   | 4 ++++
 elements/{core-deps => sdk}/clutter-gst.bst | 4 ++--
 elements/{core-deps => sdk}/clutter-gtk.bst | 2 +-
 elements/{core-deps => sdk}/clutter.bst     | 2 +-
 elements/{core-deps => sdk}/cogl.bst        | 0
 elements/world/bijiben.bst                  | 2 +-
 elements/world/gnome-nibbles.bst            | 4 ++--
 elements/world/lightsoff.bst                | 4 ++--
 elements/world/quadrapassel.bst             | 4 ++--
 elements/world/retro-gtk.bst                | 2 +-
 elements/world/swell-foop.bst               | 4 ++--
 16 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/elements/core-deps/libchamplain.bst b/elements/core-deps/libchamplain.bst
index d88b5e91..17a559bb 100644
--- a/elements/core-deps/libchamplain.bst
+++ b/elements/core-deps/libchamplain.bst
@@ -12,8 +12,8 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libsoup-2.4.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 7baef4c1..bca47a3a 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -14,12 +14,12 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter-gst.bst
-- core-deps/clutter-gtk.bst
 - core-deps/gnome-video-effects.bst
 - core-deps/libcanberra.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
+- sdk/clutter-gst.bst
+- sdk/clutter-gtk.bst
 - sdk/glib.bst
 - sdk/gst-plugins-bad.bst
 - sdk/gst-plugins-base.bst
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index c149b5f9..385f7271 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -6,7 +6,6 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
-- core-deps/clutter-gtk.bst
 - core-deps/folks.bst
 - core-deps/geocode-glib.bst
 - core-deps/gfbgraph.bst
@@ -14,6 +13,7 @@ depends:
 - core-deps/libchamplain.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
+- sdk/clutter-gtk.bst
 - sdk/geoclue.bst
 - sdk/gjs.bst
 - sdk/glib-networking.bst
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index 751a098f..802d63d3 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -6,9 +6,6 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
-- core-deps/clutter-gst.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
 - core/evince.bst
 - sdk/gjs.bst
 - sdk/gobject-introspection.bst
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index 34059b5e..8e60db69 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -15,15 +15,15 @@ build-depends:
 - freedesktop-sdk.bst:components/itstool.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
-- core-deps/clutter-gst.bst
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
 - core-deps/grilo-plugins.bst
 - core-deps/grilo.bst
 - core-deps/libpeas.bst
 - core-deps/totem-pl-parser.bst
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
+- sdk/clutter-gst.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 3d71fe0d..795f2e43 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -7,6 +7,10 @@ depends:
 - sdk/at-spi2-core.bst
 - sdk/atk.bst
 - sdk/cantarell-fonts.bst
+- sdk/clutter-gst.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
+- sdk/cogl.bst
 - sdk/enchant-2.bst
 - sdk/fcitx.bst
 - sdk/gcab.bst
diff --git a/elements/core-deps/clutter-gst.bst b/elements/sdk/clutter-gst.bst
similarity index 91%
rename from elements/core-deps/clutter-gst.bst
rename to elements/sdk/clutter-gst.bst
index c5e0c9ca..412d20dd 100644
--- a/elements/core-deps/clutter-gst.bst
+++ b/elements/sdk/clutter-gst.bst
@@ -7,8 +7,8 @@ build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
-- core-deps/clutter.bst
-- core-deps/cogl.bst
+- sdk/clutter.bst
+- sdk/cogl.bst
 - sdk/gdk-pixbuf.bst
 - sdk/gst-plugins-base.bst
 - freedesktop-sdk.bst:components/gstreamer.bst
diff --git a/elements/core-deps/clutter-gtk.bst b/elements/sdk/clutter-gtk.bst
similarity index 94%
rename from elements/core-deps/clutter-gtk.bst
rename to elements/sdk/clutter-gtk.bst
index 5d0f8a02..cb6b9d9a 100644
--- a/elements/core-deps/clutter-gtk.bst
+++ b/elements/sdk/clutter-gtk.bst
@@ -9,7 +9,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter.bst
+- sdk/clutter.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 
diff --git a/elements/core-deps/clutter.bst b/elements/sdk/clutter.bst
similarity index 97%
rename from elements/core-deps/clutter.bst
rename to elements/sdk/clutter.bst
index b12639db..0657d3b2 100644
--- a/elements/core-deps/clutter.bst
+++ b/elements/sdk/clutter.bst
@@ -8,7 +8,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
 - sdk/atk.bst
-- core-deps/cogl.bst
+- sdk/cogl.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
diff --git a/elements/core-deps/cogl.bst b/elements/sdk/cogl.bst
similarity index 100%
rename from elements/core-deps/cogl.bst
rename to elements/sdk/cogl.bst
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index ea0ac4f3..e6f5cc10 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -14,8 +14,8 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter-gtk.bst
 - core-deps/evolution-data-server.bst
+- sdk/clutter-gtk.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - sdk/libhandy.bst
diff --git a/elements/world/gnome-nibbles.bst b/elements/world/gnome-nibbles.bst
index b51d6c38..bbd5ab15 100644
--- a/elements/world/gnome-nibbles.bst
+++ b/elements/world/gnome-nibbles.bst
@@ -11,9 +11,9 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
 - core-deps/gsound.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
 - sdk/gtk+-3.bst
 - sdk/libgee.bst
 - sdk/librsvg.bst
diff --git a/elements/world/lightsoff.bst b/elements/world/lightsoff.bst
index f845b01b..228e0a9c 100644
--- a/elements/world/lightsoff.bst
+++ b/elements/world/lightsoff.bst
@@ -11,8 +11,8 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
 - sdk/gtk+-3.bst
 - sdk/librsvg.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/quadrapassel.bst b/elements/world/quadrapassel.bst
index aba20a88..55398565 100644
--- a/elements/world/quadrapassel.bst
+++ b/elements/world/quadrapassel.bst
@@ -11,9 +11,9 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
 - core-deps/gsound.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
 - sdk/gtk+-3.bst
 - sdk/libmanette.bst
 - sdk/librsvg.bst
diff --git a/elements/world/retro-gtk.bst b/elements/world/retro-gtk.bst
index 6712c96a..4bb37b1e 100644
--- a/elements/world/retro-gtk.bst
+++ b/elements/world/retro-gtk.bst
@@ -10,7 +10,7 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter-gtk.bst
+- sdk/clutter-gtk.bst
 - sdk/glib.bst
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:components/libpulse.bst
diff --git a/elements/world/swell-foop.bst b/elements/world/swell-foop.bst
index 1843331c..fb207692 100644
--- a/elements/world/swell-foop.bst
+++ b/elements/world/swell-foop.bst
@@ -11,8 +11,8 @@ build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 
 depends:
-- core-deps/clutter-gtk.bst
-- core-deps/clutter.bst
+- sdk/clutter-gtk.bst
+- sdk/clutter.bst
 - sdk/gtk+-3.bst
 - world/libgnome-games-support.bst
 - freedesktop-sdk.bst:bootstrap-import.bst