Commit 571e981e authored by Felix Kühne's avatar 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
parent a18c1668
...@@ -219,7 +219,7 @@ case $HOST in ...@@ -219,7 +219,7 @@ case $HOST in
fi fi
;; ;;
*-apple-darwin10) *-apple-darwin10)
SDK_TARGET=10.6 SDK_TARGET=10.5
echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak echo "HAVE_DARWIN_OS_ON_INTEL = 1" >> config.mak
echo "HAVE_DARWIN_9 = 1" >> config.mak echo "HAVE_DARWIN_9 = 1" >> config.mak
......
# Darwin rules # 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 \ .fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \ .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \ .dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
.png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \ .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \ .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
.dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \ .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 # .expat .clinkcc don't work with SDK yet
# .glib .IDL .gecko are required to build the mozilla plugin # .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 # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
......
...@@ -794,6 +794,10 @@ ifdef HAVE_WIN32 ...@@ -794,6 +794,10 @@ ifdef HAVE_WIN32
THEORACONF += --disable-docs THEORACONF += --disable-docs
endif endif
ifdef HAVE_DARWIN_10
THEORACONF += --disable-asm
endif
.theora: libtheora .ogg .theora: libtheora .ogg
ifdef HAVE_BEOS ifdef HAVE_BEOS
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) --disable-asm && make && make install)
......
...@@ -215,9 +215,9 @@ PCRE_VERSION=7.6 ...@@ -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 PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
FLUID_VERSION=1.0.8 FLUID_VERSION=1.0.8
FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
YASM_VERSION=0.7.0 YASM_VERSION=0.7.2
YASM_URL=$(VIDEOLAN)/testing/contrib/yasm-$(YASM_VERSION).tar.gz #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_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
KATE_VERSION=0.1.7 KATE_VERSION=0.1.7
KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
TIGER_VERSION=0.3.1 TIGER_VERSION=0.3.1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment