Commit ac63af34 authored by Diego Biurrun's avatar Diego Biurrun

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
parent b3de4544
...@@ -49,7 +49,7 @@ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES) ...@@ -49,7 +49,7 @@ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRIES)
endif endif
$(BUILD_ROOT_REL)/version.h: $(BUILD_ROOT_REL)/version.h:
$(SRC_PATH)/version.sh $(SRC_PATH) $@ $(SRC_PATH)/version.sh $(SRC_PATH) $@ $(EXTRA_VERSION)
install: install-libs install-headers install: install-libs install-headers
......
...@@ -116,6 +116,7 @@ show_help(){ ...@@ -116,6 +116,7 @@ show_help(){
echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]"
echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]" echo " --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]"
echo " --extra-libs=ELIBS add ELIBS [$ELIBS]" echo " --extra-libs=ELIBS add ELIBS [$ELIBS]"
echo " --extra-version=STRING version string suffix []"
echo " --build-suffix=SUFFIX suffix for application specific build []" echo " --build-suffix=SUFFIX suffix for application specific build []"
echo " --arch=ARCH select architecture [$arch]" echo " --arch=ARCH select architecture [$arch]"
echo " --cpu=CPU selects the minimum cpu required (affects" echo " --cpu=CPU selects the minimum cpu required (affects"
...@@ -823,6 +824,7 @@ CMDLINE_SET=" ...@@ -823,6 +824,7 @@ CMDLINE_SET="
cc cc
cpu cpu
cross_prefix cross_prefix
extra_version
logfile logfile
source_path source_path
target_os target_os
...@@ -1953,6 +1955,9 @@ echo "ARCH $arch ($cpu)" ...@@ -1953,6 +1955,9 @@ echo "ARCH $arch ($cpu)"
if test "$build_suffix" != ""; then if test "$build_suffix" != ""; then
echo "build suffix $build_suffix" echo "build suffix $build_suffix"
fi fi
if test "$extra_version" != ""; then
echo "version string suffix $extra_version"
fi
echo "big-endian ${bigendian-no}" echo "big-endian ${bigendian-no}"
if test $arch = "x86_32" -o $arch = "x86_64"; then if test $arch = "x86_32" -o $arch = "x86_64"; then
echo "yasm ${yasm-no}" echo "yasm ${yasm-no}"
...@@ -2083,6 +2088,7 @@ echo "LIBNAME=$LIBNAME" >> config.mak ...@@ -2083,6 +2088,7 @@ echo "LIBNAME=$LIBNAME" >> config.mak
echo "SLIBPREF=$SLIBPREF" >> config.mak echo "SLIBPREF=$SLIBPREF" >> config.mak
echo "SLIBSUF=$SLIBSUF" >> config.mak echo "SLIBSUF=$SLIBSUF" >> config.mak
echo "EXESUF=$EXESUF" >> config.mak echo "EXESUF=$EXESUF" >> config.mak
echo "EXTRA_VERSION=$extra_version" >> config.mak
echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak
if enabled bigendian; then if enabled bigendian; then
......
...@@ -15,6 +15,8 @@ fi ...@@ -15,6 +15,8 @@ fi
# no version number found # no version number found
test $revision || revision=UNKNOWN test $revision || revision=UNKNOWN
test "$3" && revision=$revision-$3
NEW_REVISION="#define FFMPEG_VERSION \"$revision\"" NEW_REVISION="#define FFMPEG_VERSION \"$revision\""
OLD_REVISION=`cat version.h 2> /dev/null` OLD_REVISION=`cat version.h 2> /dev/null`
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment