summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/mplayer/ChangeLog6
-rw-r--r--media-video/mplayer/files/prepare_mplayer.sh4
2 files changed, 7 insertions, 3 deletions
diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c84a334a3999..2a106f37fcc9 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.815 2011/12/16 13:05:16 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.816 2011/12/16 13:24:10 aballier Exp $
+
+ 16 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/prepare_mplayer.sh:
+ generate snapshot_version the same way as upstream version.sh and use printf
+ which should be more portable
16 Dec 2011; Alexis Ballier <aballier@gentoo.org> files/prepare_mplayer.sh:
create a snapshot_version file in snapshots to get svn revision
diff --git a/media-video/mplayer/files/prepare_mplayer.sh b/media-video/mplayer/files/prepare_mplayer.sh
index d82154487782..05aca67391c7 100644
--- a/media-video/mplayer/files/prepare_mplayer.sh
+++ b/media-video/mplayer/files/prepare_mplayer.sh
@@ -10,8 +10,8 @@ pushd ${PACKAGE} > /dev/null
rm -rf ffmpeg
git clone git://git.videolan.org/ffmpeg.git ffmpeg/
sh "$DUMP_FFMPEG"
- STORE_VERSION=$(svn log -r HEAD -q |grep ^r |cut -d' ' -f1)
- echo "$STORE_VERSION" > snapshot_version
+ STORE_VERSION=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
+ printf "$STORE_VERSION" > snapshot_version
popd > /dev/null
find "${PACKAGE}" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf