[vlc-devel] commit: contribs: updated yasm to 0.7. 2 and enabled its compilation explictly on Darwin. ( Felix Kühne )

[git version control]

vlc | branch: master | Felix Kühne <fpk at Felix-Kuhnes-MacBook.local> | Fri Feb  6 20:20:05 2009 +0100| [571e981e37a29e3bc9f3bafdcff2a6090f088a3f] | committer: Felix Kühne 

contribs: updated yasm to 0.7.2 and enabled its compilation explictly on Darwin.

Additionally, disabled ASM optimisations on Darwin 10 for libtheora and switched the default SDK to 10.5 to turn potential 64bit builds more compatible

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=571e981e37a29e3bc9f3bafdcff2a6090f088a3f
---

 extras/contrib/bootstrap                    |    2 +-
 extras/contrib/src/Distributions/darwin.mak |    4 ++--
 extras/contrib/src/Makefile                 |    4 ++++
 extras/contrib/src/packages.mak             |    6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index e5266a4..4264b90 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -219,7 +219,7 @@ case $HOST in
         fi
     ;;
     *-apple-darwin10)
-        SDK_TARGET=10.6
+        SDK_TARGET=10.5
         echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
         echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak
         echo "HAVE_DARWIN_9 = 1" >> config.mak
diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 09d280c..ac34767 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,12 +1,12 @@
 # Darwin rules
-all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .freetype \
+all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
     .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
     .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
     .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \
-    .schroedinger .libass .aclocal .libupnp
+    .schroedinger .libass .libupnp .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 7cc7a0c..46a0662 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -794,6 +794,10 @@ ifdef HAVE_WIN32
 THEORACONF += --disable-docs
 endif
 
+ifdef HAVE_DARWIN_10
+THEORACONF += --disable-asm
+endif
+
 .theora: libtheora .ogg
 ifdef HAVE_BEOS
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index fa7d2fb..b564ca6 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -215,9 +215,9 @@ 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.7.0
-YASM_URL=$(VIDEOLAN)/testing/contrib/yasm-$(YASM_VERSION).tar.gz
-#YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
+YASM_VERSION=0.7.2
+#YASM_URL=$(VIDEOLAN)/testing/contrib/yasm-$(YASM_VERSION).tar.gz
+YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
 KATE_VERSION=0.1.7
 KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
 TIGER_VERSION=0.3.1