- Add vlc-devel with hal enabled by default (per configure script) with

  a WITHOUT_HAL knob


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6212 df743ca5-7f9a-e211-a948-0013205c9059

13 files changed, 1154 insertions, 0 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
new file mode 100644
index 000000000..bbc12bd0c
--- /dev/null
+++ b/multimedia/vlc-devel/Makefile
@@ -0,0 +1,896 @@
+# New ports collection makefile for:	vlc
+# Date created:		3rd August 2001
+# Whom:			Brian Somers <brian@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.2 2005/11/29 17:44:29 ahze Exp $
+#
+# NOTES about VLC Knobs:
+# Below you will see a number of knobs, if it starts with WITHOUT_ it is
+# enabled by default, if it starts with WITH_ it is disabled by default
+# and will be autodetected to enable
+#
+# If you define for example WITH_FAAD and WITHOUT_FAAD
+# the WITHOUT_ will always over ride the WITH_.
+#
+# Interface Knobs:
+#
+# WITH_CORBA
+#  Enable a Corba interface via orbit2
+#
+# WITH_NCURSES=yes
+#  Ncurses (console) interface
+#
+# WITH_SKINS
+#  This Interface supports a skinned gtk2.0 interface
+#  Skins can be found at http://www.videolan.org/vlc/download-skins.html
+#
+# WITHOUT_WXGTK=yes
+#  WxWindows/Gtk 2.x Interface
+#  This is the default and most supported
+#  x11 interface
+#
+# WITH_WXGTK_VER=[2.4|2.6]
+#  Choose a WxGTK version you want to use.
+#  Defaults to 26
+#
+# Audio Knobs:
+#
+# 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
+#
+# WITH_ESOUND=yes
+#  Esound Support
+#
+# WITH_FAAC=yes
+#  Faac audio encoder (mp4/aac) Support
+#  ** Only enable this if you compiled multimedia/ffmpeg-devel with WITH_FAAC knob **
+#
+# WITH_FAAD=yes
+#  Faad audio decoder (mp4/aac) Support
+#
+# WITHOUT_FLAC=yes
+#  Flac Support
+#
+# WITHOUT_LAME=yes
+#  Mp3 encoder Support
+#   ** NOT DEFINED if PACKAGE_BUILDING is defined **
+#
+# WITHOUT_A52=yes
+#  liba52 audio Support
+#
+# WITH_REALAUDIO
+#  Real audio(R) support
+#
+# WITH_SHOUT
+#  Libshout2 support
+#
+# WITH_TREMOR
+#  Interger-only Ogg Vorbis decoder
+#   !!experimental!!
+#
+# WITHOUT_MAD=yes
+#  Mad mp3 audio decoder Support
+#
+# WITHOUT_OGG=yes
+#  Ogg audio decoder Support
+#
+# WITH_SPEEX=yes
+#  Speex voice codec Support
+#
+# WITH_TWOLAME=yes
+#  Twolame Mpeg layer 2 audio Support
+#
+# WITHOUT_VORBIS=yes
+#  Vorbis Support
+#
+# Graphics Knobs:
+#
+# WITH_AALIB=yes
+#  Console Graphics Support
+#
+# WITH_CACA=yes
+#  Console Graphics Support (implies WITH_AALIB)
+#
+# WITH_DV=yes
+#  Digital video input
+#
+# WITH_FRIBIDI=yes
+#
+# WITH_GGI=yes
+#
+# WITH_SDL=yes
+#  SDL video output
+#
+# WITH_SVG=yes
+#
+# WITH_SVGALIB=yes
+#  SVGAlib video output
+#
+# WITH_XOSD=yes
+#
+# Multimedia Knobs:
+#
+# WITH_DIRAC
+#  Enable dirac general-purpose video codec
+#
+# WITH_X264
+#  Enable H.264/AVC Video Support
+#
+# WITHOUT_MATROSKA=yes
+#  Matroska Container Format Support
+#
+# WITHOUT_MPEG2=yes
+#  Mpeg-2 A/V Decoder Support
+#
+# WITH_THEORA=yes
+#  Video codec for OGG/Vorbis Support
+#
+# 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
+#
+# WITH_WIN32_CODECS=yes
+#  Support for win32 multimedia DLL's
+#
+# Other Knobs:
+#
+# WITH_AVAHI=yes
+#  Avahi (Rendezvous/Bonjour (R) ) networking
+#
+# WITH_DEBUG=yes
+#  Enable debuging support
+#
+# WITHOUT_CDROM=yes
+#  Disable cddb and vcd support
+#   and other cdrom support
+#
+# WITHOUT_CDPARANOIA=yes
+#  Disable Cdparanoia support
+#
+# WITHOUT_DVBPSI=yes
+#  TS MUX and DEMUX support
+#
+# WITHOUT_DVDNAV=yes
+#  Disable DVD (dvd menus) support
+#
+# WITH_DVDREAD=yes
+#  Enable Regular DVD support (non-menu)
+#
+# WITH_GECKO= [firefox|mozilla|seamonkey|nvu]
+# WITH_VLC_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.
+#   defaults to www/mozilla
+#
+#  NOTE: The www/mplayer-plugin is much more complete.
+#
+# WITHOUT_HAL=yes
+#  Disable HAL support
+#
+# WITH_OPENGL=yes
+#  Enable OpenGL visual plugin (not playback, play back is default with X11)
+#
+# WITH_SAMBA=yes
+#  Enable SAMBA Access module
+#
+# WITH_SSL=yes
+#  Enable TLS/SSL Support for web (httpd) interface
+#
+# WITHOUT_SLP=yes
+#  Disable SLP service discovery support
+#  * recommended if you want to stream media
+#
+# WITH_OPTIMIZED_CFLAGS=yes
+#  Compile with -O2 -ffast-math -fomit-frame-pointer
+#
+# WITH_DVD_DEVICE=/dev/somedevice
+#  default 5.x and above: /dev/acd0
+#  default 4.x and below: /dev/acd0c
+#  This option changes the default dvd device
+#
+# WITH_CDROM_DEVICE=/dev/somedevice
+#  default 5.x and above: /dev/acd0
+#  default 4.x and below: /dev/acd0c
+#  This option changes the default cdrom device
+#
+# 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
+#
+# NOPORTDOCS=yes
+#  Do not install Vlc's Documents
+#
+
+PORTNAME=	vlc
+DISTVERSION=	0.8.5.20060423-test4
+PORTREVISION=	0
+CATEGORIES=	multimedia audio ipv6 net www
+MASTER_SITES=	http://download.videolan.org/pub/videolan/testing/vlc-0.8.5-test4/
+#		http://nightlies.videolan.org/build/source/
+#		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}/ \
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-${DISTVERSION:S/.20060423//}
+
+MAINTAINER=	ahze@FreeBSD.org
+COMMENT=	Multimedia streaming server and player for various audio/video formats
+
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
+
+CONFLICTS=	vlc-[0-9]*
+
+#WRKSRC=		${WRKDIR}/${PORTNAME}-0.8.5-test1
+
+WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GETOPT_LONG=yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+WANT_GNOME=	yes
+USE_GNOME=	gnometarget libxml2
+WANT_SDL=	yes
+USE_ICONV=	yes
+USE_PERL5_BUILD=yes
+
+FAKEDIR=	${WRKDIR}/fake
+PLIST=		${WRKDIR}/plist
+
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+
+CONFIGURE_ARGS+=	--enable-ffmpeg \
+			--with-ffmpeg=${LOCALBASE} \
+			--with-libiconv-prefix=${LOCALBASE} \
+			--with-ffmpeg-zlib \
+			--disable-gnome \
+			--disable-gtk \
+			--without-libintl-prefix \
+			--without-dv-raw1394
+
+MAN1=		vlc.1 \
+		vlc-config.1
+
+.if defined(WITH_WXGTK_VER) && ${WITH_WXGTK_VER}=="2.4"
+WX_CONFIG=	wxgtk2-2.4-config
+WXGTK2_PORT=	wxgtk24
+.else
+WX_CONFIG=	wxgtk2-2.6-config
+WXGTK2_PORT=	wxgtk26
+CPPFLAGS+=	-I${X11BASE}/include/wx-2.6/
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+BROKEN=Does not compile with perl ${PERL_VERSION}
+.endif
+
+.if exists(${LOCALBASE}/lib/libavutil-CVS.so) || !exists(${LOCALBASE}/lib/libavformat.a)
+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
+.else
+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+.endif
+
+# compatible knobs.
+.if defined(WITH_DEBUG)
+DEBUG=	yes
+.endif
+
+.if defined(WITH_LIBMPEG2)
+WITH_MPEG2=yes
+.endif
+
+.if defined(WITH_LIBCACA)
+WITH_CACA=yes
+.endif
+
+.if defined(WITH_LIBA52)
+WITH_A52=yes
+.endif
+
+.if defined(WITH_SMB)
+WITH_SAMBA=yes
+.endif
+
+.if defined(WITH_LIBMATROSKA)
+WITH_MATROSKA=yes
+.endif
+
+.if defined(WITH_LIBTREMOR)
+WITH_TREMOR=yes
+.endif
+# end compatible knobs
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+.endif
+
+.if defined(WITH_DVD_DEVICE)
+DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
+.else
+.if ${OSVERSION} < 500000
+DEFAULT_DVD_DEVICE=/dev/acd0c
+.else
+DEFAULT_DVD_DEVICE=/dev/acd0
+.endif
+.endif
+
+.if ${HAVE_GNOME:Mgnomevfs2} || defined(WITH_GNOMEVFS)
+USE_GNOME+=	gnomevfs2
+CONFIGURE_ARGS+=	--enable-gnomevfs
+.else
+CONFIGURE_ARGS+=	--disable-gnomevfs
+.endif
+
+.if defined(WITH_CDROM_DEVICE)
+DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
+.else
+.if ${OSVERSION} < 500000
+DEFAULT_CDROM_DEVICE=/dev/acd0c
+.else
+DEFAULT_CDROM_DEVICE=/dev/acd0
+.endif
+.endif
+
+.if defined(WITH_SKINS) && !defined(WITHOUT_SKINS)
+LIB_DEPENDS+=	tar.0:${PORTSDIR}/devel/libtar
+CONFIGURE_ARGS+=--enable-skins2
+WITH_WXGTK=	yes
+.else
+CONFIGURE_ARGS+=--disable-skins2
+.endif
+
+.if ${ARCH}=="i386" && defined(WITH_WIN32_CODECS)
+RUN_DEPENDS+=	${LOCALBASE}/lib/win32/wmv8ds32.ax:${PORTSDIR}/multimedia/win32-codecs
+CONFIGURE_ARGS+=--enable-loader
+.else
+CONFIGURE_ARGS+=--disable-loader
+.endif
+
+.if !defined(WITHOUT_WXGTK)
+BUILD_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
+RUN_DEPENDS+=	${WX_CONFIG}:${PORTSDIR}/x11-toolkits/${WXGTK2_PORT}
+CONFIGURE_ARGS+=--enable-wxwidgets
+CONFIGURE_ENV+=	WX_CONFIG="${X11BASE}/bin/${WX_CONFIG}"
+.else
+CONFIGURE_ARGS+=--disable-wxwidgets
+.endif
+
+.if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
+LIB_DEPENDS+=	 artsc.0:${PORTSDIR}/audio/arts
+CONFIGURE_ARGS+=	--enable-arts
+.else
+CONFIGURE_ARGS+=	--disable-arts
+.endif
+
+.if (defined(WITH_AVAHI) || exists(${LOCALBASE}/lib/libavahi-client.a)) && !defi
+LIB_DEPENDS+=	avahi-common.3:${PORTSDIR}/net/avahi
+CONFIGURE_ARGS+=	--enable-bonjour
+.else
+CONFIGUE_ARGS+=		--disable-bonjour
+.endif
+
+.if !defined(WITHOUT_CDROM)
+LIB_DEPENDS+=	vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
+		cdio.6:${PORTSDIR}/sysutils/libcdio
+CONFIGURE_ARGS+=--enable-vcd \
+		--disable-libcdio \
+		--disable-libcddb \
+		--disable-cddax
+.else
+CONFIGURE_ARGS+=--disable-vcd \
+		--disable-libcddb \
+		--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)
+LIB_DEPENDS+=	dvbpsi.4:${PORTSDIR}/multimedia/libdvbpsi
+CONFIGURE_ARGS+=--enable-dvbpsi \
+		--with-dvbpsi=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--disable-dvbpsi
+.endif
+
+.if !defined(WITHOUT_DVDNAV)
+LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
+CONFIGURE_ARGS+=--enable-dvdnav
+.else
+CONFIGURE_ARGS+=--disable-dvdnav
+.endif
+
+.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)
+USE_GNOME+=	esound
+CONFIGURE_ARGS+=--enable-esd
+.else
+CONFIGURE_ARGS+=--disable-esd
+.endif
+
+.if defined(WITH_FAAC) && !defined(WITHOUT_FAAC)
+CONFIGURE_ARGS+=--with-ffmpeg-faac
+LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+.endif
+
+.if (defined(WITH_FAAD) || exists(${LOCALBASE}/lib/libfaad.a)) && !defined(WITHOUT_FAAD)
+LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+CONFIGURE_ARGS+=--enable-faad
+.else
+CONFIGURE_ARGS+=--disable-faad
+.endif
+
+.if !defined(WITHOUT_FLAC)
+LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+CONFIGURE_ARGS+=--enable-flac
+.else
+CONFLGIRE_ARGS+=--disable-flac
+.endif
+
+.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) || 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(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_CACA) || exists(${LOCALBASE}/lib/libcaca.a)) && !defined(WITHOUT_CACA)
+.if !defined(WITHOUT_AALIB)
+WITH_AALIB=	yes
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+RUN_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+
+CONFIGURE_ARGS+=--enable-caca
+.endif
+.else
+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
+.else
+CONFIGURE_ARGS+=--disable-dts
+.endif
+
+.if (defined(WITH_DV) || exists(${LOCALBASE}/lib/libdv.a)) && !defined(WITHOUT_DV)
+LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
+CONFIGURE_ARGS+=--enable-dv
+.else
+CONFIGURE_ARGS+=--disable-dv
+.endif
+
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=	--enable-hal
+.else
+CONFIGURE_ARGS+=	--disable-hal
+.endif
+
+.if defined(WITHOUT_HTTPD)
+CONFIGURE_ARGS+=--disable-httpd
+.endif
+
+.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
+
+# 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
+CONFIGURE_ARGS+=--disable-mp3lame
+.endif
+
+.if !defined(WITHOUT_MATROSKA)
+LIB_DEPENDS+=	matroska.0:${PORTSDIR}/multimedia/libmatroska
+CONFIGURE_ARGS+=--enable-mkv
+.else
+CONFIGURE_ARGS+=--disable-mkv
+.endif
+
+.if !defined(WITHOUT_A52)
+LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+CONFIGURE_ARGS+=--enable-a52
+.else
+CONFIGURE_ARGS+=--disable-a52
+.endif
+
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
+USE_GECKO=	firefox mozilla seamonkey nvu
+.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
+CONFIGURE_ENV+=	MOZILLA_CONFIG="${GECKO_CONFIG}" \
+		XPIDL="${XPIDL}" \
+		XPIDL_INCL="${XPIDL_INCL}"
+CONFIGURE_ARGS+=--enable-mozilla
+.endif
+
+.if !defined(WITHOUT_MPEG2)
+LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+CONFIGURE_ARGS+=--enable-libmpeg2
+.else
+CONFIGURE_ARGS+=--disable-libmpeg2
+.endif
+
+.if defined(WITH_REALAUDIO)
+CONFIGURE_ARGS+=	--enable-real
+.endif
+
+.if (defined(WITH_SHOUT) || exists(${LOCALBASE}/lib/libshout.a)) && !defined(WITHOUT_SHOUT)
+LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
+CONFIGURE_AGRS+=	--enable-shout
+.endif
+
+.if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_THEORA)
+LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
+CONFIGURE_ARGS+=--enable-theora
+.else
+CONFIGURE_ARGS+=--disable-theora
+.endif
+
+.if !defined(WITHOUT_LIVEMEDIA)
+BUILD_DEPENDS+=	${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
+CONFIGURE_ARGS+=--enable-livedotcom \
+		--with-livedotcom-tree=${LOCALBASE}/live
+.else
+CONFIGURE_ARGS+=--disable-livedotcom
+.endif
+
+.if !defined(WITHOUT_MAD)
+LIB_DEPENDS+=	id3tag.0:${PORTSDIR}/audio/libid3tag \
+		mad.2:${PORTSDIR}/audio/libmad
+CONFIGURE_ARGS+=--enable-mad \
+		--with-mad=${LOCALBASE}
+.else
+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
+
+.if defined(WITH_OPENGL) && !defined(WITHOUT_OPENGL)
+USE_GL=	yes
+CONFIGURE_ARGS+=--enable-galaktos
+.else
+CONFIGURE_ARGS+=--disable-galaktos
+.endif
+
+.if (defined(WITH_SAMBA) || exists(${LOCALBASE}/lib/lib/libsmbclient.a)) && !defined(WITHOUT_SAMBA)
+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=	image
+CONFIGURE_ARGS+=--enable-sdl
+.else
+CONFIGURE_ARGS+=--disable-sdl
+.endif
+
+.if defined(WITH_TRANSCODE) || exists(${LOCALBASE}/bin/transcode)
+RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
+.endif
+
+.if !defined(WITHOUT_HTTPD) && (defined(WITH_SSL) || exists(${LOCALBASE}/lib/libgnutls.a))
+LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=--enable-gnutls
+.else
+CONFIGURE_ARGS+=--disable-gnutls
+.endif
+
+.if !defined(WITHOUT_SLP)
+LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
+.else
+CONFIGURE_ARGS+=--disable-slp
+.endif
+
+.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
+.else
+CONFIGURE_ARGS+=--disable-speex
+.endif
+
+.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) || 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_TREMOR) || exists(${LOCALBASE}/lib/libvorbisidec.a)) && !defined(WITHOUT_TREMOR)
+LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+.else
+CONFIGURE_ARGS+=--disable-tremor
+.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
+.else
+CONFIGURE_ARGS+=--disable-vorbis
+.endif
+
+.if (defined(WITH_XOSD) || exists(${LOCALBASE}/lib/libxosd.a)) && !defined(WITHOUT_XOSD)
+LIB_DEPENDS+=	xosd.4:${PORTSDIR}/misc/xosd
+CONFIGURE_ARGS+=--enable-xosd
+.else
+CONFIGURE_ARGS+=--disable-xosd
+.endif
+
+.if defined(DEBUG)
+CONFIGURE_AGRS+=--enable-debug
+.else
+CONFIGURE_ARGS+=--enable-release
+.endif
+
+.if defined(WITH_OPTIMIZED_CFLAGS)
+CFLAGS+=	-O2 -ffast-math -fomit-frame-pointer
+CONFIGURE_ARGS+=--enable-release \
+		--enable-optimizations
+.else
+CONFIGURE_ARGS+=--enable-release
+.endif
+
+.if ${OSVERSION} < 500000
+CONFIGURE_ENV+=	LIBS="-L/usr/lib -lcipher"
+.endif
+
+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 to your personal preferences!"
+	@${ECHO_MSG} ""
+
+post-patch:
+# Subtitle default font
+	@${REINPLACE_CMD} -e \
+	's|/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf|${WITH_VLC_DEFAULT_FONT}|' \
+		${WRKSRC}/modules/misc/freetype.c
+# mozilla plugin
+	@${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${FAKEDIR}/mozilla|; \
+		s|$$(libdir)/mozilla/components|${FAKEDIR}/mozilla|' \
+			${WRKSRC}/mozilla/Makefile.in
+# skins2 interface, no lrint on < 504000
+.if ${OSVERSION} < 504000
+	@${REINPLACE_CMD} -e 's|lrint|rint|' \
+		${WRKSRC}/modules/gui/skins2/controls/ctrl_list.cpp
+.endif
+# s/Linux/FreeBSD/
+	@${REINPLACE_CMD} -e 's|Linux|FreeBSD|' \
+		${WRKSRC}/po/*
+	@${RM} -f ${WRKSRC}/po/*.bak
+	@${REINPLACE_CMD} -e 's|Linux OSS|FreeBSD OSS|' \
+		${WRKSRC}/modules/audio_output/oss.c
+# pthreads/cflags
+	@${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \
+		-e 's/-lc_r/${PTHREAD_LIBS}/' \
+		-e 's|-mcpu=pentiumpro||' \
+		-e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \
+		${WRKSRC}/configure
+# cdrom/dvd support
+	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
+		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
+		${WRKSRC}/include/vlc_config.h
+.if ${ARCH}=="i386" && defined(WITH_WIN32_CODECS)
+	@${REINPLACE_CMD} -e 's|-DWIN32_PATH=\\"\\"|-DWIN32_PATH=\\"${LOCALBASE}/lib/win32\\"|' \
+		${WRKSRC}/loader/Makefile.in
+	@${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \
+		${WRKSRC}/loader/module.c
+.endif
+
+pre-build:
+	@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
+		${WRKSRC}/vlc-config
+
+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/pixmaps/vlc.png" >> ${PLIST}
+	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
+.endif
+.if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS)
+	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
+.endif
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET} prefix=${FAKEDIR}
+	cd ${FAKEDIR}/bin && ${FIND} -s * | \
+		${SED} -e 's|^|bin/|' >> ${PLIST}
+	cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|include/|' >> ${PLIST} \
+		&& ${FIND} -d * -type d | \
+		${SED} -e 's|^|@dirrm include/|' >> ${PLIST}
+	cd ${FAKEDIR}/lib && ${FIND} -s * -type f -o -type l| \
+		${SED} -e 's|^|lib/|' >> ${PLIST} \
+		&& ${FIND} -d * -type d | \
+		${SED} -e 's|^|@dirrm lib/|' >> ${PLIST}
+.for dir in vlc
+	cd ${FAKEDIR}/share/${dir} && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|share/${dir}/|' >> ${PLIST} \
+		&& ${FIND} -d * -type d | \
+		${SED} -e 's|^|@dirrm share/${dir}/|' >> ${PLIST}
+.endfor
+.if !defined(NOPORTDOCS)
+	cd ${FAKEDIR}/share/doc && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|share/doc/|' >> ${PLIST} \
+		 && ${FIND} -d * -type d | \
+		 ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST}
+.else
+	${RM} -rf ${FAKEDIR}/share/doc
+.endif
+		${ECHO_MSG} "@dirrm share/vlc" >> ${PLIST}
+.if !defined(WITHOUT_NLS)
+	cd ${FAKEDIR}/share/locale &&  ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|share/locale/|' >> ${PLIST}
+.endif
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITHOUT_VLC_MOZILLA_PLUGIN)
+	cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
+		${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
+.endif
+.for locale in my oc 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
+
+do-install:
+	@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|' \
+		${FAKEDIR}/bin/vlc-config
+	@${RM} -f ${FAKEDIR}/bin/*.bak
+	cd ${FAKEDIR}/bin && ${FIND} . | \
+		${CPIO} -vpdm -R ${BINOWN}:${BINGRP} ${PREFIX}/bin
+	cd ${FAKEDIR}/include && ${FIND} . | \
+		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include
+	cd ${FAKEDIR}/lib && ${FIND} . | \
+		${CPIO} -vpdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib
+	cd ${FAKEDIR}/share && ${FIND} . | \
+		${CPIO} -vpdm -L -R ${SHAREOWN} ${PREFIX}/share
+.if defined(WITH_VLC_MOZILLA_PLUGIN) && !defined(WITH_VLC_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/vlc48x48.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-devel/distinfo b/multimedia/vlc-devel/distinfo
new file mode 100644
index 000000000..847eafd5e
--- /dev/null
+++ b/multimedia/vlc-devel/distinfo
@@ -0,0 +1,3 @@
+MD5 (vlc-0.8.5-test4.tar.bz2) = c7e06ee27097493cb3dcdffe5d8be36e
+SHA256 (vlc-0.8.5-test4.tar.bz2) = 0a93d9499cae65ae911f4330a2860864d4f404440d5e17df4c471c2d0ff438f7
+SIZE (vlc-0.8.5-test4.tar.bz2) = 8450554
diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure
new file mode 100644
index 000000000..d5326ad59
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-configure
@@ -0,0 +1,45 @@
+--- configure.orig	Sun Jan  1 18:01:13 2006
++++ configure	Mon Jan  2 14:38:53 2006
+@@ -21195,11 +21195,7 @@
+   done
+ 
+     else
+-            echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-      { { echo "$as_me:$LINENO: error: cannot find ${with_dv_raw1394}/include/libraw1394/raw1394.h" >&5
+-echo "$as_me: error: cannot find ${with_dv_raw1394}/include/libraw1394/raw1394.h" >&2;}
+-   { (exit 1); exit 1; }; }
++	echo "not found"
+     fi
+   else
+ 
+@@ -21361,8 +21357,7 @@
+         if test -n "${enable_dv}"
+         then
+           { { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5
+-echo "$as_me: error: cannot find libraw1394 headers" >&2;}
+-   { (exit 1); exit 1; }; }
++echo "$as_me: error: cannot find libraw1394 headers" >&2;} ;}
+         fi
+ 
+ fi
+@@ -21381,8 +21376,7 @@
+             echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+       { { echo "$as_me:$LINENO: error: cannot cd to ${real_dv_raw1394_tree}" >&5
+-echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;}
+-   { (exit 1); exit 1; }; }
++echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;} ;}
+     fi
+     if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a"
+     then
+@@ -21610,8 +21604,7 @@
+         if test -n "${enable_dv}"
+         then
+           { { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5
+-echo "$as_me: error: cannot find libavc1394 headers" >&2;}
+-   { (exit 1); exit 1; }; }
++echo "$as_me: error: cannot find libavc1394 headers" >&2;} ; }
+         fi
+ 
+ fi
diff --git a/multimedia/vlc-devel/files/patch-include_vlc_control.h b/multimedia/vlc-devel/files/patch-include_vlc_control.h
new file mode 100644
index 000000000..d3e8d64c7
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-include_vlc_control.h
@@ -0,0 +1,56 @@
+--- /dev/null	Mon Jan  2 14:48:08 2006
++++ include/vlc_control.h	Mon Jan  2 14:46:25 2006
+@@ -0,0 +1,53 @@
++/*****************************************************************************
++ * control.h: private header for mediacontrol
++ *****************************************************************************
++ * Copyright (C) 2005 the VideoLAN team
++ * $Id: patch-include_vlc_control.h,v 1.1 2006-05-04 15:12:39 ahze Exp $
++ *
++ * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
++ *****************************************************************************/
++
++#ifndef _VLC_PRIVATE_CONTROL_H
++#define _VLC_PRIVATE_CONTROL_H 1
++
++# ifdef __cplusplus
++extern "C" {
++# endif
++
++#include <vlc/vlc.h>
++#include "vlc/control_structures.h"
++
++typedef struct {
++    vlc_object_t  *p_vlc;
++    playlist_t    *p_playlist;
++    intf_thread_t *p_intf;
++    int           vlc_object_id;
++} mediacontrol_Instance;
++
++vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input,
++                                       mediacontrol_PositionKey from,
++                                       mediacontrol_PositionKey to,
++                                       vlc_int64_t value );
++vlc_int64_t mediacontrol_position2microsecond(
++    input_thread_t *p_input,
++    const mediacontrol_Position *pos );
++
++# ifdef __cplusplus
++}
++# endif
++
++#endif
diff --git a/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_ffmpeg.c
new file mode 100644
index 000000000..502fe4c96
--- /dev/null
+++ b/multimedia/vlc-devel/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-devel/files/patch-modules_codec_ffmpeg_postprocess.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_postprocess.c
new file mode 100644
index 000000000..29b5eb319
--- /dev/null
+++ b/multimedia/vlc-devel/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-devel/files/patch-modules_codec_ffmpeg_video.c b/multimedia/vlc-devel/files/patch-modules_codec_ffmpeg_video.c
new file mode 100644
index 000000000..1ed5bda68
--- /dev/null
+++ b/multimedia/vlc-devel/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-devel/files/patch-modules_stream_out_switcher.c b/multimedia/vlc-devel/files/patch-modules_stream_out_switcher.c
new file mode 100644
index 000000000..3952ddff1
--- /dev/null
+++ b/multimedia/vlc-devel/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-devel/files/patch-modules_video_filter_swscale_common.h b/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h
new file mode 100644
index 000000000..4219d8b53
--- /dev/null
+++ b/multimedia/vlc-devel/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-devel/files/patch-modules_visualization_galaktos_PCM.c b/multimedia/vlc-devel/files/patch-modules_visualization_galaktos_PCM.c
new file mode 100644
index 000000000..78799ac46
--- /dev/null
+++ b/multimedia/vlc-devel/files/patch-modules_visualization_galaktos_PCM.c
@@ -0,0 +1,11 @@
+--- modules/visualization/galaktos/PCM.c.orig	Fri Nov 26 08:21:47 2004
++++ modules/visualization/galaktos/PCM.c	Fri Nov 26 08:22:06 2004
+@@ -79,7 +79,7 @@
+ //Takes in a 2x512 array of PCM samples
+ //and stores them
+ 
+-void addPCM(int16_t PCMdata[2][512])
++void addPCM(short PCMdata[2][512])
+ {
+   int i,j;
+   int samples=512;
diff --git a/multimedia/vlc-devel/files/svlc.desktop b/multimedia/vlc-devel/files/svlc.desktop
new file mode 100644
index 000000000..e7ed9a3ee
--- /dev/null
+++ b/multimedia/vlc-devel/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-devel/files/wxvlc.desktop b/multimedia/vlc-devel/files/wxvlc.desktop
new file mode 100644
index 000000000..c95dd3f62
--- /dev/null
+++ b/multimedia/vlc-devel/files/wxvlc.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+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;
diff --git a/multimedia/vlc-devel/pkg-descr b/multimedia/vlc-devel/pkg-descr
new file mode 100644
index 000000000..15b251466
--- /dev/null
+++ b/multimedia/vlc-devel/pkg-descr
@@ -0,0 +1,10 @@
+vlc -- the VideoLAN Client
+
+VLC media player is a highly portable multimedia player for various
+audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, and
+more) as well as DVD's, VCD's, and various streaming protocols. It
+can also be used as a server to stream in unicast or multicast in
+IPv4 or IPv6 on a high-bandwidth network. VLC also has the ability 
+to transcode media on-the-fly for streaming or saving to disk.
+
+WWW: http://www.videolan.org/