--- MPlayer-1.0rc1/Makefile 2006-10-22 18:32:31.000000000 -0400 +++ MPlayer-1.0rc1-patched/Makefile 2007-07-13 17:03:13.000000000 -0400 @@ -376,9 +376,9 @@ LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ input/libinput.a \ + $(COMMON_LIBS) \ $(MENU_LIBS) \ $(GUI_LIBS) \ - $(COMMON_LIBS) \ $(VO_LIBS) \ $(AO_LIBS) \ $(STATIC_LIB) \ @@ -388,8 +388,8 @@ ifeq ($(MENCODER),yes) LIBS_MENCODER = libmpcodecs/libmpencoders.a \ - $(MP3LAME_LIB) \ $(COMMON_LIBS) \ + $(MP3LAME_LIB) \ $(PRG_MENCODER): $(MENCODER_DEP) $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(LIBS_MENCODER) --- MPlayer-1.0rc1/configure 2006-10-22 18:32:31.000000000 -0400 +++ MPlayer-1.0rc1-patched/configure 2007-07-13 16:17:03.000000000 -0400 @@ -1263,7 +1263,7 @@ echocheck "GCC & CPU optimization abilities" - if test -n "$proc"; then + if false; then case "$proc" in 601) _march='-mcpu=601' _mcpu='-mtune=601' ;; 603) _march='-mcpu=603' _mcpu='-mtune=603' ;; @@ -3577,7 +3577,7 @@ EOF if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then _macosx=yes - _macosx_frameworks="-framework Carbon -framework QuickTime -framework CoreAudio -framework AudioUnit -framework AudioToolbox" + _macosx_frameworks="-framework Carbon -framework QuickTime -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework IOKit" _def_macosx='#define MACOSX 1' _aosrc="$_aosrc ao_macosx.c" _aomodules="macosx $_aomodules" @@ -4940,15 +4940,15 @@ if test "$_openal" = auto ; then _openal=no cat > $TMPC << EOF -#include +#include int main(void) { alSourceQueueBuffers(0, 0, 0); // alGetSourcei(0, AL_SAMPLE_OFFSET, 0); return 0; } EOF - if cc_check -lopenal ; then - _ld_openal="-lopenal" + if cc_check "-framework OpenAL"; then + _ld_openal="-framework OpenAL" _openal=yes fi fi @@ -7200,7 +7200,7 @@ if darwin ; then CFLAGS="$CFLAGS -mdynamic-no-pic -falign-loops=16 -DSYS_DARWIN -DCONFIG_DARWIN -shared-libgcc" if x86 ; then - CFLAGS="$CFLAGS -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" + CFLAGS="$CFLAGS -arch i386" fi if [ "$_cc_major" = 3 ] && [ "$_cc_minor" -lt 1 ]; then CFLAGS="$CFLAGS -no-cpp-precomp" --- MPlayer-1.0rc1/etc/example.conf 2006-10-22 18:32:31.000000000 -0400 +++ MPlayer-1.0rc1-patched/etc/example.conf 2007-07-13 15:04:03.000000000 -0400 @@ -17,7 +17,7 @@ ################## # Specify default video driver (see -vo help for a list). -#vo=xv +#vo=sdl # Use SDL video with the aalib subdriver by default. #vo = sdl:aalib @@ -44,7 +44,7 @@ #monitor-dotclock = 30M-300M # Start in fullscreen mode by default. -#fs=yes +#fs=no # Change to a different videomode when going fullscreen. #vm=yes @@ -71,7 +71,7 @@ ################## # Specify default audio driver (see -ao help for a list). -#ao=oss +#ao=sdl # Use SDL audio driver with the esd subdriver by default. #ao = sdl:esd --- MPlayer-1.0rc1/libao2/ao_openal.c 2006-10-22 18:32:25.000000000 -0400 +++ MPlayer-1.0rc1-patched/libao2/ao_openal.c 2007-07-13 16:09:04.000000000 -0400 @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include "config.h" #include "mp_msg.h" --- MPlayer-1.0rc1/libvo/aclib_template.c 2006-10-22 18:32:26.000000000 -0400 +++ MPlayer-1.0rc1-patched/libvo/aclib_template.c 2007-07-13 14:37:37.000000000 -0400 @@ -258,7 +258,7 @@ if(i>=BLOCK_SIZE/64) asm volatile( "xor %%"REG_a", %%"REG_a" \n\t" - ".balign 16 \n\t" + ".p2align 4 \n\t" "1: \n\t" "movl (%0, %%"REG_a"), %%ebx \n\t" "movl 32(%0, %%"REG_a"), %%ebx \n\t" @@ -270,7 +270,7 @@ "xor %%"REG_a", %%"REG_a" \n\t" - ".balign 16 \n\t" + ".p2align 4 \n\t" "2: \n\t" "movq (%0, %%"REG_a"), %%mm0\n" "movq 8(%0, %%"REG_a"), %%mm1\n" --- MPlayer-1.0rc1/loader/stubs.s 2006-10-22 18:32:30.000000000 -0400 +++ MPlayer-1.0rc1-patched/loader/stubs.s 2007-07-13 14:38:07.000000000 -0400 @@ -1,6 +1,6 @@ .data .LC0: .string "Called unk_%s\n" - .balign 4 + .p2align 2 .globl unk_exp1 unk_exp1: pushl %ebp --- MPlayer-1.0rc1/loader/wrapper.S 2006-10-22 18:32:30.000000000 -0400 +++ MPlayer-1.0rc1-patched/loader/wrapper.S 2007-07-13 14:39:06.000000000 -0400 @@ -15,12 +15,12 @@ .section .text .globl null_call .type null_call, @function - .balign 16,0x90 + .p2align 4,0x90 null_call: ret .globl wrapper .type wrapper, @function - .balign 16,0x90 + .p2align 4,0x90 wrapper: pusha # store registers (EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI) pushf # store flags @@ -53,7 +53,7 @@ jmp *wrapper_target # wrapper_target should return at .Lwrapper_return - .balign 16, 0x90 + .p2align 4, 0x90 .Lwrapper_return: pushl caller_return # restore the original return address pusha # more for reference sake here --- MPlayer-1.0rc1/mp3lib/Makefile 2006-10-22 18:32:26.000000000 -0400 +++ MPlayer-1.0rc1-patched/mp3lib/Makefile 2007-07-13 14:58:20.000000000 -0400 @@ -9,18 +9,18 @@ SRCS = sr1.c ifeq ($(TARGET_ARCH_X86),yes) SRCS += decode_i586.c -ifeq ($(TARGET_MMX),yes) -SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c -endif +#ifeq ($(TARGET_MMX),yes) +#SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c +#endif ifeq ($(TARGET_3DNOW),yes) SRCS += dct36_3dnow.c dct64_3dnow.c endif ifeq ($(TARGET_3DNOWEX),yes) SRCS += dct36_k7.c dct64_k7.c endif -ifeq ($(TARGET_SSE),yes) -SRCS += dct64_sse.c -endif +#ifeq ($(TARGET_SSE),yes) +#SRCS += dct64_sse.c +#endif endif ifeq ($(TARGET_ARCH_POWERPC),yes) ifeq ($(TARGET_ALTIVEC),yes) --- MPlayer-1.0rc1/mp3lib/decode_MMX.c 2006-10-22 18:32:26.000000000 -0400 +++ MPlayer-1.0rc1-patched/mp3lib/decode_MMX.c 2007-07-13 14:39:16.000000000 -0400 @@ -91,7 +91,7 @@ "pushl %%ecx\n\t" "leal "MANGLE(mp3lib_decwins)"(%%ebx,%%ebx,1), %%edx\n\t" "shrl $1, %%ecx\n\t" -".balign 16\n\t" +".p2align 4\n\t" ".L03:\n\t" "movq (%%edx),%%mm0\n\t" "movq 64(%%edx),%%mm4\n\t" @@ -169,7 +169,7 @@ ".next_loop:\n\t" "subl $64,%%esi\n\t" "movl $7,%%ecx\n\t" -".balign 16\n\t" +".p2align 4\n\t" ".L04:\n\t" "movq (%%edx),%%mm0\n\t" "movq 64(%%edx),%%mm4\n\t" --- MPlayer-1.0rc1/mp3lib/sr1.c 2006-10-22 18:32:26.000000000 -0400 +++ MPlayer-1.0rc1-patched/mp3lib/sr1.c 2007-07-13 14:56:51.000000000 -0400 @@ -52,6 +52,9 @@ static long outscale = 32768; #include "tabinit.c" +#undef HAVE_MMX +#undef HAVE_SSE + #if 1 extern int mplayer_audio_read(char *buf,int size); --- MPlayer-1.0rc1/stream/stream_cddb.c 2006-10-22 18:32:25.000000000 -0400 +++ MPlayer-1.0rc1-patched/stream/stream_cddb.c 2007-07-13 15:27:51.000000000 -0400 @@ -207,6 +207,10 @@ close(drive); return tochdr.ending_track; } +#else +int read_toc(const char *dev) { + return NULL; +} #endif /**