[vlc-devel] commit: Libass in the contribs. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at altair.videolan.org> | Sun Aug  3 09:19:41 2008 +0200| [fbac8d842f877a44f196afc857685acf1cff90c6] | committer: Jean-Baptiste Kempf 

Libass in the contribs.

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

 extras/contrib/src/Makefile                   |   23 +++++++++++++++++++++++
 extras/contrib/src/Patches/libass-cross.patch |   14 ++++++++++++++
 extras/contrib/src/packages.mak               |    2 ++
 3 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index af31627..601f3bd 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2436,6 +2436,29 @@ CLEAN_PKG += schroedinger
 DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
 
 # ***************************************************************************
+# ASS library
+# ***************************************************************************
+
+libass-$(ASS_VERSION).tar.bz2:
+	$(WGET) $(ASS_URL)
+
+libass: libass-$(ASS_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
+ifneq ($(HOST),$(BUILD))
+	patch -p0 < Patches/libass-cross.patch
+	cd $@; autoconf
+endif
+
+.libass: libass
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
+	touch $@
+
+CLEAN_FILE += .schroedinger
+CLEAN_PKG += schroedinger
+DISTCLEAN_PKG += schroedinger-$(SCHROED_VERSION).tar.gz
+
+
+# ***************************************************************************
 # Some cleaning
 # ***************************************************************************
 
diff --git a/extras/contrib/src/Patches/libass-cross.patch b/extras/contrib/src/Patches/libass-cross.patch
new file mode 100644
index 0000000..6edc6ff
--- /dev/null
+++ b/extras/contrib/src/Patches/libass-cross.patch
@@ -0,0 +1,14 @@
+--- libass/configure.ac	2008-05-22 21:04:13.000000000 +0200
++++ libass.new/configure.ac	2008-08-03 09:10:02.000000000 +0200
+@@ -42,9 +42,9 @@
+ AC_TYPE_UINT8_T
+ 
+ # Checks for library functions.
+-AC_FUNC_MALLOC
++#AC_FUNC_MALLOC
+ AC_FUNC_MEMCMP
+-AC_FUNC_REALLOC
++#AC_FUNC_REALLOC
+ AC_FUNC_STAT
+ AC_FUNC_STRTOD
+ AC_FUNC_VPRINTF
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 642f7ea..ed1e9b4 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -228,3 +228,5 @@ SCHROED_VERSION=1.0.4
 SCHROED_URL=http://www.diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
 KATE_VERSION=0.1.6
 KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
+ASS_VERSION=0.9.5
+ASS_URL=$(SF)/libass/libass-$(ASS_VERSION).tar.bz2