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.

5 files changed, 196 insertions, 24 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index e76a2c85a95..f4c18fb41e8 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2007/01/07 12:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2007/01/13 18:33:44 wiz Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 3bd5d716d51..9d98b6c0009 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.33 2006/10/12 10:49:17 markd Exp $
+$NetBSD: distinfo,v 1.34 2007/01/13 18:33:44 wiz Exp $
 
 SHA1 (kdemultimedia-3.5.5.tar.bz2) = 8ddc3174d400827e58e2e5cf87a5bd279a6bfdc1
 RMD160 (kdemultimedia-3.5.5.tar.bz2) = c31d81efeb02cea29048fbdefcb8c4f13726fded
 Size (kdemultimedia-3.5.5.tar.bz2) = 6287234 bytes
-SHA1 (patch-aa) = 6decff5d7eb5a306f90e5d7cbbae039f4995641f
+SHA1 (patch-aa) = dbc6e12e1c72fd0b830782d9ce512c0efe6c29f6
 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
 SHA1 (patch-ad) = 4a84cd2246d61e521b1ce576328c755915304b10
@@ -18,6 +18,8 @@ SHA1 (patch-al) = c8c3d6c44d19053c596b41060ab574a051c73eeb
 SHA1 (patch-am) = d08ebf77d69d8c9527728eccaa430b28664a74dd
 SHA1 (patch-an) = 79b26912aeeacb881664cd1557417bd99b96451e
 SHA1 (patch-ao) = 1c849de2e1696c4f4e81b660a42b26e2a1c5440e
+SHA1 (patch-ap) = 66368931f92a83e03b879e98440756620e65ddeb
+SHA1 (patch-aq) = 2c804af0ff952e50e909002a4b4c53422b1ba59c
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa
index 9230a0d4312..87bcb80b7aa 100644
--- a/multimedia/kdemultimedia3/patches/patch-aa
+++ b/multimedia/kdemultimedia3/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2007/01/13 18:33:44 wiz Exp $
 
---- configure.orig	2006-03-18 13:44:39.000000000 +0000
+--- configure.orig	2006-10-02 18:17:13.000000000 +0000
 +++ configure
 @@ -28862,34 +28862,15 @@ if test $kde_qtver = 1; then
     kde_qt_dirs="$QTDIR /usr/lib/qt"
@@ -126,7 +126,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
-@@ -34616,7 +34576,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl
+@@ -34615,7 +34575,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -135,7 +135,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34683,7 +34643,7 @@ fi
+@@ -34682,7 +34642,7 @@ fi
  
    if test "x$have_ossaudio" = xyes; then
      # for kmix/ and akode/
@@ -144,7 +144,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
    fi
  
  
-@@ -35280,7 +35240,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -35279,7 +35239,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -153,7 +153,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -35324,7 +35284,7 @@ _ACEOF
+@@ -35323,7 +35283,7 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -162,7 +162,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -35434,7 +35394,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -35433,7 +35393,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -171,7 +171,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  
  int
  main ()
-@@ -37422,7 +37382,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
+@@ -37432,7 +37392,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -180,7 +180,16 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -38330,7 +38290,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
+@@ -38427,13 +38387,13 @@ if test $ac_cv_header_FLAC_metadata_h = 
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_process_single in -lFLAC" >&5
+-echo $ECHO_N "checking for FLAC__seekable_stream_decoder_process_single in -lFLAC... $ECHO_C" >&6
+-if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single+set}" = set; then
++     echo "$as_me:$LINENO: checking for FLAC__stream_decoder_process_single in -lFLAC" >&5
++echo $ECHO_N "checking for FLAC__stream_decoder_process_single in -lFLAC... $ECHO_C" >&6
++if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_process_single+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -189,7 +198,100 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40500,8 +40460,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -38447,11 +38407,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_process_single ();
++char FLAC__stream_decoder_process_single ();
+ int
+ main ()
+ {
+-FLAC__seekable_stream_decoder_process_single ();
++FLAC__stream_decoder_process_single ();
+   ;
+   return 0;
+ }
+@@ -38478,20 +38438,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_process_single=yes
++  ac_cv_lib_FLAC_FLAC__stream_decoder_process_single=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single=no
++ac_cv_lib_FLAC_FLAC__stream_decoder_process_single=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_process_single" >&5
+-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single" >&6
+-if test $ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_process_single" >&5
++echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_process_single" >&6
++if test $ac_cv_lib_FLAC_FLAC__stream_decoder_process_single = yes; then
+   have_libFLAC=yes
+ fi
+ 
+@@ -38699,9 +38659,9 @@ if test $ac_cv_header_OggFLAC_seekable_s
+ 	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
+ 	;;
+      esac
+-     echo "$as_me:$LINENO: checking for OggFLAC__seekable_stream_decoder_process_single in -lOggFLAC" >&5
+-echo $ECHO_N "checking for OggFLAC__seekable_stream_decoder_process_single in -lOggFLAC... $ECHO_C" >&6
+-if test "${ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single+set}" = set; then
++     echo "$as_me:$LINENO: checking for OggFLAC__stream_decoder_process_single in -lOggFLAC" >&5
++echo $ECHO_N "checking for OggFLAC__stream_decoder_process_single in -lOggFLAC... $ECHO_C" >&6
++if test "${ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -38719,11 +38679,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 OggFLAC__seekable_stream_decoder_process_single ();
++char OggFLAC__stream_decoder_process_single ();
+ int
+ main ()
+ {
+-OggFLAC__seekable_stream_decoder_process_single ();
++OggFLAC__stream_decoder_process_single ();
+   ;
+   return 0;
+ }
+@@ -38750,20 +38710,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_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=yes
++  ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=no
++ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single=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_OggFLAC_OggFLAC__seekable_stream_decoder_process_single" >&5
+-echo "${ECHO_T}$ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single" >&6
+-if test $ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single" >&5
++echo "${ECHO_T}$ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single" >&6
++if test $ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single = yes; then
+   have_libOggFLAC=yes
+ fi
+ 
+@@ -40613,8 +40573,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -215,7 +317,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -40564,7 +40539,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40677,7 +40652,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -238,7 +340,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -40628,7 +40618,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40741,7 +40731,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -261,7 +363,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -40700,6 +40705,9 @@ case "$OS_TYPE" in
+@@ -40813,6 +40818,9 @@ case "$OS_TYPE" in
    SunOS)
      kde_mpeglib_compiles=yes
      ;;
@@ -271,7 +373,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
    *)
      echo "$as_me:$LINENO: result: *** We disable mpeglib for this platform ***" >&5
  echo "${ECHO_T}*** We disable mpeglib for this platform ***" >&6
-@@ -40709,33 +40717,14 @@ esac
+@@ -40822,33 +40830,14 @@ esac
  
  
  
@@ -309,7 +411,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40780,31 +40769,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -40893,31 +40882,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -348,7 +450,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
      echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
  echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-@@ -40857,6 +40838,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -40970,6 +40951,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_pthread_pthread_create=yes
@@ -356,7 +458,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -40869,10 +40851,6 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -40982,10 +40964,6 @@ LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
  echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
@@ -367,7 +469,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
    fi
  
      if test -z "$LIBPTHREAD" ; then
-@@ -40934,10 +40912,6 @@ rm -f conftest.err conftest.$ac_objext \
+@@ -41047,10 +41025,6 @@ rm -f conftest.err conftest.$ac_objext \
      LIBS=$kde_safe_libs
    fi
  
@@ -378,7 +480,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
  
  
  case "$OS_TYPE" in
-@@ -40959,7 +40933,7 @@ _ACEOF
+@@ -41072,7 +41046,7 @@ _ACEOF
  
      ;;
  
@@ -387,7 +489,7 @@ $NetBSD: patch-aa,v 1.10 2006/05/08 22:14:27 joerg Exp $
      OS_TYPE="BSD"
  
  cat >>confdefs.h <<\_ACEOF
-@@ -45411,11 +45387,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -45524,11 +45498,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF
  
  { (exit 0); exit 0; }
  _ACEOF
diff --git a/multimedia/kdemultimedia3/patches/patch-ap b/multimedia/kdemultimedia3/patches/patch-ap
new file mode 100644
index 00000000000..c419977f0f2
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2007/01/13 18:33:44 wiz Exp $
+
+--- kioslave/audiocd/configure.in.in.orig	2005-09-10 08:19:49.000000000 +0000
++++ kioslave/audiocd/configure.in.in
+@@ -5,7 +5,7 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
+   have_libFLAC=no
+   KDE_CHECK_HEADER(FLAC/metadata.h,
+   [
+-     KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++     KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
+ 	          have_libFLAC=yes)
+ 
+     ])
diff --git a/multimedia/kdemultimedia3/patches/patch-aq b/multimedia/kdemultimedia3/patches/patch-aq
new file mode 100644
index 00000000000..fea0da6cd25
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-aq
@@ -0,0 +1,55 @@
+$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;
+ }
+