* Get a NASM cvs snapshot from the VLC download servers, because their server...

* Get a NASM cvs snapshot from the VLC download servers, because their server regurly times out, which is annoying.

extras/contrib/src/Makefile

@@ -1814,10 +1814,16 @@ DISTCLEAN_PKG += clinkcc-$(CLINKCC_VERSION).tar.gz
 # NASM assembler
 # ***************************************************************************
 
-nasm:
-	echo $(NASM_CVSROOT) A > ./nasm.cvs
-	CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm
-	(cd $@ && autoconf && autoheader)
+nasm-$(NASM_VERSION).tar.bz2:
+	$(WGET) $(NASM_URL)
+
+nasm: nasm-$(NASM_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
+
+#nasm:
+#	echo $(NASM_CVSROOT) A > ./nasm.cvs
+#	CVS_PASSFILE=./nasm.cvs cvs -z3 -d $(NASM_CVSROOT) co nasm
+#	(cd $@ && autoconf && autoheader)
 
 .nasm: nasm
 	(cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install)
@@ -1825,6 +1831,7 @@ nasm:
 
 CLEAN_FILE += .nasm
 CLEAN_PKG += nasm nasm.cvs
+DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2
 
 # ***************************************************************************
 # Copy aclocal files

extras/contrib/src/packages.mak

@@ -161,3 +161,5 @@ CLINKCC_URL=$(SF)/clinkcc/clinkcc$(CLINKCC_VERSION).tar.gz
 EXPAT_VERSION=1.95.8
 EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
 NASM_CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nasm
+NASM_VERSION=0.98.40-20060130
+NASM_URL=$(VIDEOLAN)/testing/contrig/nasm-0.98.40-20060130.tar.bz2