Changeset 6ebae83db81a80cdc3cead264455074702223ac0

Show
Ignore:
Timestamp:
09/08/08 02:07:55 (4 months ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1218240475 +0200
git-parent:

[626d109e7396de9866298f8d01a97dba4248c102], [684179744fa5ddbdf31633552208543e9fb6e275]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1218240475 +0200
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    r8e8f3ca r6ebae83  
    37643764      ],[ 
    37653765        AC_MSG_WARN([CSRI helper library not found]) 
     3766      ]) 
     3767  ]) 
     3768 
     3769dnl 
     3770dnl libass subtitle rendering module 
     3771dnl 
     3772AC_ARG_ENABLE(libass, 
     3773  [  --enable-libass           Subtitle support using libass (default disabled)]) 
     3774AS_IF( [test "${enable_libass}" = "yes"], [ 
     3775  PKG_CHECK_MODULES(LIBASS, 
     3776      libass >= 0.9.5, 
     3777      [ 
     3778        VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS]) 
     3779        VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS]) 
     3780        VLC_ADD_PLUGIN([libass]) 
     3781 
     3782        AC_CHECK_HEADERS(fontconfig/fontconfig.h, 
     3783          [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG]) 
     3784           VLC_ADD_LIBS([libass],[-lfontconfig])]) 
     3785      ],[ 
     3786        AC_MSG_WARN([LIBASS library not found]) 
    37663787      ]) 
    37673788  ]) 

  • extras/contrib/src/Makefile

    rd29f0a6 r6ebae83  
    472472ifdef HAVE_WIN32 
    473473  ifdef HAVE_CYGWIN 
    474     (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) 
     474    (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) 
    475475  else 
    476     (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) 
     476    (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) 
    477477  endif 
    478478else 
    479479  ifdef HAVE_DARWIN_OS 
    480     (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)) 
     480    (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)) 
    481481  else 
    482482    (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) 
    …… 
    24432443    $(WGET) $(ASS_URL) 
    24442444 
     2445# mplayer patches up to August 8, 2008 are included 
    24452446libass: libass-$(ASS_VERSION).tar.bz2 
    24462447    $(EXTRACT_BZ2) 
    2447     cd $@; patch -p0 < ../Patches/libass-h-char-fix.patch 
     2448    patch -p0 < Patches/libass_mplayer_updates.patch 
    24482449ifneq ($(HOST),$(BUILD)) 
    24492450    patch -p0 < Patches/libass-cross.patch 

  • modules/codec/Modules.am

    re5747ca r683e9ff  
    3838SOURCES_kate = kate.c 
    3939SOURCES_schroedinger = schroedinger.c 
     40SOURCES_libass = libass.c