From 0b3953b19b6a0fb037ca6343f701c08ba2771098 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul.martin@codethink.co.uk>
Date: Thu, 30 Jul 2015 13:02:11 +0100
Subject: Update multimedia-common

Add newer versions of existing codec sources ogg and vorbis.
Add new codecs: tremor (integer vorbis decoder), flac and
libmad (integer MP3 decoder).

Change-Id: I39ff6c10451ad51b722ae3ef39de4fe5572af86b
---
 strata/multimedia-common.morph        | 27 ++++++++++++++++++++++-----
 strata/multimedia-common/libmad.morph | 10 ++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 strata/multimedia-common/libmad.morph

diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph
index 69f3ccad..2eaedabf 100644
--- a/strata/multimedia-common.morph
+++ b/strata/multimedia-common.morph
@@ -5,12 +5,29 @@ build-depends:
 - morph: strata/core.morph
 chunks:
 - name: ogg
-  repo: upstream:ogg
-  ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f
+  repo: upstream:ogg-git
+  ref: 9b2ba419aecb4a1c97114545d57174593dc13111
   unpetrify-ref: master
 - name: libvorbis
-  repo: upstream:libvorbis
-  ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8
-  unpetrify-ref: libvorbis-1.3.3
+  repo: upstream:libvorbis-git
+  ref: 7187e7a48f0c3ba32cc080f6bc3d921fe4ec6cc2
+  unpetrify-ref: master
+  build-depends:
+  - ogg
+- name: tremor
+  repo: upstream:tremor
+  ref: b56ffce0c0773ec5ca04c466bc00b1bbcaf65aef
+  unpetrify-ref: master
+  build-depends:
+  - ogg
+- name: flac
+  repo: upstream:flac
+  ref: 6ced857c253d5da286bf31adfd74a627aaa43c77
+  unpetrify-ref: master
   build-depends:
   - ogg
+- name: libmad
+  morph: strata/multimedia-common/libmad.morph
+  repo: upstream:libmad-tarball
+  ref: f2b21c41aef22e81b605afe96e1e6ef1bea0cfdc
+  unpetrify-ref: baserock/0.15.1b-gstreamer-sdk-fork
diff --git a/strata/multimedia-common/libmad.morph b/strata/multimedia-common/libmad.morph
new file mode 100644
index 00000000..839adc15
--- /dev/null
+++ b/strata/multimedia-common/libmad.morph
@@ -0,0 +1,10 @@
+name: libmad
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+  OPTS=
+  case $MORPH_ARCH in
+      mips64*)  ARCH_FLAGS="--enable-fpm=64bit" ;;
+  esac
+  ./configure --prefix="$PREFIX" $ARCH_FLAGS
-- 
cgit v1.2.1