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-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	2009.11.23.22.25.16;	author jakllsch;	state dead;
branches;
next	1.1;

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


desc
@@


1.2
log
@Update mkvtoolnix to 2.9.8.

Too many upstream changes to duplicate here. Upstream change log is at
http://www.bunkus.org/videotools/mkvtoolnix/doc/ChangeLog .

Remove multimedia/mmg.  mmg is now optionally built as part of mkvtoolnix.
@
text
@$NetBSD: patch-ah,v 1.1 2007/01/13 21:58:24 wiz Exp $

--- src/input/r_ogm.cpp.orig	2006-04-28 08:48:49.000000000 +0000
+++ src/input/r_ogm.cpp
@@@@ -23,6 +23,11 @@@@
 #include <vorbis/codec.h>
 #if defined(HAVE_FLAC_FORMAT_H)
 #include <FLAC/stream_decoder.h>
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
 #endif
 #if defined(SYS_WINDOWS)
 #include <windows.h>
@@@@ -102,7 +107,11 @@@@ extract_vorbis_comments(const memory_cpt
 static FLAC__StreamDecoderReadStatus
 fhe_read_cb(const FLAC__StreamDecoder *decoder,
             FLAC__byte buffer[],
+#ifdef LEGACY_FLAC
             unsigned *bytes,
+#else
+            size_t *bytes,
+#endif
             void *client_data) {
   flac_header_extractor_c *fhe;
   ogg_packet op;
@@@@ -193,6 +202,7 @@@@ flac_header_extractor_c::flac_header_ext
   decoder = FLAC__stream_decoder_new();
   if (decoder == NULL)
     mxerror(FPFX "FLAC__stream_decoder_new() failed.\n");
+#ifdef LEGACY_FLAC
   FLAC__stream_decoder_set_client_data(decoder, this);
   if (!FLAC__stream_decoder_set_read_callback(decoder, fhe_read_cb))
     mxerror(FPFX "Could not set the read callback.\n");
@@@@ -202,10 +212,16 @@@@ flac_header_extractor_c::flac_header_ext
     mxerror(FPFX "Could not set the metadata callback.\n");
   if (!FLAC__stream_decoder_set_error_callback(decoder, fhe_error_cb))
     mxerror(FPFX "Could not set the error callback.\n");
+#endif
   if (!FLAC__stream_decoder_set_metadata_respond_all(decoder))
     mxerror(FPFX "Could not set metadata_respond_all.\n");
+#ifdef LEGACY_FLAC
   if (FLAC__stream_decoder_init(decoder) !=
       FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
+#else
+  if (FLAC__stream_decoder_init_stream(decoder, fhe_read_cb, NULL, NULL, NULL, NULL, fhe_write_cb, fhe_metadata_cb, fhe_error_cb, this) !=
+      FLAC__STREAM_DECODER_INIT_STATUS_OK)
+#endif
     mxerror(FPFX "Could not initialize the FLAC decoder.\n");
   ogg_sync_init(&oy);
 }
@


1.1
log
@Support flac-1.1.3 based on a patch from
ftp.altlinux.org /pub/people/thresh
Bump PKGREVISION because this package just compiled without flac support.
@
text
@d1 1
a1 1
$NetBSD$
@