- Update to 0.8.2 [1]

- Adds OPTIONS, if you don't want to use OPTIONS define -DBATCH
  and vlc will use your knobs and auto-detect your ports.

New Knobs:
 WITH_DAAD		libopendaap itunes music shares
 WITHOUT_OGG		Disabled ogg audio decoder
 WITH_TWOLAME		Twolame Mpeg layer 2 audio Support
 WITH_DIRAC		dirac general-purpose video codec
 WITH_SMB		SAMBA Access module

Patches and Most changes merged from:	multimedia/vlc-devel [1]

13 files changed, 385 insertions, 506 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 159ac9580220..b434e045069d 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -14,9 +14,8 @@
 #
 # Interface Knobs:
 #
-# WITHOUT_HTTPD=yes
-#  Web interface to control streaming media
-#   * recommended if you want to stream media
+# WITH_CORBA
+#  Enable a Corba interface via orbit2
 #
 # WITH_NCURSES=yes
 #  Ncurses (console) interface
@@ -39,6 +38,9 @@
 # WITH_ARTS=yes
 #  Arts Support
 #
+# WITH_DAAP=yes
+#  Enable libopendaap to connect to iTunes(R) music shares.
+#
 # WITHOUT_DTS=yes
 #  DTS decoder Support
 #  useful for many dvds
@@ -47,16 +49,18 @@
 #  Esound Support
 #
 # WITH_FAAC=yes
-# Faac audio encoder (mp4/aac) Support
+#  Faac audio encoder (mp4/aac) Support
+#  ** Only enable this if you compiled multimedia/ffmpeg-devel with WITH_FAAC knob **
 #
-# WITHOUT_FAAD=yes
+# WITH_FAAD=yes
 #  Faad audio decoder (mp4/aac) Support
 #
 # WITHOUT_FLAC=yes
 #  Flac Support
 #
-# WITH_LAME=yes
+# WITHOUT_LAME=yes
 #  Mp3 encoder Support
+#   ** NOT DEFINED if PACKAGE_BUILDING is defined **
 #
 # WITHOUT_LIBA52=yes
 #  liba52 audio Support
@@ -68,15 +72,20 @@
 # WITHOUT_MAD=yes
 #  Mad mp3 audio decoder Support
 #
+# WITHOUT_OGG=yes
+#  Ogg audio decoder Support
+#
 # WITH_SPEEX=yes
 #  Speex voice codec Support
-#  Note: you need audio/speex-devel
 #
 # WITH_TOOLAME=yes
 #  Toolame Support
 #
+# WITH_TWOLAME=yes
+#  Twolame Mpeg layer 2 audio Support
+#
 # WITHOUT_VORBIS=yes
-#  Ogg/Vorbis Support
+#  Vorbis Support
 #
 # Graphics Knobs:
 #
@@ -90,7 +99,7 @@
 # WITH_LIBCACA=yes
 #  Console Graphics Support (implies WITH_AALIB)
 #
-# WITHOUT_SDL=yes
+# WITH_SDL=yes
 #  SDL video output
 #
 # WITH_SVG=yes
@@ -102,22 +111,39 @@
 #
 # Multimedia Knobs:
 #
-# WITH_H264
+# WITH_DIRAC
+#  Enable dirac general-purpose video codec
+#
+# WITH_X264
 #  Enable H.264/AVC Video Support
 #
 # WITHOUT_LIBMATROSKA=yes
 #  Matroska Container Format Support
 #
 # WITHOUT_LIBMPEG2=yes
+#  Mpeg-2 A/V Decoder Support
 #
 # WITH_LIBTHEORA=yes
+#  Video codec for OGG/Vorbis Support
 #
-# WITHOUT_TRANSCODE=yes
+# WITH_TRANSCODE=yes
 #  Disable transcode of multimedia via transcode (multimedia/transcode).
 #  This option allows you to convert a media file, dvd, A/V stream, etc
 #  in to another format. This also allows you to transcode multimedia
 #  on-the-fly and stream to a network and/or local playback.
 #
+# Streaming Knobs:
+#
+# WITHOUT_HTTPD=yes
+#  Web interface to control streaming media
+#
+# WITHOUT_LIVEMEDIA=yes
+#  Support for rstp/rtp/sdp protocols
+#  Only versions 2004.11.11 and higher are supported.
+#
+# WITHOUT_STREAM_PLUGINS=yes
+#  Disable build and install of Streaming plugins
+#
 # Other Knobs:
 #
 # DEBUG=yes
@@ -127,18 +153,20 @@
 #  Disable cddb and vcd support
 #   and other cdrom support
 #
+# WITHOUT_CDPARANOIA=yes
+#  Disable Cdparanoia support
+#
 # WITHOUT_DVBPSI=yes
 #  TS MUX and DEMUX support
 #
-# WITHOUT_DVD=yes
-#  Disable all dvd support
+# WITHOUT_DVDNAV=yes
+#  Disable DVD (dvd menus) support
 #
-# WITHOUT_LIVEMEDIA=yes
-#  Support for rstp/rtp/sdp protocols
-#  Only versions 2004.11.11 and higher are supported.
-#  * recommended if you want to stream media.
+# WITH_DVDREAD=yes
+#  Enable Regular DVD support (non-menu)
 #
-# WITH_MOZILLA_PLUGIN= [mozilla|mozilla-devel|firefox]
+# WITH_MOZILLA=	[mozilla|mozilla-devel|firefox]
+# WITH_MOZILLA_PLUGIN= yes
 #  Enable A mozilla plugin for VLC
 #  See http://www.videolan.org/doc/vlc-user-guide/en/ch07.html#id2529837
 #  for more info on using this plugin.
@@ -147,6 +175,9 @@
 # WITH_OPENGL=yes
 #  Enable OpenGL visual plugin (not playback, play back is default with X11)
 #
+# WITH_SMB=yes
+#  Enable SAMBA Access module
+#
 # WITH_SSL=yes
 #  Enable TLS/SSL Support for web (httpd) interface
 #
@@ -170,6 +201,9 @@
 # WITHOUT_NLS=yes
 #  Disable Languarge Support
 #
+# WITHOUT_STREAM_PLUGINS=yes
+#  Disable ALL streaming plugins.
+#
 # WITH_VLC_DEFAULT_FONT=/path/to/font
 #  default: ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
 #  This option lets you change the default font for subtitles
@@ -179,18 +213,13 @@
 #
 
 PORTNAME=	vlc
-PORTVERSION=	0.8.1
-PORTREVISION=	13
+DISTVERSION=	0.8.2
 CATEGORIES=	multimedia audio ipv6 net www
-MASTER_SITES=	http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
-		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \
-		ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \
-		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \
+MASTER_SITES=	http://downloads.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL:S|$|:mozilla|}
 MASTER_SITE_SUBDIR=	ahze/:mozilla
-PKGNAMESUFFIX?=	${ESOUND_SUFFIX}${MOZILLA_SUFFIX}${PKGNAMESUFFIX2}
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		vlc-intf-mozilla-plugin${EXTRACT_SUFX}:mozilla
+DISTFILES=	${PORTNAME}-${DISTVERSION:S/0.8.2.//}${EXTRACT_SUFX} \
+		vlc-intf-mozilla-plugin-0.1${EXTRACT_SUFX}:mozilla
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Multimedia streaming server and player for various audio/video formats
@@ -198,7 +227,7 @@ COMMENT=	Multimedia streaming server and player for various audio/video formats
 RUN_DEPEDNS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 
-CONFLICTS=	vlc-devel-*[0-9]*
+CONFLICTS=	vlc-*-0.8.2.200*
 
 ### BROKEN -- Needs newer verision of toolame ###
 WITHOUT_TOOLAME=	yes
@@ -213,19 +242,18 @@ USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnometarget
+USE_GNOME=	gnometarget libxml2
 USE_REINPLACE=	yes
 WANT_SDL=	yes
-USE_XLIB=	yes
 USE_ICONV=	yes
+USE_PERL5_BUILD=yes
 
 FAKEDIR=	${WRKDIR}/fake
 PLIST=		${WRKDIR}/plist
 
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS}" \
-		CPPFLAGS="-I${WRKSRC}/include/vlc/ -I${LOCALBASE}/ffmpeg ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include/vlc/ -I${LOCALBASE}/ffmpeg ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 
 CONFIGURE_ARGS+=	--enable-ffmpeg \
@@ -239,7 +267,7 @@ MAN1=		vlc.1 \
 		vlc-config.1
 
 .if defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
-.if ${WITH_MOZILLA_PLUGIN}=="firefox"
+.if ${WITH_MOZILLA}=="firefox"
 BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
 RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
 
@@ -252,7 +280,7 @@ CONFIGURE_ENV+=	MOZILLA_CONFIG="${X11BASE}/lib/mozilla${HEADERS_SUFX}/mozilla-co
 .endif
 MOZILLA_SUFFIX=-mozilla
 CONFIGURE_ARGS+=--enable-mozilla
-.if ${WITH_MOZILLA_PLUGIN}=="mozilla-devel"
+.if ${WITH_MOZILLA}=="mozilla-devel"
 HEADERS_SUFX=	-devel
 .else
 HEADERS_SUFX=
@@ -268,6 +296,50 @@ WXGTK2_PORT=	wxgtk26
 CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
 .endif
 
+.if !defined(BATCH)
+OPTIONS=	AALIB "Console graphics support" Off \
+		ARTS "Arts audio support" Off \
+		CDROM "Cddb and vcd support" On \
+		CORBA "Corba interface via orbit2" Off \
+		DAAP "iTunes(R) music shares support" Off \
+		DIRAC "Dirac audio/video codec" Off \
+		DTS "DTS audio decoder support" On \
+		DVBPSI "TS MUX and DEMUX support" On \
+		DVDNAV "DVD (dvd menus) support" On \
+		DVDREAD "Regular dvd support (no menus)" Off \
+		ESOUND "Esound audio support" Off \
+		FAAC "Faac audio encoder (mp4/aac) support" Off \
+		FAAD "Faad audio decoder (mp4/aac) support" On \
+		FLAC "Flac audio codec support" On \
+		HTTPD "Web Interface to control streaming media" On \
+		LAME "Mp3 encoder support" On \
+		LIBA52 "Liba52 (dolby) audio decoder support" On \
+		LIBCACA "Console graphics support" Off \
+		LIBMATROSKA "Matroska container format support" On \
+		LIBMPEG2 "Mpeg-2 A/V decoder support" On \
+		LIBTHEORA "OGG/Vorbis video codec support" Off \
+		LIVEMEDIA "Support for rstp/rtp/sdp protocols" On \
+		MAD "Mp3 decoder support" On \
+		MOZILLA_PLUGIN "Enable mozilla plugin" Off \
+		NCURSES "Ncurses (console) interface" Off \
+		OGG "Ogg audio decoder support" On \
+		OPENGL "OpenGL visual plugin" Off \
+		OPTIMIZED_CFLAGS "Complie with -O2 -ffast-math" Off \
+		SMB "SAMBA Access module" Off \
+		SDL "SDL video output support" Off \
+		SKINS "Skinned x11 interface (similar to xmms)" Off \
+		SLP "SLP service discovery support" On \
+		SPEEX "Voice codec support" Off \
+		SSL "TLS/SSL support for httpd interface" Off \
+		SVG "SVG graphics support" Off \
+		SVGALIB "SVGAlib video out support" On \
+		TRANSCODE "Depends on multimedia/transcode" Off \
+		TWOLAME "Twolame Mpeg layer 2 audio Support" Off \
+		VORBIS "Vorbis support (implies WITH_OGG)" On \
+		WXGTK "WxGtk+2 frontend" On \
+		X264 "H.264 AVC video codec" Off
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH}=="amd64"
@@ -281,67 +353,6 @@ WITHOUT_LIVEMEDIA=	yes
 .endif
 .endif
 
-.if ${HAVE_GNOME:Mesound}!="" && !defined(WITHOUT_ESOUND)
-WITH_ESOUND=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libaa.so.1) && !defined(WITHOUT_AALIB)
-WITH_AALIB=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libcaca.a)
-WITH_LIBCACA=	yes
-WITH_AALIB=	yes
-.endif
-
-.if exists(${LOCALBASE}/bin/fribidi-config) && !defined(WITHOUT_FRIBIDI)
-WITH_FRIBIDI=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libggi.so.2) && !defined(WITHOUT_GGI)
-WITH_GGI=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libx264.a) && !defined(WITHOUT_H264)
-WITH_H264=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libmp3lame.a) && !defined(WITHOUT_LAME)
-WITH_LAME=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libtheora.so.1) && !defined(WITHOUT_LIBTHEORA)
-WITH_LIBTHEORA=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libspeex.a) && !defined(WITHOUT_SPEEX)
-WITH_SPEEX=	yes
-.endif
-
-.if  exists(${LOCALBASE}/lib/libgnutls.a) && !defined(WITHOUT_SSL)
-WITH_SSL=	yes
-.endif
-
-.if exists(${X11BASE}/lib/librsvg-2.a) && !defined(WITHOUT_SVG)
-WITH_SVG=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/lib/vga.so.1) && !defined(WITHOUT_SVGALIB)
-WITH_SVGALIB=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libvorbisidec.a)
-WITH_LIBTREMOR=	yes
-.endif
-
-.if exists(${LOCALBASE}/bin/toolame)
-WITH_TOOLAME=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libxosd.so.4) && !defined(WITHOUT_XOSD)
-WITH_XOSD=	yes
-.endif
-
 # compatible knobs.
 .if defined(WITH_DEBUG)
 DEBUG=	yes
@@ -381,10 +392,9 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
 .endif
 
 .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
-BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
-RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
+BUILD_DEPENDS+=	libtar:${PORTSDIR}/devel/libtar
 CONFIGURE_ARGS+=--enable-skins2 --enable-skins
-CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
+USE_XLIB=	yes
 .else
 CONFIGURE_ARGS+=--disable-skins2
 .endif
@@ -398,7 +408,7 @@ CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
 CONFIGURE_ARGS+=--disable-wxwindows
 .endif
 
-.if defined(WITH_ARTS) && !defined(WITHOUT_ARTS)
+.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
 LIB_DEPENDS+=	 artsc.0:${PORTSDIR}/audio/arts
 CONFIGURE_ARGS+=	--enable-arts
 .else
@@ -410,11 +420,29 @@ LIB_DEPENDS+=	vcdinfo.1:${PORTSDIR}/multimedia/vcdimager \
 		cdio.5:${PORTSDIR}/sysutils/libcdio
 CONFIGURE_ARGS+=--enable-vcd \
 		--enable-libcddb \
-		--enable-libcdio
+		--enable-libcdio \
+		--enable-cddax
 .else
 CONFIGURE_ARGS+=--disable-vcd \
 		--disable-libcddb \
-		--disable-libcdio
+		--disable-libcdio \
+		--disable-cddax
+.endif
+
+.if !defined(WITHOUT_CDPARANOIA) && !defined(WITHOUT_CDROM)
+LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+CONFIGURE_ARGS+=--enable-cdda \
+		--enable-cddax
+.else
+CONFIGURE_ARGS+=--disable-cdda \
+		--disable-cddax
+.endif
+
+.if defined(WITH_CORBA) && !defined(WITHOUT_CORBA)
+USE_GNOME+=	orbit2
+CONFIGURE_ARGS+=--enable-corba
+.else
+CONFIGURE_ARGS+=--disable-corba
 .endif
 
 .if !defined(WITHOUT_DVBPSI)
@@ -425,21 +453,26 @@ CONFIGURE_ARGS+=--enable-dvbpsi \
 CONFIGURE_ARGS+=--disable-dvbpsi
 .endif
 
-.if !defined(WITHOUT_DVD)
+.if !defined(WITHOUT_DVDNAV)
 LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
-CONFIGURE_ARGS+=--enable-dvdnav \
-		--enable-dvdread \
-		--with-dvdcss=${LOCALBASE} \
-		--with-dvdread=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-dvdnav
 .else
-CONFIGURE_ARGS+=--disable-dvdnav \
-		--disable-dvdread
+CONFIGURE_ARGS+=--disable-dvdnav
 .endif
 
-.if defined(WITH_ESOUND) && !defined(WITHOUT_ESOUND)
+.if defined(WITH_DVDREAD) && !defined(WITHOUT_DVDREAD)
+LIB_DEPENDS+=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+CONFIGURE_ARGS+=--enable-dvdread
+.else
+CONFIGURE_ARGS+=--disable-dvdread
+.endif
+
+.if (defined(WITH_ESOUND) || ${HAVE_GNOME:Mesound}!="") && !defined(WITHOUT_ESOUND)
 ESOUND_SUFFIX=	-esound
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=--enable-esd
+.else
+CONFIGURE_ARGS+=--disable-esd
 .endif
 
 .if defined(WITH_FAAC) && !defined(WITHOUT_FAAC)
@@ -447,7 +480,7 @@ CONFIGURE_ARGS+=--with-ffmpeg-faac
 LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
 .endif
 
-.if !defined(WITHOUT_FAAD)
+.if (defined(WITH_FAAD) || exists(${LOCALBASE}/lib/libfaad.a)) && !defined(WITHOUT_FAAD)
 LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
 CONFIGURE_ARGS+=--enable-faad
 .else
@@ -461,24 +494,36 @@ CONFIGURE_ARGS+=--enable-flac
 CONFLGIRE_ARGS+=--disable-flac
 .endif
 
-.if defined(WITH_FRIBIDI) && !defined(WITHOUT_FRIBIDI)
+.if (defined(WITH_FRIBIDI) || exists(${LOCALBASE}/bin/fribidi-config)) && !defined(WITHOUT_FRIBIDI)
 LIB_DEPENDS+=	fribidi.0:${PORTSDIR}/converters/fribidi
 CONFIGURE_ARGS+=--enable-fribidi
+.else
+CONFIGURE_ARGS+=--disable-fribidi
 .endif
 
-.if defined(WITH_AALIB) && !defined(WITHOUT_AALIB)
+.if (defined(WITH_AALIB) || exists(${LOCALBASE}/lib/libaa.so.1)) && !defined(WITHOUT_AALIB)
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 CONFIGURE_ARGS+=--enable-aa
+.else
+CONFIGURE_ARGS+=--disable-aa
+.endif
+
+.if (defined(WITH_DIRAC) || exists(${LOCALBASE}/lib/libdirac_decoder.a)) && !defined(WITHOUT_DIRAC)
+LIB_DEPENDS+=	dirac_encoder.0:${PORTSDIR}/multimedia/dirac
+CONFIGURE_ARGS+=--enable-dirac
+CPPFLAGS+=	-I${LOCALBASE}/include/dirac
+.else
+CONFIGURE_ARGS+=--disable-dirac
 .endif
 
-.if defined(WITH_H264) && !defined(WITHOUT_H264)
+.if (defined(WITH_H264) || defined(WITH_X264) || exists(${LOCALBASE}/lib/libx264.a)) && !defined(WITHOUT_X264)
 CONFIGURE_ARGS+=--enable-x264
 LIB_DEPENDS+=	x264.1:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=--disable-x264
 .endif
 
-.if defined(WITH_LIBCACA) && !defined(WITHOUT_LIBCACA)
+.if (defined(WITH_LIBCACA) || exists(${LOCALBASE}/lib/libcaca.a)) && !defined(WITHOUT_LIBCACA)
 .if !defined(WITHOUT_AALIB)
 WITH_AALIB=	yes
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
@@ -490,6 +535,13 @@ CONFIGURE_ARGS+=--enable-caca
 CONFIGURE_ARGS+=--disable-caca
 .endif
 
+.if (defined(WITH_DAAP) || exists(${LOCALBASE}/lib/libopendaap.a)) && !defined(WITHOUT_DAAP)
+LIB_DEPENDS+=	opendaap.0:${PORTSDIR}/devel/libopendaap
+CONFIGURE_ARGS+=--enable-daap
+.else
+CONFIGURE_ARGS+=--disable-daap
+.endif
+
 .if !defined(WITHOUT_DTS)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
 CONFIGURE_ARGS+=--enable-dts
@@ -501,14 +553,16 @@ CONFIGURE_ARGS+=--disable-dts
 CONFIGURE_ARGS+=--disable-httpd
 .endif
 
-.if defined(WITH_GGI) && !defined(WITHOUT_GGI)
+.if (defined(WITH_GGI) || exists(${LOCALBASE}/lib/libggi.a)) && !defined(WITHOUT_GGI)
 LIB_DEPENDS+=	ggi.2:${PORTSDIR}/graphics/libggi
 CONFIGURE_ARGS+=--enable-ggi
 .else
 CONFIGURE_ARGS+=--disable-ggi
 .endif
 
-.if defined(WITH_LAME) && !defined(WITHOUT_LAME)
+# Do not use lame if PACKAGE_BUILDING is defined. since
+# lame can NOT be packaged.
+.if !defined(WITHOUT_LAME) && !defined(PACKAGE_BUILDING)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 CONFIGURE_ARGS+=--enable-mp3lame
 .else
@@ -517,6 +571,9 @@ CONFIGURE_ARGS+=--disable-mp3lame
 
 .if !defined(WITHOUT_LIBMATROSKA)
 LIB_DEPENDS+=	matroska.0:${PORTSDIR}/multimedia/libmatroska
+CONFIGURE_ARGS+=--enable-mkv
+.else
+CONFIGURE_ARGS+=--disable-mkv
 .endif
 
 .if !defined(WITHOUT_LIBA52)
@@ -533,7 +590,7 @@ CONFIGURE_ARGS+=--enable-libmpeg2
 CONFIGURE_ARGS+=--disable-libmpeg2
 .endif
 
-.if defined(WITH_LIBTHEORA) && !defined(WITHOUT_LIBTHEORA)
+.if (defined(WITH_LIBTHEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_LIBTHEORA)
 LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
 CONFIGURE_ARGS+=--enable-theora
 .else
@@ -557,6 +614,14 @@ CONFIGURE_ARGS+=--enable-mad \
 CONFIGURE_ARGS+=--disable-mad
 .endif
 
+.if !defined(WITHOUT_OGG)
+LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
+CONFIGURE_ARGS+=--enable-ogg
+.else
+CONFIGURE_ARGS+=--disable-ogg
+WITHOUT_VORBIS=	yes
+.endif
+
 .if defined(WITH_NCURSES) && !defined(WITHOUT_NCURSES)
 CONFIGURE_ARGS+=--enable-ncurses
 .endif
@@ -568,18 +633,25 @@ CONFIGURE_ARGS+=--enable-galaktos
 CONFIGURE_ARGS+=--disable-galaktos
 .endif
 
-.if !defined(WITHOUT_SDL)
+.if (defined(WITH_SMB) || exists(${LOCALBASE}/lib/lib/libsmbclient.a)) && !defined(WITHOUT_SMB)
+LIB_DEPEND+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+CONFIGURE_ARGS+=--enable-smb
+.else
+CONFIGURE_ARGS+=--disable-smb
+.endif
+
+.if defined(WITH_SDL) && !defined(WITHOUT_SDL)
 USE_SDL=	yes
 CONFIGURE_ARGS+=--enable-sdl
 .else
 CONFIGURE_ARGS+=--disable-sdl
 .endif
 
-.if !defined(WITHOUT_TRANSCODE)
+.if defined(WITH_TRANSCODE) || exists(${LOCALBASE}/bin/transcode)
 RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
 .endif
 
-.if !defined(WITHOUT_HTTPD) && defined(WITH_SSL)
+.if !defined(WITHOUT_HTTPD) && (defined(WITH_SSL) || exists(${LOCALBASE}/lib/libgnutls.a))
 LIB_DEPENDS+=	gnutls.12:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--enable-gnutls
 .else
@@ -592,7 +664,7 @@ LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
 CONFIGURE_ARGS+=--disable-slp
 .endif
 
-.if defined(WITH_SPEEX) && !defined(WITHOUT_SPEEX)
+.if (defined(WITH_SPEEX) || exists(${LOCALBASE}/lib/libspeex.a)) && !defined(WITHOUT_SPEEX)
 LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
 CONFIGURE_ARGS+=--enable-speex
 CPPFLAGS+=-I${LOCALBASE}/include/speex
@@ -600,21 +672,25 @@ CPPFLAGS+=-I${LOCALBASE}/include/speex
 CONFIGURE_ARGS+=--disable-speex
 .endif
 
-.if defined(WITH_SVG) && !defined(WITHOUT_SVG)
+.if defined(WITHOUT_STREAM_PLUGINS)
+CONFIGURE_ARGS+=--disable-sout
+.endif
+
+.if (defined(WITH_SVG) || ${HAVE_GNOME:Mlibrsvg2}!="") && !defined(WITHOUT_SVG)
 USE_GNOME+=	librsvg2
 CONFIGURE_ARGS+=--enable-svg
 .else
 CONFIGURE_AGRS+=--disable-svg
 .endif
 
-.if defined(WITH_SVGALIB) && !defined(WITHOUT_SVGALIB)
+.if (defined(WITH_SVGALIB) || exists(${LOCALBASE}/lib/lib/vga.a)) && !defined(WITHOUT_SVGALIB)
 LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 CONFIGURE_ARGS+=--enable-svgalib
 .else
 CONFIGURE_ARGS+=--disable-svgalib
 .endif
 
-.if defined(WITH_LIBTREMOR) && !defined(WITHOUT_LIBTREMOR)
+.if (defined(WITH_LIBTREMOR) || exists(${LOCALBASE}/lib/libvorbisidec.a)) && !defined(WITHOUT_LIBTREMOR)
 LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
 .else
 CONFIGURE_ARGS+=--disable-tremor
@@ -628,6 +704,13 @@ CONFIGURE_ARGS+=	--enable-toolame
 CONFIGURE_ARGS+=	--disable-toolame
 .endif
 
+.if (defined(WITH_TWOLAME) || exists(${LOCALBASE}/lib/libtwolame.a)) && !defined(WITHOUT_TWOLAME)
+LIB_DEPENDS+=		twolame.0:${PORTSDIR}/audio/twolame
+CONFIGURE_ARGS+=	--enable-twolame
+.else
+CONFIGURE_ARGS+=	--disable-twolame
+.endif
+
 .if !defined(WITHOUT_VORBIS)
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=--enable-vorbis
@@ -635,7 +718,7 @@ CONFIGURE_ARGS+=--enable-vorbis
 CONFIGURE_ARGS+=--disable-vorbis
 .endif
 
-.if defined(WITH_XOSD) && !defined(WITHOUT_XOSD)
+.if (defined(WITH_XOSD) || exists(${LOCALBASE}/lib/libxosd.a)) && !defined(WITHOUT_XOSD)
 LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
 CONFIGURE_ARGS+=--enable-xosd
 .else
@@ -650,9 +733,10 @@ CONFIGURE_ARGS+=--enable-release
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O2 -ffast-math -fomit-frame-pointer
-CONFIGURE_ARGS+=--enable-release
+CONFIGURE_ARGS+=--enable-release \
+		--enable-optimizations
 .else
-CONFIGURE_ARGS+=--disable-optimizations
+CONFIGURE_ARGS+=--enable-release
 .endif
 
 .if ${OSVERSION} < 500000
@@ -662,8 +746,8 @@ CONFIGURE_ENV+=	LIBS="-L/usr/lib -lcipher"
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Take a careful look at the beginning of the Makefile in order"
-	@${ECHO_MSG} "to learn how to tune VLC towards you personal preferences!"
-	@${ECHO_MSG} "For example, make WITH_LAME=yes"
+	@${ECHO_MSG} "to learn how to tune VLC to your personal preferences!"
+	@${ECHO_MSG} ""
 
 post-patch:
 # Subtitle default font
@@ -678,7 +762,7 @@ post-patch:
 		s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \
 			${WRKSRC}/mozilla/Makefile.in
 .endif
-# skins2 interface
+# skins2 interface, no lrint on < 504000
 .if ${OSVERSION} < 504000
 	@${REINPLACE_CMD} -e 's|lrint|rint|' \
 		${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp
@@ -695,8 +779,6 @@ post-patch:
 		-e 's|-mcpu=pentiumpro||' \
 		-e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|cflags_tuning=|# cflags_tuning=|' \
-		${WRKSRC}/vlc-config.in
 # cdrom/dvd support
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
 		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
@@ -706,9 +788,13 @@ pre-install:
 	${RM} -rf ${PLIST} ${FAKEDIR}
 	${MKDIR} ${FAKEDIR}
 	${TOUCH} -f ${PLIST}
+.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
+	${ECHO_CMD} "share/pixmaps/gvlc.png" >> ${PLIST}
+	${ECHO_CMD} "share/applications/svlc.desktop" >> ${PLIST}
+.endif
 .if !defined(WITHOUT_WXGTK)
-	${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST}
 	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
+	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
 .endif
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
@@ -745,35 +831,57 @@ pre-install:
 	cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
 		${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
 .endif
-	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
+.for locale in my ps tet tl
+	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale}/LC_MESSAGES 2>/dev/null || ${TRUE}" >> ${PLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/share/locale/${locale} 2>/dev/null || ${TRUE}" >> ${PLIST}
+.endfor
+.if defined(WITH_WXGTK) || defined(WITH_SKINS)
+	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRU
+.endif
+
+pre-configure:
+	@if [ -n "`${PKG_INFO} -xI '^ffmpeg-0.4.9.p'`" ]; then \
+		${ECHO_MSG} ;\
+		${ECHO_MSG} "Note: ffmpeg-0.4.9 detected, if you want ffmpeg's postprocess" ;\
+		${ECHO_MSG} " features please hit ^C and remove ffmpeg-0.4.9 and" ;\
+		${ECHO_MSG} " install multimedia/ffmpeg-devel" ;\
+		${ECHO_MSG} ;\
+		sleep 2 ;\
+	fi
 
 do-install:
-.if !defined(WITHOUT_WXGTK)
-	if [ ! -d ${PREFIX}/share/applications ]; then \
-		${MKDIR} ${PREFIX}/share/applications ; \
-	fi
-	${INSTALL_DATA} ${FILESDIR}/vlc.desktop ${PREFIX}/share/applications
-	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
-		${MKDIR} ${PREFIX}/share/pixmaps ; \
-	fi
-	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
-.endif
 	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
 		${FAKEDIR}/bin/vlc-config
 	@${RM} -f ${FAKEDIR}/bin/*.bak
 	cd ${FAKEDIR}/bin && ${FIND} . | \
-		${CPIO} -pdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
+		${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
 	cd ${FAKEDIR}/include && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
+		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
 	cd ${FAKEDIR}/lib && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
+		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
 	cd ${FAKEDIR}/share && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN} ${PREFIX}/share
+		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
 .if defined(WITH_MOZILLA_PLUGIN) && !defined(WITHOUT_MOZILLA_PLUGIN)
 	@${MKDIR} ${PREFIX}/lib/browser_plugins
 	${INSTALL_DATA} ${FAKEDIR}/mozilla/* ${PREFIX}/lib/browser_plugins
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc.1 ${MANPREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/vlc-config.1 ${MANPREFIX}/man/man1/
+.if defined(WITH_SKINS) || !defined(WITHOUT_WXGTK)
+	if [ ! -d ${PREFIX}/share/applications ]; then \
+		${MKDIR} ${PREFIX}/share/applications ; \
+	fi
+	if [ ! -d ${PREFIX}/share/pixmaps ]; then \
+		${MKDIR} ${PREFIX}/share/pixmaps ; \
+	fi
+.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
+	${INSTALL_DATA} ${FILESDIR}/svlc.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${FAKEDIR}/share/vlc/gvlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png
+.endif
+.if !defined(WITHOUT_WXGTK)
+	${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
+.endif
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index a30cf2d8b2a4..3fa9f6c513cb 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,6 +1,4 @@
-MD5 (vlc-0.8.1.tar.bz2) = 9cdf6d70d51dad30d198edfa96047529
-SIZE (vlc-0.8.1.tar.bz2) = 4877791
-MD5 (ffmpeg-20041113.tar.bz2) = 245bbbb766f43722826358a938afd9a9
-SIZE (ffmpeg-20041113.tar.bz2) = 1472726
-MD5 (vlc-intf-mozilla-plugin.tar.bz2) = cd4697606b8a188a92d8cc77adf857d2
-SIZE (vlc-intf-mozilla-plugin.tar.bz2) = 2493
+MD5 (vlc-0.8.2.tar.bz2) = c9d07ee1c41766bf56a27b47bdba2ad0
+SIZE (vlc-0.8.2.tar.bz2) = 5785680
+MD5 (vlc-intf-mozilla-plugin-0.1.tar.bz2) = e64ee857a300968890188c26468a2945
+SIZE (vlc-intf-mozilla-plugin-0.1.tar.bz2) = 2418
diff --git a/multimedia/vlc/files/patch-configure b/multimedia/vlc/files/patch-configure
deleted file mode 100644
index b41443af43f4..000000000000
--- a/multimedia/vlc/files/patch-configure
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure.orig	Sun Nov 14 12:45:51 2004
-+++ configure	Tue May 10 20:27:55 2005
-@@ -4969,7 +4969,6 @@
-     ;;
-   bsdi*)
-     SYS=bsdi
--    CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
- 
-   for element in dvd dvdcss vcd cdda vcdx cddax; do
-     eval "LDFLAGS_${element}="'"'"-ldvd "'$'"{LDFLAGS_${element}} "'"'
-@@ -27489,8 +27488,8 @@
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
- 
--    echo "$as_me:$LINENO: checking for libspeex version > 1.1.0" >&5
--echo $ECHO_N "checking for libspeex version > 1.1.0... $ECHO_C" >&6
-+    echo "$as_me:$LINENO: checking for libspeex version > 1.0.5" >&5
-+echo $ECHO_N "checking for libspeex version > 1.0.5... $ECHO_C" >&6
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27498,9 +27497,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <speex.h>
--       #ifdef SPEEX_SET_SUBMODE_ENCODING
-        yes
--       #endif
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-   $EGREP "yes" >/dev/null 2>&1; then
diff --git a/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.h b/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.h
deleted file mode 100644
index b474a55d5747..000000000000
--- a/multimedia/vlc/files/patch-modules-codec-ffmpeg-ffmpeg.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- modules/codec/ffmpeg/ffmpeg.h.orig	Fri Aug  8 19:08:32 2003
-+++ modules/codec/ffmpeg/ffmpeg.h	Wed Nov  5 15:10:17 2003
-@@ -49,11 +49,7 @@
- 
- } generic_thread_t;
- 
--#if LIBAVCODEC_BUILD >= 4663
--#   define LIBAVCODEC_PP
--#else
- #   undef  LIBAVCODEC_PP
--#endif
- 
- #define GetWLE( p ) \
-     ( *(u8*)(p) + ( *((u8*)(p)+1) << 8 ) )
diff --git a/multimedia/vlc/files/patch-modules_codec_ffmpeg_ffmpeg.c b/multimedia/vlc/files/patch-modules_codec_ffmpeg_ffmpeg.c
new file mode 100644
index 000000000000..502fe4c9688f
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_codec_ffmpeg_ffmpeg.c
@@ -0,0 +1,25 @@
+--- modules/codec/ffmpeg/ffmpeg.c.orig	Fri May 13 07:48:21 2005
++++ modules/codec/ffmpeg/ffmpeg.c	Fri May 13 13:28:17 2005
+@@ -42,11 +42,9 @@
+ 
+ #include "ffmpeg.h"
+ 
+-#ifdef LIBAVCODEC_PP
++#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
+ #   ifdef HAVE_POSTPROC_POSTPROCESS_H
+-#       include <postproc/postprocess.h>
+-#   else
+-#       include <libpostproc/postprocess.h>
++#       include <ffmpeg/postproc/postprocess.h>
+ #   endif
+ #endif
+ 
+@@ -105,7 +103,7 @@
+         VLC_TRUE );
+         change_integer_range( 0, 2 );
+ 
+-#ifdef LIBAVCODEC_PP
++#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
+     add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
+     add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT,
+         LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
diff --git a/multimedia/vlc/files/patch-modules_codec_ffmpeg_postprocess.c b/multimedia/vlc/files/patch-modules_codec_ffmpeg_postprocess.c
new file mode 100644
index 000000000000..29b5eb319416
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_codec_ffmpeg_postprocess.c
@@ -0,0 +1,18 @@
+--- modules/codec/ffmpeg/postprocess.c.orig	Fri May 13 07:48:21 2005
++++ modules/codec/ffmpeg/postprocess.c	Sat May 14 00:11:53 2005
+@@ -35,13 +35,9 @@
+ 
+ #include "ffmpeg.h"
+ 
+-#ifdef LIBAVCODEC_PP
++#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
+ 
+-#ifdef HAVE_POSTPROC_POSTPROCESS_H
+-#   include <postproc/postprocess.h>
+-#else
+-#   include <libpostproc/postprocess.h>
+-#endif
++#include <ffmpeg/postproc/postprocess.h>
+ 
+ #ifndef PP_CPU_CAPS_ALTIVEC
+ #   define PP_CPU_CAPS_ALTIVEC 0
diff --git a/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c b/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c
new file mode 100644
index 000000000000..1ed5bda68d4a
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c
@@ -0,0 +1,38 @@
+--- modules/codec/ffmpeg/video.c.orig	Fri May 13 13:30:36 2005
++++ modules/codec/ffmpeg/video.c	Fri May 13 13:32:42 2005
+@@ -202,7 +202,7 @@
+ 
+     p_pic = p_dec->pf_vout_buffer_new( p_dec );
+ 
+-#ifdef LIBAVCODEC_PP
++#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
+     if( p_sys->p_pp && p_sys->b_pp && !p_sys->b_pp_init )
+     {
+         E_(InitPostproc)( p_dec, p_sys->p_pp, p_context->width,
+@@ -301,7 +301,7 @@
+         p_sys->b_direct_rendering = 1;
+     }
+ 
+-#ifdef LIBAVCODEC_PP
++#if defined(LIBAVCODEC_PP) && LIBAVCODE_BUILD > 4750
+     p_sys->p_pp = NULL;
+     p_sys->b_pp = p_sys->b_pp_async = p_sys->b_pp_init = VLC_FALSE;
+     p_sys->p_pp = E_(OpenPostproc)( p_dec, &p_sys->b_pp_async );
+@@ -719,7 +719,7 @@
+ 
+     if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic );
+ 
+-#ifdef LIBAVCODEC_PP
++#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
+     E_(ClosePostproc)( p_dec, p_sys->p_pp );
+ #endif
+ 
+@@ -741,7 +741,7 @@
+         uint8_t *p_dst, *p_src;
+         int i_src_stride, i_dst_stride;
+ 
+-#ifdef LIBAVCODEC_PP
++#if defined(LIBAVCODEC_PP) && LIBAVCODEC_BUILD > 4750
+         if( p_sys->p_pp && p_sys->b_pp )
+             E_(PostprocPict)( p_dec, p_sys->p_pp, p_pic, p_ff_pic );
+         else
diff --git a/multimedia/vlc/files/patch-modules_codec_x264.c b/multimedia/vlc/files/patch-modules_codec_x264.c
deleted file mode 100644
index 07697fce1a2a..000000000000
--- a/multimedia/vlc/files/patch-modules_codec_x264.c
+++ /dev/null
@@ -1,277 +0,0 @@
---- modules/codec/x264.c.orig	Thu Nov 11 13:50:16 2004
-+++ modules/codec/x264.c	Sat May 21 16:14:56 2005
-@@ -2,7 +2,7 @@
-  * x264.c: h264 video encoder
-  *****************************************************************************
-  * Copyright (C) 2004 VideoLAN
-- * $Id: x264.c 9280 2004-11-11 12:31:27Z zorglub $
-+ * $Id: x264.c 10990 2005-05-13 11:13:05Z gbazin $
-  *
-  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
-  *
-@@ -62,22 +62,43 @@
- #define ANALYSE_TEXT N_("Analyse mode")
- #define ANALYSE_LONGTEXT N_( "This selects the analysing mode.")
- 
--#define KEYINT_TEXT N_("Sets maximum interval between I frames")
-+#define TOLERANCE_TEXT N_("Bitrate tolerance")
-+#define TOLERANCE_LONGTEXT N_( "Sets the allowed variance in average " \
-+    "bitrate.")
-+
-+#define VBV_MAXRATE_TEXT N_("Maximum local bitrate")
-+#define VBV_MAXRATE_LONGTEXT N_( "Sets a maximum local bitrate in kbits/s.")
-+
-+#define VBV_BUFSIZE_TEXT N_("Averaging period for the maximum local bitrate")
-+#define VBV_BUFSIZE_LONGTEXT N_( "Sets an averaging preiod for the maximum " \
-+    "local bitrate, in kbits/s.")
-+
-+#define VBV_INIT_TEXT N_("Initial buffer occupancy")
-+#define VBV_INIT_LONGTEXT N_( "Sets the initial buffer occupancy as a " \
-+    "fraction of the buffer size.")
-+
-+#define KEYINT_TEXT N_("Sets maximum interval between IDR-frames")
- #define KEYINT_LONGTEXT N_( "Larger values save bits, thus improve quality "\
-     "for a given bitrate, at the cost of seeking precision." )
- 
--#define IDRINT_TEXT N_("IDR frames")
--#define IDRINT_LONGTEXT N_("In H.264, I-Frames do not necessarily bound a " \
--    "closed GOP because it is allowable for a P-frame to be predicted from " \
-+#define KEYINT_MIN_TEXT N_("Sets minimum interval between IDR-frames")
-+#define KEYINT_MIN_LONGTEXT N_("In H.264, I-Frames do not necessarily bound " \
-+    "a closed GOP because it is allowable for a P-frame to be predicted from "\
-     "more frames than just the one frame before it (also see frameref). " \
-     "Therefore, I-frames are not necessarily seekable. " \
-     "IDR-Frames restrict subsequent P-frames from referring to any frame " \
--    "prior to the IDR-Frame." )
-+    "prior to the IDR-Frame. \n" \
-+    "If scenecuts appear within this interval, they are still encoded as " \
-+    "I-frames, but do not start a new GOP. Default value is keyint * 0.4." )
- 
- #define BFRAMES_TEXT N_("B frames")
- #define BFRAMES_LONGTEXT N_( "Number of consecutive B-Frames between I and " \
-     "P-frames." )
- 
-+#define BPYRAMID_TEXT N_("B pyramid")
-+#define BPYRAMID_LONGTEXT N_( "Allows B-frames to be used as references for " \
-+    "predicting other frames." )
-+
- #define FRAMEREF_TEXT N_("Number of previous frames used as predictors.")
- #define FRAMEREF_LONGTEXT N_( "This is effective in Anime, but seems to " \
-     "make little difference in live-action source material. Some decoders " \
-@@ -92,6 +113,11 @@
-     "-1 disables scene-cut detection, so I-frames are be inserted only every "\
-     "other keyint frames, which probably leads to ugly encoding artifacts." )
- 
-+#define SUBPEL_TEXT N_("Sub-pixel refinement quality.")
-+#define SUBPEL_LONGTEXT N_( "This parameter controls quality versus speed " \
-+    "tradeoffs involved in the motion estimation decision process " \
-+    "(lower = quicker and higher = better quality)." )
-+
- static char *enc_analyse_list[] =
-   { "", "all", "normal", "fast", "none" };
- static char *enc_analyse_list_text[] =
-@@ -122,16 +150,33 @@
-                 ANALYSE_LONGTEXT, VLC_FALSE );
-         change_string_list( enc_analyse_list, enc_analyse_list_text, 0 );
- 
-+    add_float( SOUT_CFG_PREFIX "tolerance", 1.0, NULL, TOLERANCE_TEXT,
-+               TOLERANCE_LONGTEXT, VLC_FALSE );
-+        change_float_range( 0, 100 );
-+
-+    add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT,
-+                 VBV_MAXRATE_LONGTEXT, VLC_FALSE );
-+
-+    add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, NULL, VBV_BUFSIZE_TEXT,
-+                 VBV_BUFSIZE_LONGTEXT, VLC_FALSE );
-+
-+    add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT,
-+               VBV_INIT_LONGTEXT, VLC_FALSE );
-+        change_float_range( 0, 1 );
-+
-     add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT,
-                  KEYINT_LONGTEXT, VLC_FALSE );
- 
--    add_integer( SOUT_CFG_PREFIX "idrint", 2, NULL, IDRINT_TEXT,
--                 IDRINT_LONGTEXT, VLC_FALSE );
-+    add_integer( SOUT_CFG_PREFIX "keyint-min", 0, NULL, KEYINT_MIN_TEXT,
-+                 KEYINT_MIN_LONGTEXT, VLC_FALSE );
- 
-     add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT,
-                  BFRAMES_LONGTEXT, VLC_FALSE );
-         change_integer_range( 0, 16 );
- 
-+    add_bool( SOUT_CFG_PREFIX "bpyramid", 0, NULL, BPYRAMID_TEXT,
-+              BPYRAMID_LONGTEXT, VLC_FALSE );
-+
-     add_integer( SOUT_CFG_PREFIX "frameref", 1, NULL, FRAMEREF_TEXT,
-                  FRAMEREF_LONGTEXT, VLC_FALSE );
-         change_integer_range( 1, 15 );
-@@ -140,6 +185,10 @@
-                  SCENE_LONGTEXT, VLC_FALSE );
-         change_integer_range( -1, 100 );
- 
-+    add_integer( SOUT_CFG_PREFIX "subpel", 5, NULL, SUBPEL_TEXT,
-+                 SUBPEL_LONGTEXT, VLC_FALSE );
-+        change_integer_range( 1, 5 );
-+
- vlc_module_end();
- 
- /*****************************************************************************
-@@ -147,7 +196,8 @@
-  *****************************************************************************/
- static const char *ppsz_sout_options[] = {
-     "qp", "qp-min", "qp-max", "cabac", "loopfilter", "analyse",
--    "keyint", "idrint", "bframes", "frameref", "scenecut", NULL
-+    "keyint", "keyint-min", "bframes", "bpyramid", "frameref", "scenecut",
-+    "subpel", "tolerance", "vbv-maxrate", "vbv-bufsize", "vbv-init", NULL
- };
- 
- static block_t *Encode( encoder_t *, picture_t * );
-@@ -180,10 +230,19 @@
-     if( p_enc->fmt_in.video.i_width % 16 != 0 ||
-         p_enc->fmt_in.video.i_height % 16!= 0 )
-     {
--        msg_Warn( p_enc, "invalid size %ix%i",
--                  p_enc->fmt_in.video.i_width,
--                  p_enc->fmt_in.video.i_height );
--        return VLC_EGENERIC;
-+        msg_Warn( p_enc, "size is not a multiple of 16 (%ix%i)",
-+                  p_enc->fmt_in.video.i_width, p_enc->fmt_in.video.i_height );
-+
-+        if( p_enc->fmt_in.video.i_width < 16 ||
-+            p_enc->fmt_in.video.i_height < 16 )
-+        {
-+            msg_Err( p_enc, "video is too small to be cropped" );
-+            return VLC_EGENERIC;
-+        }
-+
-+        msg_Warn( p_enc, "cropping video to %ix%i",
-+                  p_enc->fmt_in.video.i_width >> 4 << 4,
-+                  p_enc->fmt_in.video.i_height >> 4 << 4 );
-     }
- 
-     sout_CfgParse( p_enc, SOUT_CFG_PREFIX, ppsz_sout_options, p_enc->p_cfg );
-@@ -196,8 +255,8 @@
-     p_enc->p_sys = p_sys = malloc( sizeof( encoder_sys_t ) );
- 
-     x264_param_default( &p_sys->param );
--    p_sys->param.i_width  = p_enc->fmt_in.video.i_width;
--    p_sys->param.i_height = p_enc->fmt_in.video.i_height;
-+    p_sys->param.i_width  = p_enc->fmt_in.video.i_width >> 4 << 4;
-+    p_sys->param.i_height = p_enc->fmt_in.video.i_height >> 4 << 4;
- 
-     var_Get( p_enc, SOUT_CFG_PREFIX "qp-min", &val );
-     if( val.i_int >= 1 && val.i_int <= 51 ) i_qmin = val.i_int;
-@@ -224,9 +283,26 @@
- #if X264_BUILD >= 0x000a
-         p_sys->param.rc.b_cbr = 1;
-         p_sys->param.rc.i_bitrate = p_enc->fmt_out.i_bitrate / 1000;
-+
-+#if X264_BUILD >= 24
-+        var_Get( p_enc, SOUT_CFG_PREFIX "tolerance", &val );
-+        p_sys->param.rc.f_rate_tolerance = val.f_float;
-+
-+        var_Get( p_enc, SOUT_CFG_PREFIX "vbv-maxrate", &val );
-+        p_sys->param.rc.i_vbv_max_bitrate = val.i_int;
-+
-+        var_Get( p_enc, SOUT_CFG_PREFIX "vbv-bufsize", &val );
-+        p_sys->param.rc.i_vbv_buffer_size = val.i_int;
-+        if( !val.i_int )
-+            p_sys->param.rc.i_vbv_buffer_size = p_sys->param.rc.i_bitrate;
-+
-+        var_Get( p_enc, SOUT_CFG_PREFIX "vbv-init", &val );
-+        p_sys->param.rc.f_vbv_buffer_init = val.f_float;
-+#else
-         p_sys->param.rc.i_rc_buffer_size = p_sys->param.rc.i_bitrate;
-         p_sys->param.rc.i_rc_init_buffer = p_sys->param.rc.i_bitrate / 4;
- #endif
-+#endif
-     }
- 
-     var_Get( p_enc, SOUT_CFG_PREFIX "cabac", &val );
-@@ -236,14 +312,28 @@
-     p_sys->param.b_deblocking_filter = val.b_bool;
- 
-     var_Get( p_enc, SOUT_CFG_PREFIX "keyint", &val );
-+#if X264_BUILD >= 0x000e
-+    if( val.i_int > 0 ) p_sys->param.i_keyint_max = val.i_int;
-+    if( val.i_int > 0 ) p_sys->param.i_keyint_min = val.i_int * 0.4;
-+#else
-     if( val.i_int > 0 ) p_sys->param.i_iframe = val.i_int;
-+#endif
- 
--    var_Get( p_enc, SOUT_CFG_PREFIX "idrint", &val );
-+    var_Get( p_enc, SOUT_CFG_PREFIX "keyint-min", &val );
-+#if X264_BUILD >= 0x000e
-+    if( val.i_int > 0 ) p_sys->param.i_keyint_min = val.i_int;
-+#else
-     if( val.i_int > 0 ) p_sys->param.i_idrframe = val.i_int;
-+#endif
- 
-     var_Get( p_enc, SOUT_CFG_PREFIX "bframes", &val );
-     if( val.i_int >= 0 && val.i_int <= 16 ) p_sys->param.i_bframe = val.i_int;
- 
-+#if X264_BUILD >= 22
-+    var_Get( p_enc, SOUT_CFG_PREFIX "bpyramid", &val );
-+    p_sys->param.b_bframe_pyramid = val.b_bool;
-+#endif
-+
-     var_Get( p_enc, SOUT_CFG_PREFIX "frameref", &val );
-     if( val.i_int > 0 && val.i_int <= 15 )
-         p_sys->param.i_frame_reference = val.i_int;
-@@ -254,6 +344,12 @@
-         p_sys->param.i_scenecut_threshold = val.i_int;
- #endif
- 
-+#if X264_BUILD >= 22
-+    var_Get( p_enc, SOUT_CFG_PREFIX "subpel", &val );
-+    if( val.i_int >= 1 && val.i_int <= 5 )
-+        p_sys->param.analyse.i_subpel_refine = val.i_int;
-+#endif
-+
-     var_Get( p_enc, SOUT_CFG_PREFIX "analyse", &val );
-     if( !strcmp( val.psz_string, "none" ) )
-     {
-@@ -270,9 +366,14 @@
-     }
-     else if( !strcmp( val.psz_string, "all" ) )
-     {
-+#ifndef X264_ANALYSE_BSUB16x16
-+#   define X264_ANALYSE_BSUB16x16 0
-+#endif
-         p_sys->param.analyse.inter =
--            X264_ANALYSE_I4x4 | X264_ANALYSE_PSUB16x16 | X264_ANALYSE_PSUB8x8;
-+            X264_ANALYSE_I4x4 | X264_ANALYSE_PSUB16x16 | X264_ANALYSE_PSUB8x8 |
-+            X264_ANALYSE_BSUB16x16;
-     }
-+    if( val.psz_string ) free( val.psz_string );
- 
-     if( p_enc->fmt_in.video.i_aspect > 0 )
-     {
-@@ -347,12 +448,10 @@
- static block_t *Encode( encoder_t *p_enc, picture_t *p_pict )
- {
-     encoder_sys_t *p_sys = p_enc->p_sys;
--    x264_picture_t  pic;
--    int        i_nal;
-+    x264_picture_t pic;
-     x264_nal_t *nal;
-     block_t *p_block;
--    int i_out;
--    int i;
-+    int i_nal, i_out, i;
- 
-     /* init pic */
-     memset( &pic, 0, sizeof( x264_picture_t ) );
-@@ -364,7 +463,11 @@
-         pic.img.i_stride[i] = p_pict->p[i].i_pitch;
-     }
- 
-+#if X264_BUILD >= 0x0013
-+    x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic, &pic );
-+#else
-     x264_encoder_encode( p_sys->h, &nal, &i_nal, &pic );
-+#endif
-     for( i = 0, i_out = 0; i < i_nal; i++ )
-     {
-         int i_size = p_sys->i_buffer - i_out;
diff --git a/multimedia/vlc/files/patch-modules_gui_ncurses.c b/multimedia/vlc/files/patch-modules_gui_ncurses.c
deleted file mode 100644
index ef435ac6685d..000000000000
--- a/multimedia/vlc/files/patch-modules_gui_ncurses.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- modules/gui/ncurses.c.orig	Wed Nov  3 18:12:49 2004
-+++ modules/gui/ncurses.c	Wed Nov  3 18:14:27 2004
-@@ -875,7 +875,7 @@
- 
- static void SearchPlaylist( intf_thread_t *p_intf, char *psz_searchstring )
- {
--    bool b_ok = false;
-+    bool b_ok = 0;
-     int i_current;
-     int i_first = 0 ;
-     int i_item = -1;
-@@ -900,7 +900,7 @@
-                            psz_searchstring ) != NULL )
-         {
-             i_item = i_current;
--            b_ok = true;
-+            b_ok = 1;
-             break;
-         }
-     }
-@@ -914,7 +914,7 @@
-                                psz_searchstring ) != NULL )
-             {
-                 i_item = i_current;
--                b_ok = true;
-+                b_ok = 1;
-                 break;
-             }
-         }
diff --git a/multimedia/vlc/files/patch-modules_stream_out_switcher.c b/multimedia/vlc/files/patch-modules_stream_out_switcher.c
new file mode 100644
index 000000000000..3952ddff1848
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_stream_out_switcher.c
@@ -0,0 +1,11 @@
+--- modules/stream_out/switcher.c.orig	Wed Mar 23 03:57:15 2005
++++ modules/stream_out/switcher.c	Wed Mar 23 03:57:50 2005
+@@ -44,7 +44,7 @@
+ #ifdef HAVE_POSTPROC_POSTPROCESS_H
+ #   include <postproc/postprocess.h>
+ #else
+-#   include <libpostproc/postprocess.h>
++#   include <ffmpeg/postproc/postprocess.h>
+ #endif
+ 
+ #define SOUT_CFG_PREFIX "sout-switcher-"
diff --git a/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h b/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h
new file mode 100644
index 000000000000..4219d8b5377a
--- /dev/null
+++ b/multimedia/vlc/files/patch-modules_video_filter_swscale_common.h
@@ -0,0 +1,21 @@
+--- modules/video_filter/swscale/common.h.orig	Fri May 13 03:23:24 2005
++++ modules/video_filter/swscale/common.h	Fri May 13 03:37:24 2005
+@@ -36,7 +36,17 @@
+ #define MANGLE(a) #a
+ #endif
+ 
+-#ifdef ARCH_X86
++#if (defined(__unix__) || defined(unix)) && !defined(USG)
++#include <sys/param.h>
++#endif
++
++#if (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
++#include <sys/endian.h>
++#define bswap_16(x) bswap16(x)
++#elif (defined(__FreeBSD__) && __FreeBSD_version <= 500000)
++#include <sys/endian.h>
++#define bswap_16(x) be16toh(x)
++#elif ARCH_X86
+ static inline unsigned short ByteSwap16(unsigned short x)
+ {
+   __asm("xchgb %b0,%h0" :
diff --git a/multimedia/vlc/files/svlc.desktop b/multimedia/vlc/files/svlc.desktop
new file mode 100644
index 000000000000..e7ed9a3eeb96
--- /dev/null
+++ b/multimedia/vlc/files/svlc.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=VideoLAN (skins) Media Player
+Comment=Video and Audio player and server
+Icon=gvlc.png
+Exec=vlc --intf skins2
+TryExec=svlc
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
diff --git a/multimedia/vlc/files/vlc.desktop b/multimedia/vlc/files/wxvlc.desktop
index 2e6cd518f230..c95dd3f62a8c 100644
--- a/multimedia/vlc/files/vlc.desktop
+++ b/multimedia/vlc/files/wxvlc.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=VideoLAN Media Player
+Name=VideoLAN (wxgtk) Media Player
 Comment=Video and Audio player and server
 Icon=vlc.png
 Exec=vlc
+TryExec=wxvlc
 Terminal=false
 Type=Application
 Categories=Application;AudioVideo;