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 | 6aee30125971b05052818829546b0833c037deb0 (patch) | |
| tree | f64eef86140ac31b4a3e752d8b139ece17dc0edb /media-video | |
| parent | Added patch to not install .in files (diff) | |
| download | historical-6aee30125971b05052818829546b0833c037deb0.tar.gz historical-6aee30125971b05052818829546b0833c037deb0.tar.bz2 historical-6aee30125971b05052818829546b0833c037deb0.zip | |
Clone the ffmpeg from git as svn external was removed.
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-9999.ebuild | 9 |
3 files changed, 12 insertions, 6 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/Manifest b/media-video/mplayer/Manifest index f35f7fd72809..be00d2d20e35 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -11,6 +11,6 @@ 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 19623 RMD160 a084eb49c6041f1ba5e09b8a91036270bceeeb09 SHA1 7a1b8a6220f262cf3b884dcd85d596422336ded3 SHA256 d6926dba0a7b7a4e33f1672745abf0897492117440ed308d6a7fd0ed61faee43 -MISC ChangeLog 136922 RMD160 9ea64762796f4543c14fea51585f16c0b27de222 SHA1 677a4474c5d7d3d0cd82b52643c40afed84ee230 SHA256 97aaacb7248f15efe5612c0c686c513240a3261c69c91d07157275470230386a +EBUILD mplayer-9999.ebuild 19780 RMD160 6a8891930f2a54533215fd3c600d14c71e1d85cd SHA1 9530a0f50911801054f0e4b516ce1caeb1506549 SHA256 90ca647231e6ace96e1dd3765f69d61ec25713b4d6e5c46922eab3faf5099488 +MISC ChangeLog 137056 RMD160 da4ddaee11c27e582b9bfe901a144b49c3362961 SHA1 d09c211fe58693d519595c0c9db6394489b3f49c SHA256 e1bb227edf46f9abcd93fc30ff44a6869e3b214066552cae089a70ec585c4c02 MISC metadata.xml 4002 RMD160 ffe9c287d3f9757d086dd59a57abbaa50bbf7ff5 SHA1 ffba30bdc398c9515384344d40998e3e333319c4 SHA256 759874a20b3d4a0509f5fb18b9a4809a1e190ac3d3c74d9757faec3a024fd5e6 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 |