[gnome-build-meta/abderrahim/gst-3.30: 1/4] sdk/gst*: replace with filter elements that use the freedesktop-sdk ones
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/gst-3.30: 1/4] sdk/gst*: replace with filter elements that use the freedesktop-sdk ones
- Date: Fri, 19 Apr 2019 10:24:12 +0000 (UTC)
commit c8c3ea4e9e1a1e9bb5ff0df4756f210697cb847e
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Wed Nov 7 10:28:19 2018 +0100
sdk/gst*: replace with filter elements that use the freedesktop-sdk ones
See #97 and #119
elements/core-deps/gnome-video-effects.bst | 3 +-
elements/core-deps/gtk+.bst | 3 +-
elements/core-deps/gupnp-dlna.bst | 3 +-
elements/core-deps/tracker-miners.bst | 3 +-
elements/core/cheese.bst | 3 +-
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 | 3 +-
elements/core/sushi.bst | 3 +-
elements/core/totem.bst | 1 -
elements/sdk-platform.bst | 3 +-
elements/sdk/clutter-gst.bst | 3 +-
elements/sdk/cogl.bst | 3 +-
elements/sdk/gst-libav.bst | 37 ++++---------
elements/sdk/gst-plugins-bad.bst | 70 +++++++++++--------------
elements/sdk/gst-plugins-base.bst | 54 +++++++++----------
elements/sdk/gst-plugins-good.bst | 65 ++++++++++-------------
elements/sdk/gstreamer.bst | 21 --------
elements/world/evolution.bst | 3 +-
elements/world/gnome-internet-radio-locator.bst | 3 +-
elements/world/gnome-sound-recorder.bst | 3 +-
project.conf | 1 +
23 files changed, 128 insertions(+), 169 deletions(-)
---
diff --git a/elements/core-deps/gnome-video-effects.bst b/elements/core-deps/gnome-video-effects.bst
index 4a8b79f3..e4e8a6a1 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 70890f03..b3d2479b 100644
--- a/elements/core-deps/gtk+.bst
+++ b/elements/core-deps/gtk+.bst
@@ -12,9 +12,10 @@ depends:
- sdk/gobject-introspection.bst
- sdk/gst-plugins-bad.bst
- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
- sdk/gtk-doc.bst
- sdk/pango.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 1167c167..b0137bb5 100644
--- a/elements/core-deps/gupnp-dlna.bst
+++ b/elements/core-deps/gupnp-dlna.bst
@@ -7,10 +7,11 @@ 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.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 1b47e7d1..43c40c2a 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -13,8 +13,9 @@ depends:
- sdk/gdk-pixbuf.bst
- sdk/glib.bst
- sdk/gst-plugins-base.bst
-- sdk/gstreamer.bst
- sdk/libsecret.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 1f374b2b..e33118d6 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -15,7 +15,6 @@ depends:
- 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 +22,7 @@ depends:
- sdk/librsvg.bst
- filename: sdk/vala.bst
type: build
+- 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 35ea1716..ad015863 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 b1686367..24b6dcc8 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 4285c3b9..d4f1d323 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -19,9 +19,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 817dd515..02647f29 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -23,9 +23,10 @@ depends:
- 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.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 b37e27aa..b010afef 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -14,7 +14,8 @@ depends:
- sdk/gjs.bst
- sdk/gobject-introspection.bst
- sdk/gst-plugins-base.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/totem.bst b/elements/core/totem.bst
index 1f992293..c7a43c56 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -20,7 +20,6 @@ depends:
- 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: base.bst
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 696c0af4..0c984e0b 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -30,7 +30,6 @@ depends:
- 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
@@ -103,6 +102,8 @@ depends:
junction: freedesktop-sdk.bst
- filename: desktop/graphite2.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/clutter-gst.bst b/elements/sdk/clutter-gst.bst
index a2b68195..6449ece7 100644
--- a/elements/sdk/clutter-gst.bst
+++ b/elements/sdk/clutter-gst.bst
@@ -8,9 +8,10 @@ depends:
- 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.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 349c949d..72fde679 100644
--- a/elements/sdk/cogl.bst
+++ b/elements/sdk/cogl.bst
@@ -7,10 +7,11 @@ 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.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 c29624d0..49fb989a 100644
--- a/elements/sdk/gst-libav.bst
+++ b/elements/sdk/gst-libav.bst
@@ -1,31 +1,16 @@
-kind: autotools
-sources:
-- kind: git
- url: git_freedesktop_org:gstreamer/gst-libav
- track: master
- # Latest stable release doesn't support our ffmpeg, this is the closest commit
- # to 1.14.2 which supports ffmpeg n4.0.2 with minimal patching
- ref: 3b6597188ad25cca84ae5caa7b08767a5b4cfee7 # 1.14.0-39-g3b65971
- submodules:
- common:
- url: git_freedesktop_org:gstreamer/common
- gst-libs/ext/libav:
- url: https://git.ffmpeg.org/ffmpeg.git
- gst-libs/ext/gas-preprocessor:
- url: git://git.libav.org/gas-preprocessor.git
-- kind: patch
- path: files/gst-libav/stop-caching-codecs.patch
-- kind: patch
- path: files/gst-libav/fix-api.patch
+kind: filter
depends:
-- sdk/gst-plugins-base.bst
-- filename: desktop/ffmpeg.bst
- junction: freedesktop-sdk.bst
-- filename: base.bst
+- filename: desktop/gstreamer-libav.bst
junction: freedesktop-sdk.bst
type: build
-- filename: base-platform.bst
+- filename: bootstrap-import.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
+- filename: desktop/orc.bst
junction: freedesktop-sdk.bst
type: runtime
-variables:
- conf-local: --with-system-libav
+- filename: desktop/gstreamer.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
+- filename: sdk/gst-plugins-base.bst
+ type: runtime
diff --git a/elements/sdk/gst-plugins-bad.bst b/elements/sdk/gst-plugins-bad.bst
index ce946fa9..d95fe7c5 100644
--- a/elements/sdk/gst-plugins-bad.bst
+++ b/elements/sdk/gst-plugins-bad.bst
@@ -1,61 +1,51 @@
-kind: autotools
-sources:
-- kind: tar
- url: https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.4.tar.xz
- ref: 910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5
+kind: filter
depends:
-- sdk/gstreamer.bst
-- sdk/gst-plugins-base.bst
-- sdk/gobject-introspection.bst
-- sdk/librsvg.bst
-- sdk/opus.bst
-- filename: desktop/xorg-lib-x11.bst
- junction: freedesktop-sdk.bst
-- filename: desktop/wayland.bst
- junction: freedesktop-sdk.bst
-- filename: desktop/wayland-protocols.bst
+- filename: desktop/gstreamer-plugins-bad.bst
junction: freedesktop-sdk.bst
type: build
-- filename: desktop/orc.bst
+- filename: bootstrap-import.bst
junction: freedesktop-sdk.bst
-- filename: desktop/openal.bst
+ type: runtime
+- filename: desktop/orc.bst
junction: freedesktop-sdk.bst
-- filename: desktop/libfdk-aac.bst
+ type: runtime
+- filename: desktop/gstreamer.bst
junction: freedesktop-sdk.bst
+ type: runtime
+- filename: sdk/gst-plugins-base.bst
+ type: runtime
- filename: desktop/libdrm.bst
junction: freedesktop-sdk.bst
-- filename: desktop/libva.bst
+ type: runtime
+- filename: desktop/libfdk-aac.bst
junction: freedesktop-sdk.bst
+ type: runtime
- filename: desktop/libglvnd.bst
junction: freedesktop-sdk.bst
+ type: runtime
+- filename: sdk/librsvg.bst
+ type: runtime
- filename: desktop/libvdpau.bst
junction: freedesktop-sdk.bst
+ type: runtime
- filename: desktop/mesa.bst
junction: freedesktop-sdk.bst
+ type: runtime
+- filename: desktop/openal.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
- filename: desktop/vulkan.bst
junction: freedesktop-sdk.bst
+ type: runtime
+- filename: desktop/wayland.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
- filename: base/curl.bst
junction: freedesktop-sdk.bst
-- filename: base/sndfile.bst
+ type: runtime
+- filename: base/libwebp.bst
junction: freedesktop-sdk.bst
-- filename: base.bst
+ type: runtime
+- filename: base/sndfile.bst
junction: freedesktop-sdk.bst
- type: build
-- filename: base-platform.bst
- junction: freedesktop-sdk.bst
- type: runtime
-
-
-variables:
- host: ''
- (?):
- - arch == "i686":
- host: --host=i686-unknown-linux-gnu
- - arch == "arm":
- host: --host=arm-unknown-linux-gnueabi
- conf-local: |
- %{host} \
- --enable-experimental \
- --enable-orc \
- --enable-introspection \
- --enable-wayland
+ type: runtime
diff --git a/elements/sdk/gst-plugins-base.bst b/elements/sdk/gst-plugins-base.bst
index 8065b5ee..6766e092 100644
--- a/elements/sdk/gst-plugins-base.bst
+++ b/elements/sdk/gst-plugins-base.bst
@@ -1,36 +1,34 @@
-kind: autotools
-sources:
-- kind: tar
- url: https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz
- ref: ca6139490e48863e7706d870ff4e8ac9f417b56f3b9e4b3ce490c13b09a77461
+kind: filter
depends:
-- sdk/gobject-introspection.bst
-- sdk/gstreamer.bst
-- sdk/gtk+-3.bst
-- sdk/pango.bst
-# FIXME: remove opus from the GNOME SDK
-# once the fd.o junction is updated to 18.08.9+
-# see base/opus.bst
-- sdk/opus.bst
+- filename: desktop/gstreamer-plugins-base.bst
+ junction: freedesktop-sdk.bst
+ type: build
+- filename: bootstrap-import.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
- filename: desktop/orc.bst
junction: freedesktop-sdk.bst
+ type: runtime
+- filename: desktop/gstreamer.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
- filename: desktop/mesa.bst
junction: freedesktop-sdk.bst
+ type: runtime
+- filename: sdk/pango.bst
+ type: runtime
- filename: desktop/xorg-lib-xv.bst
junction: freedesktop-sdk.bst
-- filename: base.bst
+ type: runtime
+- filename: base/libogg.bst
junction: freedesktop-sdk.bst
- type: build
-- filename: base-platform.bst
- junction: freedesktop-sdk.bst
- type: runtime
-variables:
- conf-local: |
- --enable-experimental \
- --enable-introspection \
- --enable-ogg \
- --enable-opus \
- --enable-orc \
- --enable-pango \
- --enable-theora \
- --enable-vorbis
+ type: runtime
+- filename: base/libtheora.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
+- filename: base/libvorbis.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
+- filename: base/opus.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
diff --git a/elements/sdk/gst-plugins-good.bst b/elements/sdk/gst-plugins-good.bst
index 0122b69a..09622c11 100644
--- a/elements/sdk/gst-plugins-good.bst
+++ b/elements/sdk/gst-plugins-good.bst
@@ -1,49 +1,40 @@
-kind: autotools
-sources:
-- kind: tar
- url: https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.4.tar.xz
- ref: 5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979
+kind: filter
depends:
-- sdk/gdk-pixbuf.bst
-- sdk/gstreamer.bst
-- sdk/gobject-introspection.bst
-- sdk/gst-plugins-base.bst
-- sdk/libsoup.bst
+- filename: desktop/gstreamer-plugins-good.bst
+ junction: freedesktop-sdk.bst
+ type: build
+- filename: bootstrap-import.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
- filename: desktop/cairo.bst
junction: freedesktop-sdk.bst
+ type: runtime
+- filename: desktop/orc.bst
+ junction: freedesktop-sdk.bst
+ type: runtime
- filename: desktop/lame.bst
junction: freedesktop-sdk.bst
+ type: runtime
- filename: desktop/libpulse.bst
junction: freedesktop-sdk.bst
-- filename: base/libflac.bst
- junction: freedesktop-sdk.bst
+ type: runtime
+- filename: sdk/libsoup.bst
+ type: runtime
- filename: desktop/mpg123.bst
junction: freedesktop-sdk.bst
-- filename: desktop/orc.bst
+ type: runtime
+- filename: sdk/gtk+-3.bst
+ type: runtime
+- filename: sdk/gdk-pixbuf.bst
+ type: runtime
+- filename: desktop/gstreamer.bst
junction: freedesktop-sdk.bst
-- filename: base/wavpack.bst
+ type: runtime
+- filename: sdk/gst-plugins-base.bst
+ type: runtime
+- filename: base/libflac.bst
junction: freedesktop-sdk.bst
-- filename: base.bst
+ type: runtime
+- filename: base/wavpack.bst
junction: freedesktop-sdk.bst
- type: build
-- filename: base-platform.bst
- junction: freedesktop-sdk.bst
- type: runtime
-
-variables:
- host: ''
- (?):
- - arch == "i686":
- host: --host=i686-unknown-linux-gnu
- - arch == "arm":
- host: --host=arm-unknown-linux-gnueabi
- conf-local: |
- %{host} \
- --enable-cairo \
- --enable-experimental \
- --enable-introspection \
- --enable-lame \
- --enable-soup \
- --enable-orc \
- --enable-pulse \
- --with-default-visualizer=autoaudiosink
+ type: runtime
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index fa53fa49..488b5652 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 83c75acc..89f7566d 100644
--- a/elements/world/gnome-internet-radio-locator.bst
+++ b/elements/world/gnome-internet-radio-locator.bst
@@ -14,8 +14,9 @@ depends:
- 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.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 e2ed55d9..1fb5a0c0 100644
--- a/elements/world/gnome-sound-recorder.bst
+++ b/elements/world/gnome-sound-recorder.bst
@@ -9,7 +9,8 @@ depends:
- sdk/glib.bst
- sdk/gst-plugins-base.bst
- sdk/gst-plugins-good.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/project.conf b/project.conf
index 986b0562..a34c6cb2 100644
--- a/project.conf
+++ b/project.conf
@@ -46,6 +46,7 @@ aliases:
gitlab_com: https://gitlab.com/
gitlab_gnome_org: https://gitlab.gnome.org/
gnome_download: https://download.gnome.org/
+ gstreamer: https://gstreamer.freedesktop.org/src/
icon_theme_freedesktop_org: https://icon-theme.freedesktop.org/releases/
iso_codes: https://pkg-isocodes.alioth.debian.org/downloads/
people_freedesktop_org: https://people.freedesktop.org/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]