summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeemant Kulleen <seemant@gentoo.org>2004-10-16 05:16:48 +0000
committerSeemant Kulleen <seemant@gentoo.org>2004-10-16 05:16:48 +0000
commite117dfa954d6ef8d009a16d168c22d57d1b98a01 (patch)
tree91e9a0ef83737aa9a21769d39e02e6b465bd90fb /media-video
parentUpdated icon image. (Manifest recommit) (diff)
downloadgentoo-2-e117dfa954d6ef8d009a16d168c22d57d1b98a01.tar.gz
gentoo-2-e117dfa954d6ef8d009a16d168c22d57d1b98a01.tar.bz2
gentoo-2-e117dfa954d6ef8d009a16d168c22d57d1b98a01.zip
fix the yuv2rgb patch to work properly on altivec enabled ppc's
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/files/mplayer-1.0_pre5-yuv2rgb_fix.patch31
2 files changed, 22 insertions, 15 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c85fb650235d..a0993b0152de 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.209 2004/10/07 03:12:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.210 2004/10/16 05:16:48 seemant Exp $
+
+ 15 Oct 2004; Seemant Kulleen <seemant@gentoo.org>
+ files/mplayer-1.0_pre5-yuv2rgb_fix.patch:
+ fix the yuv2rgb patch to work properly on altivec enabled ppc's
06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
mplayer-1.0_pre5-r3.ebuild, mplayer-1.0_pre5-r4.ebuild:
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-yuv2rgb_fix.patch b/media-video/mplayer/files/mplayer-1.0_pre5-yuv2rgb_fix.patch
index 57fcf6d2a483..ab2d6e452806 100644
--- a/media-video/mplayer/files/mplayer-1.0_pre5-yuv2rgb_fix.patch
+++ b/media-video/mplayer/files/mplayer-1.0_pre5-yuv2rgb_fix.patch
@@ -1,6 +1,6 @@
-diff -ruN MPlayer-1.0pre5.orig/libvo/vo_x11.c MPlayer-1.0pre5/libvo/vo_x11.c
---- MPlayer-1.0pre5.orig/libvo/vo_x11.c 2004-10-05 20:33:25.882255632 +0200
-+++ MPlayer-1.0pre5/libvo/vo_x11.c 2004-10-05 20:33:48.286849616 +0200
+diff -urN MPlayer-1.0pre5.old/libvo/vo_x11.c MPlayer-1.0pre5/libvo/vo_x11.c
+--- MPlayer-1.0pre5.old/libvo/vo_x11.c 2004-10-15 21:54:24.809523440 -0700
++++ MPlayer-1.0pre5/libvo/vo_x11.c 2004-10-15 21:52:40.178429784 -0700
@@ -39,7 +39,6 @@
#include "sub.h"
@@ -17,10 +17,9 @@ diff -ruN MPlayer-1.0pre5.orig/libvo/vo_x11.c MPlayer-1.0pre5/libvo/vo_x11.c
static vo_info_t info = {
"X11 ( XImage/Shm )",
-Files MPlayer-1.0pre5.orig/postproc/.yuv2rgb_altivec.c.swp and MPlayer-1.0pre5/postproc/.yuv2rgb_altivec.c.swp differ
-diff -ruN MPlayer-1.0pre5.orig/postproc/swscale.c MPlayer-1.0pre5/postproc/swscale.c
---- MPlayer-1.0pre5.orig/postproc/swscale.c 2004-10-05 20:33:25.075378296 +0200
-+++ MPlayer-1.0pre5/postproc/swscale.c 2004-10-05 20:33:48.276851136 +0200
+diff -urN MPlayer-1.0pre5.old/postproc/swscale.c MPlayer-1.0pre5/postproc/swscale.c
+--- MPlayer-1.0pre5.old/postproc/swscale.c 2004-10-15 21:54:24.812522984 -0700
++++ MPlayer-1.0pre5/postproc/swscale.c 2004-10-15 21:52:40.181429328 -0700
@@ -1728,7 +1728,7 @@
//FIXME factorize
@@ -30,10 +29,10 @@ diff -ruN MPlayer-1.0pre5.orig/postproc/swscale.c MPlayer-1.0pre5/postproc/swsca
#endif
return 0;
}
-diff -ruN MPlayer-1.0pre5.orig/postproc/swscale_internal.h MPlayer-1.0pre5/postproc/swscale_internal.h
---- MPlayer-1.0pre5.orig/postproc/swscale_internal.h 2004-10-05 20:33:25.075378296 +0200
-+++ MPlayer-1.0pre5/postproc/swscale_internal.h 2004-10-05 20:33:48.277850984 +0200
-@@ -19,6 +19,12 @@
+diff -urN MPlayer-1.0pre5.old/postproc/swscale_internal.h MPlayer-1.0pre5/postproc/swscale_internal.h
+--- MPlayer-1.0pre5.old/postproc/swscale_internal.h 2004-10-15 21:54:24.813522832 -0700
++++ MPlayer-1.0pre5/postproc/swscale_internal.h 2004-10-15 21:55:47.226994080 -0700
+@@ -19,6 +19,16 @@
#ifndef SWSCALE_INTERNAL_H
#define SWSCALE_INTERNAL_H
@@ -43,12 +42,16 @@ diff -ruN MPlayer-1.0pre5.orig/postproc/swscale_internal.h MPlayer-1.0pre5/postp
+#define AVV(x...) {x}
+#endif
+
++#ifdef HAVE_ALTIVEC
++#include <altivec.h>
++#endif
++
#include "../mp_msg.h"
#define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args )
-diff -ruN MPlayer-1.0pre5.orig/postproc/yuv2rgb_altivec.c MPlayer-1.0pre5/postproc/yuv2rgb_altivec.c
---- MPlayer-1.0pre5.orig/postproc/yuv2rgb_altivec.c 2004-10-05 20:33:25.073378600 +0200
-+++ MPlayer-1.0pre5/postproc/yuv2rgb_altivec.c 2004-10-05 20:36:21.247596048 +0200
+diff -urN MPlayer-1.0pre5.old/postproc/yuv2rgb_altivec.c MPlayer-1.0pre5/postproc/yuv2rgb_altivec.c
+--- MPlayer-1.0pre5.old/postproc/yuv2rgb_altivec.c 2004-10-15 21:54:24.818522072 -0700
++++ MPlayer-1.0pre5/postproc/yuv2rgb_altivec.c 2004-10-15 21:52:40.185428720 -0700
@@ -64,6 +64,7 @@
*/
#include <stdio.h>