From aa26d3ccb7dedf33580f5e1bf755dc3ce51f2f1b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 19 Dec 2011 17:52:10 +0100
Subject: [PATCH] libav: build and install 'ffplay'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/addons/multimedia/libav/addon         | 1 +
 packages/addons/multimedia/libav/build         | 4 +++-
 packages/addons/multimedia/libav/changelog.txt | 3 +++
 packages/addons/multimedia/libav/meta          | 4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/addons/multimedia/libav/addon b/packages/addons/multimedia/libav/addon
index a5207a1972..8ac9a510f6 100755
--- a/packages/addons/multimedia/libav/addon
+++ b/packages/addons/multimedia/libav/addon
@@ -24,6 +24,7 @@
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp $PKG_BUILD/ffmpeg $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp $PKG_BUILD/ffplay $ADDON_BUILD/$PKG_ADDON_ID/bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
   cp $PKG_BUILD/ffpresets/* $ADDON_BUILD/$PKG_ADDON_ID/ffmpeg
diff --git a/packages/addons/multimedia/libav/build b/packages/addons/multimedia/libav/build
index ec0c03a928..dd46b33c65 100755
--- a/packages/addons/multimedia/libav/build
+++ b/packages/addons/multimedia/libav/build
@@ -22,6 +22,8 @@
 
 . config/options $1
 
+export pkg_config="$ROOT/$TOOLCHAIN/bin/pkg-config"
+
 # libav fails building with LTO support
   strip_lto
 
@@ -69,7 +71,7 @@ cd $PKG_BUILD/
             --enable-logging \
             --enable-doc \
             --enable-ffmpeg \
-            --disable-ffplay \
+            --enable-ffplay \
             --disable-ffprobe \
             --disable-ffserver \
             --enable-avdevice \
diff --git a/packages/addons/multimedia/libav/changelog.txt b/packages/addons/multimedia/libav/changelog.txt
index 46132ff039..cfdcfed00c 100644
--- a/packages/addons/multimedia/libav/changelog.txt
+++ b/packages/addons/multimedia/libav/changelog.txt
@@ -1,3 +1,6 @@
+2.0.1
+- add 'ffplay' binary
+
 2.0.0
 - prepare for OpenELEC-2.0 release
 
diff --git a/packages/addons/multimedia/libav/meta b/packages/addons/multimedia/libav/meta
index e8abec953e..bebdc1f195 100644
--- a/packages/addons/multimedia/libav/meta
+++ b/packages/addons/multimedia/libav/meta
@@ -20,13 +20,13 @@
 
 PKG_NAME="libav"
 PKG_VERSION="0.7.2"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libav.org"
 PKG_URL="http://libav.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2"
+PKG_BUILD_DEPENDS="toolchain alsa-lib zlib bzip2 SDL"
 PKG_PRIORITY="optional"
 PKG_SECTION="lib/multimedia"
 PKG_SHORTDESC="libav: A complete audio and video stream library"