summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-12-22 13:26:21 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-12-22 13:26:21 +0000
commit1c730a0babaf56358d82276a1bc0c68643337eec (patch)
treeed242c30abe1450952a7fe98088ee291433ccb38 /media-video/mplayer
parentpunt flwm to pave way for fltk-1.3.0 stabilization (diff)
downloadgentoo-2-1c730a0babaf56358d82276a1bc0c68643337eec.tar.gz
gentoo-2-1c730a0babaf56358d82276a1bc0c68643337eec.tar.bz2
gentoo-2-1c730a0babaf56358d82276a1bc0c68643337eec.zip
fix build of swedish help, by larkang@gmail.com, bug #395677
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mplayer')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/files/swedish.patch16
-rw-r--r--media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild4
3 files changed, 23 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 6723ce22af17..74505d3a4797 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/mplayer
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.831 2011/12/19 16:47:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.832 2011/12/22 13:26:21 aballier Exp $
+
+ 22 Dec 2011; Alexis Ballier <aballier@gentoo.org>
+ mplayer-1.0_rc4_p20111215.ebuild, +files/swedish.patch:
+ fix build of swedish help, by larkang@gmail.com, bug #395677
19 Dec 2011; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild:
improve a warning
diff --git a/media-video/mplayer/files/swedish.patch b/media-video/mplayer/files/swedish.patch
new file mode 100644
index 000000000000..6b9b1316baa3
--- /dev/null
+++ b/media-video/mplayer/files/swedish.patch
@@ -0,0 +1,16 @@
+Fix build of swedish help after 33915
+Patch by larkang@gmail.com
+https://bugs.gentoo.org/show_bug.cgi?id=395677
+
+Index: help/help_mp-sv.h
+===================================================================
+--- help/help_mp-sv.h (revision 34452)
++++ help/help_mp-sv.h (working copy)
+@@ -99,7 +99,6 @@
+ #define MSGTR_Playing "Spelar %s.\n"
+ #define MSGTR_NoSound "Audio: inget ljud\n"
+ #define MSGTR_FPSforced "FPS forcerad att vara %5.3f (ftime: %5.3f).\n"
+- "För att få bäst prestanda, omkompilera med '--disable-runtime-cpudetection'.\n"
+ #define MSGTR_AvailableVideoOutputDrivers "Tillgängliga video-ut-drivrutiner:\n"
+ #define MSGTR_AvailableAudioOutputDrivers "Tillgängliga audio-ut-drivrutiner:\n"
+ #define MSGTR_AvailableAudioCodecs "Tillgängliga audiocodec:\n"
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild
index a687d07843d3..afbe894c0eaf 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild,v 1.3 2011/12/17 13:01:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20111215.ebuild,v 1.4 2011/12/22 13:26:21 aballier Exp $
EAPI=4
@@ -188,7 +188,7 @@ fi
# xvmc requires xvideo support
REQUIRED_USE="bindist? ( !faac !win32codecs )"
-PATCHES=(
+PATCHES=( "${FILESDIR}/swedish.patch"
)
pkg_setup() {