[FFmpeg-cvslog] r15433 - in trunk: common.mak configure version.sh

[diego]

Author: diego
Date: Fri Sep 26 23:37:50 2008
New Revision: 15433

Log:
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.


Modified:
   trunk/common.mak
   trunk/configure
   trunk/version.sh

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Fri Sep 26 23:37:50 2008
@@ -49,7 +49,7 @@ $(BUILD_ROOT_REL)/version.h: $(SVN_ENTRI
 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
 

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Fri Sep 26 23:37:50 2008
@@ -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 ($
 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

Modified: trunk/version.sh
==============================================================================
--- trunk/version.sh	(original)
+++ trunk/version.sh	Fri Sep 26 23:37:50 2008
@@ -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`