diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 60 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.0_pre4-gcc34-mtune.patch | 95 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.0_pre4-help_mp-ro.h.patch | 60 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r1.ebuild | 9 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r2.ebuild | 8 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r3.ebuild | 8 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_pre4-r4.ebuild | 8 |
8 files changed, 219 insertions, 38 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index 4791c468dbe8..d0d904bba4af 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,13 @@ # 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.150 2004/06/25 00:46:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.151 2004/06/29 10:03:52 ferringb Exp $ + + 29 Jun 2004; Brian Harring <ferringb@gentoo.org> mplayer-1.0_pre4-r1.ebuild, + mplayer-1.0_pre4-r2.ebuild, mplayer-1.0_pre4-r3.ebuild, + mplayer-1.0_pre4-r4.ebuild, files/mplayer-1.0_pre4-gcc34-mtune.patch, + files/mplayer-1.0_pre4-help_mp-ro.h: + Closing out bugs #49669 (help/help_mp-ro.h having completely broken syntax), + gcc3.4 s:-mcpu:-mtune: (bug #49488). 17 Jun 2004; Seemant Kulleen <seemant@gentoo.org> mplayer-1.0_pre4-r4.ebuild: diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index 308ee7c77fe0..631f76a2b09f 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -1,40 +1,42 @@ -MD5 404b22ab9b8f966548a12b7175a6306b mplayer-1.0_pre3-r4.ebuild 11782 -MD5 aa66aaa88a2f3ad7e2aa84855817ca49 mplayer-1.0_pre4-r3.ebuild 12809 -MD5 cea831e6c1c30e31e5bccf6ffcb67954 mplayer-1.0_pre4.ebuild 11324 -MD5 6f65133de3ef150e8b11fa60bffd0a26 mplayer-1.0_pre3-r3.ebuild 11480 MD5 cc7b82f22b4a4eef14777259b4682cb2 mplayer-1.0_pre2-r1.ebuild 11366 -MD5 c4965d207bbc01b659f7e61a693268c3 mplayer-1.0_pre4-r2.ebuild 11715 MD5 704d52475e6fc47226b62e2301b4ebbd mplayer-1.0_pre3-r5.ebuild 11456 -MD5 b2ca17c028bb16fc87d9cbee16675ee6 mplayer-1.0_pre4-r4.ebuild 13140 -MD5 8bcf186917f1ced7d0346dbce3cab5e8 mplayer-0.92-r1.ebuild 11501 +MD5 8fd2219e1a840fb59be420ef43dafab6 mplayer-1.0_pre4-r4.ebuild 13158 MD5 9bc4e2e66e5fdb6b05754f85f6b6e7c5 ChangeLog 26609 +MD5 8bcf186917f1ced7d0346dbce3cab5e8 mplayer-0.92-r1.ebuild 11501 +MD5 6f65133de3ef150e8b11fa60bffd0a26 mplayer-1.0_pre3-r3.ebuild 11480 +MD5 cea831e6c1c30e31e5bccf6ffcb67954 mplayer-1.0_pre4.ebuild 11324 +MD5 404b22ab9b8f966548a12b7175a6306b mplayer-1.0_pre3-r4.ebuild 11782 +MD5 a1db442f13c45f01f623612324f0cba0 mplayer-1.0_pre4-r2.ebuild 11933 +MD5 80219dc999afb1c5ad4ef57feb8102e4 mplayer-1.0_pre4-r3.ebuild 13030 +MD5 6795b8dc6a48c2480d52e2512ce958f8 mplayer-1.0_pre4-r1.ebuild 11653 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 -MD5 2c456942a3108e4beced7a9695337251 mplayer-1.0_pre4-r1.ebuild 11445 -MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355 -MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650 -MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183 -MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767 MD5 e2fc2cbbc8ebf183dcb599b66c999331 files/ppc750FX-fix.patch 515 -MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520 +MD5 98c7d58f544829621b15427ad53b98e4 files/mga-kernel-2.6.patch 16767 MD5 6c2dab3392aab51766253b416ad2a10c files/default-skin.diff 396 -MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857 -MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299 -MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231 -MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119 -MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411 -MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358 -MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903 -MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049 -MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810 -MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467 +MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358 MD5 b0205104d1242fcccdb5dfd2188f5ab2 files/digest-mplayer-1.0_pre2-r1 358 MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r3 358 -MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358 -MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358 -MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r1 358 -MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358 MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r3 358 -MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r4 358 -MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299 +MD5 8b8084aa31b466c55d15bd06bb77086d files/mplayer-1.0_pre3-xmms.patch 411 +MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267 +MD5 aaadaff9756ff85c9855b2bbd50da184 files/mplayer-1.0_pre4-gcc34-mtune.patch 3493 +MD5 fef9f0571da54ae3df2e804100bd2632 files/vuln01-fix.diff 1231 +MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903 MD5 f998f1cad3da27cac3aea1982dc5c747 files/mplayer-1.0_pre3-libavcodec-gcc34.patch 5010 +MD5 059e03d1d2c965b04a5e53ed850de64a files/mplayer-0.90_rc4-gtk2.patch 6183 +MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299 +MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r4 358 MD5 8f18911adcd661e70ad0cd84a94d49ac files/mplayer-0.90-divx.patch 25064 +MD5 260489267a0ccf01fe300bce0ec1430d files/mencoder-segfault.patch 520 +MD5 d74f7136fa5b4fa7d9ef13f8193dfe7c files/digest-mplayer-1.0_pre3-r5 358 +MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre3-alsa-gcc34.patch 299 +MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467 +MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119 +MD5 26a52f084f4d177580ed9ea0187f54e7 files/mplayer-0.90-ppc-benh-2.patch 2049 +MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r4 358 +MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4 358 +MD5 deb1dbbf5879ed31e1b83fb7def5b600 files/digest-mplayer-0.92-r1 355 +MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857 +MD5 fa86dd9d6980ff064efcc9d9f919905e files/mplayer-1.0_pre3-libmatroska063.diff 810 +MD5 dc67207241f6a950a4d529557ebd4053 files/digest-mplayer-1.0_pre4-r2 358 +MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650 diff --git a/media-video/mplayer/files/mplayer-1.0_pre4-gcc34-mtune.patch b/media-video/mplayer/files/mplayer-1.0_pre4-gcc34-mtune.patch new file mode 100644 index 000000000000..221943f8f27e --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.0_pre4-gcc34-mtune.patch @@ -0,0 +1,95 @@ +--- configure.old 2004-04-29 23:56:20.926581760 +0200 ++++ configure 2004-04-30 00:04:54.743469720 +0200 +@@ -732,21 +732,27 @@ + # check that gcc supports our CPU, if not, fall back to earlier ones + # LGB: check -mcpu and -march swithing step by step with enabling + # to fall back till 386. +- ++# gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead ++if [ "$_cc_major" -gt 3 ] || ( [ "$_cc_major" = 3 ] && [ "$_cc_minor" -ge 4 ]) ; then ++ cpuopt=-mtune ++ else ++ cpuopt=-mcpu ++ fi ++ + echocheck "GCC & CPU optimization abilities" + cat > $TMPC << EOF + int main(void) { return 0; } + EOF + if test "$_runtime_cpudetection" = no ; then + if test "$proc" = "athlon-xp" || test "$proc" = "athlon-4" || test "$proc" = "athlon-tbird"; then +- cc_check -march=$proc -mcpu=$proc || proc=athlon ++ cc_check -march=$proc $cpuopt=$proc || proc=athlon + fi + if test "$proc" = "k6-3" || test "$proc" = "k6-2"; then +- cc_check -march=$proc -mcpu=$proc || proc=k6 ++ cc_check -march=$proc $cpuopt=$proc || proc=k6 + fi + if test "$proc" = "k6"; then +- if not cc_check -march=$proc -mcpu=$proc; then +- if cc_check -march=i586 -mcpu=i686; then ++ if not cc_check -march=$proc -$cpuopt=$proc; then ++ if cc_check -march=i586 $cpuopt=i686; then + proc=i586-i686 + else + proc=i586 +@@ -754,37 +760,37 @@ + fi + fi + if test "$proc" = "pentium4" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon"; then +- cc_check -march=$proc -mcpu=$proc || proc=i686 ++ cc_check -march=$proc $cpuopt=$proc || proc=i686 + fi + if test "$proc" = "i686" || test "$proc" = "pentium-mmx"; then +- cc_check -march=$proc -mcpu=$proc || proc=i586 ++ cc_check -march=$proc $cpuopt=$proc || proc=i586 + fi + if test "$proc" = "i586" ; then +- cc_check -march=$proc -mcpu=$proc || proc=i486 ++ cc_check -march=$proc $cpuopt=$proc || proc=i486 + fi + if test "$proc" = "i486" ; then +- cc_check -march=$proc -mcpu=$proc || proc=i386 ++ cc_check -march=$proc $cpuopt=$proc || proc=i386 + fi + if test "$proc" = "i386" ; then +- cc_check -march=$proc -mcpu=$proc || proc=error ++ cc_check -march=$proc $cpuopt=$proc || proc=error + fi + if test "$proc" = "error" ; then +- echores "Your $_cc does not even support \"i386\" for '-march' and '-mcpu'." ++ echores "Your $_cc does not even support \"i386\" for '-march' and '$cpuopt'." + _mcpu="" + _march="" + _optimizing="" + elif test "$proc" = "i586-i686"; then + _march="-march=i586" +- _mcpu="-mcpu=i686" ++ _mcpu="$cpuopt=i686" + _optimizing="$proc" + else + _march="-march=$proc" +- _mcpu="-mcpu=$proc" ++ _mcpu="$cpuopt=$proc" + _optimizing="$proc" + fi + else + # i686 is probably the most common CPU - optimize for it +- _mcpu="-mcpu=i686" ++ _mcpu="$cpuopt=i686" + # at least i486 required, for bswap instruction + _march="-march=i486" + cc_check $_mcpu || _mcpu="" +@@ -797,10 +803,10 @@ + # TODO: it may be a good idea to check GCC and fall back in all cases + if test "$host_arch" = "i586-i686"; then + _march="-march=i586" +- _mcpu="-mcpu=i686" ++ _mcpu="$cpuopt=i686" + else + _march="-march=$host_arch" +- _mcpu="-mcpu=$host_arch" ++ _mcpu="$cpuopt=$host_arch" + fi + + proc="$host_arch" diff --git a/media-video/mplayer/files/mplayer-1.0_pre4-help_mp-ro.h.patch b/media-video/mplayer/files/mplayer-1.0_pre4-help_mp-ro.h.patch new file mode 100644 index 000000000000..176364422528 --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.0_pre4-help_mp-ro.h.patch @@ -0,0 +1,60 @@ +--- MPlayer-1.0pre4-orig/help/help_mp-ro.h 2004-04-27 11:24:31.000000000 -0500 ++++ MPlayer-1.0_pre4/help/help_mp-ro.h 2004-06-29 01:54:54.081359032 -0500 +@@ -32,7 +32,7 @@ + " -fs afișare pe tot ecranul (sau -vm, -zoom, detalii în pagina man)\n" + " -x <x> -y <y> alege rezoluția (folosit pentru -vm sau -zoom)\n" + " -sub <fișier> specifică fișierul cu subtitrări folosit\n" +- (vezi și -subfps, -subdelay)\n" ++" (vezi și -subfps, -subdelay)\n" + " -playlist <fiș> specifică playlist-ul\n" + " -vid x -aid y alege pista video (x) și audio (y)\n" + " -fps x -srate y schimbă rata video (x fps) și audio (y Hz)\n" +@@ -67,9 +67,9 @@ + #define MSGTR_NoHomeDir "Nu găsesc directorul HOME.\n" + #define MSGTR_GetpathProblem "get_path(\"config\") problem\n" + #define MSGTR_CreatingCfgFile "Creez fișierul de configurare: %s\n" +-#define MSGTR_InvalidVOdriver "Numele driverului de ieșire video e greșit: %s\n" ++#define MSGTR_InvalidVOdriver "Numele driverului de ieșire video e greșit: %s\n"\ + "Încearcă '-vo help' pentru o listă cu driveri video disponibili.\n" +-#define MSGTR_InvalidAOdriver "Numele driverului de ieșire audio e greșit: %s\n" ++#define MSGTR_InvalidAOdriver "Numele driverului de ieșire audio e greșit: %s\n"\ + "Folosește '-ao help' pentru lista cu driveri audio disponibili.\n" + #define MSGTR_BuiltinCodecsConf "Folosesc 'codecs.conf' built-in.\n" + #define MSGTR_CantLoadFont "Nu pot încărca fontul: %s\n" +@@ -109,7 +109,7 @@ + " - Încearcă '-cache 8192'.\n"\ + "- Folosești -cache pentru fișiere AVI neinterleaved?\n"\ + " - Încearcă '-nocache'.\n"\ +-"Citește DOCS/HTML/en/devices.html pentru idei de reglare/accelerare.\n"\ //lang ++"Citește DOCS/HTML/en/devices.html pentru idei de reglare/accelerare.\n"\ + "Dacă tot nu reușești, citește DOCS/HTML/en/bugreports.html.\n\n" //lang + + #define MSGTR_NoGui "MPlayer a fost compilat FĂRĂ suport pentru GUI.\n" +@@ -127,8 +127,7 @@ + #define MSGTR_CannotReadVideoProperties "Video: Nu pot citi proprietățile.\n" + #define MSGTR_NoStreamFound "Nu am găsit nici un canal.\n" + #define MSGTR_InitializingAudioCodec "Inițializez codecul audio...\n" +-#define MSGTR_ErrorInitializingVODevice +-"Eroare la activarea ieșirii video (-vo) aleasă.\n" ++#define MSGTR_ErrorInitializingVODevice "Eroare la activarea ieșirii video (-vo) aleasă.\n" + #define MSGTR_ForcedVideoCodec "Codec video forțat: %s\n" + #define MSGTR_ForcedAudioCodec "Codec audio forțat: %s\n" + #define MSGTR_AODescription_AOAuthor "AO: Descriere: %s\nAO: Autor: %s\n" +@@ -202,7 +201,7 @@ + " padding=<0-2>\n"\ + " 0: de loc\n"\ + " 1: tot\n"\ +-" 2: ajustează\n"\ // dunno ++" 2: ajustează\n"\ + "\n"\ + " fast Activează codare rapidă pentru următoarele preseturi VBR,\n"\ + " la calitate puțin redusă și bitrate-uri crescute.\n"\ +@@ -476,7 +475,7 @@ + #define MSGTR_PREFERENCES_DXR3_FAME "Folosește FAME" + #define MSGTR_PREFERENCES_FontEncoding1 "Unicode" + +-/* lang ++// lang + #define MSGTR_PREFERENCES_FontEncoding2 "Limbi vest-europene (ISO-8859-1)" + #define MSGTR_PREFERENCES_FontEncoding3 "Limbi vest-europene cu Euro (ISO-8859-15)" + #define MSGTR_PREFERENCES_FontEncoding4 "Limbi central-europene sau slavice (ISO-8859-2)" diff --git a/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild index 310e46ba365c..87e78c93abd7 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild,v 1.9 2004/06/25 00:46:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r1.ebuild,v 1.10 2004/06/29 10:03:52 ferringb Exp $ inherit eutils flag-o-matic @@ -105,8 +105,13 @@ src_unpack() { cd ${S}; epatch ${FILESDIR}/mencoder-segfault.patch # GCC 3.4 fixes - cd ${S}; epatch ${FILESDIR}/${P}-alsa-gcc34.patch + epatch ${FILESDIR}/${P}-alsa-gcc34.patch + epatch ${FILESDIR}/${P}-altivec-gcc34.patch + #bug #49488 s:-mcpu:-mtune: + epatch ${FILESDIR}/${P}-gcc34-mtune.patch + #bug #49669 *major* syntax errors in help/help_mp-ro.h + epatch ${FILESDIR}/${P}-help_mp-ro.h.patch # Fix hppa detection [ "${ARCH}" = "hppa" ] && sed -i -e "s/9000*/parisc*/" "${S}/configure" diff --git a/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild index 285f646e0106..73541495826f 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild,v 1.7 2004/06/25 00:46:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r2.ebuild,v 1.8 2004/06/29 10:03:52 ferringb Exp $ inherit eutils flag-o-matic check-kernel @@ -110,6 +110,12 @@ src_unpack() { # GCC 3.4 fixes epatch ${FILESDIR}/${P}-alsa-gcc34.patch + epatch ${FILESDIR}/${P}-altivec-gcc34.patch + bug #49488 s:-mcpu:-mtune: + epatch ${FILESDIR}/${P}-gcc34-mtune.patch + + #bug #49669, *major* syntax errors in help/help_mp-ro.h + epatch ${FILESDIR}/${P}-help_mp-ro.h.patch # fixes for mga driver with kernel 2.6 get_KV_info diff --git a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild index 49fb5bbd0a29..0d708e45d203 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.11 2004/06/25 00:46:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r3.ebuild,v 1.12 2004/06/29 10:03:52 ferringb Exp $ inherit eutils flag-o-matic kmod @@ -107,8 +107,14 @@ src_unpack() { # Fix mencoder segfaulting with bad arguments epatch ${FILESDIR}/mencoder-segfault.patch + # bug #49669, *major* syntax errors in help/help_mp-ro.h + epatch ${FILESDIR}/${P}-help_mp-ro.h.patch + # GCC 3.4 fixes epatch ${FILESDIR}/${P}-alsa-gcc34.patch + epatch ${FILESDIR}/${P}-altivec-gcc34.patch + bug #49488, s:-mcpu:-mtune: + epatch ${FILESDIR}/${P}-gcc3.4-mtune.patch # fixes for mga driver with kernel 2.6 if use matrox; then diff --git a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild index 21f666e445cf..7593607a5fec 100644 --- a/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild +++ b/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.14 2004/06/25 00:46:20 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre4-r4.ebuild,v 1.15 2004/06/29 10:03:52 ferringb Exp $ inherit eutils flag-o-matic kmod @@ -109,13 +109,13 @@ src_unpack() { # Fix head/tail call for new coreutils epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch - # Fix mencoder segfaulting with bad arguments - # Already fixed by upstream - # epatch ${FILESDIR}/mencoder-segfault.patch + #bug #49669, horrid syntax errors in help/help_mp-ro.h + epatch ${FILESDIR}/help_mp-ro.h.patch # GCC 3.4 fixes epatch ${FILESDIR}/${P}-alsa-gcc34.patch epatch ${FILESDIR}/${P}-altivec-gcc34.patch + epatch ${FILESDIR}/${P}-gcc3.4-mtune.patch # fixes for mga driver with kernel 2.6 if use matrox; then get_kernel_info |