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

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index e5266a4caffa367adfc29a0c1f8413f735a44a48..4264b90225a6de7265c80a0f07d9f5fc1896e084 100755 (executable)
--- 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 09d280cbc521de6d66fdef501acd732ef72921f9..ac347674dafe77aabcf9119514f81ad4cec8043f 100644 (file)
--- 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 7cc7a0c20df8805131749db48b7d29c694a8dce4..46a0662a9a3d9f313f4ed83a150298d7f05b02e3 100644 (file)
--- 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 fa7d2fb7f831a8939d687a145e0e14d786071693..b564ca6890803b3de76b5b14045c3ae6a7e29a2f 100644 (file)
--- 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