12 files changed, 189 insertions, 12 deletions

diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index b095ed619c4a..395e7bb02701 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	audacious-plugins
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://distfiles.atheme.org/
 EXTRACT_SUFX=	.tgz
@@ -184,7 +185,7 @@ PLIST_SUB+=	VORBISPLUGIN="@comment "
 .endif
 
 .if defined(WITH_FLAC)
-LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=--enable-flacng --enable-filewriter_flac
 PLIST_SUB+=	FLACPLUGIN=""
 .else
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 7c7fe382fc5d..ff495a114095 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -208,7 +208,7 @@ gst_faad_LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
 gst_faad_DIST=	bad
 
 # flac
-gst_flac_LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+gst_flac_LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
 
 # gconf
 gst_gconf_USE_GNOME+=	gnomeprefix gconf2
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 1394b9973791..0aaa94103f50 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -33,7 +33,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	autoconf:261:env libtool:15
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
@@ -42,6 +42,9 @@ CONFIGURE_ENV+=	AKODE_CONFIG=${LOCALBASE}/bin/akode-config
 USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin
+# short-circuit auto frameworks rebuilds
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 
 OPTIONS=	AKODE "Use akode for audio playback" on \
 		MPEGLIB "Use mpeglib for audio playback" off \
@@ -72,6 +75,8 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 pre-configure:
 	${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \
 		${WRKSRC}/kappfinder-data/Makefile.in
+	@cd ${CONFIGURE_WRKSRC} \
+		&& ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} ${AUTOCONF_ARGS}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/kdemultimedia3/files/patch-configure.in b/multimedia/kdemultimedia3/files/patch-configure.in
new file mode 100644
index 000000000000..2e04bffa5e92
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-configure.in
@@ -0,0 +1,52 @@
+--- configure.in.orig	2008-03-27 18:04:50.000000000 +0100
++++ configure.in	2008-03-27 18:06:26.000000000 +0100
+@@ -937,9 +937,9 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
+   AC_LANG_SAVE
+   AC_LANG_C
+   have_libFLAC=no
+-  KDE_CHECK_HEADER(FLAC/metadata.h,
++  KDE_CHECK_HEADER(FLAC/stream_decoder.h,
+   [
+-     KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++     KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_init_ogg_stream,
+ 	          have_libFLAC=yes)
+ 
+     ])
+@@ -947,28 +947,10 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
+       LIBFLAC="-lFLAC"
+       AC_DEFINE(HAVE_LIBFLAC, 1,
+         [Define if you have libFLAC (required for loading FLAC files)])
+-  fi
+-  AC_SUBST(LIBFLAC)
+-  AC_LANG_RESTORE
+-])
+-
+-AC_DEFUN([AC_CHECK_LIBOGGFLAC],
+-[
+-  AC_LANG_SAVE
+-  AC_LANG_C
+-  have_libOggFLAC=no
+-  KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h,
+-  [
+-     KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single,
+-	          have_libOggFLAC=yes,,[-lm -lOggFLAC -lFLAC])
+-
+-    ])
+-  if test "x$have_libOggFLAC" = "xyes"; then
+-      LIBOGGFLAC="-lOggFLAC"
+       AC_DEFINE(HAVE_LIBOGGFLAC, 1,
+         [Define if you have libOggFLAC (required for loading OggFLAC files)])
+   fi
+-  AC_SUBST(LIBOGGFLAC)
++  AC_SUBST(LIBFLAC)
+   AC_LANG_RESTORE
+ ])
+ 
+@@ -976,7 +958,6 @@ AC_ARG_WITH(flac,AC_HELP_STRING([--with-
+ 
+ if test "x$flac_test" = "xyes" ; then
+   AC_CHECK_LIBFLAC
+-  AC_CHECK_LIBOGGFLAC
+ fi
+ dnl =======================================================
+ dnl FILE: ./kmid/configure.in.in
diff --git a/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp b/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp
new file mode 100644
index 000000000000..d718b1dd1209
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp
@@ -0,0 +1,30 @@
+--- kioslave/audiocd/plugins/flac/encoderflac.cpp.orig	2006-01-19 17:40:33.000000000 +0100
++++ kioslave/audiocd/plugins/flac/encoderflac.cpp	2008-03-27 18:03:56.000000000 +0100
+@@ -47,7 +47,7 @@ public:
+     unsigned long data;
+ };
+ 
+-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
++static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
+ {
+     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
+ 
+@@ -109,9 +109,6 @@ unsigned long EncoderFLAC::size(long tim
+ long EncoderFLAC::readInit(long size) {
+     kdDebug(7117) << "EncoderFLAC::readInit() called"<< endl;
+     d->data = 0;
+-    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);
+ 
+     // The options match approximely those of flac compression-level-3
+     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
+@@ -124,7 +121,7 @@ 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);
++    FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d);
+     return d->data;
+ }
+ 
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 1394b9973791..0aaa94103f50 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -33,7 +33,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	autoconf:261:env libtool:15
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
@@ -42,6 +42,9 @@ CONFIGURE_ENV+=	AKODE_CONFIG=${LOCALBASE}/bin/akode-config
 USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin
+# short-circuit auto frameworks rebuilds
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 
 OPTIONS=	AKODE "Use akode for audio playback" on \
 		MPEGLIB "Use mpeglib for audio playback" off \
@@ -72,6 +75,8 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 pre-configure:
 	${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \
 		${WRKSRC}/kappfinder-data/Makefile.in
+	@cd ${CONFIGURE_WRKSRC} \
+		&& ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} ${AUTOCONF_ARGS}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/kdemultimedia4/files/patch-configure.in b/multimedia/kdemultimedia4/files/patch-configure.in
new file mode 100644
index 000000000000..2e04bffa5e92
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/patch-configure.in
@@ -0,0 +1,52 @@
+--- configure.in.orig	2008-03-27 18:04:50.000000000 +0100
++++ configure.in	2008-03-27 18:06:26.000000000 +0100
+@@ -937,9 +937,9 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
+   AC_LANG_SAVE
+   AC_LANG_C
+   have_libFLAC=no
+-  KDE_CHECK_HEADER(FLAC/metadata.h,
++  KDE_CHECK_HEADER(FLAC/stream_decoder.h,
+   [
+-     KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
++     KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_init_ogg_stream,
+ 	          have_libFLAC=yes)
+ 
+     ])
+@@ -947,28 +947,10 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
+       LIBFLAC="-lFLAC"
+       AC_DEFINE(HAVE_LIBFLAC, 1,
+         [Define if you have libFLAC (required for loading FLAC files)])
+-  fi
+-  AC_SUBST(LIBFLAC)
+-  AC_LANG_RESTORE
+-])
+-
+-AC_DEFUN([AC_CHECK_LIBOGGFLAC],
+-[
+-  AC_LANG_SAVE
+-  AC_LANG_C
+-  have_libOggFLAC=no
+-  KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h,
+-  [
+-     KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single,
+-	          have_libOggFLAC=yes,,[-lm -lOggFLAC -lFLAC])
+-
+-    ])
+-  if test "x$have_libOggFLAC" = "xyes"; then
+-      LIBOGGFLAC="-lOggFLAC"
+       AC_DEFINE(HAVE_LIBOGGFLAC, 1,
+         [Define if you have libOggFLAC (required for loading OggFLAC files)])
+   fi
+-  AC_SUBST(LIBOGGFLAC)
++  AC_SUBST(LIBFLAC)
+   AC_LANG_RESTORE
+ ])
+ 
+@@ -976,7 +958,6 @@ AC_ARG_WITH(flac,AC_HELP_STRING([--with-
+ 
+ if test "x$flac_test" = "xyes" ; then
+   AC_CHECK_LIBFLAC
+-  AC_CHECK_LIBOGGFLAC
+ fi
+ dnl =======================================================
+ dnl FILE: ./kmid/configure.in.in
diff --git a/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp b/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp
new file mode 100644
index 000000000000..d718b1dd1209
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp
@@ -0,0 +1,30 @@
+--- kioslave/audiocd/plugins/flac/encoderflac.cpp.orig	2006-01-19 17:40:33.000000000 +0100
++++ kioslave/audiocd/plugins/flac/encoderflac.cpp	2008-03-27 18:03:56.000000000 +0100
+@@ -47,7 +47,7 @@ public:
+     unsigned long data;
+ };
+ 
+-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
++static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
+ {
+     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
+ 
+@@ -109,9 +109,6 @@ unsigned long EncoderFLAC::size(long tim
+ long EncoderFLAC::readInit(long size) {
+     kdDebug(7117) << "EncoderFLAC::readInit() called"<< endl;
+     d->data = 0;
+-    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);
+ 
+     // The options match approximely those of flac compression-level-3
+     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
+@@ -124,7 +121,7 @@ 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);
++    FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d);
+     return d->data;
+ }
+ 
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 3163fa15e014..53958d9d4af8 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.11
+PORTREVISION=	1
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,7 @@ DISTNAME=	${PORTNAME}-lib-${PORTVERSION}
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
 
-LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
 		speex.1:${PORTSDIR}/audio/speex \
 		mng.1:${PORTSDIR}/graphics/libmng \
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 63775968ffd7..a33a37bc7c9a 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	mkvtoolnix
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/mkvtoolnix/sources/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create Matroska media streams
 
-LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
+LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		ebml:${PORTSDIR}/textproc/libebml \
 		expat.6:${PORTSDIR}/textproc/expat2 \
 		lzo2.2:${PORTSDIR}/archivers/lzo2 \
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index cc357c54ad07..0a5c6e6f1ffe 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.9.0.20080223
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://nightlies.videolan.org/build/source/trunk-${DISTVERSION:S/0.9.0.//}-0024/
@@ -288,7 +288,7 @@ CONFIGURE_ARGS+=--disable-faad
 .endif
 
 .if (defined(WITH_FLAC) || exists(${LOCALBASE}/lib/libFLAC.a)) && !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=--enable-flac
 .else
 CONFLGIRE_ARGS+=--disable-flac
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index cad00fc1232d..daf007f0e972 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -10,7 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.8.6f
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
@@ -271,7 +271,7 @@ CONFIGURE_ARGS+=--disable-faad
 .endif
 
 .if (defined(WITH_FLAC) || exists(${LOCALBASE}/lib/libFLAC.a)) && !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=--enable-flac
 .else
 CONFLGIRE_ARGS+=--disable-flac