diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-09-26 21:37:50 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-09-26 21:37:50 +0000 |
| commit | ac63af34b56de848d78a445bfb9fb5908c9ac719 (patch) | |
| tree | dd3969bd8baa5e1ca03c0984828d7505b42d0edc | |
| parent | b3de4544e045cf6ddba3fa76d6e04f4cb3fb2503 (diff) | |
| download | ffmpeg-ac63af34b56de848d78a445bfb9fb5908c9ac719.tar.gz | |
Add support for passing a version string to configure that is appended to
FFmpeg's version string output. This can be used by distributions to mark
their packages as being modified versions without hacking the sources.
Originally committed as revision 15433 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 2 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rwxr-xr-x | version.sh | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/common.mak b/common.mak index 03dea4d8bc..7cd8d540eb 100644 --- a/common.mak +++ b/common.mak @@ -49,7 +49,7 @@ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES) endif $(BUILD_ROOT_REL)/version.h: - $(SRC_PATH)/version.sh $(SRC_PATH) $@ + $(SRC_PATH)/version.sh $(SRC_PATH) $@ $(EXTRA_VERSION) install: install-libs install-headers @@ -116,6 +116,7 @@ show_help(){ echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" + echo " --extra-version=STRING version string suffix []" echo " --build-suffix=SUFFIX suffix for application specific build []" echo " --arch=ARCH select architecture [$arch]" echo " --cpu=CPU selects the minimum cpu required (affects" @@ -823,6 +824,7 @@ CMDLINE_SET=" cc cpu cross_prefix + extra_version logfile source_path target_os @@ -1953,6 +1955,9 @@ echo "ARCH $arch ($cpu)" if test "$build_suffix" != ""; then echo "build suffix $build_suffix" fi +if test "$extra_version" != ""; then + echo "version string suffix $extra_version" +fi echo "big-endian ${bigendian-no}" if test $arch = "x86_32" -o $arch = "x86_64"; then echo "yasm ${yasm-no}" @@ -2083,6 +2088,7 @@ echo "LIBNAME=$LIBNAME" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBSUF=$SLIBSUF" >> config.mak echo "EXESUF=$EXESUF" >> config.mak +echo "EXTRA_VERSION=$extra_version" >> config.mak echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak if enabled bigendian; then diff --git a/version.sh b/version.sh index 121a8d3300..5f97f6d5ff 100755 --- a/version.sh +++ b/version.sh @@ -15,6 +15,8 @@ fi # no version number found test $revision || revision=UNKNOWN +test "$3" && revision=$revision-$3 + NEW_REVISION="#define FFMPEG_VERSION \"$revision\"" OLD_REVISION=`cat version.h 2> /dev/null` |