summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-03-01 15:31:15 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-03-01 15:31:15 +0000
commita6fa4b4066e3ebb09f31d88bab52b53b2d868a66 (patch)
treeb1b27659b6b46be8dbe35d2d041237e1e9008217 /media-video
parentStable for HPPA (bug #354623). (diff)
downloadgentoo-2-a6fa4b4066e3ebb09f31d88bab52b53b2d868a66.tar.gz
gentoo-2-a6fa4b4066e3ebb09f31d88bab52b53b2d868a66.tar.bz2
gentoo-2-a6fa4b4066e3ebb09f31d88bab52b53b2d868a66.zip
Update ebuild per bug #354023 and #354625. Thanks to reporters for patches.
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog5
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild18
2 files changed, 12 insertions, 11 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 9d29ce3c3443..395c916b5df8 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
# 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.779 2011/02/15 14:17:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.780 2011/03/01 15:31:15 scarabeus Exp $
+
+ 01 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
+ Update ebuild per bug #354023 and #354625. Thanks to reporters for patches.
30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild:
Clone the ffmpeg from git as svn external was removed.
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 5ff0342ae629..7bc4d3c3e4f4 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.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-9999.ebuild,v 1.91 2011/01/30 21:08:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.92 2011/03/01 15:31:15 scarabeus Exp $
EAPI=4
@@ -15,7 +15,7 @@ inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
[[ ${PV} != *9999* ]] && MPLAYER_REVISION=SVN-r32598
IUSE="3dnow 3dnowext +a52 aalib +alsa altivec aqua +ass bidi bindist bl bluray
-bs2b +cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac
+bs2b cddb +cdio cdparanoia cpudetection custom-cpuopts debug dga +dirac
directfb doc +dts +dv dvb +dvd +dvdnav dxr3 +enca +encode esd +faac +faad fbcon
ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
libcaca libmpeg2 lirc +live lzo mad md5sum +mmx mmxext mng +mp3 mpg123 nas
@@ -589,9 +589,11 @@ src_configure() {
myconf="--cc=$(tc-getCC)
--host-cc=$(tc-getBUILD_CC)
--prefix=${EPREFIX}/usr
- --confdir=${EPREFIX}/etc/mplayer
- --datadir=${EPREFIX}/usr/share/mplayer
+ --bindir=${EPREFIX}/usr/bin
--libdir=${EPREFIX}/usr/$(get_libdir)
+ --confdir=${EPREFIX}/etc/mplayer
+ --datadir=${EPREFIX}/usr/share/mplayer${namesuf}
+ --mandir=${EPREFIX}/usr/share/man
${myconf}"
CFLAGS="${CFLAGS}" ./configure ${myconf} || die
@@ -621,12 +623,8 @@ src_compile() {
src_install() {
local i
- emake prefix="${ED}/usr" \
- BINDIR="${ED}/usr/bin" \
- LIBDIR="${ED}/usr/$(get_libdir)" \
- CONFDIR="${ED}/etc/mplayer" \
- DATADIR="${ED}/usr/share/mplayer" \
- MANDIR="${ED}/usr/share/man" \
+ emake \
+ DESTDIR="${D}" \
INSTALLSTRIP="" \
install