[gnome-build-meta/abderrahim/remove-gstreamer-3-30] use gstreamer from freedesktop-sdk



commit a41f80deafd7168ab17ec25c1e3a0aaaa6122dd9
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Nov 7 10:28:19 2018 +0100

    use gstreamer from freedesktop-sdk
    
    We still rebuild gstreamer-libav because of an indirect dependency on gtk3
    
    Fix #95

 elements/core-deps/gnome-video-effects.bst      |  3 +-
 elements/core-deps/gtk+.bst                     | 10 ++--
 elements/core-deps/gupnp-dlna.bst               |  9 ++--
 elements/core-deps/tracker-miners.bst           |  6 ++-
 elements/core/cheese.bst                        | 12 +++--
 elements/core/gnome-contacts.bst                |  3 +-
 elements/core/gnome-control-center.bst          |  3 +-
 elements/core/gnome-initial-setup.bst           |  3 +-
 elements/core/gnome-shell.bst                   |  6 ++-
 elements/core/sushi.bst                         |  6 ++-
 elements/core/totem.bst                         | 12 +++--
 elements/sdk-platform.bst                       | 16 +++++--
 elements/sdk/WebKitGTK+.bst                     |  9 ++--
 elements/sdk/clutter-gst.bst                    |  6 ++-
 elements/sdk/cogl.bst                           |  6 ++-
 elements/sdk/gst-libav.bst                      |  3 +-
 elements/sdk/gst-plugins-bad.bst                | 61 -------------------------
 elements/sdk/gst-plugins-base.bst               | 36 ---------------
 elements/sdk/gst-plugins-good.bst               | 47 -------------------
 elements/sdk/gstreamer.bst                      | 21 ---------
 elements/sdk/opus.bst                           | 12 -----
 elements/world/evolution.bst                    |  3 +-
 elements/world/gnome-internet-radio-locator.bst | 12 +++--
 elements/world/gnome-sound-recorder.bst         |  9 ++--
 24 files changed, 92 insertions(+), 222 deletions(-)
---
diff --git a/elements/core-deps/gnome-video-effects.bst b/elements/core-deps/gnome-video-effects.bst
index 4a8b79f..e4e8a6a 100644
--- a/elements/core-deps/gnome-video-effects.bst
+++ b/elements/core-deps/gnome-video-effects.bst
@@ -5,6 +5,7 @@ sources:
   ref: 5a7ee0f5ade4b7d921f1b99f3b97d7d7bb830f2fef0f1daee20a7a1867708219
 depends:
 - sdk/gnome-common.bst
-- sdk/gstreamer.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/gtk+.bst b/elements/core-deps/gtk+.bst
index 70890f0..5be4400 100644
--- a/elements/core-deps/gtk+.bst
+++ b/elements/core-deps/gtk+.bst
@@ -10,11 +10,15 @@ depends:
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
 - sdk/gtk-doc.bst
 - sdk/pango.bst
+- sdk/graphene.bst
+- filename: desktop/gstreamer-plugins-bad.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core-deps/gupnp-dlna.bst b/elements/core-deps/gupnp-dlna.bst
index 1167c16..a903267 100644
--- a/elements/core-deps/gupnp-dlna.bst
+++ b/elements/core-deps/gupnp-dlna.bst
@@ -5,12 +5,15 @@ sources:
   ref: 123e368227c11d5c17fc1aa76cbdaffa345355eb51d172cd39fc74a5b468ff6a
 depends:
 - sdk/glib.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
-- sdk/gstreamer.bst
 - filename: sdk/gtk-doc.bst
   type: build
 - filename: sdk/vala.bst
   type: build
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-good.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index 1b47e7d..bdfba7d 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -12,9 +12,11 @@ depends:
 - sdk/dconf.bst
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
 - sdk/libsecret.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/libseccomp.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 1f374b2..995282d 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -12,10 +12,6 @@ depends:
 - sdk/clutter-gst.bst
 - sdk/clutter-gtk.bst
 - sdk/glib.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
 - filename: sdk/gtk-doc.bst
   type: build
@@ -23,5 +19,13 @@ depends:
 - sdk/librsvg.bst
 - filename: sdk/vala.bst
   type: build
+- filename: desktop/gstreamer-plugins-bad.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-good.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-contacts.bst b/elements/core/gnome-contacts.bst
index 6bfce88..93a1835 100644
--- a/elements/core/gnome-contacts.bst
+++ b/elements/core/gnome-contacts.bst
@@ -12,9 +12,10 @@ depends:
 - core/gnome-desktop.bst
 - sdk/adwaita-icon-theme.bst
 - sdk/glib.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
 - sdk/vala.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gnome-control-center.bst b/elements/core/gnome-control-center.bst
index 12916dd..620933e 100644
--- a/elements/core/gnome-control-center.bst
+++ b/elements/core/gnome-control-center.bst
@@ -31,7 +31,8 @@ depends:
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/gnome-initial-setup.bst b/elements/core/gnome-initial-setup.bst
index 45ba050..ee1e657 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -21,9 +21,10 @@ depends:
 - sdk/adwaita-icon-theme.bst
 - sdk/geoclue.bst
 - sdk/glib.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
 - sdk/ibus.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index 04ac0a6..e4e7378 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -22,10 +22,12 @@ depends:
 - sdk/gjs.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
 - sdk/libcroco.bst
 - sdk/libsoup.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index b37e27a..6f937e9 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -13,8 +13,10 @@ depends:
 - sdk/clutter.bst
 - sdk/gjs.bst
 - sdk/gobject-introspection.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index 86a9dca..99491b8 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -17,12 +17,16 @@ depends:
 - sdk/gdk-pixbuf.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
 - sdk/yelp-tools.bst
+- filename: desktop/gstreamer-plugins-bad.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-good.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index a850e56..9f6b686 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -28,10 +28,6 @@ depends:
 - sdk/gobject-introspection.bst
 - sdk/gsettings-desktop-schemas.bst
 - sdk/gst-libav.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
 - sdk/gvfs.bst
 - sdk/ibus.bst
@@ -65,7 +61,7 @@ depends:
 
 # 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,
-# gobject-introspection, gstreamer-*, gtk3, ibus, json-glib, libcroco, librsvg,
+# gobject-introspection, gstreamer-libav, gtk3, ibus, json-glib, libcroco, librsvg,
 # libsoup, os-release, pango, sdl2* and zenity.
 
 # Due to being relatively deep in the stack, glib needs special treatment.
@@ -106,6 +102,16 @@ depends:
   junction: freedesktop-sdk.bst
 - filename: desktop/graphite2.bst
   junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-bad.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-good.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-ugly.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/harfbuzz.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/hicolor-icon-theme.bst
diff --git a/elements/sdk/WebKitGTK+.bst b/elements/sdk/WebKitGTK+.bst
index ef3606a..0fe1a76 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -16,15 +16,18 @@ depends:
 - sdk/geoclue.bst
 - sdk/gobject-introspection.bst
 - sdk/gst-libav.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
 - sdk/gtk+-3.bst
 - sdk/libnotify.bst
 - sdk/libsecret.bst
 - sdk/libsoup.bst
 - sdk/pango.bst
 - sdk/woff2.bst
+- filename: desktop/gstreamer-plugins-bad.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-good.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/hyphen.bst
   junction: freedesktop-sdk.bst
 - filename: desktop/wayland.bst
diff --git a/elements/sdk/clutter-gst.bst b/elements/sdk/clutter-gst.bst
index 2d7c86f..06ee78c 100644
--- a/elements/sdk/clutter-gst.bst
+++ b/elements/sdk/clutter-gst.bst
@@ -7,10 +7,12 @@ depends:
 - sdk/clutter.bst
 - sdk/cogl.bst
 - sdk/gobject-introspection.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
 - filename: sdk/gtk-doc.bst
   type: build
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/sdk/cogl.bst b/elements/sdk/cogl.bst
index 349c949..3c58941 100644
--- a/elements/sdk/cogl.bst
+++ b/elements/sdk/cogl.bst
@@ -6,11 +6,13 @@ sources:
 depends:
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
 - filename: sdk/gtk-doc.bst
   type: build
 - sdk/pango.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: desktop/wayland.bst
   junction: freedesktop-sdk.bst
 - filename: base.bst
diff --git a/elements/sdk/gst-libav.bst b/elements/sdk/gst-libav.bst
index 0480fa7..3c00c04 100644
--- a/elements/sdk/gst-libav.bst
+++ b/elements/sdk/gst-libav.bst
@@ -18,8 +18,9 @@ sources:
 - kind: patch
   path: files/gst-libav/fix-api.patch
 depends:
-- sdk/gst-plugins-base.bst
 - sdk/ffmpeg.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
   type: build
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index fa53fa4..488b565 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -18,11 +18,12 @@ depends:
 - sdk/geoclue.bst
 - sdk/glib.bst
 - sdk/gsettings-desktop-schemas.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
 - sdk/libnotify.bst
 - sdk/libsoup.bst
 - sdk/yelp-tools.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
 variables:
diff --git a/elements/world/gnome-internet-radio-locator.bst b/elements/world/gnome-internet-radio-locator.bst
index 83c75ac..a117f33 100644
--- a/elements/world/gnome-internet-radio-locator.bst
+++ b/elements/world/gnome-internet-radio-locator.bst
@@ -11,11 +11,15 @@ depends:
 - sdk/clutter-gtk.bst
 - sdk/clutter.bst
 - sdk/glib.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
 - sdk/pango.bst
+- filename: desktop/gstreamer-plugins-bad.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-good.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst
diff --git a/elements/world/gnome-sound-recorder.bst b/elements/world/gnome-sound-recorder.bst
index e2ed55d..ff66949 100644
--- a/elements/world/gnome-sound-recorder.bst
+++ b/elements/world/gnome-sound-recorder.bst
@@ -7,9 +7,12 @@ depends:
 - sdk/gdk-pixbuf.bst
 - sdk/gjs.bst
 - sdk/glib.bst
-- sdk/gst-plugins-base.bst
-- sdk/gst-plugins-good.bst
-- sdk/gstreamer.bst
 - sdk/gtk+-3.bst
+- filename: desktop/gstreamer-plugins-base.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer-plugins-good.bst
+  junction: freedesktop-sdk.bst
+- filename: desktop/gstreamer.bst
+  junction: freedesktop-sdk.bst
 - filename: base.bst
   junction: freedesktop-sdk.bst


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]