head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.10 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.8 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.6 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.4 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.2 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.7.0.26 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.24 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.22 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.20 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.18 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.16 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.14 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.12 pkgsrc-2008Q1:1.7.0.10 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.8 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.6 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.4 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.2 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.6.0.2 pkgsrc-2006Q4-base:1.6 pkgsrc-2006Q3:1.5.0.12 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.10 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.8 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.6 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.4 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.2 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.3.0.4 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.2 pkgsrc-2004Q3-base:1.3; locks; strict; comment @# @; 1.8 date 2009.11.23.22.25.16; author jakllsch; state dead; branches; next 1.7; 1.7 date 2007.01.13.21.58.24; author wiz; state Exp; branches; next 1.6; 1.6 date 2006.10.08.05.22.19; author salo; state Exp; branches; next 1.5; 1.5 date 2005.03.23.16.58.39; author salo; state dead; branches; next 1.4; 1.4 date 2005.01.29.23.25.11; author kristerw; state Exp; branches; next 1.3; 1.3 date 2004.07.27.04.27.40; author salo; state dead; branches; next 1.2; 1.2 date 2004.07.22.17.47.18; author kristerw; state Exp; branches; next 1.1; 1.1 date 2004.07.21.00.04.30; author salo; state Exp; branches; next ; desc @@ 1.8 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-ab,v 1.7 2007/01/13 21:58:24 wiz Exp $ --- configure.orig 2006-04-28 19:53:45.000000000 +0000 +++ configure @@@@ -6484,9 +6484,9 @@@@ else fi; if test "$with_flac" != "no"; then - echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_new in -lFLAC" >&5 -echo $ECHO_N "checking for FLAC__seekable_stream_decoder_new in -lFLAC... $ECHO_C" >&6 -if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new+set}" = set; then + echo "$as_me:$LINENO: checking for FLAC__stream_decoder_new in -lFLAC" >&5 +echo $ECHO_N "checking for FLAC__stream_decoder_new in -lFLAC... $ECHO_C" >&6 +if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_new+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@@@ -6504,11 +6504,11 @@@@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char FLAC__seekable_stream_decoder_new (); +char FLAC__stream_decoder_new (); int main () { -FLAC__seekable_stream_decoder_new (); +FLAC__stream_decoder_new (); ; return 0; } @@@@ -6534,20 +6534,20 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new=yes + ac_cv_lib_FLAC_FLAC__stream_decoder_new=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new=no +ac_cv_lib_FLAC_FLAC__stream_decoder_new=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new" >&5 -echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new" >&6 -if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_new = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&5 +echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_new" >&6 +if test $ac_cv_lib_FLAC_FLAC__stream_decoder_new = yes; then FLAC_LIBS="-lFLAC -lm" flac_found=yes else @@@@ -6669,9 +6669,9 @@@@ fi fi if test x"$flac_found" = xyes ; then - echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_skip_single_frame in -lFLAC" >&5 -echo $ECHO_N "checking for FLAC__seekable_stream_decoder_skip_single_frame in -lFLAC... $ECHO_C" >&6 -if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame+set}" = set; then + echo "$as_me:$LINENO: checking for FLAC__stream_decoder_skip_single_frame in -lFLAC" >&5 +echo $ECHO_N "checking for FLAC__stream_decoder_skip_single_frame in -lFLAC... $ECHO_C" >&6 +if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@@@ -6689,11 +6689,11 @@@@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ -char FLAC__seekable_stream_decoder_skip_single_frame (); +char FLAC__stream_decoder_skip_single_frame (); int main () { -FLAC__seekable_stream_decoder_skip_single_frame (); +FLAC__stream_decoder_skip_single_frame (); ; return 0; } @@@@ -6719,20 +6719,20 @@@@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame=yes + ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame=no +ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame" >&5 -echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame" >&6 -if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_skip_single_frame = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame" >&5 +echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame" >&6 +if test $ac_cv_lib_FLAC_FLAC__stream_decoder_skip_single_frame = yes; then flac_decoder_skip_found=yes else flac_decoder_skip_found=no @@@@ -8620,7 +8620,7 @@@@ if test "${ac_cv_lib_magic_magic_open+se echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lmagic $LIBS" +LIBS="-lmagic -lz $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@@ -8678,7 +8678,7 @@@@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_open" >&5 echo "${ECHO_T}$ac_cv_lib_magic_magic_open" >&6 if test $ac_cv_lib_magic_magic_open = yes; then - MAGIC_LIBS="-lmagic" + MAGIC_LIBS="-lmagic -lz" fi @ 1.7 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: patch-ab,v 1.6 2006/10/08 05:22:19 salo Exp $ @ 1.6 log @Update to version 1.7.0 Changes: - mkvmerge: enhancement: Added support for MIME type detection via libmagic (patch by Robert Millan with heavy modifications by myself). - mkvmerge: bug fix: Theora headers were not handled correctly. - mkvmerge: bug fix: The WavPack reader was broken on 64bit systems (e.g. AMD64). - mkvmerge: bug fix: The Theora timecode handling was broken, and Ogg/Theora files were not identified correctly (they showed up as "unknown" in mmg). - mmg: enhancement: The 'adjust timecodes' function accepts timecodes like 'XXXXXunit' with 'unit' being 'ms', 'us', 'ns' or 's'. - mkvmerge: enhancement: mkvmerge will no longer refuse to concatenate files with differing Codec Private contents and only issue a warning in such cases. - mkvmerge: bug fix: Quicktime/MP4 reader: Added support for version 1 media headers ('mdhd' atom) with 64bit fields. Fixed the duration of the last packet passed downstream. Fixed overflow issues during re-scaling from the Quicktime/MP4's time scale to nano seconds used by mkvmerge. - mkvmerge: bug fix: Muxing wasn't working Windows 9x/ME because mkvmerge was trying to use Unicode file access functions when determining which directories to create. Fixes Anthill bug #177. - mkvmerge: new feature: Added support for the "Delay:" feature and for negative timecodes in VobSub IDX files. - mmg: new feature: If mmg is set to automatically fill in the output file name then it will clear the output file name once all input files have been removed. - mmg: bug fix: Fixed a crash that occured if the user removed an attachment and clicked somewhere in the empty space in the attachment list. Occured only on Windows. - mmg: bug fix: Re-added Chinese to the list of popular languages (those are listed first in the language drop down boxes). - mkvmerge: bug fix: The last change to the ISO 639 language handling broke the VobSub reader so that it reported the wrong language codes. This also caused mmg to not display the correct language after adding a VobSub file. @ text @d1 1 a1 1 $NetBSD$ d3 109 a111 3 --- configure.orig 2006-10-08 03:30:41.000000000 +0000 +++ configure 2006-10-08 03:52:30.000000000 +0000 @@@@ -8620,7 +8620,7 @@@@ d120 1 a120 1 @@@@ -8678,7 +8678,7 @@@@ @ 1.5 log @Updated to version 1.4.1 Changes: - added help file 1.4.1: ====== - bugfixes 1.4.0: ====== - support for MPEG-1 and MPEG-2 video read from PS and ES streams, - support for AVC (aka h.264) video from MP4 files, - support for concatenating files, - support for the new elements needed for menus, - support for WAVPACK4 lossless and lossy audio, - support for extracting VobSubs and - added an online help to mmg accessible by pressing F1 @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2005/01/29 23:25:11 kristerw Exp $ d3 18 a20 4 --- src/common/aac_common.cpp.orig Sat Jan 29 23:27:27 2005 +++ src/common/aac_common.cpp Sat Jan 29 23:32:45 2005 @@@@ -232,10 +232,10 @@@@ } a21 8 bool -parse_aac_codec_id(const string &codec_id, +parse_aac_codec_id(const char *codec_id, int &id, int &profile) { - if (codec_id.size() < strlen(MKV_A_AAC_2LC)) + if (strlen(codec_id) < strlen(MKV_A_AAC_2LC)) return false; a22 1 if (codec_id[10] == '2') @ 1.4 log @Change some string manipulations to equivalent operations that gcc 2.95 understand. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Updated to version 0.9.4. Changes: - patch-ab no longer needed 0.9.4: ====== - mkvextract: new feature: Added support for extracting TTA tracks to TTA files. new feature: Implemented the extraction of chapter information and tags as a CUE sheet which is the reverse operation to using a CUE sheet with mkvmerge's '--chapters' parameter. - mkvmerge: bug fix: SRT file recognition failed if the file contained spaces at the end of the first line. bug fix: Broken VobSub .idx files which contain timestamps going backwards no longer crash mkvmerge. A warning will be printed for such inconsistencies. bug fix: The Matroska reader contained a nice little illegal memory access (introduced in 0.9.3 with the fixes to the 'default track' handling). bug fix: The SSA reader was segfaulting if a line contained an empty text field. bug fix: The CUE sheet parser interpreted a timestamp as HH:MM:SS (hours, minutes, seconds). The correct spec is HH:MM:FF (hours, minutes, frames with 1 frame = 1/75 second). new feature: The pregap from a CUE sheet is converted into two sub-chapters (one for "INDEX 00", one for "INDEX 01"). These sub-chapters have their 'hidden' flag set. - mkvinfo: bug fix: Fixed compilation for MATROSKA_VERSION = 2. bug fix: Fixed compilation with gcc 3.2. - mmg: new feature: Added support for the two flags 'hidden' and 'enabled' in the chapter editor. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2004/07/22 17:47:18 kristerw Exp $ d3 3 a5 32 --- src/mkvinfo.cpp.orig Sun Jul 18 18:08:45 2004 +++ src/mkvinfo.cpp Thu Jul 22 19:32:58 2004 @@@@ -134,12 +134,11 @@@@ void usage() { +#ifdef HAVE_WXWINDOWS mxinfo(_( "Usage: mkvinfo [options] inname\n\n" " options:\n" -#ifdef HAVE_WXWINDOWS " -g, --gui Start the GUI (and open inname if it was given).\n" -#endif " inname Use 'inname' as the source.\n" " -v, --verbose Increase verbosity. See the man page for a detailed\n" " description of what mkvinfo outputs.\n" @@@@ -147,6 +146,18 @@@@ " -s, --summary Only show summaries of the contents, not each element.\n" " -h, --help Show this help.\n" " -V, --version Show version information.\n")); +#else + mxinfo(_( + "Usage: mkvinfo [options] inname\n\n" + " options:\n" + " inname Use 'inname' as the source.\n" + " -v, --verbose Increase verbosity. See the man page for a detailed\n" + " description of what mkvinfo outputs.\n" + " -c, --checksum Calculate and display checksums of frame contents.\n" + " -s, --summary Only show summaries of the contents, not each element.\n" + " -h, --help Show this help.\n" + " -V, --version Show version information.\n")); +#endif d8 8 a15 32 string @@@@ -786,6 +797,10 @@@@ vector &summary) { EbmlMaster *m3; int i3; +#if MATROSKA_VERSION >= 2 + string strc; +#endif + show_element(l3, 3, "Audio track"); @@@@ -1393,6 +1408,10 @@@@ def_handle(cues) { EbmlMaster *m1, *m2, *m3; int i1, i2, i3; +#if MATROSKA_VERSION >= 2 + EbmlMaster *m4; + int i4; +#endif if (verbose < 2) { show_element(l1, 1, "Cues (subentries will be skipped)"); @@@@ -1571,6 +1590,9 @@@@ bool fref_found, bref_found; uint32_t lf_tnum; uint64_t lf_timecode; +#if MATROSKA_VERSION >= 2 + string strc; +#endif show_element(l2, 2, "Block group"); d17 1 @ 1.2 log @Fix invalid use of preprocessing directive within macro arguments, to make this compile when using gcc 2.95. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Updated to version 0.9.3. Changes: - add patch to fix compilation when MATROSKA_VERSION is set to 2 or bigger. Patch sent to Moritz Bunkus and it's fixed in svn repo. - take MAINTAINERSHIP 0.9.3: ====== - mmg: bug fix: The 'default track' checkbox was broken. - mkvmerge: bug fix: Using '--cues ...:all' was broken for audio tracks that use lacing. bug fix: The latest OpenDML AVI files generated by mencoder were not read correctly. Only the first RIFF chunk was processed. bug fix: The default track feature did not work correctly with the new --track-order. new feature: When using a CUE sheet as a chapter file mkvmerge will automatically convert some of the entries to tags. new feature: Added support for TTA lossless audio files. If the user does not specify a --language for a track 'und' ('undefined') will now be used instead of 'eng'. The user can use the new option '--default-language' to change that. @ text @d3 36 a38 3 --- src/mkvinfo.cpp.orig 2004-07-18 18:08:45.000000000 +0200 +++ src/mkvinfo.cpp 2004-07-21 01:08:15.000000000 +0200 @@@@ -786,6 +786,10 @@@@ d49 1 a49 1 @@@@ -1393,6 +1397,10 @@@@ d60 1 a60 1 @@@@ -1571,6 +1579,9 @@@@ @