Author: ranger Date: Fri Jul 13 23:16:16 2007 New Revision: 887 URL: http://svn.finkproject.org/websvn/listing.php?sc=1&rev=887&repname=user%3a+ranger Log: mplayer workie on intel, now to test on ppc
Added: trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/ trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.info trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.patch trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/ trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.info trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.patch Modified: trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.info trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.patch Added: trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.info URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.info&rev=887&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.info (added) +++ trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.info Fri Jul 13 23:16:16 2007 @@ -1,0 +1,150 @@ +Package: mplayer +Version: 1.0.0rc1 +Revision: 11 +Description: MPEG 1/2, .ogm and AVI movie player +License: GPL +Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]> + +Depends: << + aalib-shlibs (>= 1.4rc5-2), + arts-shlibs, + audiofile-shlibs, + esound-shlibs, + faac-shlibs, + freetype219-shlibs, + fribidi-shlibs, + giflib-shlibs, + glib-shlibs, + glib2-shlibs (>= 2.8.6-1), + gtk+-shlibs, + jack-shlibs, + lame-shlibs, + libcdio5-shlibs, + libcdparanoia0-shlibs, + libdv4-shlibs, + libgettext3-shlibs, + libjpeg-shlibs, + libmad-shlibs, + libncurses5-shlibs, + libogg-shlibs, + libpng3-shlibs, + libtheora0-shlibs, + libvorbis0-shlibs, + lynx | lynx-ssl | www-browser, + mplayer-skin, + sdl-shlibs (>= 1.2.9-1001), + speex3-shlibs, + x11, + xmms-shlibs, + xvidcore-shlibs +<< +BuildDepends: << + aalib (>= 1.4rc5-2), + arts-dev (>= 1.1.0-12), + audiofile, + esound, + faac-dev, + fink (>= 0.26.0-1), + fontconfig2-dev, + freetype219, + fribidi-dev, + gettext-bin, + giflib, + glib, + glib2 (>= 2.8.6-1), + gtk+, + jack-dev, + lame, + libcdio5-dev, + libcdparanoia0-dev, + libdv4, + libgettext3-dev, + libiconv-dev, + libjpeg, + libmad, + libncurses5, + libogg, + libpng3, + libtheora0, + libvorbis0, + pkgconfig, + sdl (>= 1.2.9-1001), + speex3, + x11-dev, + xmms, + xvidcore +<< +Provides: x-media-player +Conflicts: << + mplayer-altivec, + mplayer-custom, + mplayer0.9 +<< +Replaces: << + mplayer-altivec, + mplayer-custom, + mplayer0.9 +<< + +CustomMirror: << + eur-CH: http://www1.mplayerhq.hu/MPlayer/releases/ + eur-CH: ftp://ftp1.mplayerhq.hu/MPlayer/releases/ + eur-HU: http://www2.mplayerhq.hu/MPlayer/releases/ + eur-HU: ftp://ftp2.mplayerhq.hu/MPlayer/releases/ + nam-US: http://www3.mplayerhq.hu/MPlayer/releases/ + nam-US: ftp://ftp4.mplayerhq.hu/MPlayer/releases/ + nam-US: http://www4.mplayerhq.hu/MPlayer/releases/ + asi-KR: http://www5.mplayerhq.hu/MPlayer/releases/ + asi-KR: ftp://ftp5.mplayerhq.hu/MPlayer/releases/ + eur-DE: http://www7.mplayerhq.hu/MPlayer/releases/ + eur-DE: ftp://ftp7.mplayerhq.hu/MPlayer/releases/ + eur-DE: ftp://ftp.fu-berlin.de/unix/X11/multimedia/MPlayer/releases/ + eur-FR: ftp://ftp.free.fr/mirrors/mplayerhq.hu/MPlayer/releases/ +<< +Source: mirror:custom:MPlayer-1.0rc1.tar.bz2 +Source-MD5: 18c05d88e22c3b815a43ca8d7152ccdc +Patch: %n.patch + +SetCPPFLAGS: -I%p/include/libcdparanoia -I%p/lib/freetype219/include -I%p/lib/fontconfig2/include +SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib +ConfigureParams: --mandir="%p/share/man" --enable-menu --enable-gui --disable-altivec --enable-xmms --disable-dvdnav --with-dvdnav-config=%p/bin/dvdnav-config --with-freetype-config=%p/lib/freetype219/bin/freetype-config +CompileScript: << + export PATH="%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH" + export PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkconfig:$PKG_CONFIG_PATH" + ./configure %c + make +<< + +InstallScript: << + make -j1 install DESTDIR=%d + + install -d -m 755 %i/etc/mplayer + install -c -m 644 etc/codecs.conf etc/input.conf %i/etc/mplayer/ + install -c -m 644 etc/example.conf %i/etc/mplayer/mplayer.conf + + rm -rf %i/share/%n/font + + install -d -m 755 %i/share/doc/%N/ + cp -r DOCS/* %i/share/doc/%N/ + mv TOOLS %i/share/doc/%N/tools +<< +DocFiles: AUTHORS ChangeLog Copyright LICENSE README + +ConfFiles: << + %p/etc/mplayer/mplayer.conf + %p/etc/mplayer/codecs.conf + %p/etc/mplayer/input.conf +<< + +Homepage: http://www.mplayerhq.hu/ +DescDetail: << +MPlayer is a movie and animation player based on the 0.2.0 version of +libmpeg2 (mpeg2dec) and the Avifile library. It uses mpeg2dec/libmpeg2 +for MPEG decoding. The supported file formats are MPEG 1/2 (MPG, DAT, +BIN, VOB) and AVI/ASF/WMF(Mpeg/PCM/AC3/DivX/MS-ADPCM/aLaw audio, +MPEG4/DivX/Indeo/CVID/WMF video codecs and many more). It supports +hardware YUV colorspace conversion and scaling via mga_vid/syncfb +devices or the X11 Xv extension. +<< +DescPackaging: --disable-dvdnav because of a missing symbol: http://lists-archives.org/mplayer-dev-eng/14284-here-s-my-hack-for-udffindfile-missing-on-darwin-macosx.html + Added: trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.patch URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.patch&rev=887&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.patch (added) +++ trunk/experimental/3rdparty/10.3/main/finkinfo/graphics/mplayer.patch Fri Jul 13 23:16:16 2007 @@ -1,0 +1,242 @@ + +--- 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 <AL/al.h> ++#include <OpenAL/al.h> + 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 <stdlib.h> + #include <stdio.h> + #include <inttypes.h> +-#include <AL/alc.h> +-#include <AL/al.h> ++#include <OpenAL/alc.h> ++#include <OpenAL/al.h> + + #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 + + /** Added: trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.info URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.info&rev=887&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.info (added) +++ trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.info Fri Jul 13 23:16:16 2007 @@ -1,0 +1,151 @@ +Package: mplayer +Version: 1.0.0rc1 +Revision: 1021 +Description: MPEG 1/2, .ogm and AVI movie player +License: GPL +Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]> + +Depends: << + aalib-shlibs (>= 1.4rc5-2), + arts-shlibs, + audiofile-shlibs, + esound-shlibs, + faac-shlibs, + fontconfig2-shlibs, + freetype219-shlibs, + fribidi-shlibs, + giflib-shlibs, + glib-shlibs, + glib2-shlibs (>= 2.12.0-1), + gtk+-shlibs, + jack-shlibs, + lame-shlibs, + libcdio7-shlibs, + libcdparanoia0-shlibs, + libdv4-shlibs, + libgettext3-shlibs, + libjpeg-shlibs, + libmad-shlibs, + libncurses5-shlibs, + libogg-shlibs, + libpng3-shlibs, + libtheora0-shlibs, + libvorbis0-shlibs, + lynx | lynx-ssl | www-browser, + mplayer-skin, + sdl-shlibs (>= 1.2.9-1001), + speex3-shlibs, + x11, + xmms-shlibs, + xvidcore-shlibs +<< +BuildDepends: << + aalib (>= 1.4rc5-2), + arts-dev (>= 1.1.0-1022), + audiofile, + esound, + faac-dev, + fink (>= 0.26.0-1), + fontconfig2-dev, + freetype219, + fribidi-dev, + gettext-bin, + giflib, + glib, + glib2 (>= 2.12.0-1), + gtk+, + jack-dev, + lame, + libcdio-dev, + libcdparanoia0-dev, + libdv4, + libgettext3-dev, + libiconv-dev, + libjpeg, + libmad, + libncurses5, + libogg, + libpng3, + libtheora0, + libvorbis0, + pkgconfig, + sdl (>= 1.2.9-1001), + speex3, + x11-dev, + xmms, + xvidcore +<< +Provides: x-media-player +Conflicts: << + mplayer-altivec, + mplayer-custom, + mplayer0.9 +<< +Replaces: << + mplayer-altivec, + mplayer-custom, + mplayer0.9 +<< + +CustomMirror: << + eur-CH: http://www1.mplayerhq.hu/MPlayer/releases/ + eur-CH: ftp://ftp1.mplayerhq.hu/MPlayer/releases/ + eur-HU: http://www2.mplayerhq.hu/MPlayer/releases/ + eur-HU: ftp://ftp2.mplayerhq.hu/MPlayer/releases/ + nam-US: http://www3.mplayerhq.hu/MPlayer/releases/ + nam-US: ftp://ftp4.mplayerhq.hu/MPlayer/releases/ + nam-US: http://www4.mplayerhq.hu/MPlayer/releases/ + asi-KR: http://www5.mplayerhq.hu/MPlayer/releases/ + asi-KR: ftp://ftp5.mplayerhq.hu/MPlayer/releases/ + eur-DE: http://www7.mplayerhq.hu/MPlayer/releases/ + eur-DE: ftp://ftp7.mplayerhq.hu/MPlayer/releases/ + eur-DE: ftp://ftp.fu-berlin.de/unix/X11/multimedia/MPlayer/releases/ + eur-FR: ftp://ftp.free.fr/mirrors/mplayerhq.hu/MPlayer/releases/ +<< +Source: mirror:custom:MPlayer-1.0rc1.tar.bz2 +Source-MD5: 18c05d88e22c3b815a43ca8d7152ccdc +Patch: %n.patch + +SetCPPFLAGS: -I%p/include/libcdparanoia -I%p/lib/freetype219/include -I%p/lib/fontconfig2/include +SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib +ConfigureParams: --mandir="%p/share/man" --enable-menu --enable-gui --disable-altivec --enable-xmms --disable-dvdnav --with-dvdnav-config=%p/bin/dvdnav-config --with-freetype-config=%p/lib/freetype219/bin/freetype-config +CompileScript: << + export PATH="%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH" + export PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkconfig:$PKG_CONFIG_PATH" + ./configure %c + make +<< + +InstallScript: << + make -j1 install DESTDIR=%d + + install -d -m 755 %i/etc/mplayer + install -c -m 644 etc/codecs.conf etc/input.conf %i/etc/mplayer/ + install -c -m 644 etc/example.conf %i/etc/mplayer/mplayer.conf + + rm -rf %i/share/%n/font + + install -d -m 755 %i/share/doc/%N/ + cp -r DOCS/* %i/share/doc/%N/ + mv TOOLS %i/share/doc/%N/tools +<< +DocFiles: AUTHORS ChangeLog Copyright LICENSE README + +ConfFiles: << + %p/etc/mplayer/mplayer.conf + %p/etc/mplayer/codecs.conf + %p/etc/mplayer/input.conf +<< + +Homepage: http://www.mplayerhq.hu/ +DescDetail: << +MPlayer is a movie and animation player based on the 0.2.0 version of +libmpeg2 (mpeg2dec) and the Avifile library. It uses mpeg2dec/libmpeg2 +for MPEG decoding. The supported file formats are MPEG 1/2 (MPG, DAT, +BIN, VOB) and AVI/ASF/WMF(Mpeg/PCM/AC3/DivX/MS-ADPCM/aLaw audio, +MPEG4/DivX/Indeo/CVID/WMF video codecs and many more). It supports +hardware YUV colorspace conversion and scaling via mga_vid/syncfb +devices or the X11 Xv extension. +<< +DescPackaging: --disable-dvdnav because of a missing symbol: http://lists-archives.org/mplayer-dev-eng/14284-here-s-my-hack-for-udffindfile-missing-on-darwin-macosx.html + Added: trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.patch URL: http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.patch&rev=887&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.patch (added) +++ trunk/experimental/3rdparty/10.4/main/finkinfo/graphics/mplayer.patch Fri Jul 13 23:16:16 2007 @@ -1,0 +1,242 @@ + +--- 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 <AL/al.h> ++#include <OpenAL/al.h> + 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 <stdlib.h> + #include <stdio.h> + #include <inttypes.h> +-#include <AL/alc.h> +-#include <AL/al.h> ++#include <OpenAL/alc.h> ++#include <OpenAL/al.h> + + #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 + + /** Modified: trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.info URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.info&rev=887&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.info (original) +++ trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.info Fri Jul 13 23:16:16 2007 @@ -1,47 +1,57 @@ Package: mplayer -Version: 1.0.0pre8 +Version: 1.0.0rc1 Revision: 1 -Source: mirror:custom:MPlayer-1.0pre8.tar.bz2 +Source: mirror:custom:MPlayer-1.0rc1.tar.bz2 CustomMirror: << eur-CH: http://www1.mplayerhq.hu/MPlayer/releases/ eur-CH: ftp://ftp1.mplayerhq.hu/MPlayer/releases/ - eur-CH: http://www4.mplayerhq.hu/MPlayer/releases/ eur-HU: http://www2.mplayerhq.hu/MPlayer/releases/ eur-HU: ftp://ftp2.mplayerhq.hu/MPlayer/releases/ - eur-DE: http://studwww.ira.uni-karlsruhe.de/~s_doeffi/MPlayer/ + nam-US: http://www3.mplayerhq.hu/MPlayer/releases/ + nam-US: ftp://ftp4.mplayerhq.hu/MPlayer/releases/ + nam-US: http://www4.mplayerhq.hu/MPlayer/releases/ + asi-KR: http://www5.mplayerhq.hu/MPlayer/releases/ + asi-KR: ftp://ftp5.mplayerhq.hu/MPlayer/releases/ + eur-DE: http://www7.mplayerhq.hu/MPlayer/releases/ + eur-DE: ftp://ftp7.mplayerhq.hu/MPlayer/releases/ eur-DE: ftp://ftp.fu-berlin.de/unix/X11/multimedia/MPlayer/releases/ - eur-SE: http://equinox.campus.ltu.se/MPlayer/releases/ - eur-SE: http://tranquillity.campus.ltu.se/~rtogni/ - eur-SE: ftp://equinox.campus.ltu.se/MPlayer/releases/ - nam-US: http://www.people.virginia.edu/~drf8f/MPlayer/releases/ + eur-FR: ftp://ftp.free.fr/mirrors/mplayerhq.hu/MPlayer/releases/ << -Source-MD5: f82bb2bc51b6cd5e5dd96f88f6f98582 +Source-MD5: 18c05d88e22c3b815a43ca8d7152ccdc Patch: %n.patch -PatchScript: perl -pi -e 's,-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk,,' configure BuildDepends: << aalib (>= 1.4rc5-2), arts-dev (>= 1.1.0-2), audiofile, esound, + faac-dev, fink (>= 0.17.0-1), fontconfig2-dev, freetype219, + fribidi-dev, gettext-bin, giflib, glib, glib2 (>= 2.6.6-1111), gtk+, + jack-dev, lame, + libcdio-dev, + libcdparanoia0-dev, libdv4, libgettext3-dev, libiconv-dev, libjpeg, libmad, + libncurses5, libogg, libpng3, + libtheora0, libvorbis0, + pkgconfig, sdl (>= 1.2.9-1001), + speex3, x11-dev, xmms, xvidcore @@ -51,23 +61,31 @@ arts-shlibs, audiofile-shlibs, esound-shlibs, + faac-shlibs, fontconfig2-shlibs, freetype219-shlibs, + fribidi-shlibs, giflib-shlibs, glib-shlibs, glib2-shlibs (>= 2.6.6-1111), gtk+-shlibs, + jack-shlibs, lame-shlibs, + libcdio7-shlibs, + libcdparanoia0-shlibs, libdv4-shlibs, libgettext3-shlibs, libjpeg-shlibs, libmad-shlibs, + libncurses5-shlibs, libogg-shlibs, libpng3-shlibs, + libtheora0-shlibs, libvorbis0-shlibs, lynx | lynx-ssl | www-browser, mplayer-skin, sdl-shlibs (>= 1.2.9-1001), + speex3-shlibs, x11, xmms-shlibs, xvidcore-shlibs @@ -77,31 +95,36 @@ Conflicts: mplayer-altivec, mplayer-custom, mplayer0.9 Provides: x-media-player -ConfigureParams: --with-extralibdir="%p/lib" --with-extraincdir="%p/include" --mandir="%p/share/man" --enable-menu --enable-gui --disable-altivec --enable-xmms --disable-gcc-checking +SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib +SetCPPFLAGS: -I%p/include/libcdparanoia -I%p/lib/freetype219/include -I%p/lib/fontconfig2/include +#NoSetMAKEFLAGS: true +#SetMAKEFLAGS: -j1 +ConfigureParams: --mandir="%p/share/man" --enable-menu --enable-gui --disable-altivec --enable-xmms --disable-dvdnav --with-dvdnav-config=%p/bin/dvdnav-config --with-freetype-config=%p/lib/freetype219/bin/freetype-config -NoSetMAKEFLAGS: true -SetMAKEFLAGS: -j1 CompileScript: << export PATH="%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH" export PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkconfig:$PKG_CONFIG_PATH" - echo "" | ./configure %c + ./configure %c make << InstallScript: << - make install DESTDIR=%d - mkdir -p %i/etc/mplayer - cp etc/codecs.conf %i/etc/mplayer/codecs.conf - cp etc/input.conf %i/etc/mplayer/input.conf - cp etc/example.conf %i/etc/mplayer/mplayer.conf - rm -rf %i/share/%n/font - mkdir -p %i/share/doc/%n - cp -r DOCS/* %i/share/doc/%n + make -j1 install DESTDIR=%d + + install -d -m 755 %i/etc/mplayer + install -c -m 644 etc/codecs.conf etc/input.conf %i/etc/mplayer/ + install -c -m 644 etc/example.conf %i/etc/mplayer/mplayer.conf + + rm -rf %i/share/%n/font + + install -d -m 755 %i/share/doc/%N/ + cp -r DOCS/* %i/share/doc/%N/ + mv TOOLS %i/share/doc/%N/tools << -DocFiles: AUTHORS ChangeLog LICENSE README +DocFiles: AUTHORS ChangeLog Copyright LICENSE README ConfFiles: << - %p/etc/mplayer/mplayer.conf - %p/etc/mplayer/codecs.conf - %p/etc/mplayer/input.conf + %p/etc/mplayer/mplayer.conf + %p/etc/mplayer/codecs.conf + %p/etc/mplayer/input.conf << Description: MPEG 1/2, .ogm and AVI movie player DescDetail: << @@ -113,13 +136,8 @@ hardware YUV colorspace conversion and scaling via mga_vid/syncfb devices or the X11 Xv extension. << -DescPort: << -faa2 is included to play mp4/AAC files, but should be also in a seperate package...which maybe we should force to use. -On second thought, mplayer's is newer - -I hope these deps are correct... - -Previously by Justin Hallett +DescPackaging: << +--disable-dvdnav because of a missing symbol: http://lists-archives.org/mplayer-dev-eng/14284-here-s-my-hack-for-udffindfile-missing-on-darwin-macosx.html << License: GPL Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]> Modified: trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.patch URL: http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.patch&rev=887&repname=user%3a+ranger ============================================================================== --- trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.patch (original) +++ trunk/experimental/3rdparty/common/main/finkinfo/graphics/mplayer.patch Fri Jul 13 23:16:16 2007 @@ -1,268 +1,252 @@ -diff -uNr MPlayer-1.0pre8/configure MPlayer-1.0pre8-new/configure ---- MPlayer-1.0pre8/configure 2006-06-11 14:35:47.000000000 -0400 -+++ MPlayer-1.0pre8-new/configure 2006-06-18 18:59:10.000000000 -0400 -@@ -830,11 +830,11 @@ - # gather more CPU information - pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1` - pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1` -- pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1` -+ pfamily="4" - pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1` - pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1` - -- exts=`$_cpuinfo | egrep 'features|flags' | cut -d ':' -f 2 | _head 1` -+ exts="" - - pparam=`echo $exts | sed -e s/k6_mtrr/mtrr/ -e s/cyrix_arr/mtrr/ -e s/centaur_mcr/mtrr/ \ - -e s/xmm/sse/ -e s/kni/sse/` -diff -uNr MPlayer-1.0pre8/libavcodec/Makefile MPlayer-1.0pre8-new/libavcodec/Makefile ---- MPlayer-1.0pre8/libavcodec/Makefile 2006-06-11 14:35:48.000000000 -0400 -+++ MPlayer-1.0pre8-new/libavcodec/Makefile 2006-06-18 15:12:04.000000000 -0400 -@@ -338,29 +338,29 @@ - endif - - # i386 mmx specific stuff +diff -uNr MPlayer-1.0rc1/Makefile MPlayer-1.0rc1-patched/Makefile +--- 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) +diff -uNr MPlayer-1.0rc1/configure MPlayer-1.0rc1-patched/configure +--- 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 <AL/al.h> ++#include <OpenAL/al.h> + 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" +diff -uNr MPlayer-1.0rc1/etc/example.conf MPlayer-1.0rc1-patched/etc/example.conf +--- 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 +diff -uNr MPlayer-1.0rc1/libao2/ao_openal.c MPlayer-1.0rc1-patched/libao2/ao_openal.c +--- 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 <stdlib.h> + #include <stdio.h> + #include <inttypes.h> +-#include <AL/alc.h> +-#include <AL/al.h> ++#include <OpenAL/alc.h> ++#include <OpenAL/al.h> + + #include "config.h" + #include "mp_msg.h" +diff -uNr MPlayer-1.0rc1/libvo/aclib_template.c MPlayer-1.0rc1-patched/libvo/aclib_template.c +--- 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" +diff -uNr MPlayer-1.0rc1/loader/stubs.s MPlayer-1.0rc1-patched/loader/stubs.s +--- 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 +diff -uNr MPlayer-1.0rc1/loader/wrapper.S MPlayer-1.0rc1-patched/loader/wrapper.S +--- 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 +diff -uNr MPlayer-1.0rc1/mp3lib/Makefile MPlayer-1.0rc1-patched/mp3lib/Makefile +--- 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) --OBJS += i386/fdct_mmx.o i386/cputest.o \ -- i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ -- i386/idct_mmx.o i386/motion_est_mmx.o \ -- i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \ -- i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o i386/snowdsp_mmx.o --ifeq ($(CONFIG_GPL),yes) --OBJS += i386/idct_mmx_xvid.o --endif --ifeq ($(TARGET_BUILTIN_VECTOR),yes) --i386/fft_sse.o: CFLAGS+= -msse --depend: CFLAGS+= -msse --endif --ifeq ($(TARGET_BUILTIN_3DNOW),yes) --i386/fft_3dn.o: CFLAGS+= -m3dnow --ifeq ($(TARGET_ARCH_X86),yes) --i386/fft_3dn2.o: CFLAGS+= -march=athlon --endif --ifeq ($(TARGET_ARCH_X86_64),yes) --i386/fft_3dn2.o: CFLAGS+= -march=k8 --endif --endif +-SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c -endif +#ifeq ($(TARGET_MMX),yes) -+#OBJS += i386/fdct_mmx.o i386/cputest.o \ -+# i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ -+# i386/idct_mmx.o i386/motion_est_mmx.o \ -+# i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \ -+# i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o i386/snowdsp_mmx.o -+#ifeq ($(CONFIG_GPL),yes) -+#OBJS += i386/idct_mmx_xvid.o ++#SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c +#endif -+#ifeq ($(TARGET_BUILTIN_VECTOR),yes) -+#i386/fft_sse.o: CFLAGS+= -msse -+#depend: CFLAGS+= -msse + 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 -+#ifeq ($(TARGET_BUILTIN_3DNOW),yes) -+#i386/fft_3dn.o: CFLAGS+= -m3dnow -+#ifeq ($(TARGET_ARCH_X86),yes) -+#i386/fft_3dn2.o: CFLAGS+= -march=athlon -+#endif -+#ifeq ($(TARGET_ARCH_X86_64),yes) -+#i386/fft_3dn2.o: CFLAGS+= -march=k8 -+#endif -+#endif -+#endif - - # armv4l specific stuff - ifeq ($(TARGET_ARCH_ARMV4L),yes) -diff -uNr MPlayer-1.0pre8/libavcodec/i386/fdct_mmx.c MPlayer-1.0pre8-new/libavcodec/i386/fdct_mmx.c ---- MPlayer-1.0pre8/libavcodec/i386/fdct_mmx.c 2006-06-11 14:35:47.000000000 -0400 -+++ MPlayer-1.0pre8-new/libavcodec/i386/fdct_mmx.c 2006-06-18 15:11:57.000000000 -0400 -@@ -358,13 +358,13 @@ - "movdqa \\t+48(%1), %%xmm7 \n\t" - "movdqa \\t(%1), %%xmm4 \n\t" - "movdqa \\t+16(%1), %%xmm5 \n\t" -- ".endm \n\t" -+ ".endmacro \n\t" - ".macro FDCT_ROW_SSE2_H2 i t \n\t" - "movq \\i(%0), %%xmm2 \n\t" - "movq \\i+8(%0), %%xmm0 \n\t" - "movdqa \\t+32(%1), %%xmm3 \n\t" - "movdqa \\t+48(%1), %%xmm7 \n\t" -- ".endm \n\t" -+ ".endmacro \n\t" - ".macro FDCT_ROW_SSE2 i \n\t" - "movq %%xmm2, %%xmm1 \n\t" - "pshuflw $27, %%xmm0, %%xmm0 \n\t" -@@ -384,7 +384,7 @@ - "psrad %3, %%xmm1 \n\t" - "packssdw %%xmm3, %%xmm1 \n\t" - "movdqa %%xmm1, \\i(%4) \n\t" -- ".endm \n\t" -+ ".endmacro \n\t" - "movdqa (%2), %%xmm6 \n\t" - "FDCT_ROW_SSE2_H1 0 0 \n\t" - "FDCT_ROW_SSE2 0 \n\t" -diff -uNr MPlayer-1.0pre8/libmpdemux/cddb.c MPlayer-1.0pre8-new/libmpdemux/cddb.c ---- MPlayer-1.0pre8/libmpdemux/cddb.c 2006-06-11 14:35:46.000000000 -0400 -+++ MPlayer-1.0pre8-new/libmpdemux/cddb.c 2006-06-18 16:09:48.000000000 -0400 -@@ -100,6 +100,13 @@ - return tochdr.cdth_trk1; - } - -+#elif defined(__APPLE__) -+ -+int -+read_toc(const char *dev) { -+ return -1; -+} -+ - #elif defined(WIN32) - int - read_toc(const char *dev) { -diff -uNr MPlayer-1.0pre8/mp3lib/Makefile MPlayer-1.0pre8-new/mp3lib/Makefile ---- MPlayer-1.0pre8/mp3lib/Makefile 2006-06-11 14:35:43.000000000 -0400 -+++ MPlayer-1.0pre8-new/mp3lib/Makefile 2006-06-18 19:16:04.000000000 -0400 -@@ -8,16 +8,6 @@ - OPTFLAGS := $(OPTFLAGS:-O4=-O0) endif - CFLAGS = -I.. $(OPTFLAGS) $(EXTRA_INC) --ifeq ($(TARGET_ARCH_X86),yes) --SRCS += decode_i586.c --OBJS += decode_i586.o --SRCS += decode_MMX.c dct64_MMX.c tabinit_MMX.c --OBJS += decode_MMX.o dct64_MMX.o tabinit_MMX.o --SRCS += dct36_3dnow.c dct64_3dnow.c --OBJS += dct36_3dnow.o dct64_3dnow.o --SRCS += dct36_k7.c dct64_k7.c --OBJS += dct36_k7.o dct64_k7.o --endif ifeq ($(TARGET_ARCH_POWERPC),yes) ifeq ($(TARGET_ALTIVEC),yes) - SRCS += dct64_altivec.c -diff -uNr MPlayer-1.0pre8/mp3lib/decod386.c MPlayer-1.0pre8-new/mp3lib/decod386.c ---- MPlayer-1.0pre8/mp3lib/decod386.c 2006-06-11 14:35:43.000000000 -0400 -+++ MPlayer-1.0pre8-new/mp3lib/decod386.c 2006-06-18 19:16:04.000000000 -0400 -@@ -124,6 +124,7 @@ - static synth_func_t synth_func; - - #if defined(CAN_COMPILE_X86_ASM) -+/* - int synth_1to1_MMX( real *bandPtr,int channel,short * samples) - { - static short buffs[2][2][0x110]; -@@ -131,6 +132,7 @@ - synth_1to1_MMX_s(bandPtr, channel, samples, (short *) buffs, &bo); - return 0; - } -+*/ - #endif - - #ifdef HAVE_ALTIVEC -diff -uNr MPlayer-1.0pre8/mp3lib/decode_MMX.c MPlayer-1.0pre8-new/mp3lib/decode_MMX.c ---- MPlayer-1.0pre8/mp3lib/decode_MMX.c 2006-06-11 14:35:43.000000000 -0400 -+++ MPlayer-1.0pre8-new/mp3lib/decode_MMX.c 2006-06-18 19:16:04.000000000 -0400 -@@ -48,6 +48,7 @@ - 1060439283, - }; - -+/* - static int temp; // buggy gcc 3.x fails if this is moved into the function :( - void synth_1to1_MMX_s(real *bandPtr, int channel, short *samples, - short *buffs, int *bo) -@@ -91,7 +92,7 @@ +diff -uNr MPlayer-1.0rc1/mp3lib/decode_MMX.c MPlayer-1.0rc1-patched/mp3lib/decode_MMX.c +--- 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" -+".align 4\n\t" ++".p2align 4\n\t" ".L03:\n\t" "movq (%%edx),%%mm0\n\t" "movq 64(%%edx),%%mm4\n\t" -@@ -169,7 +170,7 @@ +@@ -169,7 +169,7 @@ ".next_loop:\n\t" "subl $64,%%esi\n\t" "movl $7,%%ecx\n\t" -".balign 16\n\t" -+".align 4\n\t" ++".p2align 4\n\t" ".L04:\n\t" "movq (%%edx),%%mm0\n\t" "movq 64(%%edx),%%mm4\n\t" -@@ -246,3 +247,5 @@ - :"m"(bandPtr),"m"(channel),"m"(samples),"m"(buffs),"m"(bo), "m"(temp) - :"memory","%edi","%esi","%ebx","%esp"); +diff -uNr MPlayer-1.0rc1/mp3lib/sr1.c MPlayer-1.0rc1-patched/mp3lib/sr1.c +--- 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); + +diff -uNr MPlayer-1.0rc1/stream/stream_cddb.c MPlayer-1.0rc1-patched/stream/stream_cddb.c +--- 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; } -+ -+*/ -diff -uNr MPlayer-1.0pre8/mp3lib/mpg123.h MPlayer-1.0pre8-new/mp3lib/mpg123.h ---- MPlayer-1.0pre8/mp3lib/mpg123.h 2006-06-11 14:35:43.000000000 -0400 -+++ MPlayer-1.0pre8-new/mp3lib/mpg123.h 2006-06-18 19:16:04.000000000 -0400 -@@ -116,6 +116,7 @@ - extern real mp3lib_decwin[(512+32)]; - extern real *mp3lib_pnts[]; - -+/* - extern int synth_1to1_pent( real *,int,short * ); - extern void make_decode_tables_MMX(long scaleval); - extern int synth_1to1_MMX( real *,int,short * ); -@@ -124,6 +125,7 @@ - extern void dct36_3dnow(real *,real *,real *,real *,real *); - extern void dct36_3dnowex(real *,real *,real *,real *,real *); - extern void dct36_sse(real *,real *,real *,real *,real *); -+*/ - - typedef int (*synth_func_t)( real *,int,short * ); - typedef void (*dct36_func_t)(real *,real *,real *,real *,real *); -diff -uNr MPlayer-1.0pre8/mp3lib/sr1.c MPlayer-1.0pre8-new/mp3lib/sr1.c ---- MPlayer-1.0pre8/mp3lib/sr1.c 2006-06-11 14:35:43.000000000 -0400 -+++ MPlayer-1.0pre8-new/mp3lib/sr1.c 2006-06-18 19:16:04.000000000 -0400 -@@ -389,10 +389,12 @@ - /******************************************************************************/ - - /* It's hidden from gcc in assembler */ -+/* - extern void dct64_MMX(real *, real *, real *); - extern void dct64_MMX_3dnow(real *, real *, real *); - extern void dct64_MMX_3dnowex(real *, real *, real *); - void (*dct64_MMX_func)(real *, real *, real *); -+*/ - - #include "cpudetect.h" - -@@ -412,40 +414,6 @@ - - #ifdef CAN_COMPILE_X86_ASM - -- if (gCpuCaps.hasMMX) -- { -- _has_mmx = 1; -- make_decode_tables_MMX(outscale); -- mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: made decode tables with MMX optimization\n"); -- synth_func = synth_1to1_MMX; -- } -- -- if (gCpuCaps.has3DNowExt) -- { -- dct36_func=dct36_3dnowex; -- dct64_MMX_func= (gCpuCaps.hasMMX2) ? dct64_MMX_3dnowex : dct64_MMX_3dnow; -- mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow!Ex optimized decore!\n"); -- } -- else -- if (gCpuCaps.has3DNow) -- { -- dct36_func = dct36_3dnow; -- dct64_MMX_func = dct64_MMX_3dnow; -- mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow! optimized decore!\n"); -- } -- else -- if (gCpuCaps.hasMMX) -- { -- dct64_MMX_func = dct64_MMX; -- mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using MMX optimized decore!\n"); -- } -- else -- if (gCpuCaps.cpuType >= CPUTYPE_I586) -- { -- synth_func = synth_1to1_pent; -- mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using Pentium optimized decore!\n"); -- } -- else ++#else ++int read_toc(const char *dev) { ++ return NULL; ++} #endif - #ifdef HAVE_ALTIVEC - if (gCpuCaps.hasAltiVec) + + /** ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits