--- a/patches/flac-01-forte.diff Tue Sep 18 16:52:15 2007 +0000
+++ b/patches/flac-01-forte.diff Tue Sep 18 17:26:35 2007 +0000
@@ -1,5 +1,5 @@
---- flac-1.2.0/configure.in-orig 2007-08-01 13:33:59.050837000 -0500
-+++ flac-1.2.0/configure.in 2007-08-01 13:13:34.248470000 -0500
+--- flac-1.2.1/configure.in-orig 2007-08-01 13:33:59.050837000 -0500
++++ flac-1.2.1/configure.in 2007-08-01 13:13:34.248470000 -0500
@@ -48,6 +48,14 @@ AM_CONFIG_HEADER(config.h)
AC_C_BIGENDIAN
@@ -15,15 +15,15 @@
AC_CHECK_TYPES(socklen_t, [], [])
dnl check for getopt in standard library
-@@ -280,7 +288,7 @@ if test "x$debug" = xtrue; then
+@@ -308,7 +308,7 @@
else
- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
+ CPPFLAGS="-DNDEBUG $CPPFLAGS"
if test "x$GCC" = xyes; then
-- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
-+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -funroll-loops -finline-functions -Wall -W -Winline"
+- CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS"
+ CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
fi
fi
- CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
--- flac-1.2.0/include/share/replaygain_analysis.h-orig 2007-08-01 13:37:48.953601000 -0500
+++ flac-1.2.0/include/share/replaygain_analysis.h 2007-08-01 13:13:34.288739000 -0500
@@ -1,59 +1,59 @@
@@ -236,58 +236,63 @@
{
union {
double d;
---- flac-1.2.0/src/plugin_common/tags.c-orig 2007-08-01 13:39:21.131268000 -0500
-+++ flac-1.2.0/src/plugin_common/tags.c 2007-08-01 13:25:03.310108000 -0500
-@@ -28,12 +28,7 @@
- #include "FLAC/assert.h"
+--- flac-1.2.1/src/plugin_common/tags.c-orig 2007-08-01 13:39:21.131268000 -0500
++++ flac-1.2.1/src/plugin_common/tags.c 2007-08-01 13:25:03.310108000 -0500
+@@ -29,12 +29,7 @@
#include "FLAC/metadata.h"
+ #include "share/alloc.h"
-#ifndef FLaC__INLINE
-#define FLaC__INLINE
-#endif
-
-
--static FLaC__INLINE unsigned local__wide_strlen(const FLAC__uint16 *s)
-+static FLAC_INLINE unsigned local__wide_strlen(const FLAC__uint16 *s)
+-static FLaC__INLINE size_t local__wide_strlen(const FLAC__uint16 *s)
++static FLaC_INLINE size_t local__wide_strlen(const FLAC__uint16 *s)
{
- unsigned n = 0;
+ size_t n = 0;
while(*s++)
-@@ -47,7 +42,7 @@ static FLaC__INLINE unsigned local__wide
+@@ -48,7 +43,7 @@
* and a more clear explanation at the end of this section:
* http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
*/
--static FLaC__INLINE unsigned local__utf8len(const FLAC__byte *utf8)
-+static FLAC_INLINE unsigned local__utf8len(const FLAC__byte *utf8)
+-static FLaC__INLINE size_t local__utf8len(const FLAC__byte *utf8)
++static FLaC_INLINE size_t local__utf8len(const FLAC__byte *utf8)
{
FLAC__ASSERT(0 != utf8);
if ((utf8[0] & 0x80) == 0) {
-@@ -89,7 +84,7 @@ static FLaC__INLINE unsigned local__utf8
+@@ -90,7 +85,7 @@
}
+-static FLaC__INLINE size_t local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
++static FLaC_INLINE size_t local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
+ {
+ const size_t len = local__utf8len(utf8);
+
+@@ -145,7 +140,7 @@
+ return out;
+ }
+
+-static FLaC__INLINE size_t local__ucs2len(FLAC__uint16 ucs2)
++static FLaC_INLINE size_t local__ucs2len(FLAC__uint16 ucs2)
+ {
+ if (ucs2 < 0x0080)
+ return 1;
+@@ -155,7 +150,7 @@
+ return 3;
+ }
+
+-static FLaC__INLINE size_t local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
++static FLaC_INLINE size_t local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
+ {
+ if (ucs2 < 0x080) {
+ utf8[0] = (FLAC__byte)ucs2;
-static FLaC__INLINE unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
+static FLAC_INLINE unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
{
const unsigned len = local__utf8len(utf8);
-@@ -144,7 +139,7 @@ static FLAC__uint16 *local__convert_utf8
- return out;
- }
-
--static FLaC__INLINE unsigned local__ucs2len(FLAC__uint16 ucs2)
-+static FLAC_INLINE unsigned local__ucs2len(FLAC__uint16 ucs2)
- {
- if (ucs2 < 0x0080)
- return 1;
-@@ -154,7 +149,7 @@ static FLaC__INLINE unsigned local__ucs2
- return 3;
- }
-
--static FLaC__INLINE unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
-+static FLAC_INLINE unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
- {
- if (ucs2 < 0x080) {
- utf8[0] = (FLAC__byte)ucs2;
--- flac-1.2.0/src/plugin_common/dither.c-orig 2007-08-01 13:39:27.414786000 -0500
+++ flac-1.2.0/src/plugin_common/dither.c 2007-08-01 13:25:25.428824000 -0500
@@ -32,17 +32,12 @@