fix the yuv2rgb patch to work properly on altivec enabled ppc's

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c85fb650235df34bb5448e6359f2cd1280c97ebe..a0993b0152de4f70479ab4cddc9446522847e6f8 100644 (file)
--- 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/Manifest b/media-video/mplayer/Manifest
index f9e80212cce78d7068ed78b8eb47473fb7bcb8b5..21c60bab9f01db9ac625720c109c6f3d872ccd60 100644 (file)
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,42 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 28cedfe37d81f0a144b0bf8ce35095c5 ChangeLog 39450
-MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
-MD5 1e280b6d342af22ba5586da17800087c mplayer-1.0_pre5-r3.ebuild 15492
+MD5 42e71d724dca61a5ebe33d0c347f4e4f mplayer-1.0_pre5-r2.ebuild 14285
 MD5 f3805b6605c967bb9a73433e2f4b72b7 mplayer-1.0_pre5-r4.ebuild 15190
 MD5 a85740a291e190516009abeccd91c6f7 mplayer-1.0_pre4-r7.ebuild 12611
-MD5 42e71d724dca61a5ebe33d0c347f4e4f mplayer-1.0_pre5-r2.ebuild 14285
-MD5 88afe4c7008da4f33b5b89ddc1ab8069 files/digest-mplayer-1.0_pre5-r3 527
-MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
-MD5 6c62fe3136b83cc8ea960f4563df8555 files/digest-mplayer-1.0_pre5-r4 360
-MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 ec9437b6385a558b6da1fa5a1d12c618 ChangeLog 39610
+MD5 1e280b6d342af22ba5586da17800087c mplayer-1.0_pre5-r3.ebuild 15492
+MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
+MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
+MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
 MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
-MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
-MD5 58c893cf3a6a9684c691c94da631e810 files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19578
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
 MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
+MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
+MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
-MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
-MD5 b72a70cd788b73c1012ebe763e1125f6 files/digest-mplayer-1.0_pre4-r7 445
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
 MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
-MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 b72a70cd788b73c1012ebe763e1125f6 files/digest-mplayer-1.0_pre4-r7 445
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
+MD5 88afe4c7008da4f33b5b89ddc1ab8069 files/digest-mplayer-1.0_pre5-r3 527
+MD5 6c62fe3136b83cc8ea960f4563df8555 files/digest-mplayer-1.0_pre5-r4 360
+MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZLRBArHZZzCEUG0RAv9AAJ9I1ahpLK7oLLBm13t8NxOadUonmwCdF9BZ
-hRi4riHlaVLazGrh/55ycR4=
-=Pa2L
------END PGP SIGNATURE-----

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 57fcf6d2a48330b18e165bde0b41e42d4061f4ee..ab2d6e452806a2d64e4ca164b3babbbb26c4a819 100644 (file)
--- 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
  
@@ -42,13 +41,17 @@ diff -ruN MPlayer-1.0pre5.orig/postproc/swscale_internal.h MPlayer-1.0pre5/postp
 +#else
 +#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>