[vlc-devel] commit: Use libass from greg's git. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jul 10 20:36:13 2009 +0200| [c6a97a1b0bba035c8c1bb06dcc12ec6c67c2e109] | committer: Jean-Baptiste Kempf 

Use libass from greg's git.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c6a97a1b0bba035c8c1bb06dcc12ec6c67c2e109
---

 extras/contrib/src/Makefile     |    9 +++++++++
 extras/contrib/src/packages.mak |    1 +
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 2fa673d..7971e1d 100644
--- 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 b25b3d0..501886f 100644
--- 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