summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-03-20 22:12:46 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-03-20 22:12:46 +0000
commit85cbbfef04176b4b15764a7b0dadbc5033b64903 (patch)
treeb573134b9c412fa7eff72073366e3b96212bbe6b /media-video
parentVersion bump, bug #359291 (diff)
downloadgentoo-2-85cbbfef04176b4b15764a7b0dadbc5033b64903.tar.gz
gentoo-2-85cbbfef04176b4b15764a7b0dadbc5033b64903.tar.bz2
gentoo-2-85cbbfef04176b4b15764a7b0dadbc5033b64903.zip
Move to use libav in live mplayer ebuild and snapshot preparator. Force due to unsynced tree.
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/files/prepare_mplayer.sh2
-rw-r--r--media-video/mplayer/mplayer-9999.ebuild4
3 files changed, 8 insertions, 4 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index e76ea7cfec57..eba581d3b64d 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
# 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.783 2011/03/20 11:19:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.784 2011/03/20 22:12:45 scarabeus Exp $
+
+ 20 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> mplayer-9999.ebuild,
+ files/prepare_mplayer.sh:
+ Move to use libav in live mplayer ebuild and snapshot preparator.
20 Mar 2011; Raúl Porcel <armin76@gentoo.org>
mplayer-1.0_rc4_p20101114.ebuild:
diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh
index 2518f2ebf6a5..138af6305107 100644
--- a/media-video/mplayer/files/prepare_mplayer.sh
+++ b/media-video/mplayer/files/prepare_mplayer.sh
@@ -7,7 +7,7 @@ svn checkout svn://svn.mplayerhq.hu/mplayer/trunk ${PACKAGE}
pushd ${PACKAGE} > /dev/null
# ffmpeg is in git now so no svn external anymore
rm -rf ffmpeg
- git clone git://git.ffmpeg.org/ffmpeg.git
+ git clone git://git.libav.org/libav.git
STORE_VERSION=$(svn log -r HEAD -q |grep ^r |cut -d' ' -f1)
echo "*** Remember to adjust mplayer ebuild with revision: \"SVN-${STORE_VERSION}\" ***"
popd > /dev/null
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 752c502ea13b..00ad70dc9eb1 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,10 +1,10 @@
# 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.93 2011/03/02 16:54:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-9999.ebuild,v 1.94 2011/03/20 22:12:45 scarabeus Exp $
EAPI=4
-EGIT_REPO_URI="git://git.ffmpeg.org/ffmpeg.git"
+EGIT_REPO_URI="git://git.libav.org/libav.git"
EGIT_PROJECT="ffmpeg"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git" || SVN_ECLASS=""