From da974436a5f22e8c2dfdbbf64bb021fe8097ecbe Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 13 Nov 2010 13:47:04 +0100
Subject: [PATCH] libvorbis: add metafile support, cleanups, thanks to cowbalt

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/audio/libvorbis/build   |  5 +----
 packages/audio/libvorbis/install |  3 +--
 packages/audio/libvorbis/meta    | 14 ++++++++++++++
 packages/audio/libvorbis/url     |  1 -
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 packages/audio/libvorbis/meta
 delete mode 100644 packages/audio/libvorbis/url

diff --git a/packages/audio/libvorbis/build b/packages/audio/libvorbis/build
index c62ccd3d5d..63cee8f9eb 100755
--- a/packages/audio/libvorbis/build
+++ b/packages/audio/libvorbis/build
@@ -2,9 +2,6 @@
 
 . config/options $1
 
-$SCRIPTS/build toolchain
-$SCRIPTS/build libogg
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -14,6 +11,6 @@ cd $PKG_BUILD
             --enable-shared \
             --with-ogg=$SYSROOT_PREFIX/usr
 
-$MAKE
+make
 
 $MAKEINSTALL
diff --git a/packages/audio/libvorbis/install b/packages/audio/libvorbis/install
index 2a81499420..bed96af141 100755
--- a/packages/audio/libvorbis/install
+++ b/packages/audio/libvorbis/install
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 . config/options $1
-$SCRIPTS/install libogg
 
 mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/lib/.libs/libvorbis*.so*[.0-9] $INSTALL/usr/lib
+  cp -P $PKG_BUILD/lib/.libs/libvorbis*.so*[.0-9] $INSTALL/usr/lib
diff --git a/packages/audio/libvorbis/meta b/packages/audio/libvorbis/meta
new file mode 100644
index 0000000000..72a9918d7b
--- /dev/null
+++ b/packages/audio/libvorbis/meta
@@ -0,0 +1,14 @@
+PKG_NAME="libvorbis"
+PKG_VERSION="1.3.2"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="http://www.vorbis.com/"
+PKG_URL="http://downloads.xiph.org/releases/vorbis/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libogg"
+PKG_BUILD_DEPENDS="toolchain libogg"
+PKG_PRIORITY="optional"
+PKG_SECTION="audio"
+PKG_SHORTDESC="libvorbis: Lossless audio compression tools using the ogg-vorbis algorithms"
+PKG_LONGDESC="Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, general-purpose compressed audio format for mid to high quality (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and variable bitrates from 16 to 128 kbps/channel. This places Vorbis in the same competitive class as audio representations such as MPEG-4 (AAC), and similar to, but higher performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC."
+PKG_IS_ADDON="no"
\ No newline at end of file
diff --git a/packages/audio/libvorbis/url b/packages/audio/libvorbis/url
deleted file mode 100644
index d6dde96860..0000000000
--- a/packages/audio/libvorbis/url
+++ /dev/null
@@ -1 +0,0 @@
-http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2