From 59de46f76bfb1e4a534fa3e960da7e6603c1442f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Tue, 29 Mar 2011 15:18:04 +0200
Subject: [PATCH] flac: various cleanups, change download url

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/audio/flac/build                     |  2 --
 packages/audio/flac/meta                      |  4 ++--
 .../flac/patches/flac-1.2.1-configure.patch   | 24 +++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 packages/audio/flac/patches/flac-1.2.1-configure.patch

diff --git a/packages/audio/flac/build b/packages/audio/flac/build
index e55feb969f..f352e19865 100755
--- a/packages/audio/flac/build
+++ b/packages/audio/flac/build
@@ -23,14 +23,12 @@
 . config/options $1
 
 cd $PKG_BUILD
-do_autoreconf -I m4
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
             --disable-static \
             --enable-shared \
             --disable-rpath \
-            --with-gnu-ld \
             --disable-altivec \
             --disable-doxygen-docs \
             --disable-thorough-tests \
diff --git a/packages/audio/flac/meta b/packages/audio/flac/meta
index 54e314c088..52acda5243 100644
--- a/packages/audio/flac/meta
+++ b/packages/audio/flac/meta
@@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://flac.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="libiconv libogg"
 PKG_BUILD_DEPENDS="toolchain libiconv libogg"
 PKG_PRIORITY="optional"
@@ -33,4 +33,4 @@ PKG_SHORTDESC="flac: An Free Lossless Audio Codec"
 PKG_LONGDESC="Grossly oversimplified, FLAC is similar to MP3, but lossless, meaning that audio is compressed in FLAC without throwing away any information. This is similar to how Zip works, except with FLAC you will get much better compression because it is designed specifically for audio."
 PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="no"
+PKG_AUTORECONF="yes"
diff --git a/packages/audio/flac/patches/flac-1.2.1-configure.patch b/packages/audio/flac/patches/flac-1.2.1-configure.patch
new file mode 100644
index 0000000000..16fc3e51dc
--- /dev/null
+++ b/packages/audio/flac/patches/flac-1.2.1-configure.patch
@@ -0,0 +1,24 @@
+diff -Naur flac-1.2.1-old/configure.in flac-1.2.1-new/configure.in
+--- flac-1.2.1-old/configure.in	2007-09-13 08:48:42.000000000 -0700
++++ flac-1.2.1-new/configure.in	2010-08-17 20:51:01.000000000 -0700
+@@ -21,6 +21,8 @@
+ AC_INIT(src/flac/main.c)
+ AM_INIT_AUTOMAKE(flac, 1.2.1)
+ 
++AC_CONFIG_MACRO_DIR([m4])
++
+ # Don't automagically regenerate autoconf/automake generated files unless
+ # explicitly requested.  Eases autobuilding -mdz
+ AM_MAINTAINER_MODE
+diff -Naur flac-1.2.1-old/Makefile.am flac-1.2.1-new/Makefile.am
+--- flac-1.2.1-old/Makefile.am	2007-09-16 12:29:29.000000000 -0700
++++ flac-1.2.1-new/Makefile.am	2010-08-17 20:51:27.000000000 -0700
+@@ -30,6 +30,8 @@
+ 
+ AUTOMAKE_OPTIONS = foreign 1.7
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ SUBDIRS = doc include m4 man src examples test build obj
+ 
+ DISTCLEANFILES = libtool-disable-static