mplayer 0.90-r4 build failed, ***** mplayer-0.90-coreutils-fixup.patch ***** ============================================== PATCH COMMAND: patch -p0 < /usr/portage/media-video/mplayer/files/mplayer-0.90-coreutils-fixup.patch ============================================== can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urpN MPlayer-0.90/configure MPlayer-0.90.CUfixed/configure |--- MPlayer-0.90/configure 2003-03-22 18:29:16.000000000 +0200 |+++ MPlayer-0.90.CUfixed/configure 2003-08-03 09:38:25.000000000 +0200 -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored ============================================== PATCH COMMAND: patch -p1 < /usr/portage/media-video/mplayer/files/mplayer-0.90-coreutils-fixup.patch ============================================== patching file configure Hunk #1 succeeded at 453 (offset 1 line). Hunk #2 FAILED at 553. 1 out of 2 hunks FAILED -- saving rejects to file configure.rej ============================================== PATCH COMMAND: patch -p2 < /usr/portage/media-video/mplayer/files/mplayer-0.90-coreutils-fixup.patch ============================================== missing header for unified diff at line 4 of patch can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urpN MPlayer-0.90/configure MPlayer-0.90.CUfixed/configure |--- MPlayer-0.90/configure 2003-03-22 18:29:16.000000000 +0200 |+++ MPlayer-0.90.CUfixed/configure 2003-08-03 09:38:25.000000000 +0200 -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored ============================================== PATCH COMMAND: patch -p3 < /usr/portage/media-video/mplayer/files/mplayer-0.90-coreutils-fixup.patch ============================================== missing header for unified diff at line 4 of patch can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urpN MPlayer-0.90/configure MPlayer-0.90.CUfixed/configure |--- MPlayer-0.90/configure 2003-03-22 18:29:16.000000000 +0200 |+++ MPlayer-0.90.CUfixed/configure 2003-08-03 09:38:25.000000000 +0200 -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored ============================================== PATCH COMMAND: patch -p4 < /usr/portage/media-video/mplayer/files/mplayer-0.90-coreutils-fixup.patch ============================================== missing header for unified diff at line 4 of patch can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urpN MPlayer-0.90/configure MPlayer-0.90.CUfixed/configure |--- MPlayer-0.90/configure 2003-03-22 18:29:16.000000000 +0200 |+++ MPlayer-0.90.CUfixed/configure 2003-08-03 09:38:25.000000000 +0200 -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored
*** Bug 25825 has been marked as a duplicate of this bug. ***
Should be fixed in latest version on CVS: ------------------------------------------------------------ azarah@nosferatu mplayer $ cvs diff Index: ChangeLog =================================================================== RCS file: /home/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v retrieving revision 1.69 diff -u -r1.69 ChangeLog --- ChangeLog 3 Aug 2003 12:03:15 -0000 1.69 +++ ChangeLog 3 Aug 2003 22:17:20 -0000 @@ -2,6 +2,10 @@ # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 # $Header: /home/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.69 2003/08/03 12:03:15 azarah Exp $ + 04 Aug 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90-r4.ebuild, + files/mplayer-0.90-ppc-benh-2.patch: + Fix ppc-benh.patch to play nicely with coreutils-fixup.patch, bug #25833 + *mplayer-0.90-r4 (03 Aug 2003) 03 Aug 2003; Martin Schlemmer <azarah@gentoo.org> mplayer-0.90-r4.ebuild, Index: mplayer-0.90-r4.ebuild =================================================================== RCS file: /home/cvsroot/gentoo-x86/media-video/mplayer/mplayer-0.90-r4.ebuild,v retrieving revision 1.1 diff -u -r1.1 mplayer-0.90-r4.ebuild --- mplayer-0.90-r4.ebuild 3 Aug 2003 12:03:15 -0000 1.1 +++ mplayer-0.90-r4.ebuild 3 Aug 2003 22:17:20 -0000 @@ -106,20 +106,21 @@ epatch ${FILESDIR}/default-skin.diff fi + # Use gtk-2.x cd ${S}; epatch ${FILESDIR}/${PN}-0.90_rc4-gtk2.patch + # Fix head/tail call for new coreutils + epatch ${FILESDIR}/${P}-coreutils-fixup.patch + if [ -n "`use ppc`" ] then # Fix mplayer to detect detect/use altivec on benh kernels, # bug #18511. - cd ${S}; epatch ${FILESDIR}/${P}-ppc-benh.patch + cd ${S}; epatch ${FILESDIR}/${P}-ppc-benh-2.patch fi # Fix version, bug #19691 epatch ${FILESDIR}/${P}-fix-version.patch - - # Fix head/tail call for new coreutils - epatch ${FILESDIR}/${P}-coreutils-fixup.patch #Fixing divx 2003 API if has_version '>=media-libs/divx4linux-20030428' cvs server: files/mplayer-0.90-ppc-benh-2.patch is a new entry, no comparison available azarah@nosferatu mplayer $ cat files/mplayer-0.90-ppc-benh-2.patch --- configure.orig 2003-04-07 05:12:59.000000000 +0200 +++ configure 2003-04-07 05:15:05.000000000 +0200 @@ -550,14 +550,24 @@ fi pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1` + pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1` + pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1` pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1` pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1` pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -n 1` if test -z "$pparam" ; then - pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -n 1` + pparam=`$_cpuinfo | grep '^flags' | cut -d ':' -f 2 | head -n 1` + fi + + # Fix for benh kernel on ppc + if test -z "$pname" ; then + pname=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1` + fi + if test -z "$pparam" ; then + pparam=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ' ' -f 3 | head -n 1` fi _mmx=no @@ -843,12 +853,43 @@ proc='' _march='' _mcpu='' - cpu750=`$_cpuinfo | grep "cpu.*750"` - if test -n "$cpu750"; then - _march='-mcpu=750' - _mcpu='-mtune=750' + + echocheck "Using ppc ($pname) optimizations" + + case "$pname" in + 603*) + _march="-mcpu=603" + _mcpu="-mtune=603" + ;; + 604*) + _march="-mcpu=604" + _mcpu="-mtune=604" + ;; + 74[10]0*) + _march="-mcpu=7400" + _mcpu="-mtune=7400" + ;; + 745[570]*) + _march="-mcpu=7450" + _mcpu="-mtune=7450" + ;; + 7[45][50]*) + _march="-mcpu=750" + _mcpu="-mtune=750" + ;; + 82[46][50]*) + _march="-mcpu=603e" + _mcpu="-mtune=603e" + ;; + esac + + if test "$_altivec" = yes ; then + _march="$_march -maltivec -mabi=altivec" fi + + echores "$_mcpu and $_march" ;; + alpha) _def_arch='#define ARCH_ALPHA 1' azarah@nosferatu mplayer $
