[pkgsrc/trunk]: pkgsrc/multimedia/mkvtoolnix Support flac-1.1.3 based on a pa...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2deda42f81d
branches:  trunk
changeset: 523817:a2deda42f81d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jan 13 21:58:24 2007 +0000

description:
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.

diffstat:

 multimedia/mkvtoolnix/Makefile         |    4 +-
 multimedia/mkvtoolnix/distinfo         |    9 +-
 multimedia/mkvtoolnix/patches/patch-ab |  116 ++++++++++-
 multimedia/mkvtoolnix/patches/patch-ad |   24 ++
 multimedia/mkvtoolnix/patches/patch-ae |   55 +++++
 multimedia/mkvtoolnix/patches/patch-af |  361 +++++++++++++++++++++++++++++++++
 multimedia/mkvtoolnix/patches/patch-ag |   54 ++++
 multimedia/mkvtoolnix/patches/patch-ah |   53 ++++
 8 files changed, 667 insertions(+), 9 deletions(-)

diffs (truncated from 731 to 300 lines):

diff -r 47081e18740b -r a2deda42f81d multimedia/mkvtoolnix/Makefile
--- a/multimedia/mkvtoolnix/Makefile    Sat Jan 13 21:45:56 2007 +0000
+++ b/multimedia/mkvtoolnix/Makefile    Sat Jan 13 21:58:24 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2007/01/07 12:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/13 21:58:24 wiz Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
-PKGREVISION=   1
+PKGREVISION=   2
 
 MAINTAINER=    salo%NetBSD.org@localhost
 HOMEPAGE=      http://www.bunkus.org/videotools/mkvtoolnix/
diff -r 47081e18740b -r a2deda42f81d multimedia/mkvtoolnix/distinfo
--- a/multimedia/mkvtoolnix/distinfo    Sat Jan 13 21:45:56 2007 +0000
+++ b/multimedia/mkvtoolnix/distinfo    Sat Jan 13 21:58:24 2007 +0000
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.22 2006/10/31 20:52:36 rillig Exp $
+$NetBSD: distinfo,v 1.23 2007/01/13 21:58:24 wiz Exp $
 
 SHA1 (mkvtoolnix-1.7.0.tar.bz2) = c705af2778faac3e5244015646e331e811500b26
 RMD160 (mkvtoolnix-1.7.0.tar.bz2) = 0c90a44f0b6df466a4799ed8fa2f99791059c7fb
 Size (mkvtoolnix-1.7.0.tar.bz2) = 655481 bytes
 SHA1 (patch-aa) = 602bd5b9af024a02bcb6b59714d6aaa0031cbd85
-SHA1 (patch-ab) = 0a2ecaf091aa0735440a12c1534dc58eeb8ec549
+SHA1 (patch-ab) = df0bd9e6ed99be6d1f3f711b3d43ab605fc6b3d8
 SHA1 (patch-ac) = 8206116fcc72d757ac1456baae00a8254b8e4866
+SHA1 (patch-ad) = 9b57e92c910f84fa7b5eb88456fce6b08a3b0cf0
+SHA1 (patch-ae) = 47b34e89b259121fe731e9d55c404394be1fa1d6
+SHA1 (patch-af) = 402e4520d9b566e3422c983b80e8a005ed83b728
+SHA1 (patch-ag) = b9959a3c541447703fce51292097f3b33b146327
+SHA1 (patch-ah) = 85f638aa8fdc171a096a37ff2d580bfbe738d753
diff -r 47081e18740b -r a2deda42f81d multimedia/mkvtoolnix/patches/patch-ab
--- a/multimedia/mkvtoolnix/patches/patch-ab    Sat Jan 13 21:45:56 2007 +0000
+++ b/multimedia/mkvtoolnix/patches/patch-ab    Sat Jan 13 21:58:24 2007 +0000
@@ -1,8 +1,114 @@
-$NetBSD: patch-ab,v 1.6 2006/10/08 05:22:19 salo Exp $
+$NetBSD: patch-ab,v 1.7 2007/01/13 21:58:24 wiz Exp $
 
---- configure.orig     2006-10-08 03:30:41.000000000 +0000
-+++ configure  2006-10-08 03:52:30.000000000 +0000
-@@ -8620,7 +8620,7 @@
+--- 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
@@ -11,7 +117,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8678,7 +8678,7 @@
+@@ -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
diff -r 47081e18740b -r a2deda42f81d multimedia/mkvtoolnix/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mkvtoolnix/patches/patch-ad    Sat Jan 13 21:58:24 2007 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ad,v 1.1 2007/01/13 21:58:24 wiz Exp $
+
+--- configure.in.orig  2006-04-28 14:52:55.000000000 +0000
++++ configure.in
+@@ -495,8 +495,8 @@ dnl
+               [ with_flac=${withval} ], [ with_flac=yes ])
+ 
+   if test "$with_flac" != "no"; then
+-    AC_CHECK_LIB(FLAC, FLAC__seekable_stream_decoder_new,
+-                 [ FLAC_LIBS="-lFLAC -lm"
++    AC_CHECK_LIB(FLAC, FLAC__stream_decoder_new,
++                 [ FLAC_LIBS="-lFLAC $OGG_LIBS -lm"
+                    flac_found=yes ],
+                  [ flac_found=no ],
+                  "-lm")
+@@ -510,7 +510,7 @@ dnl
+                     ])
+   fi
+   if test x"$flac_found" = xyes ; then
+-    AC_CHECK_LIB(FLAC, FLAC__seekable_stream_decoder_skip_single_frame,
++    AC_CHECK_LIB(FLAC, FLAC__stream_decoder_skip_single_frame,
+                  [ flac_decoder_skip_found=yes ],
+                  [ flac_decoder_skip_found=no ],
+                  $FLAC_LIBS)
diff -r 47081e18740b -r a2deda42f81d multimedia/mkvtoolnix/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mkvtoolnix/patches/patch-ae    Sat Jan 13 21:58:24 2007 +0000
@@ -0,0 +1,55 @@
+$NetBSD: patch-ae,v 1.1 2007/01/13 21:58:24 wiz Exp $
+
+--- src/input/flac_common.cpp.orig     2005-09-03 12:32:53.000000000 +0000
++++ src/input/flac_common.cpp
+@@ -20,6 +20,11 @@
+ #include <stdarg.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
+ 
+ #include "bit_cursor.h"
+ #include "common.h"
+@@ -145,7 +150,11 @@ typedef struct {
+ static FLAC__StreamDecoderReadStatus
+ flac_read_cb(const FLAC__StreamDecoder *,
+              FLAC__byte buffer[],
++#ifdef LEGACY_FLAC
+              unsigned *bytes,
++#else
++             size_t *bytes,
++#endif
+              void *client_data) {
+   flac_header_extractor_t *fhe;
+   int num_bytes;
+@@ -210,6 +219,7 @@ flac_decode_headers(unsigned char *mem,
+   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, &fhe);
+   if (!FLAC__stream_decoder_set_read_callback(decoder, flac_read_cb))
+     mxerror(FPFX "Could not set the read callback.\n");
+@@ -219,11 +229,18 @@ flac_decode_headers(unsigned char *mem,
+     mxerror(FPFX "Could not set the metadata callback.\n");
+   if (!FLAC__stream_decoder_set_error_callback(decoder, flac_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)
+     mxerror(FPFX "Could not initialize the FLAC decoder.\n");
++#else
++  if (FLAC__stream_decoder_init_stream(decoder, flac_read_cb, NULL, NULL, NULL, NULL, flac_write_cb, flac_metadata_cb, flac_error_cb, &fhe) !=
++      FLAC__STREAM_DECODER_INIT_STATUS_OK)
++    mxerror(FPFX "Could not initialize the FLAC decoder.\n");
++#endif
+   FLAC__stream_decoder_process_until_end_of_stream(decoder);
+ 
+   result = 0;
diff -r 47081e18740b -r a2deda42f81d multimedia/mkvtoolnix/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/mkvtoolnix/patches/patch-af    Sat Jan 13 21:58:24 2007 +0000
@@ -0,0 +1,361 @@
+$NetBSD: patch-af,v 1.1 2007/01/13 21:58:24 wiz Exp $
+
+--- src/input/r_flac.cpp.orig  2005-10-12 16:41:09.000000000 +0000
++++ src/input/r_flac.cpp
+@@ -20,9 +20,6 @@
+ #include <string.h>
+ #include <ogg/ogg.h>
+ #include <vorbis/codec.h>
+-#if defined(HAVE_FLAC_FORMAT_H)
+-#include <FLAC/seekable_stream_decoder.h>
+-#endif
+ 
+ #include "common.h"
+ #include "flac_common.h"
+@@ -36,6 +33,7 @@
+ #if defined(HAVE_FLAC_FORMAT_H)
+ #define FPFX "flac_reader: "
+ 
++#ifdef LEGACY_FLAC
+ static FLAC__SeekableStreamDecoderReadStatus
+ flac_read_cb(const FLAC__SeekableStreamDecoder *,
+              FLAC__byte buffer[],
+@@ -43,55 +41,123 @@ flac_read_cb(const FLAC__SeekableStreamD
+              void *client_data) {
+   return ((flac_reader_c *)client_data)->read_cb(buffer, bytes);
+ }
++#else
++static FLAC__StreamDecoderReadStatus
++flac_read_cb(const FLAC__StreamDecoder *,
++             FLAC__byte buffer[],
++             size_t *bytes,
++             void *client_data) {
++  return ((flac_reader_c *)client_data)->read_cb(buffer, bytes);
++}
++#endif
+ 
+ static FLAC__StreamDecoderWriteStatus
++#ifdef LEGACY_FLAC
+ flac_write_cb(const FLAC__SeekableStreamDecoder *,
+               const FLAC__Frame *frame,
+               const FLAC__int32 * const data[],
+               void *client_data) {
+   return ((flac_reader_c *)client_data)->write_cb(frame, data);
+ }
++#else