Update to 0.8.6b (merged from multimedia/vlc-devel, note this requires ffmpeg-devel now!)

13 files changed, 161 insertions, 307 deletions

diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 4eebc1dd376e..975835a19ead 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,25 +3,63 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc/Makefile,v 1.4 2006/10/01 16:05:06 ahze Exp $
-#
+#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.21 2006/10/01 18:16:43 ahze Exp $
+#      $Id: Makefile 6 2006-09-27 14:05:34Z buhnux $
 # *** PLEASE READ Makefile.inc for more information on knobs ***
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.5
-PORTREVISION=	12
+DISTVERSION=	0.8.6b
+PORTEPOCH=	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://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \
+		http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${DISTVERSION}/ \
+		ftp://ftp.crans.org/pub/videolan/vlc/${DISTVERSION}/ \
+		ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${DISTVERSION}/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Multimedia streaming server and player for various audio/video formats
 
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
+		avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
+
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
 
+OPTIONS+=	A52 "a52 audio support, many DVDs use this" On
+OPTIONS+=	AALIB "Aalib Console Graphics Support" Off
+OPTIONS+=	AVAHI "Avahi (Rendezvous/Bonjour (R) ) networking" On
+OPTIONS+=	CACA "Libcaca Console Graphics Support" Off
+OPTIONS+=	ARTS "Enable arts sound support" Off
+OPTIONS+=	CORBA "Enable a Corba interface via orbit2" Off
+OPTIONS+=	DAAP "Connect to iTunes(R) music shares" On
+OPTIONS+=	DEBUG "Enable debuging support" Off
+OPTIONS+=	DTS "DTS decoder support, many DVDs use this" On
+OPTIONS+=	ESOUND "Esound Support" Off
+OPTIONS+=	FAAC "Faac audio encoder (mp4/aac) support" Off
+OPTIONS+=	FAAD "Faad audio decoder (mp4/aac) support" Off
+OPTIONS+=	FLAC "Flac audio codec support" Off
+OPTIONS+=	HTTPD "Streaming media control via http" On
+OPTIONS+=	LAME "Lame mp3 audio encoder support" On
+OPTIONS+=	LIVEMEDIA "Support for rstp/rtp/sdp protocols" On
+OPTIONS+=	MAD "Mad mp3 audio decoder support" On
+OPTIONS+=	MATROSKA "Matroska Container Format support" On
+OPTIONS+=	MPEG2 "Mpeg-2 audio/video decoder Support" On
+OPTIONS+=	NCURSES "Enable ncueses (console) interface" Off
+OPTIONS+=	OGG "Ogg audio decoder support" On
+OPTIONS+=	REALAUDIO "Real audio(R) support" On
+OPTIONS+=	SAMBA "SAMBA Access module" On
+OPTIONS+=	SDL "SDL video output" On
+OPTIONS+=	SVG "SVG graphics support" Off
+OPTIONS+=	SVGALIB "SVGALIB video output" Off
+OPTIONS+=	SHOUT "Shout2 support" Off
+OPTIONS+=	SKINS "Enable GTK+ skinsned interface" Off
+OPTIONS+=	SPEEX "Speex voice codec support" On
+OPTIONS+=	THEORA "OGG/Vorbis video codec support" Off
+OPTIONS+=	TWOLAME "Twolame mpeg2 audio encoder support" Off
+OPTIONS+=	VORBIS "Vorbis support" On
+OPTIONS+=	WIN32_CODECS "win32 multimedia DLL's" Off
+OPTIONS+=	X264 "Enable H.264/AVC codec support" On
+
 CONFLICTS=	vlc-devel-[0-9]*
 
 WITH_VLC_DEFAULT_FONT?=	${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
@@ -36,45 +74,35 @@ WANT_SDL=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 
-FAKEDIR=	${WRKDIR}/fake
+FAKEDIR=	${WRKDIR}/fake/${PREFIX}
 PLIST=		${WRKDIR}/plist
 
 USE_LDCONFIG=	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_ENV=	CPPFLAGS="-I${FAKEDIR}/include -I${WRKSRC}/include ${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include -I${LOCALBASE}/ffmpeg ${PTHREAD_CFLAGS} -DHAVE_POSTPROC_POSTPROCESS_H" \
+		LDFLAGS="${LDFLAGS} -L${FAKEDIR}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lc" \
+		LIBS="-lc"
 
 CONFIGURE_ARGS+=	--enable-ffmpeg \
 			--with-ffmpeg=${LOCALBASE} \
 			--with-libiconv-prefix=${LOCALBASE} \
+			--with-libintl-prefix=${LOCALBASE} \
 			--with-ffmpeg-zlib \
 			--disable-gnome \
 			--disable-gtk \
 			--without-libintl-prefix \
-			--without-dv-raw1394
+			--without-dv-raw1394 \
+			--disable-dv
 
 MAN1=		vlc.1 \
 		vlc-config.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500035
-BROKEN=	Does not build on FreeBSD 4.x
-.endif
-
 .if ${PERL_LEVEL} < 500800
 BROKEN=	Does not compile with perl ${PERL_VERSION}
 .endif
 
-.if exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) || !exists(${LOCALBASE}/lib/libavformat.a)
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel
-FFMPEG=	new
-.else
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-FFMPEG=	old
-EXTRA_PATCHES=	${PATCHDIR}/old-ffmpeg-patch
-.endif
-
 # compatible knobs.
 .if defined(WITH_DEBUG)
 DEBUG=	yes
@@ -152,12 +180,20 @@ CONFIGURE_ARGS+=--disable-loader
 .endif
 
 .if !defined(WITHOUT_WXGTK)
-USE_WX=		2.6
+USE_WX=		2.8
+WX_UNICODE=	yes
 CONFIGURE_ARGS+=--enable-wxwidgets
 .else
 CONFIGURE_ARGS+=--disable-wxwidgets
 .endif
 
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=--enable-hal
+.else
+CONFIGURE_ARGS+=--disable-hal
+.endif
+
 .if (defined(WITH_ARTS) || exists(${LOCALBASE}/lib/libartsc.so)) && !defined(WITHOUT_ARTS)
 LIB_DEPENDS+=	 artsc.0:${PORTSDIR}/audio/arts
 CONFIGURE_ARGS+=	--enable-arts
@@ -176,8 +212,7 @@ CONFIGUE_ARGS+=		--disable-bonjour
 LIB_DEPENDS+=	vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
 		cdio.7:${PORTSDIR}/sysutils/libcdio
 CONFIGURE_ARGS+=--enable-vcd \
-		--disable-libcdio \
-		--disable-libcddb \
+		--enable-libcddb \
 		--disable-cddax
 .else
 CONFIGURE_ARGS+=--disable-vcd \
@@ -264,13 +299,13 @@ CONFIGURE_ARGS+=--enable-aa
 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
+.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
+.endif
 
 .if !defined(WITHOUT_X264)
 CONFIGURE_ARGS+=--enable-x264
@@ -305,13 +340,6 @@ CONFIGURE_ARGS+=--enable-dts
 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_HTTPD)
 CONFIGURE_ARGS+=--disable-httpd
 .endif
@@ -362,7 +390,7 @@ CONFIGURE_ARGS+=--enable-libmpeg2
 CONFIGURE_ARGS+=--disable-libmpeg2
 .endif
 
-.if defined(WITH_REALAUDIO)
+.if !defined(WITHOUT_REALAUDIO)
 CONFIGURE_ARGS+=	--enable-real \
 			--enable-realrtsp
 .endif
@@ -381,10 +409,10 @@ CONFIGURE_ARGS+=--disable-theora
 
 .if (defined(WITH_LIVEMEDIA) || exists(${LOCALBASE}/live/liveMedia/libliveMedia.a)) && !defined(WITHOUT_LIVEMEDIA)
 BUILD_DEPENDS+=	${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
-CONFIGURE_ARGS+=--enable-livedotcom \
-		--with-livedotcom-tree=${LOCALBASE}/live
+CONFIGURE_ARGS+=--enable-live555 \
+		--with-live555-tree=${LOCALBASE}/live
 .else
-CONFIGURE_ARGS+=--disable-livedotcom
+CONFIGURE_ARGS+=--disable-live555
 .endif
 
 .if !defined(WITHOUT_MAD)
@@ -396,6 +424,20 @@ CONFIGURE_ARGS+=--enable-mad \
 CONFIGURE_ARGS+=--disable-mad
 .endif
 
+.if !defined(WITHOUT_MODDEMUX)
+LIB_DEPENDS+=	modplug.0:${PORTSDIR}/audio/libmodplug
+CONFIGURE_ARGS+=--enable-mod
+.else
+CONFIGURE_ARGS+=--disable-mod
+.endif
+
+.if !defined(WITHOUT_MPCDEMUX)
+LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
+CONFIGURE_ARGS+=--enable-mpc
+.else
+CONFIGURE_ARGS+=--disable-mpc
+.endif
+
 .if !defined(WITHOUT_OGG)
 LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
 CONFIGURE_ARGS+=--enable-ogg
@@ -433,7 +475,7 @@ CONFIGURE_ARGS+=--disable-sdl
 RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
 .endif
 
-.if !defined(WITHOUT_HTTPD) && (defined(WITH_SSL) || exists(${LOCALBASE}/lib/libgnutls.a))
+.if !defined(WITHOUT_HTTPD)
 LIB_DEPENDS+=	gnutls.15:${PORTSDIR}/security/gnutls
 CONFIGURE_ARGS+=--enable-gnutls
 .else
diff --git a/multimedia/vlc/Makefile.inc b/multimedia/vlc/Makefile.inc
index 266816021dde..503fe2b03a17 100644
--- a/multimedia/vlc/Makefile.inc
+++ b/multimedia/vlc/Makefile.inc
@@ -1,12 +1,11 @@
-
 # 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
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc/Makefile.inc,v 1.3 2006/09/30 18:15:02 ahze Exp $
-#
+#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.8 2006/10/01 18:16:43 ahze Exp $
+#      $Id: Makefile.inc 6 2006-09-27 14:05:34Z buhnux $
 # If you define for example WITH_FAAD and WITHOUT_FAAD
 # the WITHOUT_ will always over ride the WITH_.
 #
@@ -50,14 +49,21 @@
 # WITH_FLAC=yes
 #  Flac Support
 #
+
 # WITHOUT_LAME=yes
 #  Mp3 encoder Support
 #   ** NOT DEFINED if PACKAGE_BUILDING is defined **
 #
 # WITHOUT_A52=yes
-#  liba52 audio Support
+#  liba52 audio support
+#
+# WITHOUT_MODDEMUX
+#  ModPlug mod-like music support
 #
-# WITH_REALAUDIO
+# WITHOUT_MPCDEMUX
+#  Musepack audio compression support
+#
+# WITHOUT_REALAUDIO
 #  Real audio(R) support
 #
 # WITH_SHOUT
@@ -90,9 +96,6 @@
 # WITH_CACA=yes
 #  Console Graphics Support (implies WITH_AALIB)
 #
-# WITH_DV=yes
-#  Digital video input
-#
 # WITH_FRIBIDI=yes
 #
 # WITH_GGI=yes
@@ -107,6 +110,7 @@
 #
 # WITH_XOSD=yes
 #
+
 # Multimedia Knobs:
 #
 # WITH_DIRAC
@@ -124,12 +128,6 @@
 # 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
@@ -150,6 +148,9 @@
 # WITHOUT_AVAHI=yes
 #  Avahi (Rendezvous/Bonjour (R) ) networking
 #
+# WITHOUT_DBUS=yes
+#  Disable d-bus support
+#
 # WITH_DEBUG=yes
 #  Enable debuging support
 #
@@ -181,6 +182,9 @@
 # WITHOUT_GNOMEVFS
 #  GnomeVFS support
 #
+# WITHOUT_HAL=yes
+#  Disable HAL support
+#
 # WITH_OPENGL=yes
 #  Enable OpenGL visual plugin (not playback, play back is default with X11)
 #
@@ -221,15 +225,6 @@
 #  Do not install Vlc's Documents
 #
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Take a careful look at Makefile.inc in order"
-	@${ECHO_MSG} "to learn how to tune VLC to your personal preferences!"
-	@${ECHO_MSG} ""
-.if !defined(BATCH) || !defined(PACKAGE_BUILDING)
-	@sleep 3
-.endif
-
 post-patch:
 # Subtitle default font
 	@${REINPLACE_CMD} -e \
@@ -255,10 +250,6 @@ post-patch:
 		-e 's/-lc_r/${PTHREAD_LIBS}/' \
 		-e 's|-mcpu=pentiumpro||' \
 		${WRKSRC}/configure
-.if ${FFMPEG:L}=="old"
-	@${REINPLACE_CMD} -e 's|postproc/postprocess.h|ffmpeg/postproc/postprocess.h|' \
-			${WRKSRC}/configure
-.endif
 # cdrom/dvd support
 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \
 		s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
@@ -270,11 +261,22 @@ post-patch:
 		${WRKSRC}/loader/module.c
 .endif
 
+pre-configure:
+.if !exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) && exists(${LOCALBASE}/lib/libavformat.a)
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "ERROR: ${PKGNAME} requires a newer version of FFMpeg"
+	@${ECHO_CMD} "please deinstall multimedia/ffmpeg before continuing"
+	@${ECHO_CMD} "the build."
+	@${ECHO_CMD} ""
+	@${FALSE}
+.endif
+
+
 pre-build:
 	@${REINPLACE_CMD} -e 's|/intl/libintl.a|${WRKSRC}/intl/libintl.a|' \
 		${WRKSRC}/vlc-config
 
-pre-install:
+pre-install: build
 	${RM} -rf ${PLIST} ${FAKEDIR}
 	${MKDIR} ${FAKEDIR}
 	${TOUCH} -f ${PLIST}
@@ -284,15 +286,14 @@ pre-install:
 .endif
 .if !defined(WITHOUT_WXGTK)
 	${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST}
-	${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST}
+	${ECHO_CMD} "share/applications/vlc.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}
-	${RM} -f ${FAKEDIR}/share/locale/locale.alias \
-		 ${FAKEDIR}/lib/charset.alias
+	${RM} -f ${FAKEDIR}/share/locale/locale.alias
 	cd ${FAKEDIR}/bin && ${FIND} -s * | \
 		${SED} -e 's|^|bin/|' >> ${PLIST}
 	cd ${FAKEDIR}/include && ${FIND} -s * -type f -o -type l | \
@@ -327,7 +328,7 @@ pre-install:
 	cd ${FAKEDIR}/mozilla && ${FIND} -s * | \
 		${SED} -e 's|^|lib/browser_plugins/|' >> ${PLIST}
 .endif
-.for locale in my oc ps tet tl
+.for locale in co fur 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
@@ -362,7 +363,7 @@ do-install:
 	${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} ${FILESDIR}/vlc.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png
 .endif
 .endif
diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo
index 28ea6025936b..b8be9d9176a6 100644
--- a/multimedia/vlc/distinfo
+++ b/multimedia/vlc/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-0.8.5.tar.bz2) = 16bb5bf87ed94879a8eb7b0ff9b4f16f
-SHA256 (vlc-0.8.5.tar.bz2) = 48bc557bec16b48a304e5e760aef10e1c3cca2d74a011bc900bd1768d9ee79fa
-SIZE (vlc-0.8.5.tar.bz2) = 8562996
+MD5 (vlc-0.8.6b.tar.bz2) = eef8e95e34a3e0d2414b080cb7a1f749
+SHA256 (vlc-0.8.6b.tar.bz2) = 1a101f517485cd1bcabac5c4d180421d34e86af78710ed858ec61f78e3602377
+SIZE (vlc-0.8.6b.tar.bz2) = 10479890
diff --git a/multimedia/vlc/files/old-ffmpeg-patch b/multimedia/vlc/files/old-ffmpeg-patch
deleted file mode 100644
index a7129ec3e6b2..000000000000
--- a/multimedia/vlc/files/old-ffmpeg-patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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 );
---- 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-"
---- 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-configure b/multimedia/vlc/files/patch-configure
index d5326ad5963f..e7e6e9e29b77 100644
--- a/multimedia/vlc/files/patch-configure
+++ b/multimedia/vlc/files/patch-configure
@@ -1,19 +1,16 @@
---- 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;}
+--- configure.orig	Fri Dec  8 20:33:49 2006
++++ configure	Sun Dec 10 09:40:46 2006
+@@ -2412,8 +2412,7 @@
+ done
+ if test -z "$ac_aux_dir"; then
+   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;}
 -   { (exit 1); exit 1; }; }
-+	echo "not found"
-     fi
-   else
++echo "$as_me: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&2;} }
+ fi
  
-@@ -21361,8 +21357,7 @@
+ # These three variables are undocumented and unsupported,
+@@ -37873,8 +37872,7 @@
          if test -n "${enable_dv}"
          then
            { { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5
@@ -23,9 +20,9 @@
          fi
  
  fi
-@@ -21381,8 +21376,7 @@
-             echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+@@ -37893,8 +37891,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; }; }
@@ -33,7 +30,7 @@
      fi
      if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a"
      then
-@@ -21610,8 +21604,7 @@
+@@ -38113,8 +38110,7 @@
          if test -n "${enable_dv}"
          then
            { { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5
diff --git a/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c b/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c
deleted file mode 100644
index 1ed5bda68d4a..000000000000
--- a/multimedia/vlc/files/patch-modules_codec_ffmpeg_video.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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 93a3fc8debd0..000000000000
--- a/multimedia/vlc/files/patch-modules_codec_x264.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- modules/codec/x264.c.orig	Sat May  6 15:52:19 2006
-+++ modules/codec/x264.c	Fri Nov  3 16:47:49 2006
-@@ -547,7 +547,7 @@
- 
-     /* cbr = 1 overrides qp or crf and sets an average bitrate
-        but maxrate = average bitrate is needed for "real" CBR */
--    if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.b_cbr = 1;
-+    if( p_sys->param.rc.i_bitrate > 0 ) p_sys->param.rc.i_rc_method = 1;
- 
-     var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
-     if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
-@@ -737,7 +737,11 @@
- #if X264_BUILD >= 37
-     var_Get( p_enc, SOUT_CFG_PREFIX "crf", &val ); 
-     if( val.i_int >= 0 && val.i_int <= 51 ) /* crf != 0 overrides qp */
-+#if X264_BUILD >= 54
-+        p_sys->param.rc.f_rf_constant = val.i_int;
-+#else
-         p_sys->param.rc.i_rf_constant = val.i_int;
-+#endif
- #endif
- 
- #if X264_BUILD >= 39
diff --git a/multimedia/vlc/files/patch-modules_control_corba_corba.c b/multimedia/vlc/files/patch-modules_control_corba_corba.c
deleted file mode 100644
index 040a156cae8b..000000000000
--- a/multimedia/vlc/files/patch-modules_control_corba_corba.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- modules/control/corba/corba.c.orig	Sun Aug 20 00:16:21 2006
-+++ modules/control/corba/corba.c	Sun Aug 20 00:17:24 2006
-@@ -28,8 +28,8 @@
- #include "MediaControl.h"
- #include "orbit/poa/portableserver-poa-type.h"
- 
--#include <vlc/control.h>
- #include <vlc/vlc.h>
-+#include <vlc/mediacontrol.h>
- #include <vlc/intf.h>
- #include <vlc/vout.h>
- #include <vlc/aout.h>
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-src_misc_charset.c b/multimedia/vlc/files/patch-src_misc_charset.c
deleted file mode 100644
index 2fe21e7c4343..000000000000
--- a/multimedia/vlc/files/patch-src_misc_charset.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/misc/charset.c.orig	Mon May 29 15:08:35 2006
-+++ src/misc/charset.c	Mon May 29 15:09:00 2006
-@@ -570,7 +570,9 @@
-     /* Some systems (like Darwin, SunOS 4 or DJGPP) have only the C locale.
-      * Therefore we don't use setlocale here; it would return "C". */
- #  if HAVE_SETLOCALE && !__APPLE__
-+#  if defined LC_ALL
-     psz_lang = setlocale( LC_ALL, NULL );
-+#  endif
- #  endif
-     if( psz_lang == NULL || psz_lang[0] == '\0' )
-     {
diff --git a/multimedia/vlc/files/patch-vlc-0.8.6-MOAB-02-01-2007 b/multimedia/vlc/files/patch-vlc-0.8.6-MOAB-02-01-2007
deleted file mode 100644
index 5e41d1ed3c51..000000000000
--- a/multimedia/vlc/files/patch-vlc-0.8.6-MOAB-02-01-2007
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ru vlc-0.8.6.orig/modules/access/cdda/access.c vlc-0.8.6/modules/access/cdda/access.c
---- modules/access/cdda/access.c	2007-01-03 10:01:09.000000000 +0100
-+++ modules/access/cdda/access.c	2007-01-03 10:02:45.000000000 +0100
-@@ -89,17 +89,17 @@
-   case CDIO_LOG_DEBUG:
-   case CDIO_LOG_INFO:
-     if (p_cdda->i_debug & INPUT_DBG_CDIO)
--      msg_Dbg( p_cdda_input, message);
-+      msg_Dbg( p_cdda_input, "%s", message);
-     break;
-   case CDIO_LOG_WARN:
--    msg_Warn( p_cdda_input, message);
-+    msg_Warn( p_cdda_input, "%s", message);
-     break;
-   case CDIO_LOG_ERROR:
-   case CDIO_LOG_ASSERT:
--    msg_Err( p_cdda_input, message);
-+    msg_Err( p_cdda_input, "%s", message);
-     break;
-   default:
--    msg_Warn( p_cdda_input, message,
-+    msg_Warn( p_cdda_input, "%s\n%s %d", message,
-             "the above message had unknown cdio log level",
-             level);
-   }
-diff -ru vlc-0.8.6.orig/modules/access/vcdx/access.c vlc-0.8.6/modules/access/vcdx/access.c
---- modules/access/vcdx/access.c	2007-01-03 10:01:10.000000000 +0100
-+++ modules/access/vcdx/access.c	2007-01-03 10:01:52.000000000 +0100
-@@ -92,17 +92,17 @@
-   case CDIO_LOG_DEBUG:
-   case CDIO_LOG_INFO:
-     if (p_vcdplayer->i_debug & INPUT_DBG_CDIO)
--      msg_Dbg( p_vcd_access, message);
-+      msg_Dbg( p_vcd_access, "%s", message);
-     break;
-   case CDIO_LOG_WARN:
--    msg_Warn( p_vcd_access, message);
-+    msg_Warn( p_vcd_access, "%s", message);
-     break;
-   case CDIO_LOG_ERROR:
-   case CDIO_LOG_ASSERT:
--    msg_Err( p_vcd_access, message);
-+    msg_Err( p_vcd_access, "%s", message);
-     break;
-   default:
--    msg_Warn( p_vcd_access, message,
-+    msg_Warn( p_vcd_access, "%s\n%s %d", message,
-             _("The above message had unknown log level"),
-             level);
-   }
-@@ -118,14 +118,14 @@
-   case VCD_LOG_DEBUG:
-   case VCD_LOG_INFO:
-     if (p_vcdplayer->i_debug & INPUT_DBG_VCDINFO)
--      msg_Dbg( p_vcd_access, message);
-+      msg_Dbg( p_vcd_access, "%s", message);
-     break;
-   case VCD_LOG_WARN:
--    msg_Warn( p_vcd_access, message);
-+    msg_Warn( p_vcd_access, "%s", message);
-     break;
-   case VCD_LOG_ERROR:
-   case VCD_LOG_ASSERT:
--    msg_Err( p_vcd_access, message);
-+    msg_Err( p_vcd_access, "%s", message);
-     break;
-   default:
-     msg_Warn( p_vcd_access, "%s\n%s %d", message,
diff --git a/multimedia/vlc/files/patch-wxgtk28 b/multimedia/vlc/files/patch-wxgtk28
new file mode 100644
index 000000000000..adcb742a7573
--- /dev/null
+++ b/multimedia/vlc/files/patch-wxgtk28
@@ -0,0 +1,10 @@
+--- modules/gui/wxwidgets/dialogs.cpp
++++ modules/gui/wxwidgets/dialogs.cpp
+@@ -380,7 +380,7 @@
+     {
+         p_file_generic_dialog->SetMessage( wxU(p_arg->psz_title) );
+         p_file_generic_dialog->SetWildcard( wxU(p_arg->psz_extensions) );
+-        p_file_generic_dialog->SetStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
++        p_file_generic_dialog->SetWindowStyle( (p_arg->b_save ? wxSAVE : wxOPEN) |
+                                          (p_arg->b_multiple ? wxMULTIPLE:0) );
+     }
diff --git a/multimedia/vlc/files/wxvlc.desktop b/multimedia/vlc/files/vlc.desktop
index c95dd3f62a8c..c95dd3f62a8c 100644
--- a/multimedia/vlc/files/wxvlc.desktop
+++ b/multimedia/vlc/files/vlc.desktop