Commit 4b075c9a authored by Felix Paul Kühne's avatar Felix Paul Kühne

* updated patch for FLAC 1.2.1 and disabled all ASM optimisations for OSX...

* updated patch for FLAC 1.2.1 and disabled all ASM optimisations for OSX Intel, as they aren't supported. I object this update and would like to continue using the 1.1.x series of FLAC for this branch.
parent 2bcf6ba7
...@@ -76,6 +76,7 @@ case $HOST in ...@@ -76,6 +76,7 @@ case $HOST in
i686-apple-darwin8) i686-apple-darwin8)
SDK_TARGET=10.4 SDK_TARGET=10.4
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 = 1" >> config.mak echo "HAVE_DARWIN_OS = 1" >> config.mak
echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
......
...@@ -754,7 +754,11 @@ ifdef HAVE_WIN32 ...@@ -754,7 +754,11 @@ ifdef HAVE_WIN32
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest --disable-asm-optimizations && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest --disable-asm-optimizations && cd src&& make -C libFLAC&& make -C libFLAC install && cd .. && make -C include install)
else else
ifdef HAVE_DARWIN_OS ifdef HAVE_DARWIN_OS
(cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && sed -e 's%-Wl,-syslibroot,%-syslibroot %' -i.orig src/libFLAC/Makefile && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) ifdef HAVE_DARWIN_OS_ON_INTEL
(cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations --disable-oggtest && sed -e 's%-Wl,-syslibroot,%-syslibroot %' -i.orig src/libFLAC/Makefile && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install)
else
(cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install)
endif
else else
(cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install) (cd $<; autoconf && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-oggtest && cd src && make -C libFLAC && make -C libFLAC install && cd .. && make -C include install)
endif endif
......
diff -puriN flac/configure flac-patched/configure
--- flac/configure 2006-01-26 22:42:40.000000000 +0100
+++ flac-patched/configure 2006-01-26 22:36:50.000000000 +0100
@@ -8702,6 +8702,7 @@ fi
case "$host" in
i386-*-openbsd3.[0-3]) OBJ_FORMAT=aoutb ;;
+ i*86-apple-darwin*) OBJ_FORMAT=macho ;;
*) OBJ_FORMAT=elf ;;
esac
diff -puriN flac/configure.in flac-patched/configure.in
--- flac/configure.in 2006-01-26 22:42:36.000000000 +0100
+++ flac-patched/configure.in 2006-01-26 22:36:50.000000000 +0100
@@ -52,6 +52,7 @@ AM_CONDITIONAL(FLaC__CPU_PPC, test x$cpu
AM_CONDITIONAL(FLaC__CPU_SPARC, test x$cpu_sparc = xtrue)
case "$host" in
i386-*-openbsd3.[[0-3]]) OBJ_FORMAT=aoutb ;;
+ i*86-apple-darwin*) OBJ_FORMAT=macho ;;
*) OBJ_FORMAT=elf ;;
esac
AC_SUBST(OBJ_FORMAT)
diff -puriN flac/src/libFLAC/ia32/nasm.h flac-patched/src/libFLAC/ia32/nasm.h diff -puriN flac/src/libFLAC/ia32/nasm.h flac-patched/src/libFLAC/ia32/nasm.h
--- flac/src/libFLAC/ia32/nasm.h 2005-01-25 05:14:22.000000000 +0100 --- flac/src/libFLAC/ia32/nasm.h 2005-01-25 05:14:22.000000000 +0100
+++ flac-patched/src/libFLAC/ia32/nasm.h 2006-01-26 22:38:54.000000000 +0100 +++ flac-patched/src/libFLAC/ia32/nasm.h 2006-01-26 22:38:54.000000000 +0100
......
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