diff options
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/Manifest | 5 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 18 |
3 files changed, 15 insertions, 13 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/Manifest b/media-video/mplayer/Manifest index ac20ea1352a6..ecfa6f632cac 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -11,6 +11,7 @@ DIST svgalib_helper-1.9.17-mplayer.tar.gz 7583 RMD160 927ff34f187e4fa9528e2e4820 EBUILD mplayer-1.0_rc4_p20091026-r1.ebuild 18994 RMD160 703252f6fa80d26861cdfa527b908d46b3e47b2c SHA1 7c313494950845a272a6d9c4032db7c257c8aee1 SHA256 05ecd2470da16c3a01db8807e6cdb07015ef4c722d986398281b87ef900780e6 EBUILD mplayer-1.0_rc4_p20101114.ebuild 20160 RMD160 d1d9a84a8405113a9b6ff37473c16590054729fc SHA1 6e15165eb69fb4eb4c14f7b059f8c5cd9f1f843e SHA256 5273dce8c77ea476bbf79df746a93c504ba6a7117e40a71522a8ef9f47f47dfa EBUILD mplayer-1.0_rc4_p20101219.ebuild 20170 RMD160 eaf9ba0c48f420361e1e9ee678d58f636b7022e4 SHA1 e8d0d50037e34e1d701d9b17a89dd012e219331a SHA256 f8127f97c387ad15636e8c1f7777aee88b6bf54ab9eba197b1775103825f1983 -EBUILD mplayer-9999.ebuild 19780 RMD160 6a8891930f2a54533215fd3c600d14c71e1d85cd SHA1 9530a0f50911801054f0e4b516ce1caeb1506549 SHA256 90ca647231e6ace96e1dd3765f69d61ec25713b4d6e5c46922eab3faf5099488 -MISC ChangeLog 137050 RMD160 0ffc351e26c45d6df013328d7d9c159cb3e18c9c SHA1 9162283ad7c41b7b7fb3a8c1bb1f7453c9cf66e5 SHA256 fef0a131651bc868240d8aac461d32590d877494f23a435b49b264fe9a8c252b +EBUILD mplayer-9999.ebuild 19688 RMD160 e3afb606f0189711ca00f734acfee522a9173c49 SHA1 fcf8793abbd83278b786b6fdcd8e40e82453ca7d SHA256 1d03888bf47669c84a55b7cd76a41715942ddfe6c2fae6650f401303f50ebdcd +MISC ChangeLog 137211 RMD160 f2780a16d67078aa37ad5671a9503e70ddc0e554 SHA1 3f17215344d0e05254319f4cf2effb6349571c74 SHA256 6c5a6b70ac1cdc89b77d12a10d4a44580af6abd5144b83bf59e502f24408ec0b MISC metadata.xml 4002 RMD160 ffe9c287d3f9757d086dd59a57abbaa50bbf7ff5 SHA1 ffba30bdc398c9515384344d40998e3e333319c4 SHA256 759874a20b3d4a0509f5fb18b9a4809a1e190ac3d3c74d9757faec3a024fd5e6 +MISC mplayer-9999.ebuild.orig 19780 RMD160 6a8891930f2a54533215fd3c600d14c71e1d85cd SHA1 9530a0f50911801054f0e4b516ce1caeb1506549 SHA256 90ca647231e6ace96e1dd3765f69d61ec25713b4d6e5c46922eab3faf5099488 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 |