[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090204-81-g932751d
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Mar 3 13:58:29 UTC 2009
The following commit has been merged in the master branch:
commit 100de95812ca1b74934a727f98512cf76c4dc3da
Author: Reinhard Tartler <siretart at tauware.de>
Date: Tue Mar 3 07:54:42 2009 +0100
improve get-orig-source.sh
For the mplayer package, the support for dynamically looking for
svn:externals was integrated. FFmpeg is now the last package that lacks
this support, and since I like to consider tracking
svn://svn.mplayerhq.hu/ffmpeg/branches/0.5 instead of
svn://svn.mplayerhq.hu/ffmpeg/trunk, it seems pretty convenient to be
able to change that url at a single place.
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index 96753e9..3e3554d 100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -69,32 +69,37 @@ fi
CLEANUPSCRIPT=`pwd`/debian/strip.sh
TARBALL=../ffmpeg-debian_0.svn${SVNDATE}.orig.tar.gz
TARBALL_UNSTRIPPED=../ffmpeg_0.svn${SVNDATE}.orig.tar.gz
+PACKAGENAME=ffmpeg
TMPDIR=`mktemp -d`
trap 'rm -rf ${TMPDIR}' EXIT
-svn export -r{${SVNDATE}} \
- --ignore-externals \
- svn://svn.mplayerhq.hu/ffmpeg/trunk \
- ${TMPDIR}/ffmpeg
-
-svn info -r{${SVNDATE}} \
- svn://svn.mplayerhq.hu/ffmpeg/trunk \
- | awk '/^Revision/ {print $2}' \
- > ${TMPDIR}/ffmpeg/.svnrevision
+baseurl="svn://svn.mplayerhq.hu/ffmpeg/trunk"
svn export -r{${SVNDATE}} \
- svn://svn.mplayerhq.hu/mplayer/trunk/libswscale \
- ${TMPDIR}/ffmpeg/libswscale
+ --ignore-externals \
+ ${baseurl} \
+ ${TMPDIR}/${PACKAGENAME}
svn info -r{${SVNDATE}} \
- svn://svn.mplayerhq.hu/mplayer/trunk/libswscale \
+ ${baseurl} \
| awk '/^Revision/ {print $2}' \
- > ${TMPDIR}/ffmpeg/libswscale/.svnrevision
+ > ${TMPDIR}/${PACKAGENAME}/.svnrevision
+
+# get svn externals
+svn pg svn:externals $baseurl | \
+while read external url; do
+ [ -z $url ] && continue
+ dest="${TMPDIR}/${PACKAGENAME}/${external}"
+ svn export -r{${SVNDATE}} --ignore-externals $url $dest
+ svn info $url -r{${SVNDATE}} \
+ | awk '/^Revision/ {print $2}' \
+ > ${TMPDIR}/${PACKAGENAME}/${external}/.svnrevision
+done
-tar czf ${TARBALL_UNSTRIPPED} -C ${TMPDIR} ffmpeg
+tar czf ${TARBALL_UNSTRIPPED} -C ${TMPDIR} ${PACKAGENAME}
-( cd ${TMPDIR}/ffmpeg && sh ${CLEANUPSCRIPT} )
+( cd ${TMPDIR}/${PACKAGENAME} && sh ${CLEANUPSCRIPT} )
-tar czf ${TARBALL} -C ${TMPDIR} ffmpeg
+tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME}
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list