src/patches/flac-1.2.1-cflags.patch

   1 diff -up flac-1.2.1/src/libFLAC/Makefile.am.cflags flac-1.2.1/src/libFLAC/Makefile.am
   2 --- flac-1.2.1/src/libFLAC/Makefile.am.cflags   2007-09-14 23:06:17.000000000 +0200
   3 +++ flac-1.2.1/src/libFLAC/Makefile.am  2008-03-17 14:19:29.000000000 +0100
   4 @@ -41,7 +41,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_
   5  else
   6  # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
   7  #@@@ PPC optimizations temporarily disabled
   8 -CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
   9 +CPUCFLAGS = -DFLAC__NO_ASM
  10  endif
  11  endif
  12
  13 @@ -69,7 +69,7 @@ endif
  14  endif
  15  endif
  16
  17 -libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
  18 +libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ libFLAC_extracflags.la
  19
  20  SUBDIRS = $(ARCH_SUBDIRS) include .
  21
  22 @@ -112,7 +112,10 @@ libFLAC_la_SOURCES = \
  23         metadata_iterators.c \
  24         metadata_object.c \
  25         stream_decoder.c \
  26 -       stream_encoder.c \
  27         stream_encoder_framing.c \
  28         window.c \
  29         $(extra_ogg_sources)
  30 +
  31 +noinst_LTLIBRARIES = libFLAC_extracflags.la
  32 +libFLAC_extracflags_la_SOURCES = stream_encoder.c
  33 +libFLAC_extracflags_la_CFLAGS = $(AM_CFLAGS) -funroll-loops
  34 diff -up flac-1.2.1/configure.in.cflags flac-1.2.1/configure.in
  35 --- flac-1.2.1/configure.in.cflags      2007-09-13 17:48:42.000000000 +0200
  36 +++ flac-1.2.1/configure.in     2008-03-17 14:17:08.000000000 +0100
  37 @@ -301,7 +301,7 @@ else
  38         CPPFLAGS="-DNDEBUG $CPPFLAGS"
  39         if test "x$GCC" = xyes; then
  40                 CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
  41 -               CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
  42 +               CFLAGS="-Wall -W -Winline $CFLAGS"
  43         fi
  44  fi
  45