[gnome-build-meta/abderrahim/freedesktop-sdk-18.08.19-3.30: 2/3] sdk: use SDL and ffmpeg from freedesktop-sdk

[Abderrahim Kitouni <akitouni src gnome org>]

commit 2f0326d4135495f7da1ea1637959b898b2347fd3
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Nov 8 16:42:12 2018 +0100

    sdk: use SDL and ffmpeg from freedesktop-sdk
    
    See https://gitlab.com/freedesktop-sdk/freedesktop-sdk/merge_requests/680
    
    (cherry picked from commit 6a257d95fc31e616f8eba0b6aac0bcc0e571a4d7)

 elements/sdk-platform.bst   | 22 +++++++----
 elements/sdk/ffmpeg.bst     | 94 ---------------------------------------------
 elements/sdk/gst-libav.bst  |  3 +-
 elements/sdk/sdl2-image.bst | 22 -----------
 elements/sdk/sdl2-mixer.bst | 19 ---------
 elements/sdk/sdl2-net.bst   | 22 -----------
 elements/sdk/sdl2-ttf.bst   | 21 ----------
 elements/sdk/sdl2.bst       | 47 -----------------------
 8 files changed, 16 insertions(+), 234 deletions(-)
---
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index a850e56..2125ff9 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -16,7 +16,6 @@ depends:
 - sdk/dconf.bst
 - sdk/enchant-2.bst
 - sdk/fcitx.bst
-- sdk/ffmpeg.bst
 - sdk/gcab.bst
 - sdk/gcr.bst
 - sdk/gdk-pixbuf.bst
@@ -48,11 +47,6 @@ depends:
 - sdk/pango.bst
 - sdk/pycairo.bst
 - sdk/pygobject.bst
-- sdk/sdl2-image.bst
-- sdk/sdl2-mixer.bst
-- sdk/sdl2-net.bst
-- sdk/sdl2-ttf.bst
-- sdk/sdl2.bst
 - sdk/vte.bst
 - sdk/woff2.bst
 - sdk/yelp-xsl.bst
@@ -64,9 +58,9 @@ depends:
 # update our reference to add any new elements.
 
 # Currently, the elements we want to build ourselves, and not use from freedesktop-sdk are:
-# appstream-glib, at-spi2-*, atk, dconf, fcitx, ffmpeg, gcab, gdk-pixbuf, geoclue2, glib-networking,
+# appstream-glib, at-spi2-*, atk, dconf, fcitx, gcab, gdk-pixbuf, geoclue2, glib-networking,
 # gobject-introspection, gstreamer-*, gtk3, ibus, json-glib, libcroco, librsvg,
-# libsoup, os-release, pango, sdl2* and zenity.
+# libsoup, os-release, pango and zenity.
 
 # Due to being relatively deep in the stack, glib needs special treatment.
 
@@ -90,6 +84,8 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: desktop/emoji-one-font.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/ffmpeg.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/flatpak-xdg-utils.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/fontconfig.bst
@@ -160,6 +156,16 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: desktop/libpulse.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/sdl2-image.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/sdl2-mixer.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/sdl2-net.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/sdl2-ttf.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/sdl2.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/shared-mime-info.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/sound-theme-freedesktop.bst
diff --git a/elements/sdk/gst-libav.bst b/elements/sdk/gst-libav.bst
index 0480fa7..c29624d 100644
--- a/elements/sdk/gst-libav.bst
+++ b/elements/sdk/gst-libav.bst
@@ -19,7 +19,8 @@ sources:
   path: files/gst-libav/fix-api.patch
 depends:
 - sdk/gst-plugins-base.bst
-- sdk/ffmpeg.bst
+- filename: desktop/ffmpeg.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
   type: build