[vlc-commits] Contribs: remove unused packages

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun May  8 20:15:32 2011 +0200| [b0dcad9571e6a552423c41512ade2d10d294fcb9] | committer: Jean-Baptiste Kempf

Contribs: remove unused packages

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

 extras/contrib/src/contrib-src.mak |   20 +-------------------
 extras/contrib/src/packages.mak    |    3 ---
 2 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index af92a83..c9ed620 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -524,24 +524,6 @@ CLEAN_PKG += libmpeg2
 DISTCLEAN_PKG += libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
 # ***************************************************************************
-# pcre
-# ***************************************************************************
-
-pcre-$(PCRE_VERSION).tar.bz2:
-	$(WGET) $(PCRE_URL)
-
-pcre: pcre-$(PCRE_VERSION).tar.bz2
-	$(EXTRACT_BZ2)
-
-.pcre: pcre
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install )
-	touch $@
-
-CLEAN_FILE += .pcre
-CLEAN_PKG += pcre
-DISTCLEAN_PKG += pcre-$(PCRE_VERSION).tar.bz2
-
-# ***************************************************************************
 # lua
 # ***************************************************************************
 
@@ -2758,7 +2740,7 @@ clean-src: clean
 	rm -rf $(DISTCLEAN_PKG)
 
 clean-svn:
-	rm -rf ffmpeg tremor x264 libdca pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live libass
+	rm -rf ffmpeg tremor x264 libdca pa_stable_v$(PORTAUDIO_VERSION).tar.gz portaudio live555-$(LIVEDOTCOM_VERSION).tar.gz live libass
 
 distclean: clean-src
 
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 18ca308..7c200ca 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -203,9 +203,6 @@ LUA_VERSION=5.1.4
 LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
 NCURSES_VERSION=5.7
 NCURSES_URL=$(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
-ASA_URL=$(CONTRIB_VIDEOLAN)/asa.git.tar.gz
-PCRE_VERSION=8.00
-PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
 FLUID_VERSION=1.0.9# DO NOT update, this will require glib
 #FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
 FLUID_URL=http://downloads.sourceforge.net/project/fluidsynth/older%20releases/fluidsynth-$(FLUID_VERSION).tar.gz