Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17:/tmp/cvs-serv15828/main/finkinfo/graphics
Modified Files:
Tag: pangocairo-branch
mplayer.info mplayer.patch
Log Message:
new upstream, pending release to unstable
Index: mplayer.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/mplayer.info,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -d -r1.5.2.3 -r1.5.2.4
--- mplayer.info 15 Mar 2007 16:08:46 -0000 1.5.2.3
+++ mplayer.info 19 Jul 2007 19:42:48 -0000 1.5.2.4
@@ -1,55 +1,143 @@
Package: mplayer
-Version: 1.0.0pre6a
-Revision: 1012
-Architecture: powerpc
-Source: mirror:custom:MPlayer-1.0pre6a.tar.bz2
+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-HU: http://www1.mplayerhq.hu/MPlayer/releases/
- eur-HU: http://www2.mplayerhq.hu/MPlayer/releases/
- eur-HU: ftp://ftp1.mplayerhq.hu/MPlayer/releases/
- eur-HU: ftp://ftp2.mplayerhq.hu/MPlayer/releases/
- eur-CH: http://www4.mplayerhq.hu/MPlayer/releases/
- nam-US: http://ftp5.mplayerhq.hu/MPlayer/releases/
- nam-US: http://ftp5.mplayerhq.hu/MPlayer/releases/
- oce-AU: ftp://ftp6.mplayerhq.hu/MPlayer/releases/
- eur-BG: ftp://ftp8.mplayerhq.hu/MPlayer/releases/
+ 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
-Source-MD5: a812d945b884c2e2fa7f90c57cd76bff
+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
+<<
-BuildDepends: lame, gtk+, glib, libpng3, aalib (>= 1.4rc5-2), libogg,
libvorbis0, libdv4, libmad, sdl (>= 1.2.9-1001), arts-dev (>= 1.1.0-2),
gettext-dev, gettext-bin, gettext-tools, libiconv-dev, xvidcore, x11-dev, fink
(>= 0.17.0-1), xmms, libjpeg, giflib, glib2-dev (>= 2.12.0-1), esound, audiofile
+InstallScript: <<
+ make -j1 install DESTDIR=%d
-Depends: x11, gtk+-shlibs, glib-shlibs, libpng3-shlibs, aalib-shlibs (>=
1.4rc5-2), sdl-shlibs (>= 1.2.9-1001), libogg-shlibs, libvorbis0-shlibs,
libmad-shlibs, lame-shlibs, lynx | lynx-ssl | www-browser, libdv4-shlibs,
arts-shlibs, mplayer-skin, xvidcore-shlibs, xmms-shlibs, libjpeg-shlibs,
giflib-shlibs, glib2-shlibs (>= 2.12.0-1), esound-shlibs, audiofile-shlibs
+ 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
-Replaces: mplayer-altivec, mplayer-custom, mplayer0.9
-Conflicts: mplayer-altivec, mplayer-custom, mplayer0.9
-Provides: x-media-player
+ rm -rf %i/share/%n/font
-PatchScript: <<
-#!/bin/bash -ev
-touch .developer
-patch -p1 < %a/%n.patch
+ 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
-ConfigureParams: --with-extralibdir="%p/lib" --with-extraincdir="%p/include"
--mandir="%p/share/man" --enable-menu --enable-gui --disable-cpu-optimization
--disable-altivec --enable-xmms
-
-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
-<<
-DocFiles: AUTHORS ChangeLog 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
+
+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
@@ -59,14 +147,5 @@
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...
+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
-Previously by Justin Hallett
-<<
-License: GPL
-Maintainer: Chris Zubrzycki <[EMAIL PROTECTED]>
-Homepage: http://www.mplayerhq.hu/
Index: mplayer.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/mplayer.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- mplayer.patch 20 Jan 2006 20:26:46 -0000 1.1
+++ mplayer.patch 19 Jul 2007 19:42:48 -0000 1.1.2.1
@@ -1,115 +1,242 @@
-diff -ruN MPlayer-1.0pre6/configure MPlayer-1.0pre6.new/configure
---- MPlayer-1.0pre6/configure Thu Dec 23 10:36:00 2004
-+++ MPlayer-1.0pre6.new/configure Tue Dec 28 20:36:49 2004
-@@ -272,6 +272,7 @@
+
+--- 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 @@
- Miscellaneous options:
- --enable-runtime-cpudetection Enable runtime CPU detection [disable]
-+ --disable-cpu-optimization Disable gcc CPU build optimization [enable]
- --cc=COMPILER use this C compiler to build MPlayer [gcc]
- --host-cc=COMPILER use this C compiler to build apps needed for the
build process [gcc]
- --as=ASSEMBLER use this assembler to build MPlayer [as]
-@@ -365,6 +366,7 @@
- test "$CC" && _cc="$CC"
- _as=auto
- _runtime_cpudetection=no
-+_cpu_optimization=yes
- for ac_option do
- case "$ac_option" in
- --target=*)
-@@ -406,6 +408,12 @@
- --disable-runtime-cpudetection)
- _runtime_cpudetection=no
- ;;
-+ --disable-cpu-optimization)
-+ _cpu_optimization=no
-+ ;;
-+ --enable-cpu-optimization)
-+ _cpu_optimization=yes
-+ ;;
- --install-path=*)
- _install=`echo $ac_option | cut -d '=' -f 2 | sed 's/\/$//'`"/install"
- ;;
-@@ -1029,32 +1037,34 @@
+ 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 test "$_cpu_optimization" = yes; then
-+ 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' ;;
-- 603e|603ev) _march='-mcpu=603e' _mcpu='-mtune=603e' ;;
-- 604|604e|604r|604ev) _march='-mcpu=604' _mcpu='-mtune=604' ;;
-- 740|740/750|745/755) _march='-mcpu=740' _mcpu='-mtune=740' ;;
-- 750|750CX) _march='-mcpu=750' _mcpu='-mtune=750' ;;
-- *) ;;
-+ 601) _march='-mcpu=601' _mcpu='-mtune=601' ;;
-+ 603) _march='-mcpu=603' _mcpu='-mtune=603' ;;
-+ 603e|603ev) _march='-mcpu=603e' _mcpu='-mtune=603e' ;;
-+ 604|604e|604r|604ev) _march='-mcpu=604' _mcpu='-mtune=604' ;;
-+ 740|740/750|745/755) _march='-mcpu=740' _mcpu='-mtune=740' ;;
-+ 750|750CX) _march='-mcpu=750' _mcpu='-mtune=750' ;;
-+ *) ;;
- esac
- # gcc 3.1(.1) and up supports 7400 and 7450
- if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "1"; then
-- case "$proc" in
-- 7400*|7410*) _march='-mcpu=7400' _mcpu='-mtune=7400' ;;
-- 7450*|7455*) _march='-mcpu=7450' _mcpu='-mtune=7450' ;;
-- *) ;;
-- esac
-+ case "$proc" in
-+ 7400*|7410*) _march='-mcpu=7400' _mcpu='-mtune=7400' ;;
-+ 7450*|7455*) _march='-mcpu=7450' _mcpu='-mtune=7450' ;;
-+ *) ;;
-+ esac
- fi
- # gcc 3.2 and up supports 970
- if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3"; then
-- case "$proc" in
-- 970*) _march='-mcpu=970' _mcpu='-mtune=970' ;;
-- *) ;;
-- esac
-- fi
-- fi
-+ case "$proc" in
-+ 970*) _march='-mcpu=970' _mcpu='-mtune=970' ;;
-+ *) ;;
-+ esac
-+ fi #gcc3.3 - 970
-+ fi #proc
-+ fi #disable_opt
+ 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 @@
+ ##################
- if test -n "$_mcpu"; then
- _optimizing=`echo $_mcpu | cut -c 8-`
-@@ -1408,6 +1418,8 @@
- --with-extralibdir=*) ;;
- --enable-runtime-cpudetection) ;;
- --disable-runtime-cpudetection) ;;
-+ --enable-cpu-optimization) ;;
-+ --disable-cpu-optimization) ;;
- --install-path=*) ;;
- --with-install=*) ;;
+ # Specify default video driver (see -vo help for a list).
+-#vo=xv
++#vo=sdl
-diff -ruN MPlayer-1.0pre6/etc/example.conf MPlayer-1.0pre6.new/etc/example.conf
---- MPlayer-1.0pre6/etc/example.conf Tue Jul 20 14:02:22 2004
-+++ MPlayer-1.0pre6.new/etc/example.conf Tue Dec 28 20:39:42 2004
-@@ -14,13 +14,13 @@
- ##
+ # Use SDL video with the aalib subdriver by default.
+ #vo = sdl:aalib
+@@ -44,7 +44,7 @@
+ #monitor-dotclock = 30M-300M
- # Specify default video driver (see -vo help for a list).
--# vo=xv
-+# vo=sdl
+ # 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
+-#ao=oss
++#ao=sdl
- # fullscreen mode
--# fs=yes
-+# fs=no
+ # 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>
- # Change to a different videomode when going fullscreen
- # (dga, x11, sdl video output drivers only).
+ #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
+
+ /**
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
