From 07be49de5615eb4408dcb2b34b78776515640f6a Mon Sep 17 00:00:00 2001
From: Chris Lord <chris@openedhand.com>
Date: Wed, 27 Sep 2006 15:29:04 +0000
Subject: - Fix mp3 playback (update libmad) - add mp3 decoder to
 gst-meta-audio - add avi demuxer to gst-meta-video

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@768 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/gstreamer/gst-meta-audio_0.10.bb |  6 +++---
 meta/packages/gstreamer/gst-meta-video_0.10.bb |  5 +++--
 meta/packages/libmad/libmad_0.15.0b.bb         | 25 -------------------------
 meta/packages/libmad/libmad_0.15.1b.bb         | 25 +++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 meta/packages/libmad/libmad_0.15.0b.bb
 create mode 100644 meta/packages/libmad/libmad_0.15.1b.bb

diff --git a/meta/packages/gstreamer/gst-meta-audio_0.10.bb b/meta/packages/gstreamer/gst-meta-audio_0.10.bb
index 39cad65b7..fdf3933f6 100644
--- a/meta/packages/gstreamer/gst-meta-audio_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-audio_0.10.bb
@@ -1,5 +1,5 @@
-DEPENDS = "gst-meta-base gst-plugins-bad"
-RDEPENDS = "gst-meta-base gst-plugin-ivorbis gst-plugin-ogg"
-PR = "r4"
+DEPENDS = "gst-meta-base gst-plugins-bad gst-plugins-ugly"
+RDEPENDS = "gst-meta-base gst-plugin-ivorbis gst-plugin-ogg gst-plugin-mad"
+PR = "r5"
 
 ALLOW_EMPTY = "1"
diff --git a/meta/packages/gstreamer/gst-meta-video_0.10.bb b/meta/packages/gstreamer/gst-meta-video_0.10.bb
index 8d1d363d2..40150e09f 100644
--- a/meta/packages/gstreamer/gst-meta-video_0.10.bb
+++ b/meta/packages/gstreamer/gst-meta-video_0.10.bb
@@ -1,6 +1,7 @@
 DEPENDS = "gst-meta-base gst-plugins-good gst-plugins-ugly"
-RDEPENDS = "gst-meta-base gst-plugin-matroska gst-plugin-mpeg2dec"
+RDEPENDS = "gst-meta-base gst-plugin-avi gst-plugin-matroska \
+            gst-plugin-mpeg2dec"
 RRECOMMENDS = "gst-meta-audio"
-PR = "r3"
+PR = "r4"
 
 ALLOW_EMPTY = "1"
diff --git a/meta/packages/libmad/libmad_0.15.0b.bb b/meta/packages/libmad/libmad_0.15.0b.bb
deleted file mode 100644
index d6e6dda1d..000000000
--- a/meta/packages/libmad/libmad_0.15.0b.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "MPEG Audio Decoder Library"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "libid3tag"
-LICENSE = "GPL"
-PR = "r2"
-
-SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz"
-S = "${WORKDIR}/libmad-${PV}"
-
-inherit autotools 
-
-EXTRA_OECONF = "-enable-speed --enable-shared"
-# The ASO's don't take any account of thumb...
-EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"
-
-do_configure_prepend () {
-#	damn picky automake...
-	touch NEWS AUTHORS ChangeLog
-}
-
-do_stage() {
-	oe_libinstall -so libmad ${STAGING_LIBDIR}
-	install -m 0644 mad.h ${STAGING_INCDIR}
-}
diff --git a/meta/packages/libmad/libmad_0.15.1b.bb b/meta/packages/libmad/libmad_0.15.1b.bb
new file mode 100644
index 000000000..aac373613
--- /dev/null
+++ b/meta/packages/libmad/libmad_0.15.1b.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "MPEG Audio Decoder Library"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "libid3tag"
+LICENSE = "GPL"
+
+SRC_URI = "ftp://ftp.mars.org/pub/mpeg/libmad-${PV}.tar.gz"
+S = "${WORKDIR}/libmad-${PV}"
+
+inherit autotools 
+
+EXTRA_OECONF = "-enable-speed --enable-shared"
+# The ASO's don't take any account of thumb...
+EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"
+EXTRA_OECONF_append_arm = " --enable-fpm=arm"
+
+do_configure_prepend () {
+#	damn picky automake...
+	touch NEWS AUTHORS ChangeLog
+}
+
+do_stage() {
+	oe_libinstall -so libmad ${STAGING_LIBDIR}
+	install -m 0644 mad.h ${STAGING_INCDIR}
+}
-- 
cgit v1.2.3