| 1 |
scarabeus 11/01/30 21:08:15 |
| 2 |
|
| 3 |
Modified: ChangeLog mplayer-9999.ebuild |
| 4 |
Log: |
| 5 |
Clone the ffmpeg from git as svn external was removed. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.778 media-video/mplayer/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.778&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?rev=1.778&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/ChangeLog?r1=1.777&r2=1.778 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v |
| 19 |
retrieving revision 1.777 |
| 20 |
retrieving revision 1.778 |
| 21 |
diff -u -r1.777 -r1.778 |
| 22 |
--- ChangeLog 30 Jan 2011 12:55:54 -0000 1.777 |
| 23 |
+++ ChangeLog 30 Jan 2011 21:08:15 -0000 1.778 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-video/mplayer |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.777 2011/01/30 12:55:54 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.778 2011/01/30 21:08:15 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 30 Jan 2011; Tomáš Chvátal <scarabeus@g.o> mplayer-9999.ebuild: |
| 31 |
+ Clone the ffmpeg from git as svn external was removed. |
| 32 |
|
| 33 |
30 Jan 2011; Tomáš Chvátal <scarabeus@g.o> mplayer-9999.ebuild: |
| 34 |
Update live verison to eapi4 and use_required syntax. Fix default |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.91 media-video/mplayer/mplayer-9999.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.91&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?rev=1.91&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild?r1=1.90&r2=1.91 |
| 43 |
|
| 44 |
Index: mplayer-9999.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v |
| 47 |
retrieving revision 1.90 |
| 48 |
retrieving revision 1.91 |
| 49 |
diff -u -r1.90 -r1.91 |
| 50 |
--- mplayer-9999.ebuild 30 Jan 2011 12:55:54 -0000 1.90 |
| 51 |
+++ mplayer-9999.ebuild 30 Jan 2011 21:08:15 -0000 1.91 |
| 52 |
@@ -1,11 +1,13 @@ |
| 53 |
# Copyright 1999-2011 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.90 2011/01/30 12:55:54 scarabeus Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.91 2011/01/30 21:08:15 scarabeus Exp $ |
| 57 |
|
| 58 |
EAPI=4 |
| 59 |
|
| 60 |
+EGIT_REPO_URI="git://git.ffmpeg.org/ffmpeg.git" |
| 61 |
+EGIT_PROJECT="ffmpeg" |
| 62 |
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk" |
| 63 |
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion" || SVN_ECLASS="" |
| 64 |
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS="" |
| 65 |
|
| 66 |
inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS} |
| 67 |
|
| 68 |
@@ -268,8 +270,9 @@ |
| 69 |
src_unpack() { |
| 70 |
if [[ ${PV} = *9999* ]]; then |
| 71 |
subversion_src_unpack |
| 72 |
- |
| 73 |
cd "${WORKDIR}" |
| 74 |
+ rm -rf "${WORKDIR}/${P}/ffmpeg/" |
| 75 |
+ ( S="${WORKDIR}/${P}/ffmpeg/" git_src_unpack ) |
| 76 |
else |
| 77 |
unpack ${A} |
| 78 |
fi |
Archives