Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32380
Modified Files:
mplayer.info mplayer.patch
Log Message:
New version from tracker
https://sourceforge.net/tracker2/?func=detail&atid=414256&aid=2338551&group_id=17203
Index: mplayer.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/mplayer.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mplayer.info 28 Sep 2008 23:19:06 -0000 1.11
+++ mplayer.info 30 Nov 2008 12:08:12 -0000 1.12
@@ -2,7 +2,7 @@
Package: mplayer
Version: 1.0.0rc2
-Revision: 1008
+Revision: 1011
License: GPL
Maintainer: James Bunton <[EMAIL PROTECTED]>
Homepage: http://www.mplayerhq.hu/
@@ -20,11 +20,7 @@
Source: mirror:custom:MPlayer-1.0rc2.tar.bz2
Source-MD5: 7e27e535c2d267637df34898f1b91707
PatchFile: %n.patch
-PatchFile-md5: a14edf3bd48944be34e54fcb4530592d
-PatchScript: <<
-%{default_script}
-sed -i'' -e 's,mssse3,msse3,' configure
-<<
+PatchFile-md5: 5f4e46c3471229a106cf509b1ed86709
Depends: <<
aalib-shlibs,
Index: mplayer.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/mplayer.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mplayer.patch 28 Sep 2008 18:48:31 -0000 1.3
+++ mplayer.patch 30 Nov 2008 12:08:12 -0000 1.4
@@ -141,7 +141,7 @@
#define PREFETCH "prefetch"
#else
-#define PREFETCH "/nop"
-+#define PREFETCH "nop"
++#define PREFETCH "# nop"
#endif
/* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */
@@ -154,8 +154,164 @@
#else
-#define PREFETCH "/nop"
-#define PREFETCHW "/nop"
-+#define PREFETCH "nop"
-+#define PREFETCHW "nop"
++#define PREFETCH "# nop"
++#define PREFETCHW "# nop"
#endif
#ifdef HAVE_3DNOW
+diff -ur MPlayer-1.0rc2/libswscale/yuv2rgb_template.c
MPlayer-1.0rc2-p1/libswscale/yuv2rgb_template.c
+--- MPlayer-1.0rc2/libswscale/yuv2rgb_template.c 2007-10-08
05:49:31.000000000 +1000
++++ MPlayer-1.0rc2-p1/libswscale/yuv2rgb_template.c 2008-11-16
17:54:27.000000000 +1100
+@@ -154,7 +154,7 @@
+ "movd (%2, %0), %%mm0;" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */
+ "movd (%3, %0), %%mm1;" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */
+ "movq (%5, %0, 2), %%mm6;" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */
+- //".balign 16 \n\t"
++ //".align 4 \n\t"
+ "1: \n\t"
+ /* no speed diference on my [EMAIL PROTECTED] with prefetch,
+ * if it is faster for anyone with -benchmark then tell me
+@@ -249,7 +249,7 @@
+ "movd (%2, %0), %%mm0;" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */
+ "movd (%3, %0), %%mm1;" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */
+ "movq (%5, %0, 2), %%mm6;" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */
+- //".balign 16 \n\t"
++ //".align 4 \n\t"
+ "1: \n\t"
+ YUV2RGB
+
+@@ -333,7 +333,7 @@
+ "movd (%2, %0), %%mm0;" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */
+ "movd (%3, %0), %%mm1;" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */
+ "movq (%5, %0, 2), %%mm6;" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */
+- //".balign 16 \n\t"
++ //".align 4 \n\t"
+ "1: \n\t"
+ YUV2RGB
+ /* mm0=B, %%mm2=G, %%mm1=R */
+@@ -479,7 +479,7 @@
+ "movd (%2, %0), %%mm0;" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */
+ "movd (%3, %0), %%mm1;" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */
+ "movq (%5, %0, 2), %%mm6;" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */
+- //".balign 16 \n\t"
++ //".align 4 \n\t"
+ "1: \n\t"
+ YUV2RGB
+ /* convert RGB plane to RGB packed format,
+diff -ur MPlayer-1.0rc2/libvo/aclib_template.c
MPlayer-1.0rc2-p1/libvo/aclib_template.c
+--- MPlayer-1.0rc2/libvo/aclib_template.c 2007-10-08 05:49:28.000000000
+1000
++++ MPlayer-1.0rc2-p1/libvo/aclib_template.c 2008-11-16 17:54:40.000000000
+1100
+@@ -258,7 +258,7 @@
+ if(i>=BLOCK_SIZE/64)
+ asm volatile(
+ "xor %%"REG_a", %%"REG_a" \n\t"
+- ".balign 16 \n\t"
++ ".align 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"
++ ".align 4 \n\t"
+ "2: \n\t"
+ "movq (%0, %%"REG_a"), %%mm0\n"
+ "movq 8(%0, %%"REG_a"), %%mm1\n"
+--- MPlayer-1.0rc2/libvo/vo_macosx.m 2008-11-22 00:20:15.000000000 +1100
++++ MPlayer-1.0rc2-p1/libvo/vo_macosx.m 2008-11-22 13:41:48.000000000
+1100
+@@ -285,19 +285,21 @@
+ #if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
+ //this chunk of code is heavily based off SDL_macosx.m from SDL
+ //it uses an Apple private function to request foreground
operation
+- void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
+- ProcessSerialNumber myProc, frProc;
+- Boolean sameProc;
+-
+- if (GetFrontProcess(&frProc) == noErr)
+- {
+- if (GetCurrentProcess(&myProc) == noErr)
+- {
+- if (SameProcess(&frProc, &myProc, &sameProc) ==
noErr && !sameProc)
+- {
+- CPSEnableForegroundOperation(&myProc);
++ typedef struct CPSProcessSerNum
++ {
++ UInt32 lo;
++ UInt32 hi;
++ } CPSProcessSerNum;
++ OSErr CPSEnableForegroundOperation(CPSProcessSerNum* psn,
UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
++ OSErr CPSGetCurrentProcess(CPSProcessSerNum* psn);
++ OSErr CPSSetFrontProcess(CPSProcessSerNum* psn);
++ CPSProcessSerNum psn;
++
++ if (!CPSGetCurrentProcess(&psn)) {
++ if
(!CPSEnableForegroundOperation(&psn,0x03,0x3C,0x2C,0x1103)) {
++ if (!CPSSetFrontProcess(&psn)) {
++ // Success!
+ }
+- SetFrontProcess(&myProc);
+ }
+ }
+ #endif
+@@ -308,6 +310,7 @@
+ [mpGLView autorelease];
+ }
+
++ [NSApp setDelegate:mpGLView];
+ [mpGLView display];
+ [mpGLView preinit];
+ }
+@@ -1023,4 +1026,12 @@
+ mpGLView = NULL;
+ mplayer_put_key(KEY_ESC);
+ }
++
++/*
++ NSApplication delegate
++*/
++- (void)applicationDidBecomeActive:(NSNotification *)aNotification
++{
++ [window makeKeyAndOrderFront:self];
++}
+ @end
+--- MPlayer-1.0rc2/etc/example.conf 2007-10-08 05:49:33.000000000 +1000
++++ MPlayer-1.0rc2-p1/etc/example.conf 2008-11-22 14:32:34.000000000 +1100
+@@ -17,7 +17,7 @@
+ ##################
+
+ # Specify default video driver (see -vo help for a list).
+-#vo=xv
++vo=macosx
+
+ # Use SDL video with the aalib subdriver by default.
+ #vo = sdl:aalib
+@@ -71,7 +71,7 @@
+ ##################
+
+ # Specify default audio driver (see -ao help for a list).
+-#ao=oss
++ao=macosx
+
+ # Use SDL audio driver with the esd subdriver by default.
+ #ao = sdl:esd
+@@ -83,6 +83,18 @@
+ #af=lavcresample=44100
+
+
++#################
++# OSD and fonts #
++#################
++
++fontconfig=1
++font="Bitstream Vera Sans"
++subfont-autoscale=1
++ass=yes
++ass-use-margins=yes
++embeddedfonts=yes
++
++
+ ##################
+ # other settings #
+ ##################
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
