Initial revision

11 files changed, 594 insertions, 0 deletions

diff --git a/vlc/build/faad2-remove-bmp.patch b/vlc/build/faad2-remove-bmp.patch
new file mode 100644
index 00000000..89651394
--- /dev/null
+++ b/vlc/build/faad2-remove-bmp.patch
@@ -0,0 +1,76 @@
+diff -ur faad2.orig/configure.in faad2/configure.in
+--- faad2.orig/configure.in	2006-08-13 16:13:31.000000000 +0200
++++ faad2/configure.in	2006-08-14 12:03:07.000000000 +0200
+@@ -29,9 +29,6 @@
+ AC_ARG_WITH(xmms,[  --with-xmms             compile XMMS-1 plugin],

+ 	     WITHXMMS=$withval, WITHXMMS=no)

+ 

+-AC_ARG_WITH(bmp,[  --with-bmp              compile beep media player plugin],

+-	     [WITHBMP=$withval;WITHXMMS=$withval], [WITHBMP=no])

+-

+ AC_ARG_WITH(drm,[  --with-drm              compile libfaad with DRM support],

+ 	     WITHDRM=$withval, WITHDRM=no)

+ 

+@@ -114,12 +111,6 @@
+  AM_CONDITIONAL(HAVE_XMMS, false)

+ fi

+ 

+-if test x$WITHBMP = xyes; then

+-  AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])

+-  AM_CONDITIONAL([HAVE_XMMS], true)

+-  AM_CONDITIONAL([HAVE_BMP], true)

+-fi

+-

+ if test x$WITHDRM = xyes; then

+   AC_DEFINE(DRM, 1, [Define if you want to use libfaad together with Digital Radio Mondiale (DRM)])

+   AC_DEFINE(DRM_PS, 1, [Define if you want support for Digital Radio Mondiale (DRM) parametric stereo])

+diff -ur faad2.orig/plugins/Makefile.am faad2/plugins/Makefile.am
+--- faad2.orig/plugins/Makefile.am	2006-08-07 20:47:45.000000000 +0200
++++ faad2/plugins/Makefile.am	2006-08-14 11:35:44.000000000 +0200
+@@ -1,17 +1,13 @@
+-if HAVE_MPEG4IP_PLUG

+-if HAVE_XMMS

+-SUBDIRS = xmms mpeg4ip

+-else

+-SUBDIRS = mpeg4ip

+-endif #HAVE_XMMS

+-else

+-if HAVE_XMMS

+-SUBDIRS = xmms

+-else

+-if HAVE_BMP

+-SUBDIRS = bmp

+-else

+-SUBDIRS =

+-endif #HAVE_BMP

+-endif #HAVE_XMMS

+-endif #HAVE_MPEG4IP_PLUG

++if HAVE_MPEG4IP_PLUG
++if HAVE_XMMS
++SUBDIRS = xmms mpeg4ip
++else
++SUBDIRS = mpeg4ip
++endif #HAVE_XMMS
++else
++if HAVE_XMMS
++SUBDIRS = xmms
++else
++SUBDIRS =
++endif #HAVE_XMMS
++endif #HAVE_MPEG4IP_PLUG
+diff -ur faad2.orig/plugins/xmms/src/Makefile.am faad2/plugins/xmms/src/Makefile.am
+--- faad2.orig/plugins/xmms/src/Makefile.am	2006-08-07 20:47:45.000000000 +0200
++++ faad2/plugins/xmms/src/Makefile.am	2006-08-14 12:06:15.000000000 +0200
+@@ -1,12 +1,6 @@
+-if HAVE_BMP

+-libdir=$(shell pkg-config --variable=input-plugin-dir bmp)

+-local_CFLAGS=$(shell pkg-config --cflags bmp)

+-local_LDFLAGS=$(shell pkg-config --libs bmp)

+-else

+ local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall

+ local_LDFLAGS=`$(XMMS_CONFIG) --libs`

+ libdir = `$(XMMS_CONFIG) --input-plugin-dir`

+-endif #HAVE_BMP

+ lib_LTLIBRARIES = libmp4.la

+ 

+ libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \

diff --git a/vlc/build/ffmpeg-0.4.9-pre1-gcc4-1.patch b/vlc/build/ffmpeg-0.4.9-pre1-gcc4-1.patch
new file mode 100644
index 00000000..07e3a87a
--- /dev/null
+++ b/vlc/build/ffmpeg-0.4.9-pre1-gcc4-1.patch
@@ -0,0 +1,115 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-09-07
+Initial Package Version: 0.4.9-pre1
+Upstream Status:         Some fixes unknown, the MMX fix is from upstream CVS
+Origin:                  Frugalware Linux (frugalware.org)
+                         http://frugalware.org/pipermail/frugalware-darcs/2005-August/003296.html
+                         Also the MMX fix is from upstream CVS
+                         http://www1.mplayerhq.hu/cgi-bin/cvsweb.cgi/ffmpeg/libavcodec/i386/dsputil_mmx.c.diff?r1=1.88&r2=1.89&cvsroot=FFMpeg
+Description:             Fixes GCC-4.0.1 build problems
+
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/ac3.h ffmpeg-0.4.9-pre1/libavcodec/ac3.h
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/ac3.h	2003-03-06 11:32:04.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/ac3.h	2005-09-07 18:50:35.000000000 +0000
+@@ -43,6 +43,7 @@
+     int cplfleak, cplsleak;
+ } AC3BitAllocParameters;
+ 
++#if 0
+ extern const uint16_t ac3_freqs[3];
+ extern const uint16_t ac3_bitratetab[19];
+ extern const int16_t ac3_window[256];
+@@ -52,6 +53,7 @@
+ extern const uint16_t dbkneetab[4];
+ extern const uint16_t floortab[8];
+ extern const uint16_t fgaintab[8];
++#endif
+ 
+ void ac3_common_init(void);
+ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/avcodec.h ffmpeg-0.4.9-pre1/libavcodec/avcodec.h
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/avcodec.h	2004-07-09 12:49:55.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/avcodec.h	2005-09-07 18:49:40.000000000 +0000
+@@ -1657,6 +1657,14 @@
+ #define FF_OPT_MAX_DEPTH 10
+ } AVOption;
+ 
++struct AVOption;
++#ifdef HAVE_MMX
++extern const struct AVOption avoptions_common[3 + 5];
++#else
++extern const struct AVOption avoptions_common[3];
++#endif
++extern const struct AVOption avoptions_workaround_bug[11];
++
+ /**
+  * Parse option(s) and sets fields in passed structure
+  * @param strct	structure where the parsed results will be written
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/common.h ffmpeg-0.4.9-pre1/libavcodec/common.h
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/common.h	2004-07-01 12:33:07.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/common.h	2005-09-07 18:49:40.000000000 +0000
+@@ -62,14 +62,6 @@
+ #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
+ #define AVOPTION_END() AVOPTION_SUB(NULL)
+ 
+-struct AVOption;
+-#ifdef HAVE_MMX
+-extern const struct AVOption avoptions_common[3 + 5];
+-#else
+-extern const struct AVOption avoptions_common[3];
+-#endif
+-extern const struct AVOption avoptions_workaround_bug[11];
+-
+ #endif /* HAVE_AV_CONFIG_H */
+ 
+ /* Suppress restrict if it was not defined in config.h.  */
+
+diff -Naur ffmpeg-0.4.9-pre1-orig/libavcodec/i386/dsputil_mmx.c ffmpeg-0.4.9-pre1/libavcodec/i386/dsputil_mmx.c
+--- ffmpeg-0.4.9-pre1-orig/libavcodec/i386/dsputil_mmx.c	2004-06-08 02:13:44.000000000 +0000
++++ ffmpeg-0.4.9-pre1/libavcodec/i386/dsputil_mmx.c	2005-09-07 18:54:04.000000000 +0000
+@@ -644,26 +644,22 @@
+         "punpcklwd %%mm0, %%mm1		\n\t"
+         "punpckhwd %%mm4, %%mm3		\n\t"
+         "punpckhwd %%mm0, %%mm6		\n\t"
+-        "movd %%mm5, %0			\n\t"
+-        "punpckhdq %%mm5, %%mm5		\n\t"
+-        "movd %%mm5, %1			\n\t"
+-        "movd %%mm3, %2			\n\t"
+-        "punpckhdq %%mm3, %%mm3		\n\t"
+-        "movd %%mm3, %3			\n\t"
+-        "movd %%mm1, %4			\n\t"
+-        "punpckhdq %%mm1, %%mm1		\n\t"
+-        "movd %%mm1, %5			\n\t"
+-        "movd %%mm6, %6			\n\t"
+-        "punpckhdq %%mm6, %%mm6		\n\t"
+-        "movd %%mm6, %7			\n\t"
+-        : "=m" (*(uint32_t*)(src + 0*stride)),
+-          "=m" (*(uint32_t*)(src + 1*stride)),
+-          "=m" (*(uint32_t*)(src + 2*stride)),
+-          "=m" (*(uint32_t*)(src + 3*stride)),
+-          "=m" (*(uint32_t*)(src + 4*stride)),
+-          "=m" (*(uint32_t*)(src + 5*stride)),
+-          "=m" (*(uint32_t*)(src + 6*stride)),
+-          "=m" (*(uint32_t*)(src + 7*stride))
++        "movd %%mm5, (%0)               \n\t" 
++        "punpckhdq %%mm5, %%mm5         \n\t" 
++        "movd %%mm5, (%0,%2)            \n\t" 
++        "movd %%mm3, (%0,%2,2)          \n\t" 
++        "punpckhdq %%mm3, %%mm3         \n\t" 
++        "movd %%mm3, (%0,%3)            \n\t" 
++        "movd %%mm1, (%1)               \n\t" 
++        "punpckhdq %%mm1, %%mm1         \n\t" 
++        "movd %%mm1, (%1,%2)            \n\t" 
++        "movd %%mm6, (%1,%2,2)          \n\t" 
++        "punpckhdq %%mm6, %%mm6         \n\t" 
++        "movd %%mm6, (%1,%3)            \n\t" 
++        :: "r" (src), 
++        "r" (src + 4*stride), 
++        "r" ((long)   stride ), 
++        "r" ((long)(3*stride)) 
+     );
+ }
+ 
diff --git a/vlc/build/ffmpeg-faac.patch b/vlc/build/ffmpeg-faac.patch
new file mode 100644
index 00000000..eb6eef88
--- /dev/null
+++ b/vlc/build/ffmpeg-faac.patch
@@ -0,0 +1,72 @@
+--- faac.c.orig	2007-02-28 10:56:15.000000000 +0100
++++ faac.c	2007-03-16 03:14:30.000000000 +0100
+@@ -28,28 +28,28 @@
+ #include <faac.h>
+ 
+ typedef struct FaacAudioContext {
+-    faacEncHandle faac_handle;
++    NeAACEncHandle faac_handle;
+ } FaacAudioContext;
+ 
+ static int Faac_encode_init(AVCodecContext *avctx)
+ {
+     FaacAudioContext *s = avctx->priv_data;
+-    faacEncConfigurationPtr faac_cfg;
++    NeAACEncConfigurationPtr faac_cfg;
+     unsigned long samples_input, max_bytes_output;
+ 
+     /* number of channels */
+     if (avctx->channels < 1 || avctx->channels > 6)
+         return -1;
+ 
+-    s->faac_handle = faacEncOpen(avctx->sample_rate,
++    s->faac_handle = NeAACEncOpen(avctx->sample_rate,
+                                  avctx->channels,
+                                  &samples_input, &max_bytes_output);
+ 
+     /* check faac version */
+-    faac_cfg = faacEncGetCurrentConfiguration(s->faac_handle);
++    faac_cfg = NeAACEncGetCurrentConfiguration(s->faac_handle);
+     if (faac_cfg->version != FAAC_CFG_VERSION) {
+         av_log(avctx, AV_LOG_ERROR, "wrong libfaac version (compiled for: %d, using %d)\n", FAAC_CFG_VERSION, faac_cfg->version);
+-        faacEncClose(s->faac_handle);
++        NeAACEncClose(s->faac_handle);
+         return -1;
+     }
+ 
+@@ -79,7 +79,7 @@
+         unsigned char *buffer = NULL;
+         unsigned long decoder_specific_info_size;
+ 
+-        if (!faacEncGetDecoderSpecificInfo(s->faac_handle, &buffer,
++        if (!NeAACEncGetDecoderSpecificInfo(s->faac_handle, &buffer,
+                                            &decoder_specific_info_size)) {
+             avctx->extradata = av_malloc(decoder_specific_info_size + FF_INPUT_BUFFER_PADDING_SIZE);
+             avctx->extradata_size = decoder_specific_info_size;
+@@ -91,7 +91,7 @@
+ #define free please_use_av_free
+     }
+ 
+-    if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) {
++    if (!NeAACEncSetConfiguration(s->faac_handle, faac_cfg)) {
+         av_log(avctx, AV_LOG_ERROR, "libfaac doesn't support this output format!\n");
+         return -1;
+     }
+@@ -105,7 +105,7 @@
+     FaacAudioContext *s = avctx->priv_data;
+     int bytes_written;
+ 
+-    bytes_written = faacEncEncode(s->faac_handle,
++    bytes_written = NeAACEncEncode(s->faac_handle,
+                                   data,
+                                   avctx->frame_size * avctx->channels,
+                                   frame,
+@@ -121,7 +121,7 @@
+     av_freep(&avctx->coded_frame);
+     av_freep(&avctx->extradata);
+ 
+-    faacEncClose(s->faac_handle);
++    NeAACEncClose(s->faac_handle);
+     return 0;
+ }
+ 
diff --git a/vlc/build/slack-desc b/vlc/build/slack-desc
new file mode 100644
index 00000000..543a6ed9
--- /dev/null
+++ b/vlc/build/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+vlc: vlc (multimedia player for various audio and video formats)
+vlc:
+vlc: VLC media player is a highly portable multimedia player for various
+vlc: audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...)
+vlc: as well as DVDs, VCDs, and various streaming protocols.
+vlc: It can also be used as a server to stream in unicast or multicast in
+vlc: IPv4 or IPv6 on a high-bandwidth network.
+vlc:
+vlc:
+vlc: vlc home: http://www.videolan.org/vlc/
+vlc:
diff --git a/vlc/build/slack-desc.mozplugin b/vlc/build/slack-desc.mozplugin
new file mode 100644
index 00000000..6e78a578
--- /dev/null
+++ b/vlc/build/slack-desc.mozplugin
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+             |-----handy-ruler------------------------------------------------------|
+vlc-mozplugin: vlc-mozplugin (Videolan plugin for Mozilla browsers)
+vlc-mozplugin:
+vlc-mozplugin: VLC media player is a multimedia player for various audio and
+vlc-mozplugin: video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...)
+vlc-mozplugin: as well as DVDs, VCDs, and various streaming protocols.
+vlc-mozplugin:
+vlc-mozplugin: Install this package if you need Videolan plugin for your
+vlc-mozplugin: Mozilla based browsers.
+vlc-mozplugin:
+vlc-mozplugin: vlc home: http://www.videolan.org/vlc/
+vlc-mozplugin:
diff --git a/vlc/build/vlc-0.8.6-ffmpegX11.patch b/vlc/build/vlc-0.8.6-ffmpegX11.patch
new file mode 100644
index 00000000..215bb7c1
--- /dev/null
+++ b/vlc/build/vlc-0.8.6-ffmpegX11.patch
@@ -0,0 +1,42 @@
+diff -Naupr vlc-0.8.6.orig/configure vlc-0.8.6/configure
+--- vlc-0.8.6.orig/configure	2006-12-09 02:33:49.000000000 +0100
++++ vlc-0.8.6/configure	2006-12-15 19:49:50.000000000 +0100
+@@ -43190,7 +43190,7 @@ if test "${with_ffmpeg_mp3lame+set}" = s
+      if test "$with_ffmpeg_mp3lame" = "yes";	then
+ 
+   for element in ffmpeg; do
+-    eval "LDFLAGS_${element}="'"'"-lmp3lame "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-lmp3lame -lX11 -lXext "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+@@ -43432,7 +43432,7 @@ echo "${ECHO_T}${real_ffmpeg_tree}/libav
+      if test "${with_ffmpeg_mp3lame}" != "yes"; then
+ 
+   for element in ffmpeg; do
+-    eval "LDFLAGS_${element}="'"'"-lmp3lame "'$'"{LDFLAGS_${element}} "'"'
++    eval "LDFLAGS_${element}="'"'"-lmp3lame -lX11 -lXext "'$'"{LDFLAGS_${element}} "'"'
+     am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+   done
+ 
+diff -Naupr vlc-0.8.6.orig/configure.ac vlc-0.8.6/configure.ac
+--- vlc-0.8.6.orig/configure.ac	2006-12-09 02:32:53.000000000 +0100
++++ vlc-0.8.6/configure.ac	2006-12-15 19:49:17.000000000 +0100
+@@ -2512,7 +2512,7 @@ dnl Those options have to be here becaus
+    [    --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support],
+    [
+      if test "$with_ffmpeg_mp3lame" = "yes";	then
+-     	VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame])
++     	VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame -lX11 -lXext])
+      fi])
+ 
+  AC_ARG_WITH(ffmpeg-faac,
+@@ -2602,7 +2602,7 @@ dnl Those options have to be here becaus
+    fi
+    if fgrep -s "CONFIG_MP3LAME=yes" "${real_ffmpeg_tree}/config.mak"; then
+      if test "${with_ffmpeg_mp3lame}" != "yes"; then
+-       VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame])
++       VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame -lX11 -lXext])
+      fi
+    fi
+    if fgrep -s "CONFIG_FAAC=yes" "${real_ffmpeg_tree}/config.mak"; then
diff --git a/vlc/build/vlc-0.8.6-wx28.patch b/vlc/build/vlc-0.8.6-wx28.patch
new file mode 100644
index 00000000..82fb0489
--- /dev/null
+++ b/vlc/build/vlc-0.8.6-wx28.patch
@@ -0,0 +1,12 @@
+diff -Naupr vlc-0.8.6.orig/modules/gui/wxwidgets/dialogs.cpp vlc-0.8.6/modules/gui/wxwidgets/dialogs.cpp
+--- vlc-0.8.6.orig/modules/gui/wxwidgets/dialogs.cpp	2006-12-09 02:12:14.000000000 +0100
++++ vlc-0.8.6/modules/gui/wxwidgets/dialogs.cpp	2007-01-08 15:05:02.000000000 +0100
+@@ -376,7 +376,7 @@ void DialogsProvider::OnOpenFileGeneric(
+     {
+         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/vlc/build/vlc-0.8.6a-faad2.patch b/vlc/build/vlc-0.8.6a-faad2.patch
new file mode 100644
index 00000000..94a803c0
--- /dev/null
+++ b/vlc/build/vlc-0.8.6a-faad2.patch
@@ -0,0 +1,101 @@
+diff -Naupr vlc-0.8.6a.orig/modules/codec/faad.c vlc-0.8.6a/modules/codec/faad.c
+--- vlc-0.8.6a.orig/modules/codec/faad.c	2007-01-03 19:27:59.000000000 +0100
++++ vlc-0.8.6a/modules/codec/faad.c	2007-01-08 19:52:35.000000000 +0100
+@@ -55,7 +55,7 @@ static void DoReordering( decoder_t *, u
+ struct decoder_sys_t
+ {
+     /* faad handler */
+-    faacDecHandle *hfaad;
++    NeAACDecHandle *hfaad;
+ 
+     /* samples */
+     audio_date_t date;
+@@ -95,7 +95,7 @@ static int Open( vlc_object_t *p_this )
+ {
+     decoder_t *p_dec = (decoder_t*)p_this;
+     decoder_sys_t *p_sys = p_dec->p_sys;
+-    faacDecConfiguration *cfg;
++    NeAACDecConfiguration *cfg;
+ 
+     if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','4','a') )
+     {
+@@ -111,7 +111,7 @@ static int Open( vlc_object_t *p_this )
+     }
+ 
+     /* Open a faad context */
+-    if( ( p_sys->hfaad = faacDecOpen() ) == NULL )
++    if( ( p_sys->hfaad = NeAACDecOpen() ) == NULL )
+     {
+         msg_Err( p_dec, "cannot initialize faad" );
+         return VLC_EGENERIC;
+@@ -136,7 +136,7 @@ static int Open( vlc_object_t *p_this )
+         unsigned long i_rate;
+         unsigned char i_channels;
+ 
+-        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
++        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
+                           p_dec->fmt_in.i_extra,
+                           &i_rate, &i_channels ) < 0 )
+         {
+@@ -155,12 +155,12 @@ static int Open( vlc_object_t *p_this )
+     }
+ 
+     /* Set the faad config */
+-    cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
++    cfg = NeAACDecGetCurrentConfiguration( p_sys->hfaad );
+     if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+         cfg->outputFormat = FAAD_FMT_FLOAT;
+     else
+         cfg->outputFormat = FAAD_FMT_16BIT;
+-    faacDecSetConfiguration( p_sys->hfaad, cfg );
++    NeAACDecSetConfiguration( p_sys->hfaad, cfg );
+ 
+     /* buffer */
+     p_sys->i_buffer = p_sys->i_buffer_size = 0;
+@@ -212,7 +212,7 @@ static aout_buffer_t *DecodeBlock( decod
+         unsigned long i_rate;
+         unsigned char i_channels;
+ 
+-        if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
++        if( NeAACDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
+                           p_dec->fmt_in.i_extra,
+                           &i_rate, &i_channels ) >= 0 )
+         {
+@@ -228,7 +228,7 @@ static aout_buffer_t *DecodeBlock( decod
+         unsigned char i_channels;
+ 
+         /* Init faad with the first frame */
+-        if( faacDecInit( p_sys->hfaad,
++        if( NeAACDecInit( p_sys->hfaad,
+                          p_sys->p_buffer, p_sys->i_buffer,
+                          &i_rate, &i_channels ) < 0 )
+         {
+@@ -257,16 +257,16 @@ static aout_buffer_t *DecodeBlock( decod
+     if( p_sys->i_buffer )
+     {
+         void *samples;
+-        faacDecFrameInfo frame;
++        NeAACDecFrameInfo frame;
+         aout_buffer_t *p_out;
+         int i, j;
+ 
+-        samples = faacDecDecode( p_sys->hfaad, &frame,
++        samples = NeAACDecDecode( p_sys->hfaad, &frame,
+                                  p_sys->p_buffer, p_sys->i_buffer );
+ 
+         if( frame.error > 0 )
+         {
+-            msg_Warn( p_dec, "%s", faacDecGetErrorMessage( frame.error ) );
++            msg_Warn( p_dec, "%s", NeAACDecGetErrorMessage( frame.error ) );
+ 
+             /* Flush the buffer */
+             p_sys->i_buffer = 0;
+@@ -403,7 +403,7 @@ static void Close( vlc_object_t *p_this 
+     decoder_t *p_dec = (decoder_t *)p_this;
+     decoder_sys_t *p_sys = p_dec->p_sys;
+ 
+-    faacDecClose( p_sys->hfaad );
++    NeAACDecClose( p_sys->hfaad );
+     if( p_sys->p_buffer ) free( p_sys->p_buffer );
+     free( p_sys );
+ }
diff --git a/vlc/build/vlc-0.8.6a_dirac.patch b/vlc/build/vlc-0.8.6a_dirac.patch
new file mode 100644
index 00000000..84bd75a6
--- /dev/null
+++ b/vlc/build/vlc-0.8.6a_dirac.patch
@@ -0,0 +1,93 @@
+Index: configure.ac
+===================================================================
+--- configure.ac (revision 19443)
++++ configure.ac (revision 19466)
+@@ -3531,5 +3531,5 @@
+ [  --enable-dirac          experimental dirac codec (default disabled)])
+ if test "${enable_dirac}" = "yes"; then
+-  PKG_CHECK_MODULES(DIRAC,dirac, [
++  PKG_CHECK_MODULES(DIRAC,[dirac >= 0.6.0], [
+       VLC_ADD_PLUGINS([dirac])
+       VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
+Index: modules/codec/dirac.c
+===================================================================
+--- modules/codec/dirac.c (revision 18062)
++++ modules/codec/dirac.c (revision 19466)
+@@ -146,11 +146,13 @@
+     int i_plane;
+ 
+-    p_dec->fmt_out.i_codec =
+-        p_sys->p_dirac->seq_params.chroma == format411 ?
+-        VLC_FOURCC('I','4','1','1') :
+-        p_sys->p_dirac->seq_params.chroma == format420 ?
+-        VLC_FOURCC('I','4','2','0') :
+-        p_sys->p_dirac->seq_params.chroma == format422 ?
+-        VLC_FOURCC('I','4','2','2') : 0;
++    switch( p_sys->p_dirac->seq_params.chroma )
++    {
++    case format420: p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0'); break;
++    case format422: p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','2'); break;
++    case format444: p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','4','4'); break;    // XXX 0.6 ?
++    default:        
++        p_dec->fmt_out.i_codec = 0;
++        break;
++    }
+ 
+     p_dec->fmt_out.video.i_visible_width =
+@@ -161,7 +163,7 @@
+ 
+     p_dec->fmt_out.video.i_frame_rate =
+-        p_sys->p_dirac->seq_params.frame_rate.numerator;
++        p_sys->p_dirac->src_params.frame_rate.numerator;
+     p_dec->fmt_out.video.i_frame_rate_base =
+-        p_sys->p_dirac->seq_params.frame_rate.denominator;
++        p_sys->p_dirac->src_params.frame_rate.denominator;
+ 
+     /* Get a new picture */
+@@ -169,7 +171,7 @@
+ 
+     if( p_pic == NULL ) return NULL;
+-
+-    p_pic->b_progressive = !p_sys->p_dirac->seq_params.interlace;
+-    p_pic->b_top_field_first = p_sys->p_dirac->seq_params.topfieldfirst;
++    p_pic->b_progressive = !p_sys->p_dirac->src_params.interlace;
++    p_pic->b_top_field_first = p_sys->p_dirac->src_params.topfieldfirst;
++
+     p_pic->i_nb_fields = 2;
+ 
+@@ -253,6 +255,6 @@
+                      p_sys->p_dirac->seq_params.height,
+                      p_sys->p_dirac->seq_params.chroma,
+-                     (float)p_sys->p_dirac->seq_params.frame_rate.numerator/
+-                     p_sys->p_dirac->seq_params.frame_rate.denominator );
++                     (float)p_sys->p_dirac->src_params.frame_rate.numerator/
++                     p_sys->p_dirac->src_params.frame_rate.denominator );
+ 
+             FreeFrameBuffer( p_sys->p_dirac );
+@@ -354,18 +356,16 @@
+     config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
+ 
+-    /* Initialse the encoder context with the presets for SD576 - Standard
+-     * Definition Digital (some parameters will be overwritten later on) */
+-    dirac_encoder_context_init( &p_sys->ctx, SD576 );
+-
+-    /* Override parameters if required */
++    dirac_encoder_context_init( &p_sys->ctx, VIDEO_FORMAT_CUSTOM );
++    /* */
+     p_sys->ctx.seq_params.width = p_enc->fmt_in.video.i_width;
+     p_sys->ctx.seq_params.height = p_enc->fmt_in.video.i_height;
+     p_sys->ctx.seq_params.chroma = format420;
+-    p_sys->ctx.seq_params.frame_rate.numerator =
++    /* */
++    p_sys->ctx.src_params.frame_rate.numerator =
+         p_enc->fmt_in.video.i_frame_rate;
+-    p_sys->ctx.seq_params.frame_rate.denominator =
++    p_sys->ctx.src_params.frame_rate.denominator =
+         p_enc->fmt_in.video.i_frame_rate_base;
+-    p_sys->ctx.seq_params.interlace = 0;
+-    p_sys->ctx.seq_params.topfieldfirst = 0;
++    p_sys->ctx.src_params.interlace = 0;
++    p_sys->ctx.src_params.topfieldfirst = 0;
+ 
+     var_Get( p_enc, ENC_CFG_PREFIX "quality", &val );
+
diff --git a/vlc/build/vlc-0.8.6a_osdmenu_paths.patch b/vlc/build/vlc-0.8.6a_osdmenu_paths.patch
new file mode 100644
index 00000000..1d076aef
--- /dev/null
+++ b/vlc/build/vlc-0.8.6a_osdmenu_paths.patch
@@ -0,0 +1,33 @@
+Index: vlc-0.8.6a/share/osdmenu/default.cfg
+===================================================================
+--- vlc-0.8.6a.orig/share/osdmenu/default.cfg	2006-04-19 09:25:02.000000000 +0200
++++ vlc-0.8.6a/share/osdmenu/default.cfg	2006-04-24 16:21:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/default
++dir /usr/share/vlc/osdmenu/default
+ action	key-play-pause (0,0)
+         unselect unselected.png
+         select   selection/play_pause.png
+Index: vlc-0.8.6a/share/osdmenu/dvd.cfg
+===================================================================
+--- vlc-0.8.6a.orig/share/osdmenu/dvd.cfg	2006-04-19 09:25:02.000000000 +0200
++++ vlc-0.8.6a/share/osdmenu/dvd.cfg	2006-04-24 16:21:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-dir share/osdmenu/dvd
++dir /usr/share/vlc/osdmenu/dvd
+ action	key-play (0,0)
+         unselect unselect/barroff.png
+         select   selection/play.png
+Index: vlc-0.8.6a/modules/video_filter/osdmenu.c
+===================================================================
+--- vlc-0.8.6a.orig/modules/video_filter/osdmenu.c	2006-04-19 09:25:11.000000000 +0200
++++ vlc-0.8.6a/modules/video_filter/osdmenu.c	2006-04-24 16:21:46.000000000 +0200
+@@ -92,7 +92,7 @@
+ #if defined( WIN32 ) || defined( UNDER_CE )
+ #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
+ #else
+-#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
++#define OSD_DEFAULT_CFG "/usr/share/vlc/osdmenu/default.cfg"
+ #endif
+ 
+ #define OSD_UPDATE_MIN     0
diff --git a/vlc/build/vlc_deffont.patch b/vlc/build/vlc_deffont.patch
new file mode 100644
index 00000000..36a70297
--- /dev/null
+++ b/vlc/build/vlc_deffont.patch
@@ -0,0 +1,12 @@
+--- vlc-0.8.6a.orig/modules/misc/freetype.c     2007-02-02 09:23:54.000000000 +0100
++++ vlc-0.8.6a/modules/misc/freetype.c  2007-04-04 13:04:24.000000000 +0200
+@@ -55,7 +55,7 @@
+ #elif defined( WIN32 )
+ #define DEFAULT_FONT "" /* Default font found at run-time */
+ #else
+-#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
++#define DEFAULT_FONT "@@XPREFIX@@/lib/X11/fonts/TTF/DejaVuSans.ttf"
+ #endif
+
+ #if defined(HAVE_FRIBIDI)
+