Use libass from greg's git.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 2fa673d7e2a1420f197a7fd25191ff4100597f54..7971e1da7e957360c7fff8ffbbcd92a3f6d0a9ad 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2510,6 +2510,14 @@ DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 libass-$(ASS_VERSION).tar.bz2:
        $(WGET) $(ASS_URL)
 
+ifdef GIT
+libass:
+       $(GIT) clone $(ASS_GIT)
+ifneq ($(HOST),$(BUILD))
+       patch -p0 < Patches/libass-cross.patch
+       (cd $@; autoreconf -ivf)
+endif
+else
 # mplayer patches up to August 8, 2008 are included
 libass: libass-$(ASS_VERSION).tar.bz2
        $(EXTRACT_BZ2)
@@ -2518,6 +2526,7 @@ ifneq ($(HOST),$(BUILD))
        patch -p0 < Patches/libass-cross.patch
        (cd $@; autoreconf -ivf)
 endif
+endif
 
 .libass: libass .png
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index b25b3d00ba255fbfdf5cad992d714203538b67db..501886f263afa409deda66fd89dcbba0711258e5 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -226,5 +226,6 @@ SCHROED_VERSION=1.0.7
 SCHROED_URL=http://www.diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
 ASS_VERSION=0.9.6
 ASS_URL=$(SF)/libass/libass-$(ASS_VERSION).tar.bz2
+ASS_GIT=git://greg.geekmind.org/libass.git
 GSM_VERSION=1.0.12
 GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz