Author: ranger
Date: Mon Jun 19 01:29:30 2006
New Revision: 132
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=132&repname=user%3a+ranger>
Log:
holy crap, it runs on intel!
Modified:
trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.info
trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.patch
Modified: trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.info&rev=132&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.info (original)
+++ trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.info Mon Jun 19
01:29:30 2006
@@ -16,6 +16,7 @@
nam-US: http://www.people.virginia.edu/~drf8f/MPlayer/releases/
<<
Source-MD5: f82bb2bc51b6cd5e5dd96f88f6f98582
+Patch: %n.patch
BuildDepends: <<
aalib (>= 1.4rc5-2),
@@ -75,12 +76,6 @@
Conflicts: mplayer-altivec, mplayer-custom, mplayer0.9
Provides: x-media-player
-#PatchScript: <<
-##!/bin/bash -e
-#touch .developer
-#patch -p0 < %a/%n.patch
-#<<
-
ConfigureParams: --with-extralibdir="%p/lib" --with-extraincdir="%p/include"
--mandir="%p/share/man" --enable-menu --enable-gui --disable-altivec
--enable-xmms --disable-gcc-checking
NoSetMAKEFLAGS: true
Modified: trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.patch&rev=132&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.patch (original)
+++ trunk/experimental/3rdparty/main/finkinfo/graphics/mplayer.patch Mon Jun 19
01:29:30 2006
@@ -1,44 +1,124 @@
-Index: etc/example.conf
-===================================================================
-RCS file: /cvsroot/mplayer/main/etc/example.conf,v
-retrieving revision 1.70
-diff -u -r1.70 example.conf
---- etc/example.conf 27 Mar 2006 11:39:14 -0000 1.70
-+++ etc/example.conf 30 Apr 2006 14:29:46 -0000
-@@ -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
-Index: mp3lib/Makefile
-===================================================================
-RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v
-retrieving revision 1.40
-diff -u -r1.40 Makefile
---- mp3lib/Makefile 27 Jan 2006 00:06:40 -0000 1.40
-+++ mp3lib/Makefile 30 Apr 2006 14:29:46 -0000
+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
+-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
+-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
++#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
++#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
@@ -56,21 +136,133 @@
ifeq ($(TARGET_ARCH_POWERPC),yes)
ifeq ($(TARGET_ALTIVEC),yes)
SRCS += dct64_altivec.c
-Index: mp3lib/sr1.c
-===================================================================
-RCS file: /cvsroot/mplayer/main/mp3lib/sr1.c,v
-retrieving revision 1.37
-diff -u -r1.37 sr1.c
---- mp3lib/sr1.c 15 Apr 2006 14:33:19 -0000 1.37
-+++ mp3lib/sr1.c 30 Apr 2006 14:29:46 -0000
-@@ -31,10 +31,6 @@
-
- #include "fastmemcpy.h"
-
--#ifdef ARCH_X86
--#define CAN_COMPILE_X86_ASM
--#endif
+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 @@
+ "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"
+ ".L03:\n\t"
+ "movq (%%edx),%%mm0\n\t"
+ "movq 64(%%edx),%%mm4\n\t"
+@@ -169,7 +170,7 @@
+ ".next_loop:\n\t"
+ "subl $64,%%esi\n\t"
+ "movl $7,%%ecx\n\t"
+-".balign 16\n\t"
++".align 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.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;
+- }
-
- //static FILE* mp3_file=NULL;
-
- int MP3_frames=0;
+- 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
+ #endif
+ #ifdef HAVE_ALTIVEC
+ if (gCpuCaps.hasAltiVec)
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
