diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-30 21:08:15 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-01-30 21:08:15 +0000 |
| commit | 72fbb83c7c20e6d487ba39dbcf0eaa8202664dcc (patch) | |
| tree | 1727bcc0b415321c1e060965c728936bace1cc31 /media-video | |
| parent | Added more upstream fixes. Switched to EAPI=4. Added static-libs flag, force ... (diff) | |
| download | gentoo-2-72fbb83c7c20e6d487ba39dbcf0eaa8202664dcc.tar.gz gentoo-2-72fbb83c7c20e6d487ba39dbcf0eaa8202664dcc.tar.bz2 gentoo-2-72fbb83c7c20e6d487ba39dbcf0eaa8202664dcc.zip | |
Clone the ffmpeg from git as svn external was removed.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/mplayer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog index e43eaec4de8a..52916b2147c1 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.777 2011/01/30 12:55:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.778 2011/01/30 21:08:15 scarabeus Exp $ + + 30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild: + Clone the ffmpeg from git as svn external was removed. 30 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild: Update live verison to eapi4 and use_required syntax. Fix default diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index 176f1409cd01..5ff0342ae629 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -1,11 +1,13 @@ # 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.90 2011/01/30 12:55:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.91 2011/01/30 21:08:15 scarabeus Exp $ EAPI=4 +EGIT_REPO_URI="git://git.ffmpeg.org/ffmpeg.git" +EGIT_PROJECT="ffmpeg" ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" -[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS="" +[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS="" inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} @@ -268,8 +270,9 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]]; then subversion_src_unpack - cd "${WORKDIR}" + rm -rf "${WORKDIR}/${P}/ffmpeg/" + ( S="${WORKDIR}/${P}/ffmpeg/" git_src_unpack ) else unpack ${A} fi |