[vlc-devel] commit: Remove asa from contribs. (Jean-Baptiste Kempf )

git version control git at videolan.org
Fri Jul 24 13:28:22 CEST 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jul 24 12:54:58 2009 +0200| [731d6aa7ac2aacd2f513c9fe7094af917ed95b9c] | committer: Jean-Baptiste Kempf 

Remove asa from contribs.

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

 extras/contrib/src/Makefile |   24 +-----------------------
 1 files changed, 1 insertions(+), 23 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 3e9b153..caf78c2 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1759,7 +1759,7 @@ ifdef HAVE_DARWIN_OS
 	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -fnested-functions" && make && make install)
 else
 ifdef HAVE_WIN32
-	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) --std=gnu99" LIBS="-lpthreadGC2" && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) --std=gnu99"  && make && make install)
 else
 	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make -C src && make -C src install)
 endif
@@ -2418,28 +2418,6 @@ CLEAN_PKG += ncurses
 DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 
 # ***************************************************************************
-# asa library (ASS/SSA support)
-# ***************************************************************************
-
-asa.git.tar.gz:
-	$(WGET) $(ASA_URL)
-
-asa: asa.git.tar.gz
-	$(EXTRACT_GZ)
-	patch -p0 < Patches/asa-git.diff
-
-.asa: asa .fontconfig .pcre .iconv
-	(cd $<; ./bootstrap; $(HOSTCC) CFLAGS="$(CFLAGS) -DPCRE_STATIC" ./configure $(HOSTCONF) --prefix=$(PREFIX))
-	(cd $</lib/import; make || (echo "Please copy a ./preparse file you built for your host into asa/lib/import"; echo "When you are finished, press enter." ; echo "If you are building natively, press enter." ; read i ; make) )
-	(cd $<; make && make install)
-	$(INSTALL_NAME)
-	touch $@
-
-CLEAN_FILE += .asa
-CLEAN_PKG += asa
-DISTCLEAN_PKG += asa.git.tar.gz
-
-# ***************************************************************************
 # FluidSynth library (Midi)
 # ***************************************************************************
 




More information about the vlc-devel mailing list