diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index af92a8346847f5f015e7a6c4204d9090fe36719f..c9ed6202ce914155fa6c667e322e8da8c1a23f09 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -523,24 +523,6 @@ CLEAN_FILE += .mpeg2 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 18ca308233bd079c1fce5b6b4b6309124c1e8fc5..7c200ca315ca822d0b113527b9c907069c938e76 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