From 2681974e0d01e4c6c9567694ac7f416fbdd0f77a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 1 Jul 2016 13:19:04 +0100
Subject: Move orc to multimedia-common

Its a common dependency of gstreamer 0.10 and 1.x

Change-Id: I56b4ad29d6e29af47aa0e6fa6b195487c6966620
---
 strata/multimedia-common.morph         |  5 +++++
 strata/multimedia-common/orc.morph     |  5 +++++
 strata/multimedia-gstreamer-0.10.morph |  8 --------
 strata/multimedia-gstreamer.morph      | 11 -----------
 strata/multimedia-gstreamer/orc.morph  |  5 -----
 5 files changed, 10 insertions(+), 24 deletions(-)
 create mode 100644 strata/multimedia-common/orc.morph
 delete mode 100644 strata/multimedia-gstreamer/orc.morph

(limited to 'strata')

diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph
index 8ec5817e..3df50d0d 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-common/orc.morph b/strata/multimedia-common/orc.morph
new file mode 100644
index 00000000..97a5da9d
--- /dev/null
+++ b/strata/multimedia-common/orc.morph
@@ -0,0 +1,5 @@
+name: orc
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
index 390f3933..e53c0916 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 81c59f73..8dcda772 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
diff --git a/strata/multimedia-gstreamer/orc.morph b/strata/multimedia-gstreamer/orc.morph
deleted file mode 100644
index 97a5da9d..00000000
--- a/strata/multimedia-gstreamer/orc.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: orc
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --disable-gtk-doc
-- 
cgit v1.2.1