| Summary: | mplayer 1.0pre1 patch fails to apply | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Nicolai Langfeldt <janl> |
| Component: | Current packages | Assignee: | PPC Porters <ppc> |
| Status: | RESOLVED DUPLICATE | ||
| Severity: | normal | ||
| Priority: | High | ||
| Version: | unspecified | ||
| Hardware: | PPC | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
Trying to 'ebuild /usr/portage/media-video/mplayer/mplayer-1.0_pre1.ebuild merge' the applying of mplayer-0.90-ppc-benh-2.patch fails. Reproducible: Always Steps to Reproduce: 1. Remove work dir 2. ebuild ... 3. find patch failure report (mine is attached) Actual Results: configure.rej was created in the work direcotrory. Expected Results: No patches should fail. # cat configure.rej *************** *** 872,883 **** proc='' _march='' _mcpu='' - cpu750=`$_cpuinfo | grep "cpu.*750"` - if test -n "$cpu750"; then - _march='-mcpu=750' - _mcpu='-mtune=750' fi ;; alpha) _def_arch='#define ARCH_ALPHA 1' --- 882,924 ---- proc='' _march='' _mcpu='' + + 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'