diff -urN ooo_SRC680_m147_src.orig/sndfile/libsndfile-1.0.9.patch ooo_SRC680_m147_src/sndfile/libsndfile-1.0.9.patch --- ooo_SRC680_m147_src.orig/sndfile/libsndfile-1.0.9.patch 2005-12-16 09:18:03.000000000 +0100 +++ ooo_SRC680_m147_src/sndfile/libsndfile-1.0.9.patch 2005-12-22 17:31:16.000000000 +0100 @@ -1,5 +1,5 @@ -*** misc/libsndfile-1.0.9/configure Tue Mar 30 06:24:15 2004 ---- misc/build/libsndfile-1.0.9/configure Wed Jun 2 11:54:38 2004 +*** misc/libsndfile-1.0.9/configure Tue Mar 30 13:24:15 2004 +--- misc/build/libsndfile-1.0.9/configure Thu Dec 22 16:12:33 2005 *************** *** 6459,6467 **** # PIC is the default on this platform @@ -50,7 +50,7 @@ lt_int_apple_cc_single_mod=yes fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -! archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' +! archive_cmds='$CC -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' else ! archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' fi @@ -98,7 +98,7 @@ ;; esac output_verbose_link_cmd='echo' -! archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name @executable_path/$soname $verstring' +! archive_cmds='$CC -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name @executable_path/$soname $verstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's ! archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name @executable_path/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' @@ -128,7 +128,7 @@ lt_int_apple_cc_single_mod=yes fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -! archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' +! archive_cmds_CXX='$CC -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' else ! archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' fi @@ -164,7 +164,7 @@ lt_int_apple_cc_single_mod=yes fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -! archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' +! archive_cmds_F77='$CC -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' else ! archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' fi @@ -199,7 +199,7 @@ lt_int_apple_cc_single_mod=yes fi if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -! archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' +! archive_cmds_GCJ='$CC -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' else ! archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name @executable_path/$soname $verstring' fi @@ -212,27 +212,25 @@ fi module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' hardcode_direct_GCJ=no -*** misc/libsndfile-1.0.9/src/sndfile.h Tue Mar 30 06:25:22 2004 ---- misc/build/libsndfile-1.0.9/src/sndfile.h Wed Jun 2 11:51:41 2004 *************** -*** 230,236 **** - ** off64_t (Solaris), __int64_t (Win32) etc. - */ - -! typedef loff_t sf_count_t ; - - #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL - ---- 230,236 ---- - ** off64_t (Solaris), __int64_t (Win32) etc. - */ - -! typedef off_t sf_count_t ; - - #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL - -*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 13:02:07 2004 ---- misc/build/libsndfile-1.0.9/ltmain.sh Mon Mar 28 16:37:47 2005 +*** 26687,26693 **** + case "$target_os" in + darwin* | rhapsody*) + os_is_macosx=1 +! OS_SPECIFIC_CFLAGS="-fpascal-strings -I/Developer/Headers/FlatCarbon" + OS_SPECIFIC_LINKS="-framework CoreAudio" + ;; + mingw32msvc) +--- 26694,26700 ---- + case "$target_os" in + darwin* | rhapsody*) + os_is_macosx=1 +! OS_SPECIFIC_CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -fpascal-strings -I/Developer/Headers/FlatCarbon" + OS_SPECIFIC_LINKS="-framework CoreAudio" + ;; + mingw32msvc) +*** misc/libsndfile-1.0.9/ltmain.sh Sat Mar 27 05:02:07 2004 +--- misc/build/libsndfile-1.0.9/ltmain.sh Thu Dec 22 16:05:28 2005 *************** *** 2980,2987 **** ;; @@ -252,3 +250,55 @@ ;; irix | nonstopux) +*** misc/libsndfile-1.0.9/src/float_cast.h Wed Mar 3 09:23:12 2004 +--- misc/build/libsndfile-1.0.9/src/float_cast.h Thu Dec 22 16:05:28 2005 +*************** +*** 45,50 **** +--- 45,55 ---- + + #include "config.h" + ++ #if (defined (__MACH__) && defined (__APPLE__)) ++ #include ++ #endif ++ ++ + /* + ** The presence of the required functions are detected during the configure + ** process and the values HAVE_LRINT and HAVE_LRINTF are set accordingly in +*************** +*** 142,148 **** + return res [1] ; + } /* double2int */ + +! #elif (defined (__MACH__) && defined (__APPLE__)) + + /* For Apple MacOSX. */ + +--- 147,153 ---- + return res [1] ; + } /* double2int */ + +! #elif (defined (__MACH__) && defined (__APPLE__) && TARGET_CPU_PPC) + + /* For Apple MacOSX. */ + +*** misc/libsndfile-1.0.9/src/sndfile.h Tue Mar 30 13:25:22 2004 +--- misc/build/libsndfile-1.0.9/src/sndfile.h Thu Dec 22 16:06:14 2005 +*************** +*** 230,236 **** + ** off64_t (Solaris), __int64_t (Win32) etc. + */ + +! typedef loff_t sf_count_t ; + + #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL + +--- 230,236 ---- + ** off64_t (Solaris), __int64_t (Win32) etc. + */ + +! typedef off_t sf_count_t ; + + #define SF_COUNT_MAX 0x7FFFFFFFFFFFFFFFLL + diff -urN ooo_SRC680_m147_src.orig/sndfile/makefile.mk ooo_SRC680_m147_src/sndfile/makefile.mk --- ooo_SRC680_m147_src.orig/sndfile/makefile.mk 2005-12-22 11:16:22.000000000 +0100 +++ ooo_SRC680_m147_src/sndfile/makefile.mk 2005-12-22 17:32:27.000000000 +0100 @@ -63,7 +63,7 @@ .EXPORT: LDFLAGS .ENDIF -CONFIGURE_ACTION=./configure --with-pic +CONFIGURE_ACTION=sh -c 'CFLAGS="$(UNIVERSAL_CFLAGS)" .$/configure --disable-dependency-tracking --disable-static --with-pic' BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=$(GNUMAKE)