[gnome-build-meta/abderrahim/remove-gstreamer: 3/3] use gstreamer from freedesktop-sdk
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/remove-gstreamer: 3/3] use gstreamer from freedesktop-sdk
- Date: Fri, 9 Nov 2018 19:59:53 +0000 (UTC)
commit e0f37c98d6745bf61b74b2f1a58313d9abe0bf40
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Wed Nov 7 10:28:19 2018 +0100
use gstreamer from freedesktop-sdk
Fixes #97
elements/core-deps/gnome-video-effects.bst | 3 +-
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 | 65 -------------------------
elements/sdk/gst-plugins-base.bst | 32 ------------
elements/sdk/gst-plugins-good.bst | 34 -------------
elements/sdk/gstreamer.bst | 23 ---------
elements/sdk/gtk+.bst | 9 ++--
elements/world/evolution.bst | 3 +-
elements/world/gnome-internet-radio-locator.bst | 12 +++--
elements/world/gnome-sound-recorder.bst | 9 ++--
23 files changed, 91 insertions(+), 199 deletions(-)
---
diff --git a/elements/core-deps/gnome-video-effects.bst b/elements/core-deps/gnome-video-effects.bst
index 0215bce..1eb246d 100644
--- a/elements/core-deps/gnome-video-effects.bst
+++ b/elements/core-deps/gnome-video-effects.bst
@@ -5,7 +5,8 @@ sources:
track: master
depends:
- sdk/gnome-common.bst
-- sdk/gstreamer.bst
+- filename: desktop/gstreamer.bst
+ junction: freedesktop-sdk.bst
- filename: base/intltool.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/core-deps/gupnp-dlna.bst b/elements/core-deps/gupnp-dlna.bst
index f503c39..be9ce86 100644
--- a/elements/core-deps/gupnp-dlna.bst
+++ b/elements/core-deps/gupnp-dlna.bst
@@ -5,13 +5,16 @@ sources:
track: master
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/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index eeab6d7..ace135b 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -13,9 +13,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/intltool.bst
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 9267052..9f96ee6 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,6 +19,14 @@ 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/intltool.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/core/gnome-contacts.bst b/elements/core/gnome-contacts.bst
index 7eec0eb..25b9508 100644
--- a/elements/core/gnome-contacts.bst
+++ b/elements/core/gnome-contacts.bst
@@ -13,9 +13,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/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/core/gnome-control-center.bst b/elements/core/gnome-control-center.bst
index 7dea8e6..32d3a1d 100644
--- a/elements/core/gnome-control-center.bst
+++ b/elements/core/gnome-control-center.bst
@@ -28,11 +28,12 @@ depends:
- sdk/gdk-pixbuf.bst
- sdk/glib.bst
- sdk/gsettings-desktop-schemas.bst
-- sdk/gstreamer.bst
- sdk/gtk+-3.bst
- filename: sdk/gtk-doc.bst
type: build
- sdk/ibus.bst
+- filename: desktop/gstreamer.bst
+ junction: freedesktop-sdk.bst
- filename: base/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/core/gnome-initial-setup.bst b/elements/core/gnome-initial-setup.bst
index ed737e9..161e953 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -21,8 +21,9 @@ depends:
- sdk/adwaita-icon-theme.bst
- sdk/geoclue.bst
- sdk/glib.bst
-- sdk/gstreamer.bst
- sdk/gtk+-3.bst
+- filename: desktop/gstreamer.bst
+ junction: freedesktop-sdk.bst
- filename: base/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index e96fa7a..24e9c72 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -22,11 +22,13 @@ 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/docbook-xsl.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index e963b8b..0b96564 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -13,9 +13,11 @@ 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/buildsystem-meson.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index 98c5e40..1559cb6 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/intltool.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 3677ca3..b6d0207 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -29,10 +29,6 @@ depends:
- sdk/graphene.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+.bst
- sdk/gtk+-3.bst
- sdk/gvfs.bst
@@ -67,7 +63,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, 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.
@@ -108,6 +104,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 269931c..8ff0e52 100644
--- a/elements/sdk/WebKitGTK+.bst
+++ b/elements/sdk/WebKitGTK+.bst
@@ -15,15 +15,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 11df417..21408ce 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/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/sdk/cogl.bst b/elements/sdk/cogl.bst
index 57a95cd..5c22b8d 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/buildsystem-autotools.bst
diff --git a/elements/sdk/gst-libav.bst b/elements/sdk/gst-libav.bst
index 52db5f3..e8f2d5e 100644
--- a/elements/sdk/gst-libav.bst
+++ b/elements/sdk/gst-libav.bst
@@ -4,8 +4,9 @@ sources:
url: git_freedesktop_org:gstreamer/gst-libav
track: master
depends:
-- sdk/gst-plugins-base.bst
- sdk/ffmpeg.bst
+- filename: desktop/gstreamer-plugins-base.bst
+ junction: freedesktop-sdk.bst
- filename: base/buildsystem-autotools.bst
junction: freedesktop-sdk.bst
type: build
diff --git a/elements/sdk/gtk+.bst b/elements/sdk/gtk+.bst
index 67f9dd0..59397d4 100644
--- a/elements/sdk/gtk+.bst
+++ b/elements/sdk/gtk+.bst
@@ -10,14 +10,17 @@ depends:
- sdk/glib.bst
- sdk/gobject-introspection.bst
- sdk/graphene.bst
-- sdk/gst-plugins-bad.bst
-- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
- filename: sdk/gtk-doc.bst
type: build
- sdk/pango.bst
- filename: desktop/cups.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.bst
+ junction: freedesktop-sdk.bst
- filename: desktop/wayland.bst
junction: freedesktop-sdk.bst
- filename: base/buildsystem-meson.bst
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]