aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2011-03-16 21:53:58 +0100
committerJanne Grunau <janne-libav@jannau.net>2011-03-18 21:57:38 +0100
commitfaa6f1c306b817a7349e3fe16590371d6d499998 (patch)
tree4a7f97223ee136465e54ba81acd26850489eaba1
parentfda299f0d01c1691625180786a01b01065df7156 (diff)
downloadffmpeg-faa6f1c306b817a7349e3fe16590371d6d499998.tar.gz
get rid of the last svn mentions
-rw-r--r--Doxyfile2
-rw-r--r--Makefile3
-rw-r--r--doc/developer.texi2
-rw-r--r--doc/faq.texi4
-rw-r--r--doc/general.texi2
-rw-r--r--libpostproc/postprocess.c2
-rwxr-xr-xtests/fate.sh2
-rwxr-xr-xversion.sh9
8 files changed, 9 insertions, 17 deletions
diff --git a/Doxyfile b/Doxyfile
index a7782f1fcf..5d80a2b6f5 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -577,7 +577,7 @@ EXCLUDE_SYMLINKS = NO
# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS = *.svn *.git *.d
+EXCLUDE_PATTERNS = *.git *.d
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/Makefile b/Makefile
index 1ec443699e..e3b7f1e686 100644
--- a/Makefile
+++ b/Makefile
@@ -98,9 +98,8 @@ ffplay.o: CFLAGS += $(SDL_CFLAGS)
VERSION_SH = $(SRC_PATH_BARE)/version.sh
GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD
-SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries
-.version: $(wildcard $(GIT_LOG) $(SVN_ENTRIES)) $(VERSION_SH) config.mak
+.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak
.version: M=@
version.h .version:
diff --git a/doc/developer.texi b/doc/developer.texi
index 379f6b2a40..ec196d7d0e 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -74,7 +74,7 @@ Indent size is 4.
The presentation is one inspired by 'indent -i4 -kr -nut'.
The TAB character is forbidden outside of Makefiles as is any
form of trailing whitespace. Commits containing either will be
-rejected by the Subversion repository.
+rejected by the git repository.
The main priority in Libav is simplicity and small code size in order to
minimize the bug count.
diff --git a/doc/faq.texi b/doc/faq.texi
index a07254a236..bfaaaf49f4 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -23,7 +23,7 @@ help out creating them.
@section I have a problem with an old version of Libav; where should I report it?
Nowhere. We do not support old Libav versions in any way, we simply lack
the time, motivation and manpower to do so. If you have a problem with an
-old version of Libav, upgrade to the latest Subversion snapshot. If you
+old version of Libav, upgrade to the latest git snapshot. If you
still experience the problem, then you can report it according to the
guidelines in @url{http://libav.org/bugreports.html}.
@@ -47,7 +47,7 @@ Likely reasons
@item We are busy and haven't had time yet to read your report or
investigate the issue.
@item You didn't follow @url{http://libav.org/bugreports.html}.
-@item You didn't use Subversion HEAD.
+@item You didn't use git master.
@item You reported a segmentation fault without gdb output.
@item You describe a problem but not how to reproduce it.
@item It's unclear if you use ffmpeg as command line tool or use
diff --git a/doc/general.texi b/doc/general.texi
index cd06533fad..3ef4d678eb 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -1032,7 +1032,7 @@ llrint() in its C library.
Install your Cygwin with all the "Base" packages, plus the
following "Devel" ones:
@example
-binutils, gcc4-core, make, subversion, mingw-runtime, texi2html
+binutils, gcc4-core, make, git, mingw-runtime, texi2html
@end example
And the following "Utils" one:
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 6834dd723d..3d951fc6fc 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -71,7 +71,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
...
*/
-//Changelog: use the Subversion log
+//Changelog: use git log
#include "config.h"
#include "libavutil/avutil.h"
diff --git a/tests/fate.sh b/tests/fate.sh
index 56729d88bc..6f0e0fffcb 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -29,7 +29,6 @@ checkout(){
case "$repo" in
file:*|/*) src="${repo#file:}" ;;
git:*) git clone "$repo" "$src" ;;
- svn:*) svn co "$repo" "$src" ;;
esac
}
@@ -37,7 +36,6 @@ update()(
cd ${src} || return
case "$repo" in
git:*) git pull ;;
- svn:*) svn up ;;
esac
)
diff --git a/version.sh b/version.sh
index 66a1c6f0ac..6ec2b2567e 100755
--- a/version.sh
+++ b/version.sh
@@ -1,13 +1,8 @@
#!/bin/sh
-revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
-test "$revision" && revision=SVN-r$revision
-
# check for git short hash
-if ! test "$revision"; then
- revision=$(cd "$1" && git describe --always 2> /dev/null)
- test "$revision" && revision=git-$revision
-fi
+revision=$(cd "$1" && git describe --always 2> /dev/null)
+test "$revision" && revision=git-$revision
# no revision number found
test "$revision" || revision=UNKNOWN