Removed nasm from the contribs and changed the build behaviour for yasm: it's only...

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 154927d064f2fba3b23cdffb1f7613fb242ff61b..dfd07dd8d8df606366d4a4b8689a014341bafa36 100644 (file)
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -4,15 +4,15 @@ download-all: autoconf automake libtool cmake gettext pkgconfig freetype2 \
     speex libshout faad2 faac lame twolame libebml libmatroska ffmpeg libdca \
     libdvdcss libdvdnav libdvbpsi live libcaca libmodplug xml asa jpeg tiff \
     SDL zlib libpng libgpg-error libgcrypt opencdk gnutls libopendaap libcddb \
-    libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib nasm \
-    yasm x264 goom lua zvbi fontconfig ncurses all
+    libcdio vcdimager SDL_image glib gecko-sdk mpcdec dirac expat taglib \
+    x264 yasm goom lua zvbi fontconfig ncurses all
 all: .autoconf .automake .libtool .cmake .intl .pkgcfg .freetype \
     .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod .asa \
     .png .gpg-error .gcrypt .opencdk .gnutls .opendaap .cddb .cdio .vcdimager \
     .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
-    .dca .tag .nasm .yasm .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
+    .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
 # .expat .clinkcc don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
 # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index d6be119820fcf064c8990148b809f4d794eb22d3..be7d3646f6c10cc91cddab2b67d0c4fc063d5eb3 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1375,8 +1375,13 @@ ifdef HAVE_WIN32
        (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
   endif
 else
-.x264: x264
+ifdef HAVE_DARWIN_OS_ON_INTEL
+  .x264: x264 .yasm
+       (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+else
+  .x264: x264
        (cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
+endif
 endif
        touch $@
 
@@ -2229,29 +2234,6 @@ CLEAN_FILE += .clinkcc
 CLEAN_PKG += clinkcc
 DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz
 
-# ***************************************************************************
-# NASM assembler
-# ***************************************************************************
-
-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)
-       touch $@
-
-CLEAN_FILE += .nasm
-CLEAN_PKG += nasm nasm.cvs
-DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2
-
 # ***************************************************************************
 # YASM assembler
 # ***************************************************************************