summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-07-01 12:19:04 (GMT)
committerJavier Jardón <jjardon@gnome.org>2016-07-01 12:19:04 (GMT)
commit2681974e0d01e4c6c9567694ac7f416fbdd0f77a (patch)
treef7c6470e083bc30739b2f9648a9fee51fb5b9ad7
parent0d96f1994aaa9612dc2a40111686f869b984fb40 (diff)
downloaddefinitions-2681974e0d01e4c6c9567694ac7f416fbdd0f77a.tar.gz
Move orc to multimedia-common
Its a common dependency of gstreamer 0.10 and 1.x Change-Id: I56b4ad29d6e29af47aa0e6fa6b195487c6966620
-rw-r--r--strata/multimedia-common.morph5
-rw-r--r--strata/multimedia-common/orc.morph (renamed from strata/multimedia-gstreamer/orc.morph)0
-rw-r--r--strata/multimedia-gstreamer-0.10.morph8
-rw-r--r--strata/multimedia-gstreamer.morph11
4 files changed, 5 insertions, 19 deletions
diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph
index 8ec5817..3df50d0 100644
--- a/strata/multimedia-common.morph
+++ b/strata/multimedia-common.morph
@@ -57,3 +57,8 @@ chunks:
repo: upstream:libmpeg2-tarball
ref: d1e80dc431815df3ac6eeed654eeccaf8d6beea7
unpetrify-ref: libmpeg2-0.5.1
+- name: orc
+ morph: strata/multimedia-common/orc.morph
+ repo: upstream:orc
+ ref: 831886d1f70d3cc21a913b2e335da38af4cae524
+ unpetrify-ref: orc-0.4.25
diff --git a/strata/multimedia-gstreamer/orc.morph b/strata/multimedia-common/orc.morph
index 97a5da9..97a5da9 100644
--- a/strata/multimedia-gstreamer/orc.morph
+++ b/strata/multimedia-common/orc.morph
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
index 390f393..e53c091 100644
--- a/strata/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.morph
@@ -7,18 +7,11 @@ build-depends:
- morph: strata/audio-bluetooth.morph
- morph: strata/multimedia-common.morph
chunks:
-- name: orc
- repo: upstream:orc
- ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a
- unpetrify-ref: baserock/morph
- build-system: autotools
- name: gstreamer@0.10
repo: upstream:gstreamer
ref: 76fc67b18c38e7f6c9cfacc4e4d0ed11d3b2c548
unpetrify-ref: "0.10"
build-system: autotools
- build-depends:
- - orc
submodules:
common:
url: upstream:gstreamer-common
@@ -40,7 +33,6 @@ chunks:
build-depends:
- gstreamer@0.10
- gstreamer-plugins-base@0.10
- - orc
submodules:
common:
url: upstream:gstreamer-common
diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph
index 81c59f7..8dcda77 100644
--- a/strata/multimedia-gstreamer.morph
+++ b/strata/multimedia-gstreamer.morph
@@ -8,18 +8,11 @@ build-depends:
- morph: strata/mesa-common.morph
- morph: strata/graphics-common.morph
chunks:
-- name: orc
- morph: strata/multimedia-gstreamer/orc.morph
- repo: upstream:orc
- ref: 831886d1f70d3cc21a913b2e335da38af4cae524
- unpetrify-ref: orc-0.4.25
- name: gstreamer
repo: upstream:gstreamer
ref: 1abf889dddc75b4e4db2f4505a4287cb20878d27
unpetrify-ref: 1.8.0
build-system: autotools
- build-depends:
- - orc
submodules:
common:
url: upstream:gstreamer-common
@@ -30,7 +23,6 @@ chunks:
build-system: autotools
build-depends:
- gstreamer
- - orc
submodules:
common:
url: upstream:gstreamer-common
@@ -42,7 +34,6 @@ chunks:
build-depends:
- gstreamer
- gstreamer-plugins-base
- - orc
submodules:
common:
url: upstream:gstreamer-common
@@ -54,7 +45,6 @@ chunks:
build-depends:
- gstreamer
- gstreamer-plugins-base
- - orc
submodules:
common:
url: upstream:gstreamer-common
@@ -66,7 +56,6 @@ chunks:
build-depends:
- gstreamer
- gstreamer-plugins-base
- - orc
submodules:
gst-libs/ext/libav:
url: upstream:ffmpeg