---
enlightenment.morph | 23 ++++++++++++++++++++++-
qt4-devel-system-x86_64-generic.morph | 13 +++++++++----
qt4-tools.morph | 29 ++++++++++++++++++++++++-----
qt5-devel-system-x86_64-generic.morph | 13 +++++++++----
qt5-tools.morph | 33 ++++++++++++++++++++++++++++-----
5 files changed, 92 insertions(+), 19 deletions(-)
diff --git a/enlightenment.morph b/enlightenment.morph
index 0a0c4a0..4a8c278 100644
--- a/enlightenment.morph
+++ b/enlightenment.morph
@@ -11,11 +11,30 @@ build-depends:
- repo: baserock:baserock/morphs
ref: master
morph: lua
+- repo: baserock:baserock/morphs
+ ref: master
+ morph: audio-bluetooth
chunks:
+- name: orc
+ repo: upstream:orc
+ ref: baserock/morph
+ build-depends: []
+- name: gstreamer
+ repo: upstream:gstreamer
+ ref: baserock/morph/0.10
+ build-depends:
+ - orc
+- name: gstreamer-plugins-base
+ repo: upstream:gstreamer-plugins-base
+ ref: baserock/morph/0.10
+ build-depends:
+ - gstreamer
- name: efl
repo: upstream:enlightenment/efl
ref: baserock/morph
- build-depends: []
+ build-depends:
+ - gstreamer
+ - gstreamer-plugins-base
- name: elementary
repo: upstream:enlightenment/elementary
ref: baserock/morph
@@ -26,6 +45,8 @@ chunks:
ref: baserock/morph
build-depends:
- efl
+ - gstreamer
+ - gstreamer-plugins-base
- name: enlightenment
repo: upstream:enlightenment/enlightenment
ref: baserock/morph
diff --git a/qt4-devel-system-x86_64-generic.morph
b/qt4-devel-system-x86_64-generic.morph
index 823d690..8747bc2 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -1,6 +1,6 @@
{
"name": "qt4-devel-system-x86_64-generic",
- "description": "A system that is able to build other systems based on
the 64-bit x86 architecture.",
+ "description": "A Qt4 based development system with the Enlightenment
desktop.",
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "x86_64",
@@ -42,6 +42,11 @@
"ref": "master"
},
{
+ "morph": "audio-bluetooth",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
+ },
+ {
"morph": "qt4-tools",
"repo": "baserock:baserock/morphs",
"ref": "master"
@@ -66,8 +71,8 @@
"set-hostname",
"ssh",
"add-config-files",
- "simple-network",
- "nfsboot",
- "install-files"
+ "simple-network",
+ "nfsboot",
+ "install-files"
]
}
diff --git a/qt4-tools.morph b/qt4-tools.morph
index 0756ae6..f6d8524 100644
--- a/qt4-tools.morph
+++ b/qt4-tools.morph
@@ -12,15 +12,32 @@
"repo": "baserock:baserock/morphs",
"ref": "master",
"morph": "x-x86_64-generic"
- },
- {
- "repo": "baserock:baserock/morphs",
- "ref": "master",
- "morph": "multimedia"
}
],
"chunks": [
{
+ "name": "orc",
+ "repo": "upstream:orc",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "gstreamer",
+ "repo": "upstream:gstreamer",
+ "ref": "baserock/morph/0.10",
+ "build-depends": [
+ "orc"
+ ]
+ },
+ {
+ "name": "gstreamer-plugins-base",
+ "repo": "upstream:gstreamer-plugins-base",
+ "ref": "baserock/morph/0.10",
+ "build-depends": [
+ "gstreamer"
+ ]
+ },
+ {
"name": "icu",
"repo": "upstream:icu",
"ref": "baserock/morph",
@@ -51,6 +68,8 @@
"repo": "upstream:qt4-tools",
"ref": "baserock/morph",
"build-depends": [
+ "gstreamer",
+ "gstreamer-plugins-base",
"icu",
"ruby-1.9",
"sqlite3"
diff --git a/qt5-devel-system-x86_64-generic.morph
b/qt5-devel-system-x86_64-generic.morph
index f27d545..6c3cfd3 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -1,6 +1,6 @@
{
"name": "qt5-devel-system-x86_64-generic",
- "description": "A system that is able to build other systems based on
the 64-bit x86 architecture.",
+ "description": "A Qt5 based development system with the Enlightenment
desktop.",
"kind": "system",
"system-kind": "rootfs-tarball",
"arch": "x86_64",
@@ -42,6 +42,11 @@
"ref": "master"
},
{
+ "morph": "audio-bluetooth",
+ "repo": "baserock:baserock/morphs",
+ "ref": "master"
+ },
+ {
"morph": "qt5-tools",
"repo": "baserock:baserock/morphs",
"ref": "master"
@@ -66,8 +71,8 @@
"set-hostname",
"ssh",
"add-config-files",
- "simple-network",
- "nfsboot",
- "install-files"
+ "simple-network",
+ "nfsboot",
+ "install-files"
]
}
diff --git a/qt5-tools.morph b/qt5-tools.morph
index b0d1bd6..bab8d1e 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -12,15 +12,32 @@
"repo": "baserock:baserock/morphs",
"ref": "master",
"morph": "x-x86_64-generic"
- },
- {
- "repo": "baserock:baserock/morphs",
- "ref": "master",
- "morph": "multimedia"
}
],
"chunks": [
{
+ "name": "orc",
+ "repo": "upstream:orc",
+ "ref": "baserock/morph",
+ "build-depends": []
+ },
+ {
+ "name": "gstreamer",
+ "repo": "upstream:gstreamer",
+ "ref": "baserock/morph/0.10",
+ "build-depends": [
+ "orc"
+ ]
+ },
+ {
+ "name": "gstreamer-plugins-base",
+ "repo": "upstream:gstreamer-plugins-base",
+ "ref": "baserock/morph/0.10",
+ "build-depends": [
+ "gstreamer"
+ ]
+ },
+ {
"name": "icu",
"repo": "upstream:icu",
"ref": "baserock/morph",
@@ -51,6 +68,8 @@
"repo": "upstream:qt5/qtbase",
"ref": "baserock/morph",
"build-depends": [
+ "gstreamer",
+ "gstreamer-plugins-base",
"icu"
]
},
@@ -138,6 +157,8 @@
"repo": "upstream:qt5/qtwebkit",
"ref": "baserock/morph",
"build-depends": [
+ "gstreamer",
+ "gstreamer-plugins-base",
"qtbase",
"sqlite3",
"icu",
@@ -162,6 +183,8 @@
"repo": "upstream:qt5/qtmultimedia",
"ref": "baserock/morph",
"build-depends": [
+ "gstreamer",
+ "gstreamer-plugins-base",
"qtbase"
]
},
--
1.7.10.4