Contrib: introduce yasm to build x264 on darwin.

Also fix Distributions gitignore.

diff --git a/extras/contrib/.gitignore b/extras/contrib/.gitignore
index 45b3145a89c05771c475b89e73a4caa43080eb64..27832ef1cd68232a0b80fa064d8d254feb60d187 100755 (executable)
--- a/extras/contrib/.gitignore
+++ b/extras/contrib/.gitignore
@@ -14,7 +14,7 @@ info
 src/*
 # But not our files
 !Makefile
-!src/Distributions
+!src/Distributions/*
 !src/Patches
 !src/packages.mak
 !src/Makefile

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 237380d4fad67e62a08bfa6de8c5826eaba8cdfb..154927d064f2fba3b23cdffb1f7613fb242ff61b 100644 (file)
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -5,14 +5,14 @@ download-all: autoconf automake libtool cmake gettext pkgconfig freetype2 \
     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 \
-    x264 goom lua zvbi fontconfig ncurses all
+    yasm x264 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 .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
+    .dca .tag .nasm .yasm .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 8221cbb46ace2ab01a2eeb295aa9f6909428a159..4fb18fecc7d437a9b982511db97189471894d877 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2252,6 +2252,24 @@ CLEAN_FILE += .nasm
 CLEAN_PKG += nasm nasm.cvs
 DISTCLEAN_PKG += nasm-$(NASM_VERSION).tar.bz2
 
+# ***************************************************************************
+# YASM assembler
+# ***************************************************************************
+
+yasm-$(YASM_VERSION).tar.gz:
+       $(WGET) $(YASM_URL)
+
+yasm: yasm-$(YASM_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.yasm: yasm
+       (cd $< && $(HOSTCC) ./configure --prefix=$(PREFIX) && make && make install)
+       touch $@
+
+CLEAN_FILE += .yasm
+CLEAN_PKG += yasm
+DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
+
 # ***************************************************************************
 # Copy aclocal files
 # This is necessary for --missing aclocal to succeed after a

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 2c19aa469e6d7ca3a5124c4e072dfaa025a81f11..b6e1447379e1f56c049c0a575938b481fd9e4af5 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -219,3 +219,5 @@ PCRE_VERSION=7.6
 PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
 FLUID_VERSION=1.0.8
 FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
+YASM_VERSION=0.6.2
+YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz