Minor fix

(Portage version: 2.0.51.19)

5 files changed, 82 insertions, 7 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 42c99cf34e79..1e17af087775 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.298 2005/04/17 10:24:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.299 2005/04/17 14:05:35 lu_zero Exp $
+
+  17 Apr 2005; Luca Barbato <lu_zero@gentoo.org>
+  +files/mplayer-1.0_pre5-alsa-gcc34.patch,
+  +files/mplayer-1.0_pre5-help_mp-ro.h.patch, mplayer-1.0_pre5-r5.ebuild,
+  mplayer-1.0_pre7.ebuild:
+  Fixed pre5 patchset
 
   17 Apr 2005; Markus Rothe <corsair@gentoo.org> mplayer-1.0_pre6-r4.ebuild:
   Stable on ppc64; bug #89277
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gcc34.patch b/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gcc34.patch
new file mode 100644
index 000000000000..f733923c62a0
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gcc34.patch
@@ -0,0 +1,11 @@
+--- libao2/ao_alsa9.c.org	2003-10-04 12:28:58.000000000 -0500
++++ libao2/ao_alsa9.c	2004-04-10 15:28:37.057002080 -0500
+@@ -341,7 +341,7 @@
+             strcpy(devstr, "surround51");
+             alsa_device = devstr;
+            break;
+-          default:
++          default: ;
+         }
+     }
+ 
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-help_mp-ro.h.patch b/media-video/mplayer/files/mplayer-1.0_pre5-help_mp-ro.h.patch
new file mode 100644
index 000000000000..176364422528
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_pre5-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_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
index ce2d255f13f8..911d84994c4e 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.30 2005/04/16 10:05:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.31 2005/04/17 14:05:35 lu_zero Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -166,13 +166,13 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
 
 	#bug #49669, horrid syntax errors in help/help_mp-ro.h	
-	epatch ${FILESDIR}/mplayer-1.0_pre4-help_mp-ro.h.patch
+	epatch ${FILESDIR}/mplayer-1.0_pre5-help_mp-ro.h.patch
 
 	#adds mythtv support to mplayer
 	use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch
 
 	# GCC 3.4 fixes
-	epatch ${FILESDIR}/mplayer-1.0_pre4-alsa-gcc34.patch
+	epatch ${FILESDIR}/mplayer-1.0_pre5-alsa-gcc34.patch
 
 	#Workaround for the altivec softscaler issues
 	epatch ${FILESDIR}/mplayer-1.0_pre5-yuv2rgb_fix.patch
diff --git a/media-video/mplayer/mplayer-1.0_pre7.ebuild b/media-video/mplayer/mplayer-1.0_pre7.ebuild
index cbbe562031b0..ad9ecd6c15eb 100644
--- a/media-video/mplayer/mplayer-1.0_pre7.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7.ebuild,v 1.1 2005/04/17 00:20:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7.ebuild,v 1.2 2005/04/17 14:05:35 lu_zero Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -83,8 +83,6 @@ DEPEND="${RDEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-#KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~ia64 ~hppa ~sparc"
-#agriffis - uncomment this when ia64 is ready - Chris
 KEYWORDS="~x86 ~ppc ~alpha ~amd64 hppa ~sparc ~ppc64"
 
 # ecpu_check