8 files changed, 68 insertions, 436 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 859b32f59713..f8510a9d7996 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -24,8 +24,7 @@
 # WITHOUT_LIBID3TAG=yes
 
 PORTNAME=	vlc
-PORTVERSION=	0.7.0
-PORTREVISION=	4
+PORTVERSION=	0.7.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
@@ -35,7 +34,7 @@ COMMENT=	An X11 video streaming client/server solution
 LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
 		mad.2:${PORTSDIR}/audio/libmad \
-		avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
+		avcodec.0:${PORTSDIR}/${FFMPEG_PORT} \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
@@ -55,9 +54,9 @@ USE_GCC=	3.2
 
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PATH_GTKCONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS=-L${LOCALBASE}/lib WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
+CONFIGURE_ENV=	PATH_GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
 CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 		--with-dvdread=${LOCALBASE} \
 		--with-mad=${LOCALBASE} \
@@ -66,6 +65,7 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 		--enable-ffmpeg \
 		--with-ffmpeg=${LOCALBASE} \
 		--disable-libcdio \
+		--disable-skins2 \
 		--program-prefix="" \
 		--without-libintl-prefix \
 		--without-libiconv-prefix
@@ -73,6 +73,11 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 MAN1=		vlc.1 \
 		vlc-config.1
 
+FFMPEG_PORT?=	multimedia/ffmpeg
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CFLAGS+=	${CPPFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_AUTODETECT) && !defined(BATCH)
@@ -208,6 +213,8 @@ PLIST_FILES+=	lib/vlc/liblivedotcom.a
 LIB_DEPENDS+=	speex.2:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=--enable-speex
 PLIST_FILES+=	lib/vlc/codec/libspeex_plugin.so
+.else
+CONFIGURE_ARGS+=--disable-speex
 .endif
 
 .if defined(WITH_SVGALIB) && !defined(WITHOUT_SVGALIB)
@@ -236,16 +243,18 @@ CONFIGURE_ENV+=	LIBS="-L/usr/lib -lcipher"
 .endif
 
 .if ${ARCH} == "i386"
-PLIST_SUB+=	MMX=""
-.else
-PLIST_SUB+=	MMX="@comment "
+PLIST_FILES+=	lib/vlc/libi420_rgb_mmx.a lib/vlc/libi420_ymga_mmx.a \
+		lib/vlc/libi420_yuy2_mmx.a lib/vlc/libi422_yuy2_mmx.a \
+		lib/vlc/libmemcpy3dn.a lib/vlc/libmemcpymmx.a \
+		lib/vlc/libmemcpymmxext.a
 .endif
 
 .if ${OSVERSION} >= 502010
 BROKEN=		"conflicts with new threads architecture"
 .endif
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
-BROKEN=		"Does not compile on alpha 4.x"
+# libstdc++.a(eh_terminate.o): gp-relative relocation against dynamic symbol __cxxabiv1::__terminate_handler
+BROKEN=		"gp-relative relocation against dynamic symbol"
 .endif
 
 pre-everything::
@@ -256,7 +265,9 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-lpthread/-lpthread-broken/' \
-		-e 's/-lc_r/${PTHREAD_LIBS}/' ${WRKSRC}/configure
+		-e 's/-lc_r/${PTHREAD_LIBS}/' \
+		-e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index 242eac9201ce..a3211dbb3e2f 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (vlc-0.7.0.tar.gz) = 05efef68528892ca933585c7db0842e3
-SIZE (vlc-0.7.0.tar.gz) = 5308669
+MD5 (vlc-0.7.1.tar.gz) = faa5e3162a3e9b3a3d8c3dcc06f70911
+SIZE (vlc-0.7.1.tar.gz) = 6102502
diff --git a/multimedia/vlc-devel/files/patch-modules-demux-mkv.cpp b/multimedia/vlc-devel/files/patch-modules-demux-mkv.cpp
deleted file mode 100644
index 6b46a14a881e..000000000000
--- a/multimedia/vlc-devel/files/patch-modules-demux-mkv.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -Nur modules/demux/mkv.cpp.orig modules/demux/mkv.cpp
---- modules/demux/mkv.cpp.orig	2003-12-22 15:27:37.000000000 +0100
-+++ modules/demux/mkv.cpp	2004-01-21 17:02:42.000000000 +0100
-@@ -543,15 +543,15 @@
-                             msg_Dbg( p_input, "|   |   |   + Track Type=%s",
-                                      psz_type );
-                         }
--                        else  if( EbmlId( *el3 ) == KaxTrackFlagEnabled::ClassInfos.GlobalId )
--                        {
--                            KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)el3;
--                            fenb.ReadData( p_sys->es->I_O() );
--
--                            tk.b_enabled = uint32( fenb );
--                            msg_Dbg( p_input, "|   |   |   + Track Enabled=%u",
--                                     uint32( fenb )  );
--                        }
-+//                         else  if( EbmlId( *el3 ) == KaxTrackFlagEnabled::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)el3;
-+//                             fenb.ReadData( p_sys->es->I_O() );
-+
-+//                             tk.b_enabled = uint32( fenb );
-+//                             msg_Dbg( p_input, "|   |   |   + Track Enabled=%u",
-+//                                      uint32( fenb )  );
-+//                         }
-                         else  if( EbmlId( *el3 ) == KaxTrackFlagDefault::ClassInfos.GlobalId )
-                         {
-                             KaxTrackFlagDefault &fdef = *(KaxTrackFlagDefault*)el3;
-@@ -651,44 +651,44 @@
-                             tk.psz_codec_name = UTF8ToStr( UTFstring( cname ) );
-                             msg_Dbg( p_input, "|   |   |   + Track Codec Name=%s", tk.psz_codec_name );
-                         }
--                        else if( EbmlId( *el3 ) == KaxCodecSettings::ClassInfos.GlobalId )
--                        {
--                            KaxCodecSettings &cset = *(KaxCodecSettings*)el3;
--                            cset.ReadData( p_sys->es->I_O() );
--
--                            tk.psz_codec_settings = UTF8ToStr( UTFstring( cset ) );
--                            msg_Dbg( p_input, "|   |   |   + Track Codec Settings=%s", tk.psz_codec_settings );
--                        }
--                        else if( EbmlId( *el3 ) == KaxCodecInfoURL::ClassInfos.GlobalId )
--                        {
--                            KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)el3;
--                            ciurl.ReadData( p_sys->es->I_O() );
--
--                            tk.psz_codec_info_url = strdup( string( ciurl ).c_str() );
--                            msg_Dbg( p_input, "|   |   |   + Track Codec Info URL=%s", tk.psz_codec_info_url );
--                        }
--                        else if( EbmlId( *el3 ) == KaxCodecDownloadURL::ClassInfos.GlobalId )
--                        {
--                            KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)el3;
--                            cdurl.ReadData( p_sys->es->I_O() );
--
--                            tk.psz_codec_download_url = strdup( string( cdurl ).c_str() );
--                            msg_Dbg( p_input, "|   |   |   + Track Codec Info URL=%s", tk.psz_codec_download_url );
--                        }
--                        else if( EbmlId( *el3 ) == KaxCodecDecodeAll::ClassInfos.GlobalId )
--                        {
--                            KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)el3;
--                            cdall.ReadData( p_sys->es->I_O() );
--
--                            msg_Dbg( p_input, "|   |   |   + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) );
--                        }
--                        else if( EbmlId( *el3 ) == KaxTrackOverlay::ClassInfos.GlobalId )
--                        {
--                            KaxTrackOverlay &tovr = *(KaxTrackOverlay*)el3;
--                            tovr.ReadData( p_sys->es->I_O() );
-+//                         else if( EbmlId( *el3 ) == KaxCodecSettings::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxCodecSettings &cset = *(KaxCodecSettings*)el3;
-+//                             cset.ReadData( p_sys->es->I_O() );
-+
-+//                             tk.psz_codec_settings = UTF8ToStr( UTFstring( cset ) );
-+//                             msg_Dbg( p_input, "|   |   |   + Track Codec Settings=%s", tk.psz_codec_settings );
-+//                         }
-+//                         else if( EbmlId( *el3 ) == KaxCodecInfoURL::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)el3;
-+//                             ciurl.ReadData( p_sys->es->I_O() );
-+
-+//                             tk.psz_codec_info_url = strdup( string( ciurl ).c_str() );
-+//                             msg_Dbg( p_input, "|   |   |   + Track Codec Info URL=%s", tk.psz_codec_info_url );
-+//                         }
-+//                         else if( EbmlId( *el3 ) == KaxCodecDownloadURL::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)el3;
-+//                             cdurl.ReadData( p_sys->es->I_O() );
-+
-+//                             tk.psz_codec_download_url = strdup( string( cdurl ).c_str() );
-+//                             msg_Dbg( p_input, "|   |   |   + Track Codec Info URL=%s", tk.psz_codec_download_url );
-+//                         }
-+//                         else if( EbmlId( *el3 ) == KaxCodecDecodeAll::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)el3;
-+//                             cdall.ReadData( p_sys->es->I_O() );
-+
-+//                             msg_Dbg( p_input, "|   |   |   + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) );
-+//                         }
-+//                         else if( EbmlId( *el3 ) == KaxTrackOverlay::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxTrackOverlay &tovr = *(KaxTrackOverlay*)el3;
-+//                             tovr.ReadData( p_sys->es->I_O() );
- 
--                            msg_Dbg( p_input, "|   |   |   + Track Overlay=%u <== UNUSED", uint32( tovr ) );
--                        }
-+//                             msg_Dbg( p_input, "|   |   |   + Track Overlay=%u <== UNUSED", uint32( tovr ) );
-+//                         }
-                         else  if( EbmlId( *el3 ) == KaxTrackVideo::ClassInfos.GlobalId )
-                         {
-                             msg_Dbg( p_input, "|   |   |   + Track Video" );
-@@ -698,21 +698,22 @@
- 
-                             while( ( el4 = p_sys->ep->Get() ) != NULL )
-                             {
--                                if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId )
--                                {
--                                    KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4;
--                                    fint.ReadData( p_sys->es->I_O() );
--
--                                    msg_Dbg( p_input, "|   |   |   |   + Track Video Interlaced=%u", uint8( fint ) );
--                                }
--                                else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId )
--                                {
--                                    KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4;
--                                    stereo.ReadData( p_sys->es->I_O() );
--
--                                    msg_Dbg( p_input, "|   |   |   |   + Track Video Stereo Mode=%u", uint8( stereo ) );
--                                }
--                                else if( EbmlId( *el4 ) == KaxVideoPixelWidth::ClassInfos.GlobalId )
-+//                                 if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId )
-+//                                 {
-+//                                     KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4;
-+//                                     fint.ReadData( p_sys->es->I_O() );
-+
-+//                                     msg_Dbg( p_input, "|   |   |   |   + Track Video Interlaced=%u", uint8( fint ) );
-+//                                 }
-+//                                 else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId )
-+//                                 {
-+//                                     KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4;
-+//                                     stereo.ReadData( p_sys->es->I_O() );
-+
-+//                                     msg_Dbg( p_input, "|   |   |   |   + Track Video Stereo Mode=%u", uint8( stereo ) );
-+//                                 }
-+//                                 else 
-+                              if( EbmlId( *el4 ) == KaxVideoPixelWidth::ClassInfos.GlobalId )
-                                 {
-                                     KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)el4;
-                                     vwidth.ReadData( p_sys->es->I_O() );
-@@ -752,28 +753,28 @@
-                                     tk.f_fps = float( vfps );
-                                     msg_Dbg( p_input, "   |   |   |   + fps=%f", float( vfps ) );
-                                 }
--                                else if( EbmlId( *el4 ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
--                                {
--                                     KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)el4;
--                                    vdmode.ReadData( p_sys->es->I_O() );
-+//                                 else if( EbmlId( *el4 ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
-+//                                 {
-+//                                      KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)el4;
-+//                                     vdmode.ReadData( p_sys->es->I_O() );
-+
-+//                                     msg_Dbg( p_input, "|   |   |   |   + Track Video Display Unit=%s",
-+//                                              uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) );
-+//                                 }
-+//                                 else if( EbmlId( *el4 ) == KaxVideoAspectRatio::ClassInfos.GlobalId )
-+//                                 {
-+//                                     KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)el4;
-+//                                     ratio.ReadData( p_sys->es->I_O() );
-+
-+//                                     msg_Dbg( p_input, "   |   |   |   + Track Video Aspect Ratio Type=%u", uint8( ratio ) );
-+//                                 }
-+//                                 else if( EbmlId( *el4 ) == KaxVideoGamma::ClassInfos.GlobalId )
-+//                                 {
-+//                                     KaxVideoGamma &gamma = *(KaxVideoGamma*)el4;
-+//                                     gamma.ReadData( p_sys->es->I_O() );
- 
--                                    msg_Dbg( p_input, "|   |   |   |   + Track Video Display Unit=%s",
--                                             uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) );
--                                }
--                                else if( EbmlId( *el4 ) == KaxVideoAspectRatio::ClassInfos.GlobalId )
--                                {
--                                    KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)el4;
--                                    ratio.ReadData( p_sys->es->I_O() );
--
--                                    msg_Dbg( p_input, "   |   |   |   + Track Video Aspect Ratio Type=%u", uint8( ratio ) );
--                                }
--                                else if( EbmlId( *el4 ) == KaxVideoGamma::ClassInfos.GlobalId )
--                                {
--                                    KaxVideoGamma &gamma = *(KaxVideoGamma*)el4;
--                                    gamma.ReadData( p_sys->es->I_O() );
--
--                                    msg_Dbg( p_input, "   |   |   |   + fps=%f", float( gamma ) );
--                                }
-+//                                     msg_Dbg( p_input, "   |   |   |   + fps=%f", float( gamma ) );
-+//                                 }
-                                 else
-                                 {
-                                     msg_Dbg( p_input, "|   |   |   |   + Unknown (%s)", typeid(*el4).name() );
diff --git a/multimedia/vlc-devel/pkg-plist b/multimedia/vlc-devel/pkg-plist
index 22f8d3f9cfd1..d1cdb35218bc 100644
--- a/multimedia/vlc-devel/pkg-plist
+++ b/multimedia/vlc-devel/pkg-plist
@@ -58,6 +58,7 @@ lib/vlc/codec/liba52_plugin.so
 lib/vlc/codec/libadpcm_plugin.so
 lib/vlc/codec/libaraw_plugin.so
 lib/vlc/codec/libcinepak_plugin.so
+lib/vlc/codec/libcvdsub_plugin.so
 lib/vlc/codec/libdts_plugin.so
 lib/vlc/codec/libdvbsub_plugin.so
 lib/vlc/codec/liblpcm_plugin.so
@@ -65,16 +66,19 @@ lib/vlc/codec/libmpeg_audio_plugin.so
 lib/vlc/codec/librawvideo_plugin.so
 lib/vlc/codec/libspudec_plugin.so
 lib/vlc/codec/libsubsdec_plugin.so
+lib/vlc/codec/libsvcdsub_plugin.so
 lib/vlc/codec/libvorbis_plugin.so
 lib/vlc/control/libgestures_plugin.so
 lib/vlc/control/libhotkeys_plugin.so
 lib/vlc/control/libhttp_plugin.so
 lib/vlc/control/librc_plugin.so
+lib/vlc/demux/libaiff_plugin.so
 lib/vlc/demux/liba52sys_plugin.so
 lib/vlc/demux/libaac_plugin.so
 lib/vlc/demux/libasf_plugin.so
 lib/vlc/demux/libau_plugin.so
 lib/vlc/demux/libavi_plugin.so
+lib/vlc/demux/libdemux2_plugin.so
 lib/vlc/demux/libdemuxdump_plugin.so
 lib/vlc/demux/libdemuxsub_plugin.so
 lib/vlc/demux/libdtssys_plugin.so
@@ -85,23 +89,22 @@ lib/vlc/demux/libmp4_plugin.so
 lib/vlc/demux/libmpeg_system_plugin.so
 lib/vlc/demux/libmpga_plugin.so
 lib/vlc/demux/libmpgv_plugin.so
+lib/vlc/demux/libnsv_plugin.so
 lib/vlc/demux/libogg_plugin.so
+lib/vlc/demux/libplaylist_plugin.so
 lib/vlc/demux/libps_plugin.so
+lib/vlc/demux/libps2_plugin.so
+lib/vlc/demux/libpva_plugin.so
 lib/vlc/demux/librawdv_plugin.so
+lib/vlc/demux/libreal_plugin.so
 lib/vlc/demux/libts_plugin.so
 lib/vlc/demux/libwav_plugin.so
 lib/vlc/gui/libgtk_plugin.so
 lib/vlc/gui/libwxwindows_plugin.so
 lib/vlc/libffmpeg.a
-%%MMX%%lib/vlc/libi420_rgb_mmx.a
-%%MMX%%lib/vlc/libi420_ymga_mmx.a
-%%MMX%%lib/vlc/libi420_yuy2_mmx.a
-%%MMX%%lib/vlc/libi422_yuy2_mmx.a
-%%MMX%%lib/vlc/libmemcpy3dn.a
-%%MMX%%lib/vlc/libmemcpymmx.a
-%%MMX%%lib/vlc/libmemcpymmxext.a
 lib/vlc/libstream_out_transcode.a
 lib/vlc/misc/libdummy_plugin.so
+lib/vlc/misc/libexport_plugin.so
 lib/vlc/misc/libfreetype_plugin.so
 lib/vlc/misc/libgtk_main_plugin.so
 lib/vlc/misc/libhttpd_plugin.so
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 859b32f59713..f8510a9d7996 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -24,8 +24,7 @@
 # WITHOUT_LIBID3TAG=yes
 
 PORTNAME=	vlc
-PORTVERSION=	0.7.0
-PORTREVISION=	4
+PORTVERSION=	0.7.1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/
 
@@ -35,7 +34,7 @@ COMMENT=	An X11 video streaming client/server solution
 LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread \
 		mad.2:${PORTSDIR}/audio/libmad \
-		avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
+		avcodec.0:${PORTSDIR}/${FFMPEG_PORT} \
 		a52.0:${PORTSDIR}/audio/liba52 \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
@@ -55,9 +54,9 @@ USE_GCC=	3.2
 
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	PATH_GTKCONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS=-L${LOCALBASE}/lib WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
+CONFIGURE_ENV=	PATH_GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		WX_CONFIG=${X11BASE}/bin/wxgtk2-2.4-config
 CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 		--with-dvdread=${LOCALBASE} \
 		--with-mad=${LOCALBASE} \
@@ -66,6 +65,7 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 		--enable-ffmpeg \
 		--with-ffmpeg=${LOCALBASE} \
 		--disable-libcdio \
+		--disable-skins2 \
 		--program-prefix="" \
 		--without-libintl-prefix \
 		--without-libiconv-prefix
@@ -73,6 +73,11 @@ CONFIGURE_ARGS+=--with-dvdcss=${LOCALBASE} \
 MAN1=		vlc.1 \
 		vlc-config.1
 
+FFMPEG_PORT?=	multimedia/ffmpeg
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CFLAGS+=	${CPPFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_AUTODETECT) && !defined(BATCH)
@@ -208,6 +213,8 @@ PLIST_FILES+=	lib/vlc/liblivedotcom.a
 LIB_DEPENDS+=	speex.2:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=--enable-speex
 PLIST_FILES+=	lib/vlc/codec/libspeex_plugin.so
+.else
+CONFIGURE_ARGS+=--disable-speex
 .endif
 
 .if defined(WITH_SVGALIB) && !defined(WITHOUT_SVGALIB)
@@ -236,16 +243,18 @@ CONFIGURE_ENV+=	LIBS="-L/usr/lib -lcipher"
 .endif
 
 .if ${ARCH} == "i386"
-PLIST_SUB+=	MMX=""
-.else
-PLIST_SUB+=	MMX="@comment "
+PLIST_FILES+=	lib/vlc/libi420_rgb_mmx.a lib/vlc/libi420_ymga_mmx.a \
+		lib/vlc/libi420_yuy2_mmx.a lib/vlc/libi422_yuy2_mmx.a \
+		lib/vlc/libmemcpy3dn.a lib/vlc/libmemcpymmx.a \
+		lib/vlc/libmemcpymmxext.a
 .endif
 
 .if ${OSVERSION} >= 502010
 BROKEN=		"conflicts with new threads architecture"
 .endif
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500000
-BROKEN=		"Does not compile on alpha 4.x"
+# libstdc++.a(eh_terminate.o): gp-relative relocation against dynamic symbol __cxxabiv1::__terminate_handler
+BROKEN=		"gp-relative relocation against dynamic symbol"
 .endif
 
 pre-everything::
@@ -256,7 +265,9 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-lpthread/-lpthread-broken/' \
-		-e 's/-lc_r/${PTHREAD_LIBS}/' ${WRKSRC}/configure
+		-e 's/-lc_r/${PTHREAD_LIBS}/' \
+		-e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 242eac9201ce..a3211dbb3e2f 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,2 +1,2 @@
-MD5 (vlc-0.7.0.tar.gz) = 05efef68528892ca933585c7db0842e3
-SIZE (vlc-0.7.0.tar.gz) = 5308669
+MD5 (vlc-0.7.1.tar.gz) = faa5e3162a3e9b3a3d8c3dcc06f70911
+SIZE (vlc-0.7.1.tar.gz) = 6102502
diff --git a/multimedia/vlc/files/patch-modules-demux-mkv.cpp b/multimedia/vlc/files/patch-modules-demux-mkv.cpp
deleted file mode 100644
index 6b46a14a881e..000000000000
--- a/multimedia/vlc/files/patch-modules-demux-mkv.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -Nur modules/demux/mkv.cpp.orig modules/demux/mkv.cpp
---- modules/demux/mkv.cpp.orig	2003-12-22 15:27:37.000000000 +0100
-+++ modules/demux/mkv.cpp	2004-01-21 17:02:42.000000000 +0100
-@@ -543,15 +543,15 @@
-                             msg_Dbg( p_input, "|   |   |   + Track Type=%s",
-                                      psz_type );
-                         }
--                        else  if( EbmlId( *el3 ) == KaxTrackFlagEnabled::ClassInfos.GlobalId )
--                        {
--                            KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)el3;
--                            fenb.ReadData( p_sys->es->I_O() );
--
--                            tk.b_enabled = uint32( fenb );
--                            msg_Dbg( p_input, "|   |   |   + Track Enabled=%u",
--                                     uint32( fenb )  );
--                        }
-+//                         else  if( EbmlId( *el3 ) == KaxTrackFlagEnabled::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxTrackFlagEnabled &fenb = *(KaxTrackFlagEnabled*)el3;
-+//                             fenb.ReadData( p_sys->es->I_O() );
-+
-+//                             tk.b_enabled = uint32( fenb );
-+//                             msg_Dbg( p_input, "|   |   |   + Track Enabled=%u",
-+//                                      uint32( fenb )  );
-+//                         }
-                         else  if( EbmlId( *el3 ) == KaxTrackFlagDefault::ClassInfos.GlobalId )
-                         {
-                             KaxTrackFlagDefault &fdef = *(KaxTrackFlagDefault*)el3;
-@@ -651,44 +651,44 @@
-                             tk.psz_codec_name = UTF8ToStr( UTFstring( cname ) );
-                             msg_Dbg( p_input, "|   |   |   + Track Codec Name=%s", tk.psz_codec_name );
-                         }
--                        else if( EbmlId( *el3 ) == KaxCodecSettings::ClassInfos.GlobalId )
--                        {
--                            KaxCodecSettings &cset = *(KaxCodecSettings*)el3;
--                            cset.ReadData( p_sys->es->I_O() );
--
--                            tk.psz_codec_settings = UTF8ToStr( UTFstring( cset ) );
--                            msg_Dbg( p_input, "|   |   |   + Track Codec Settings=%s", tk.psz_codec_settings );
--                        }
--                        else if( EbmlId( *el3 ) == KaxCodecInfoURL::ClassInfos.GlobalId )
--                        {
--                            KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)el3;
--                            ciurl.ReadData( p_sys->es->I_O() );
--
--                            tk.psz_codec_info_url = strdup( string( ciurl ).c_str() );
--                            msg_Dbg( p_input, "|   |   |   + Track Codec Info URL=%s", tk.psz_codec_info_url );
--                        }
--                        else if( EbmlId( *el3 ) == KaxCodecDownloadURL::ClassInfos.GlobalId )
--                        {
--                            KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)el3;
--                            cdurl.ReadData( p_sys->es->I_O() );
--
--                            tk.psz_codec_download_url = strdup( string( cdurl ).c_str() );
--                            msg_Dbg( p_input, "|   |   |   + Track Codec Info URL=%s", tk.psz_codec_download_url );
--                        }
--                        else if( EbmlId( *el3 ) == KaxCodecDecodeAll::ClassInfos.GlobalId )
--                        {
--                            KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)el3;
--                            cdall.ReadData( p_sys->es->I_O() );
--
--                            msg_Dbg( p_input, "|   |   |   + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) );
--                        }
--                        else if( EbmlId( *el3 ) == KaxTrackOverlay::ClassInfos.GlobalId )
--                        {
--                            KaxTrackOverlay &tovr = *(KaxTrackOverlay*)el3;
--                            tovr.ReadData( p_sys->es->I_O() );
-+//                         else if( EbmlId( *el3 ) == KaxCodecSettings::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxCodecSettings &cset = *(KaxCodecSettings*)el3;
-+//                             cset.ReadData( p_sys->es->I_O() );
-+
-+//                             tk.psz_codec_settings = UTF8ToStr( UTFstring( cset ) );
-+//                             msg_Dbg( p_input, "|   |   |   + Track Codec Settings=%s", tk.psz_codec_settings );
-+//                         }
-+//                         else if( EbmlId( *el3 ) == KaxCodecInfoURL::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxCodecInfoURL &ciurl = *(KaxCodecInfoURL*)el3;
-+//                             ciurl.ReadData( p_sys->es->I_O() );
-+
-+//                             tk.psz_codec_info_url = strdup( string( ciurl ).c_str() );
-+//                             msg_Dbg( p_input, "|   |   |   + Track Codec Info URL=%s", tk.psz_codec_info_url );
-+//                         }
-+//                         else if( EbmlId( *el3 ) == KaxCodecDownloadURL::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxCodecDownloadURL &cdurl = *(KaxCodecDownloadURL*)el3;
-+//                             cdurl.ReadData( p_sys->es->I_O() );
-+
-+//                             tk.psz_codec_download_url = strdup( string( cdurl ).c_str() );
-+//                             msg_Dbg( p_input, "|   |   |   + Track Codec Info URL=%s", tk.psz_codec_download_url );
-+//                         }
-+//                         else if( EbmlId( *el3 ) == KaxCodecDecodeAll::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxCodecDecodeAll &cdall = *(KaxCodecDecodeAll*)el3;
-+//                             cdall.ReadData( p_sys->es->I_O() );
-+
-+//                             msg_Dbg( p_input, "|   |   |   + Track Codec Decode All=%u <== UNUSED", uint8( cdall ) );
-+//                         }
-+//                         else if( EbmlId( *el3 ) == KaxTrackOverlay::ClassInfos.GlobalId )
-+//                         {
-+//                             KaxTrackOverlay &tovr = *(KaxTrackOverlay*)el3;
-+//                             tovr.ReadData( p_sys->es->I_O() );
- 
--                            msg_Dbg( p_input, "|   |   |   + Track Overlay=%u <== UNUSED", uint32( tovr ) );
--                        }
-+//                             msg_Dbg( p_input, "|   |   |   + Track Overlay=%u <== UNUSED", uint32( tovr ) );
-+//                         }
-                         else  if( EbmlId( *el3 ) == KaxTrackVideo::ClassInfos.GlobalId )
-                         {
-                             msg_Dbg( p_input, "|   |   |   + Track Video" );
-@@ -698,21 +698,22 @@
- 
-                             while( ( el4 = p_sys->ep->Get() ) != NULL )
-                             {
--                                if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId )
--                                {
--                                    KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4;
--                                    fint.ReadData( p_sys->es->I_O() );
--
--                                    msg_Dbg( p_input, "|   |   |   |   + Track Video Interlaced=%u", uint8( fint ) );
--                                }
--                                else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId )
--                                {
--                                    KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4;
--                                    stereo.ReadData( p_sys->es->I_O() );
--
--                                    msg_Dbg( p_input, "|   |   |   |   + Track Video Stereo Mode=%u", uint8( stereo ) );
--                                }
--                                else if( EbmlId( *el4 ) == KaxVideoPixelWidth::ClassInfos.GlobalId )
-+//                                 if( EbmlId( *el4 ) == KaxVideoFlagInterlaced::ClassInfos.GlobalId )
-+//                                 {
-+//                                     KaxVideoFlagInterlaced &fint = *(KaxVideoFlagInterlaced*)el4;
-+//                                     fint.ReadData( p_sys->es->I_O() );
-+
-+//                                     msg_Dbg( p_input, "|   |   |   |   + Track Video Interlaced=%u", uint8( fint ) );
-+//                                 }
-+//                                 else if( EbmlId( *el4 ) == KaxVideoStereoMode::ClassInfos.GlobalId )
-+//                                 {
-+//                                     KaxVideoStereoMode &stereo = *(KaxVideoStereoMode*)el4;
-+//                                     stereo.ReadData( p_sys->es->I_O() );
-+
-+//                                     msg_Dbg( p_input, "|   |   |   |   + Track Video Stereo Mode=%u", uint8( stereo ) );
-+//                                 }
-+//                                 else 
-+                              if( EbmlId( *el4 ) == KaxVideoPixelWidth::ClassInfos.GlobalId )
-                                 {
-                                     KaxVideoPixelWidth &vwidth = *(KaxVideoPixelWidth*)el4;
-                                     vwidth.ReadData( p_sys->es->I_O() );
-@@ -752,28 +753,28 @@
-                                     tk.f_fps = float( vfps );
-                                     msg_Dbg( p_input, "   |   |   |   + fps=%f", float( vfps ) );
-                                 }
--                                else if( EbmlId( *el4 ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
--                                {
--                                     KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)el4;
--                                    vdmode.ReadData( p_sys->es->I_O() );
-+//                                 else if( EbmlId( *el4 ) == KaxVideoDisplayUnit::ClassInfos.GlobalId )
-+//                                 {
-+//                                      KaxVideoDisplayUnit &vdmode = *(KaxVideoDisplayUnit*)el4;
-+//                                     vdmode.ReadData( p_sys->es->I_O() );
-+
-+//                                     msg_Dbg( p_input, "|   |   |   |   + Track Video Display Unit=%s",
-+//                                              uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) );
-+//                                 }
-+//                                 else if( EbmlId( *el4 ) == KaxVideoAspectRatio::ClassInfos.GlobalId )
-+//                                 {
-+//                                     KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)el4;
-+//                                     ratio.ReadData( p_sys->es->I_O() );
-+
-+//                                     msg_Dbg( p_input, "   |   |   |   + Track Video Aspect Ratio Type=%u", uint8( ratio ) );
-+//                                 }
-+//                                 else if( EbmlId( *el4 ) == KaxVideoGamma::ClassInfos.GlobalId )
-+//                                 {
-+//                                     KaxVideoGamma &gamma = *(KaxVideoGamma*)el4;
-+//                                     gamma.ReadData( p_sys->es->I_O() );
- 
--                                    msg_Dbg( p_input, "|   |   |   |   + Track Video Display Unit=%s",
--                                             uint8( vdmode ) == 0 ? "pixels" : ( uint8( vdmode ) == 1 ? "centimeters": "inches" ) );
--                                }
--                                else if( EbmlId( *el4 ) == KaxVideoAspectRatio::ClassInfos.GlobalId )
--                                {
--                                    KaxVideoAspectRatio &ratio = *(KaxVideoAspectRatio*)el4;
--                                    ratio.ReadData( p_sys->es->I_O() );
--
--                                    msg_Dbg( p_input, "   |   |   |   + Track Video Aspect Ratio Type=%u", uint8( ratio ) );
--                                }
--                                else if( EbmlId( *el4 ) == KaxVideoGamma::ClassInfos.GlobalId )
--                                {
--                                    KaxVideoGamma &gamma = *(KaxVideoGamma*)el4;
--                                    gamma.ReadData( p_sys->es->I_O() );
--
--                                    msg_Dbg( p_input, "   |   |   |   + fps=%f", float( gamma ) );
--                                }
-+//                                     msg_Dbg( p_input, "   |   |   |   + fps=%f", float( gamma ) );
-+//                                 }
-                                 else
-                                 {
-                                     msg_Dbg( p_input, "|   |   |   |   + Unknown (%s)", typeid(*el4).name() );
diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist
index 22f8d3f9cfd1..d1cdb35218bc 100644
--- a/multimedia/vlc/pkg-plist
+++ b/multimedia/vlc/pkg-plist
@@ -58,6 +58,7 @@ lib/vlc/codec/liba52_plugin.so
 lib/vlc/codec/libadpcm_plugin.so
 lib/vlc/codec/libaraw_plugin.so
 lib/vlc/codec/libcinepak_plugin.so
+lib/vlc/codec/libcvdsub_plugin.so
 lib/vlc/codec/libdts_plugin.so
 lib/vlc/codec/libdvbsub_plugin.so
 lib/vlc/codec/liblpcm_plugin.so
@@ -65,16 +66,19 @@ lib/vlc/codec/libmpeg_audio_plugin.so
 lib/vlc/codec/librawvideo_plugin.so
 lib/vlc/codec/libspudec_plugin.so
 lib/vlc/codec/libsubsdec_plugin.so
+lib/vlc/codec/libsvcdsub_plugin.so
 lib/vlc/codec/libvorbis_plugin.so
 lib/vlc/control/libgestures_plugin.so
 lib/vlc/control/libhotkeys_plugin.so
 lib/vlc/control/libhttp_plugin.so
 lib/vlc/control/librc_plugin.so
+lib/vlc/demux/libaiff_plugin.so
 lib/vlc/demux/liba52sys_plugin.so
 lib/vlc/demux/libaac_plugin.so
 lib/vlc/demux/libasf_plugin.so
 lib/vlc/demux/libau_plugin.so
 lib/vlc/demux/libavi_plugin.so
+lib/vlc/demux/libdemux2_plugin.so
 lib/vlc/demux/libdemuxdump_plugin.so
 lib/vlc/demux/libdemuxsub_plugin.so
 lib/vlc/demux/libdtssys_plugin.so
@@ -85,23 +89,22 @@ lib/vlc/demux/libmp4_plugin.so
 lib/vlc/demux/libmpeg_system_plugin.so
 lib/vlc/demux/libmpga_plugin.so
 lib/vlc/demux/libmpgv_plugin.so
+lib/vlc/demux/libnsv_plugin.so
 lib/vlc/demux/libogg_plugin.so
+lib/vlc/demux/libplaylist_plugin.so
 lib/vlc/demux/libps_plugin.so
+lib/vlc/demux/libps2_plugin.so
+lib/vlc/demux/libpva_plugin.so
 lib/vlc/demux/librawdv_plugin.so
+lib/vlc/demux/libreal_plugin.so
 lib/vlc/demux/libts_plugin.so
 lib/vlc/demux/libwav_plugin.so
 lib/vlc/gui/libgtk_plugin.so
 lib/vlc/gui/libwxwindows_plugin.so
 lib/vlc/libffmpeg.a
-%%MMX%%lib/vlc/libi420_rgb_mmx.a
-%%MMX%%lib/vlc/libi420_ymga_mmx.a
-%%MMX%%lib/vlc/libi420_yuy2_mmx.a
-%%MMX%%lib/vlc/libi422_yuy2_mmx.a
-%%MMX%%lib/vlc/libmemcpy3dn.a
-%%MMX%%lib/vlc/libmemcpymmx.a
-%%MMX%%lib/vlc/libmemcpymmxext.a
 lib/vlc/libstream_out_transcode.a
 lib/vlc/misc/libdummy_plugin.so
+lib/vlc/misc/libexport_plugin.so
 lib/vlc/misc/libfreetype_plugin.so
 lib/vlc/misc/libgtk_main_plugin.so
 lib/vlc/misc/libhttpd_plugin.so