head	1.2;
access;
symbols
	pkgsrc-2017Q3:1.1.0.92
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.88
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.86
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.84
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.82
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.80
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.78
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.76
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.74
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.72
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.70
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.68
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.66
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.64
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.62
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.60
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.58
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.56
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.54
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.52
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.50
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.48
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.46
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.44
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.42
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.40
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.38
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.36
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.34
	pkgsrc-2010Q3-base:1.1
	pkgsrc-2010Q2:1.1.0.32
	pkgsrc-2010Q2-base:1.1
	pkgsrc-2010Q1:1.1.0.30
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.28
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.26
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.24
	pkgsrc-2009Q2-base:1.1
	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	2017.09.26.10.27.09;	author wiz;	state dead;
branches;
next	1.1;
commitid	9ARpkXTuh9Wg2H8A;

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


desc
@@


1.2
log
@*: remove qt3 and the packages using it, including KDE3

Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html
@
text
@$NetBSD: patch-aq,v 1.1 2007/01/13 18:33:44 wiz Exp $

--- kioslave/audiocd/plugins/flac/encoderflac.cpp.orig	2006-01-19 16:40:33.000000000 +0000
+++ kioslave/audiocd/plugins/flac/encoderflac.cpp
@@@@ -29,6 +29,11 @@@@
 #include <kconfig.h>
 #include <kdebug.h>
 
+#if !defined FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
 
 extern "C"
 {
@@@@ -47,7 +52,11 @@@@ public:
     unsigned long data;
 };
 
+#ifdef LEGACY_FLAC
 static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
+#else
+static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
+#endif
 {
     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
 
@@@@ -109,9 +118,11 @@@@ unsigned long EncoderFLAC::size(long tim
 long EncoderFLAC::readInit(long size) {
     kdDebug(7117) << "EncoderFLAC::readInit() called"<< endl;
     d->data = 0;
+#ifdef LEGACY_FLAC
     FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback);
     FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback);
     FLAC__stream_encoder_set_client_data(d->encoder, d);
+#endif
 
     // The options match approximely those of flac compression-level-3
     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
@@@@ -124,7 +135,13 @@@@ long EncoderFLAC::readInit(long size) {
     if (size > 0)
         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
 
-    FLAC__stream_encoder_init(d->encoder);
+#ifdef LEGACY_FLAC
+    if(FLAC__stream_encoder_init(d->encoder) != FLAC__STREAM_ENCODER_OK)
+		; // really should handle an init failure
+#else
+    if(FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d) != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
+		; // really should handle an init failure
+#endif
     return d->data;
 }
 
@


1.1
log
@Add support for flac-1.1.3 based on patches from Josh Coalson on
kde-devel. Bump PKGREVISION because previously it would just compile
without flac support.
@
text
@d1 1
a1 1
$NetBSD$
@