From b87e4fd1be1e54c55e4f2fb7a37475f324bcc036 Mon Sep 17 00:00:00 2001
From: Ulrich Klauer <ulrich@chirlu.de>
Date: Tue, 28 May 2013 19:07:35 +0200
Subject: [PATCH] Update package flac

Update package flac to 1.3.0; both patches removed, as the issues have
been addressed upstream.  Also remove the dependency on libiconv,
since this is only used for the command-line frontend, not the
libraries. Finally, downloads have moved from SourceForge to Xiph.Org.
---
 index.html                |  4 ++--
 src/flac-1-win32.patch    | 15 ---------------
 src/flac-2-lwsock32.patch | 23 -----------------------
 src/flac.mk               | 18 +++++++++---------
 4 files changed, 11 insertions(+), 49 deletions(-)
 delete mode 100644 src/flac-1-win32.patch
 delete mode 100644 src/flac-2-lwsock32.patch

diff --git a/index.html b/index.html
index 5d0085fb..c5aba5b1 100644
--- a/index.html
+++ b/index.html
@@ -1119,8 +1119,8 @@ aptitude -t squeeze-backports install cmake yasm</pre>
     </tr>
     <tr>
         <td id="flac-package">flac</td>
-        <td id="flac-version">1.2.1</td>
-        <td id="flac-website"><a href="http://www.xiph.org/ogg/">FLAC</a></td>
+        <td id="flac-version">1.3.0</td>
+        <td id="flac-website"><a href="http://www.xiph.org/flac/">FLAC</a></td>
     </tr>
     <tr>
         <td id="flann-package">flann</td>
diff --git a/src/flac-1-win32.patch b/src/flac-1-win32.patch
deleted file mode 100644
index 92018d33..00000000
--- a/src/flac-1-win32.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -ru flac-1.2.1.orig/include/share/alloc.h flac-1.2.1/include/share/alloc.h
---- flac-1.2.1.orig/include/share/alloc.h       2007-09-12 07:32:21.000000000 +0200
-+++ flac-1.2.1/include/share/alloc.h    2009-10-27 19:55:58.000000000 +0100
-@@ -35,7 +35,7 @@
- 
- #ifndef SIZE_MAX
- # ifndef SIZE_T_MAX
--#  ifdef _MSC_VER
-+#  if defined _MSC_VER || defined __MINGW32__
- #   define SIZE_T_MAX UINT_MAX
- #  else
- #   error
diff --git a/src/flac-2-lwsock32.patch b/src/flac-2-lwsock32.patch
deleted file mode 100644
index 16a2c1e8..00000000
--- a/src/flac-2-lwsock32.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -urN flac-1.2.1.orig/src/libFLAC/flac.pc.in flac-1.2.1/src/libFLAC/flac.pc.in
---- flac-1.2.1.orig/src/libFLAC/flac.pc.in	2007-02-07 12:07:32.000000000 +1100
-+++ flac-1.2.1/src/libFLAC/flac.pc.in	2010-10-07 14:57:17.000000000 +1100
-@@ -6,5 +6,5 @@
- Name: FLAC
- Description: Free Lossless Audio Codec Library
- Version: @VERSION@
--Libs: -L${libdir} -lFLAC -lm
-+Libs: -L${libdir} -lFLAC -lm -lwsock32
- Cflags: -I${includedir}/FLAC
-diff -urN flac-1.2.1.orig/src/libFLAC++/flac++.pc.in flac-1.2.1/src/libFLAC++/flac++.pc.in
---- flac-1.2.1.orig/src/libFLAC++/flac++.pc.in	2007-02-07 12:07:32.000000000 +1100
-+++ flac-1.2.1/src/libFLAC++/flac++.pc.in	2010-10-07 14:57:36.000000000 +1100
-@@ -7,5 +7,5 @@
- Description: Free Lossless Audio Codec Library (C++ API)
- Version: @VERSION@
- Requires: flac
--Libs: -L${libdir} -lFLAC++ -lm
-+Libs: -L${libdir} -lFLAC++ -lm -lwsock32
- Cflags: -I${includedir}/FLAC++
diff --git a/src/flac.mk b/src/flac.mk
index 8b473944..38cbff42 100644
--- a/src/flac.mk
+++ b/src/flac.mk
@@ -3,23 +3,23 @@
 
 PKG             := flac
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := bd54354900181b59db3089347cc84ad81e410b38
+$(PKG)_CHECKSUM := a136e5748f8fb1e6c524c75000a765fc63bb7b1b
 $(PKG)_SUBDIR   := flac-$($(PKG)_VERSION)
-$(PKG)_FILE     := flac-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/flac/flac-src/flac-$($(PKG)_VERSION)-src/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libiconv ogg
+$(PKG)_FILE     := flac-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://downloads.xiph.org/releases/flac/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc ogg
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://flac.cvs.sourceforge.net/viewvc/flac/flac/' | \
-    grep '<option>FLAC_RELEASE_' | \
-    $(SED) -n 's,.*FLAC_RELEASE_\([0-9][0-9_]*\)__.*,\1,p' | \
-    $(SED) 's,_,.,g' | \
-    head -1
+    $(WGET) -q -O- 'http://downloads.xiph.org/releases/flac/' | \
+    $(SED) -n 's,.*<a href="flac-\([0-9][0-9.]*\)\.tar\.[gx]z">.*,\1,p' | \
+    $(SORT) -V | \
+    tail -1
 endef
 
 define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --enable-static \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-doxygen-docs \