Update to FLAC 1.1.2. Notable changes:

* better Ogg FLAC support
* speedups
* several new options to flac and metaflac
* several API additions
* streaming support in the XMMS plugin
* bugfixes

8 files changed, 71 insertions, 74 deletions

diff --git a/audio/flac/files/patch-Makefile.in b/audio/flac/files/patch-Makefile.in
index 14d5d917a9c3..b0a73cdc9a22 100644
--- a/audio/flac/files/patch-Makefile.in
+++ b/audio/flac/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Wed Sep 25 06:53:31 2002
-+++ Makefile.in	Sat Oct  5 01:29:53 2002
-@@ -144,7 +144,7 @@
- am__quote = @am__quote@
- install_sh = @install_sh@
- 
+--- Makefile.in.orig
++++ Makefile.in
+@@ -258,7 +258,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 -SUBDIRS = doc include man src test build flac.pbproj obj
 +SUBDIRS = $(DOC) include man src test build flac.pbproj
- 
  DISTCLEANFILES = libtool-disable-static
- 
+ EXTRA_DIST = \
+ 	COPYING.FDL \
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
index b16793a26fae..e335f4533ff4 100644
--- a/audio/flac/files/patch-configure
+++ b/audio/flac/files/patch-configure
@@ -1,40 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Sun Feb 23 01:11:25 2003
-+++ configure	Sun Feb 23 01:11:27 2003
-@@ -7817,6 +7817,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -9818,6 +9819,8 @@
-   fi
- 
- 
-+# Disable id3lib detection
-+if false; then
- 
- # Check whether --with-id3lib or --without-id3lib was given.
- if test "${with_id3lib+set}" = set; then
-@@ -10006,6 +10009,8 @@
- 
- 	rm -f conf.id3libtest
- 
-+fi
-+have_id3lib=no
- 
- 
- if test x$have_id3lib = xyes; then
-@@ -11713,7 +11718,7 @@
+--- configure.orig
++++ configure
+@@ -10541,9 +10541,9 @@
  if test x$debug = xtrue; then
  	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
  else
--	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
+-	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
 +	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
  	if test x$GCC = xyes; then
- 		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
+-		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
++		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -DFLaC__INLINE=__inline__"
  	fi
+ fi
+ CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
diff --git a/audio/flac/files/patch-doc_Makefile.in b/audio/flac/files/patch-doc_Makefile.in
index 496e05d20bc5..7d82b0fba502 100644
--- a/audio/flac/files/patch-doc_Makefile.in
+++ b/audio/flac/files/patch-doc_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- doc/Makefile.in.orig	Sat Oct  5 01:22:15 2002
-+++ doc/Makefile.in	Sat Oct  5 01:23:02 2002
-@@ -135,7 +135,7 @@
- 
+--- doc/Makefile.in.orig
++++ doc/Makefile.in
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
  SUBDIRS = . html
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
- 
  doc_DATA = \
  	FLAC.tag
+ 
diff --git a/audio/flac/files/patch-doc_html_Makefile.in b/audio/flac/files/patch-doc_html_Makefile.in
index 84ecda3a4988..b63d9e76e82d 100644
--- a/audio/flac/files/patch-doc_html_Makefile.in
+++ b/audio/flac/files/patch-doc_html_Makefile.in
@@ -1,14 +1,35 @@
 
 $FreeBSD$
 
---- doc/html/Makefile.in.orig	Sat Oct  5 01:22:20 2002
-+++ doc/html/Makefile.in	Sat Oct  5 01:23:09 2002
-@@ -135,7 +135,7 @@
- 
+--- doc/html/Makefile.in.orig
++++ doc/html/Makefile.in
+@@ -236,7 +236,7 @@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
  SUBDIRS = ru images
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
 +docdir = $(datadir)/doc/$(PACKAGE)/html
- 
  doc_DATA = \
+ 	changelog.html \
  	comparison.html \
+@@ -577,13 +577,13 @@
+ 
+ # The install targets don't copy whole directories so we have to
+ # handle 'api/' specially:
+-@FLaC__HAS_DOXYGEN_TRUE@install-data-local:
+-@FLaC__HAS_DOXYGEN_TRUE@	$(mkinstalldirs) $(DESTDIR)$(docdir)/api
+-@FLaC__HAS_DOXYGEN_TRUE@	(cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
+-@FLaC__HAS_DOXYGEN_TRUE@uninstall-local:
+-@FLaC__HAS_DOXYGEN_TRUE@	rm -rf $(DESTDIR)$(docdir)/api
+-@FLaC__HAS_DOXYGEN_TRUE@maintainer-clean-local:
+-@FLaC__HAS_DOXYGEN_TRUE@	rm -rf api
++install-data-local:
++	$(mkinstalldirs) $(DESTDIR)$(docdir)/api
++	(cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
++uninstall-local:
++	rm -rf $(DESTDIR)$(docdir)/api
++maintainer-clean-local:
++	rm -rf api
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/audio/flac/files/patch-doc_html_images_Makefile.in b/audio/flac/files/patch-doc_html_images_Makefile.in
index 57589f31dc80..e0eef34182bc 100644
--- a/audio/flac/files/patch-doc_html_images_Makefile.in
+++ b/audio/flac/files/patch-doc_html_images_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- doc/html/images/Makefile.in.orig	Sat Oct  5 01:22:31 2002
-+++ doc/html/images/Makefile.in	Sat Oct  5 01:23:21 2002
-@@ -133,7 +133,7 @@
- 
+--- doc/html/images/Makefile.in.orig
++++ doc/html/images/Makefile.in
+@@ -226,7 +226,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
 +docdir = $(datadir)/doc/$(PACKAGE)/html/images
- 
  doc_DATA = \
  	1x1.gif \
+ 	cafebug.gif \
diff --git a/audio/flac/files/patch-doc_html_ru_Makefile.in b/audio/flac/files/patch-doc_html_ru_Makefile.in
index c0ddee3a669d..7843a0cc5469 100644
--- a/audio/flac/files/patch-doc_html_ru_Makefile.in
+++ b/audio/flac/files/patch-doc_html_ru_Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- doc/html/ru/Makefile.in.orig	Sat Oct  5 01:22:27 2002
-+++ doc/html/ru/Makefile.in	Sat Oct  5 01:23:15 2002
-@@ -133,7 +133,7 @@
- 
+--- doc/html/ru/Makefile.in.orig
++++ doc/html/ru/Makefile.in
+@@ -226,7 +226,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
 +docdir = $(datadir)/doc/$(PACKAGE)/html/ru
- 
  doc_DATA = \
  	authors.html \
+ 	comparison.html \
diff --git a/audio/flac/files/patch-man_flac.1 b/audio/flac/files/patch-man_flac.1
index 2f41f9cacb68..58bb5ceaabb0 100644
--- a/audio/flac/files/patch-man_flac.1
+++ b/audio/flac/files/patch-man_flac.1
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- man/flac.1.orig	Wed Apr 16 00:53:22 2003
-+++ man/flac.1	Wed Apr 16 00:54:05 2003
-@@ -353,8 +353,7 @@
+--- man/flac.1.orig
++++ man/flac.1
+@@ -397,8 +397,7 @@
  .PP
  The programs are documented fully by HTML format
  documentation, available in
diff --git a/audio/flac/files/patch-src_libFLAC_cpu.c b/audio/flac/files/patch-src_libFLAC_cpu.c
index 36a52ecc2fb8..adc10c2ec480 100644
--- a/audio/flac/files/patch-src_libFLAC_cpu.c
+++ b/audio/flac/files/patch-src_libFLAC_cpu.c
@@ -3,7 +3,7 @@ $FreeBSD$
 
 --- src/libFLAC/cpu.c.orig
 +++ src/libFLAC/cpu.c
-@@ -25,6 +25,11 @@
+@@ -37,6 +37,11 @@
  #include <config.h>
  #endif
  
@@ -12,22 +12,21 @@ $FreeBSD$
 +#include <sys/sysctl.h>
 +#endif
 +
- const unsigned FLAC__CPUINFO_IA32_CPUID_CMOV = 0x00008000;
- const unsigned FLAC__CPUINFO_IA32_CPUID_MMX = 0x00800000;
- const unsigned FLAC__CPUINFO_IA32_CPUID_FXSR = 0x01000000;
-@@ -52,6 +57,15 @@
+ #if defined FLAC__CPU_PPC
+ #if !defined FLAC__NO_ASM
+ #if defined FLAC__SYS_DARWIN
+@@ -95,6 +100,14 @@
  
  #ifndef FLAC__SSE_OS
  		info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = false;
-+#else
-+#if defined(__FreeBSD__)
++#elif defined(__FreeBSD__)
++		/* on FreeBSD we can double-check via sysctl whether the OS supports SSE */
 +		{
 +			int sse;
 +			size_t len = sizeof(sse);
 +			if (sysctlbyname("hw.instruction_sse", &sse, &len, NULL, 0) || !sse)
 +				info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = false;
 +		}
-+#endif
  #endif
  
  #ifdef FLAC__USE_3DNOW