head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q1:1.1.0.22
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.20
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.18
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.16
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.14
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.12
	pkgsrc-2008Q1:1.1.0.10
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.8
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.6
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.4
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.2
	pkgsrc-2007Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.06.08.00.56.10;	author snj;	state dead;
branches;
next	1.1;

1.1
date	2007.01.09.23.36.45;	author wiz;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Grr, forgot to cvs rm these.
@
text
@$NetBSD: patch-ad,v 1.1 2007/01/09 23:36:45 wiz Exp $

--- flac123.h.orig	2005-02-25 05:52:02.000000000 +0000
+++ flac123.h
@@@@ -22,13 +22,24 @@@@
 #include <limits.h>
 #include <FLAC/all.h>
 
+/* by LEGACY_FLAC we mean pre-1.1.3 before FLAC__FileDecoder was merged into FLAC__StreamDecoder */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
 /* string widths for printing ID3 (vorbis) data in remote mode */
 #define VORBIS_TAG_LEN 30
 #define VORBIS_YEAR_LEN 4
 
 /* the main data structure of the program */
 typedef struct {
+#ifdef LEGACY_FLAC
     FLAC__FileDecoder *decoder;
+#else
+    FLAC__StreamDecoder *decoder;
+#endif
 
     /* bits, rate, channels, byte_format */
     ao_sample_format sam_fmt; /* input sample's true format */
@


1.1
log
@Fix build with flac-1.1.3.
@
text
@d1 1
a1 1
$NetBSD$
@