Merge branch '0.9.0-libass' of git://git.videolan.org/vlc

diff --combined configure.ac
index b5eebe464d869c7dadd1182c60ffe877638a402e,e679d0698b03eb6aa7383bb899f7433caf371c81..b9bc30e749c95426710ff811cddd1997c1db58c8
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -810,13 -810,10 +810,13 @@@ AC_CHECK_TYPE(ssize_t,, 
    AC_DEFINE(ssize_t, int)
  ])
  
 -dnl don't attemp to use poll on darwin, it can't poll a tty. select will do a better job.
 -if test "${SYS}" != "darwin"; then
 -  AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])])
 +dnl Check for poll
 +AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])], [
 +if test ${SYS} != "mingw32"
 +then
 +    AC_MSG_WARN([Your platform does not support poll(). VLC has it's own poll() implementation, but it is only intended to be used on Windows. VLC might crash or be insecure when you see this message. Either switch to an OS with a proper poll() implementation, or implement one for your OS in VLC])
  fi
 +])
  
  dnl Check for dirent
  need_dirent=false
@@@ -2955,11 -2952,6 +2955,11 @@@ dn
  dnl  avcodec decoder/encoder plugin
  dnl
  
 +if test "${with_ffmpeg_tree}"
 +then
 +  AC_MSG_WARN([--with-ffmpeg-tree is deprecated. Use PKG_CONFIG_PATH instead.])
 +fi
 +
  AC_ARG_ENABLE(avcodec,
  [  --enable-avcodec        libavcodec codec (default enabled)])
  if test "${enable_avcodec}" != "no"
@@@ -3766,6 -3758,27 +3766,27 @@@ AS_IF( [test "${enable_csri}" = "yes"]
        ])
    ])
  
+ dnl
+ dnl libass subtitle rendering module
+ dnl
+ AC_ARG_ENABLE(libass,
+   [  --enable-libass           Subtitle support using libass (default disabled)])
+ AS_IF( [test "${enable_libass}" = "yes"], [
+   PKG_CHECK_MODULES(LIBASS,
+       libass >= 0.9.5,
+       [
+         VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS])
+         VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
+         VLC_ADD_PLUGIN([libass])
+ 
+               AC_CHECK_HEADERS(fontconfig/fontconfig.h,
+                 [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
+                  VLC_ADD_LIBS([libass],[-lfontconfig])])
+       ],[
+         AC_MSG_WARN([LIBASS library not found])
+       ])
+   ])
+ 
  dnl
  dnl asa demuxer
  dnl

diff --combined extras/contrib/src/Makefile
index 39fba3d6522fd8e706fc17ff9d533b2170d29fe2,dfdb278b70cc51a5139b5545c39dc3fcdc4f39f0..aa76dd17814301d5aa75c42c22f39effa49fe304
--- 1/extras/contrib/src/Makefile
--- 2/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@@ -471,13 -471,13 +471,13 @@@ fontconfig: fontconfig-$(FONTCONFIG_VER
  .fontconfig: fontconfig .xml .freetype
  ifdef HAVE_WIN32
    ifdef HAVE_CYGWIN
-       (cd $<; autoreconf && LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
+       (cd $<; autoreconf && LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure --target=$(HOST) --disable-pic --disable-shared --disable-docs --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 && make && make install)
    else
-       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --with-cache-dir=WINDOWSTEMPDIR --with-arch=i686 --with-default-fonts=C:\\windows\fonts --with-add-fonts=C:\\winnt\fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
    endif
  else
    ifdef HAVE_DARWIN_OS
-       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-confdir=/etc/fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR))
+       (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR))
    else
        (cd $<; autoreconf && $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
    endif
@@@ -1067,7 -1067,7 +1067,7 @@@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERS
  
  ifdef SVN
  ffmpeg:
 -      $(SVN) co $(FFMPEG_SVN) ffmpeg -r 14080
 +      $(SVN) co $(FFMPEG_SVN) ffmpeg -r 14661
  ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
  endif
@@@ -1084,7 -1084,7 +1084,7 @@@ ifdef HAVE_DARWIN_O
        (cd $@/libswscale; patch -p0 < ../../Patches/ffmpeg-fix-noaltivec.patch)
  endif
  ifdef NO_TEXT_RELOCATION
 -      (cd $@; patch -p1 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
 +      (cd $@; patch -p0 < ../Patches/ffmpeg-svn-mmx_removal-darwin9.patch)
  endif
  ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-uclibc.patch
@@@ -2442,9 -2442,10 +2442,10 @@@ DISTCLEAN_PKG += schroedinger-$(SCHROED
  libass-$(ASS_VERSION).tar.bz2:
        $(WGET) $(ASS_URL)
  
+ # mplayer patches up to August 8, 2008 are included
  libass: libass-$(ASS_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       cd $@; patch -p0 < ../Patches/libass-h-char-fix.patch
+       patch -p0 < Patches/libass_mplayer_updates.patch
  ifneq ($(HOST),$(BUILD))
        patch -p0 < Patches/libass-cross.patch
        cd $@; autoconf
@@@ -2458,6 -2459,7 +2459,6 @@@ CLEAN_FILE += .libas
  CLEAN_PKG += libass
  DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
  
 -
  # ***************************************************************************
  # Some cleaning
  # ***************************************************************************