[SCM] libav/experimental: get svn version when using separate build tree

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:48:22 UTC 2013


The following commit has been merged in the experimental branch:
commit 54003e1a707dea428c4dc56d2fdda8180063b122
Author: Måns Rullgård <mans at mansr.com>
Date:   Wed Jun 28 20:46:58 2006 +0000

    get svn version when using separate build tree
    
    Originally committed as revision 5539 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 91fa008..9c64009 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
 
 .PHONY: version.h
 version.h:
-	$(SRC_PATH)/version.sh
+	$(SRC_PATH)/version.sh "$(SRC_PATH)"
 
 output_example$(EXESUF): output_example.o .libs
 	$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
diff --git a/version.sh b/version.sh
index 09c0382..4721a71 100755
--- a/version.sh
+++ b/version.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-svn_revision=`svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
+svn_revision=`cd "$1" && svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
 test $svn_revision || svn_revision=UNKNOWN
 
 NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\""

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list