Home | History | Annotate | Download | only in patches
      1     diff -ur flac-1.1.2/configure.in flac-1.1.2.new/configure.in
      2     --- flac-1.1.2/configure.in	2005-02-03 05:03:25.000000000 +0000
      3     +++ flac-1.1.2.new/configure.in	2005-08-30 13:59:46.803550000 +0100
      4     @@ -200,7 +200,7 @@
      5      if test x$debug = xtrue; then
      6      	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
      7      else
      8     -	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
      9     +	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O -DNDEBUG"
     10      	if test x$GCC = xyes; then
     11      		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
     12      	fi
     13     diff -ur flac-1.1.2/src/libFLAC/format.c flac-1.1.2.new/src/libFLAC/format.c
     14     --- flac-1.1.2/src/libFLAC/format.c	2005-02-04 06:54:49.000000000 +0000
     15     +++ flac-1.1.2.new/src/libFLAC/format.c	2005-08-30 13:38:58.746695000 +0100
     16     @@ -63,7 +63,7 @@
     17      
     18      FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };
     19      FLAC_API const unsigned FLAC__STREAM_SYNC = 0x664C6143;
     20     -FLAC_API const unsigned FLAC__STREAM_SYNC_LEN = 32; /* bits */;
     21     +FLAC_API const unsigned FLAC__STREAM_SYNC_LEN = 32; /* bits */
     22      
     23      FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MIN_BLOCK_SIZE_LEN = 16; /* bits */
     24      FLAC_API const unsigned FLAC__STREAM_METADATA_STREAMINFO_MAX_BLOCK_SIZE_LEN = 16; /* bits */
     25     @@ -254,7 +254,7 @@
     26      	return j;
     27      }
     28      
     29     -static __inline unsigned utf8len_(const FLAC__byte *utf8)
     30     +static inline unsigned utf8len_(const FLAC__byte *utf8)
     31      {
     32      	FLAC__ASSERT(0 != utf8);
     33      	if ((utf8[0] & 0x80) == 0)
     34     diff -ur flac-1.1.2/src/plugin_common/tags.c flac-1.1.2.new/src/plugin_common/tags.c
     35     --- flac-1.1.2/src/plugin_common/tags.c	2005-02-01 05:12:30.000000000 +0000
     36     +++ flac-1.1.2.new/src/plugin_common/tags.c	2005-08-30 14:12:51.913876000 +0100
     37     @@ -25,7 +25,7 @@
     38      #include "FLAC/metadata.h"
     39      
     40      
     41     -static __inline unsigned local__wide_strlen(const FLAC__uint16 *s)
     42     +static inline unsigned local__wide_strlen(const FLAC__uint16 *s)
     43      {
     44      	unsigned n = 0;
     45      	while(*s++)
     46     @@ -33,7 +33,7 @@
     47      	return n;
     48      }
     49      
     50     -static __inline unsigned local__utf8len(const FLAC__byte *utf8)
     51     +static inline unsigned local__utf8len(const FLAC__byte *utf8)
     52      {
     53      	FLAC__ASSERT(0 != utf8);
     54      	if ((utf8[0] & 0x80) == 0)
     55     @@ -46,7 +46,7 @@
     56      		return 0;
     57      }
     58      
     59     -static __inline unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
     60     +static inline unsigned local__utf8_to_ucs2(const FLAC__byte *utf8, FLAC__uint16 *ucs2)
     61      {
     62      	const unsigned len = local__utf8len(utf8);
     63      
     64     @@ -98,7 +98,7 @@
     65      	return out;
     66      }
     67      
     68     -static __inline unsigned local__ucs2len(FLAC__uint16 ucs2)
     69     +static inline unsigned local__ucs2len(FLAC__uint16 ucs2)
     70      {
     71      	if (ucs2 < 0x0080)
     72      		return 1;
     73     @@ -108,7 +108,7 @@
     74      		return 3;
     75      }
     76      
     77     -static __inline unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
     78     +static inline unsigned local__ucs2_to_utf8(FLAC__uint16 ucs2, FLAC__byte *utf8)
     79      {
     80      	if (ucs2 < 0x080) {
     81      		utf8[0] = (FLAC__byte)ucs2;
     82     diff -ur flac-1.1.2/src/share/replaygain_analysis/replaygain_analysis.c flac-1.1.2.new/src/share/replaygain_analysis/replaygain_analysis.c
     83     --- flac-1.1.2/src/share/replaygain_analysis/replaygain_analysis.c	2003-12-16 18:30:47.000000000 +0000
     84     +++ flac-1.1.2.new/src/share/replaygain_analysis/replaygain_analysis.c	2005-08-30 13:49:39.359105000 +0100
     85     @@ -116,7 +116,15 @@
     86       * sampleWindow calculation in ResetSampleFrequency(), and was causing
     87       * buffer overflows for 48kHz analysis, hence the +1.
     88       */
     89     +#ifndef __sun
     90      #define MAX_SAMPLES_PER_WINDOW  (size_t) (MAX_SAMP_FREQ * RMS_WINDOW_TIME + 1.)   /* max. Samples per Time slice */
     91     +#else
     92     +/* Different #define for Solaris Forte compiler because it
     93     +   doesn't like to multiply floats when declaring a variable. */
     94     +#define MAX_SAMPLES_PER_WINDOW  (size_t) (2401)
     95     +#define UINT32_T_FORTE 12000.0 /* Used in Unit32_t code below. */
     96     +#endif
     97     +
     98      #define PINK_REF                64.82 /* 298640883795 */                          /* calibration value */
     99      
    100      static Float_t          linprebuf [MAX_ORDER * 2];
    101     @@ -136,8 +144,13 @@
    102      static double           lsum;
    103      static double           rsum;
    104      static int              freqindex;
    105     +#ifndef __sun
    106      static Uint32_t  A [(size_t)(STEPS_per_dB * MAX_dB)];
    107      static Uint32_t  B [(size_t)(STEPS_per_dB * MAX_dB)];
    108     +#else
    109     +static Uint32_t  A [(size_t)(UINT32_T_FORTE)];
    110     +static Uint32_t  B [(size_t)(UINT32_T_FORTE)];
    111     +#endif
    112      
    113      /* for each filter:
    114         [0] 48 kHz, [1] 44.1 kHz, [2] 32 kHz, [3] 24 kHz, [4] 22050 Hz, [5] 16 kHz, [6] 12 kHz, [7] is 11025 Hz, [8] 8 kHz */
    115