Removed nasm in favour of yasm for Darwin-x86. Note that yasm isn't build on PowerPC...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index be7d3646f6c10cc91cddab2b67d0c4fc063d5eb3..6d1d7b693ae53d12eb7bb7504cc2fb91a234e0da 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2235,6 +2235,7 @@ CLEAN_PKG += clinkcc
 DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz
 
 # ***************************************************************************
+<<<<<<< Updated upstream:extras/contrib/src/Makefile
 # YASM assembler
 # ***************************************************************************
 
@@ -2253,6 +2254,8 @@ CLEAN_PKG += yasm
 DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
 
 # ***************************************************************************
+=======
+>>>>>>> Stashed changes:extras/contrib/src/Makefile
 # Copy aclocal files
 # This is necessary for --missing aclocal to succeed after a
 # configure.ac/Makefile.am change in the vlc root dir

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index b6e1447379e1f56c049c0a575938b481fd9e4af5..c61d56fa1e3dcf52ed6429c04011415a28613c1d 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -199,9 +199,6 @@ UPNP_VERSION=1.2.1
 UPNP_URL=$(SF)/upnp/libupnp-$(UPNP_VERSION).tar.gz
 EXPAT_VERSION=2.0.0
 EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
-NASM_CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nasm
-NASM_VERSION=2.02
-NASM_URL=$(SF)/nasm/nasm-$(NASM_VERSION).tar.bz2
 PTHREADS_VERSION=2-8-0
 PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
 UNICOWS_VERSION=1.1.1