diff options
| -rw-r--r-- | media-video/mplayer/ChangeLog | 12 | ||||
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.0_rc2_p20090731-linguas.patch | 14 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild | 7 |
3 files changed, 25 insertions, 8 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index df966a20f5b7..9840136918a8 100644 --- a/media-video/mplayer/ChangeLog +++ b/media-video/mplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/mplayer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.663 2009/08/03 06:42:36 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.664 2009/08/03 07:10:37 ssuominen Exp $ + + 03 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + mplayer-1.0_rc2_p20090731.ebuild, + +files/mplayer-1.0_rc2_p20090731-linguas.patch: + Fix LINGUAS handling wrt #280129. 03 Aug 2009; Alexis Ballier <aballier@gentoo.org> mplayer-9999.ebuild: Use tr instead of sed for creating the linguas list, this fixes a build @@ -24,11 +29,6 @@ -lirc -nas -nut -openal -oss -pvr -radio -samba (-svga) -teletext -tga -v4l -vdpau (-vidix) (-win32codecs) -xanim -xscreensaver -zoran". - 02 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> - mplayer-1.0_rc2_p20090731.ebuild: - LINGUAS handling is broken, pass --language=all to get localized - documentation. - 01 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org> mplayer-1.0_rc2_p20090731.ebuild: Restore the local labels patch. Sigh. diff --git a/media-video/mplayer/files/mplayer-1.0_rc2_p20090731-linguas.patch b/media-video/mplayer/files/mplayer-1.0_rc2_p20090731-linguas.patch new file mode 100644 index 000000000000..6c0dcbe2865f --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.0_rc2_p20090731-linguas.patch @@ -0,0 +1,14 @@ +diff -ur mplayer-1.0_rc2_p20090731.orig/configure mplayer-1.0_rc2_p20090731/configure +--- mplayer-1.0_rc2_p20090731.orig/configure 2009-07-31 23:22:31.000000000 +0300 ++++ mplayer-1.0_rc2_p20090731/configure 2009-08-03 10:02:18.000000000 +0300 +@@ -2838,8 +2838,9 @@ + test -z "$language_man" && language_man=en + + for lang in $language_msg ; do +- test -f "help/help_mp-${lang}.h" && language_msg=$lang && break ++ test -f "help/help_mp-${lang}.h" && language_msg_tmp=$lang && break + done ++language_msg=$language_msg_tmp + test -z "$language_msg" && language_msg=en + _mp_help="help/help_mp-${language_msg}.h" + echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc" diff --git a/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild b/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild index adb6e0c5c2cc..4053c7ceb35d 100644 --- a/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild +++ b/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild,v 1.8 2009/08/03 03:55:29 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc2_p20090731.ebuild,v 1.9 2009/08/03 07:10:37 ssuominen Exp $ EAPI="2" @@ -222,10 +222,13 @@ src_prepare() { fi epatch "${FILESDIR}"/${PN}-1.0_rc2_p20090530-fix-mp3lib-use-local-labels-2.patch + epatch "${FILESDIR}"/${P}-linguas.patch } src_configure() { - local myconf="--language=all" + local myconf="" + + [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}" # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable # compilation in almost every situation. The reason for this is |