[Ffmpeg-cvslog] r5502 - in trunk: . Makefile ffmpeg.c ffplay.c ffserver.c libavcodec/avcodec.h version.sh

[diego]

Author: diego
Date: Tue Jun 20 12:24:08 2006
New Revision: 5502

Added:
   trunk/version.sh   (contents, props changed)
Modified:
   trunk/   (props changed)
   trunk/Makefile
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/ffserver.c
   trunk/libavcodec/avcodec.h

Log:
Use Subversion revision for FFMPEG_VERSION.
based on a patch by Ismail D?nmez ismail$$at$$pardus$$dot$$org$$dot$$tr


Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Tue Jun 20 12:24:08 2006
@@ -67,7 +67,7 @@
 FFLIBDIRS = -L./libavformat -L./libavcodec -L./libavutil
 FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)
 
-all: lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
+all: version.h lib $(PROGS_G) $(PROGS) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
 
 lib:
 	$(MAKE) -C libavutil   all
@@ -90,6 +90,10 @@
 	cp -p $< $@
 	$(STRIP) $@
 
+.PHONY: version.h
+version.h:
+	$(SRC_PATH)/version.sh
+
 output_example$(EXESUF): output_example.o .libs
 	$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ output_example.o $(FFLIBS) $(EXTRALIBS)
 
@@ -220,7 +224,7 @@
 	$(MAKE) -C libpostproc distclean
 	$(MAKE) -C tests       distclean
 	$(MAKE) -C vhook       distclean
-	rm -f .depend config.mak config.h *.pc
+	rm -f .depend config.mak config.h version.h *.pc
 
 TAGS:
 	etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Tue Jun 20 12:24:08 2006
@@ -40,6 +40,7 @@
 #undef time //needed because HAVE_AV_CONFIG_H is defined on top
 #include <time.h>
 
+#include "version.h"
 #include "cmdutils.h"
 
 #undef NDEBUG

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Tue Jun 20 12:24:08 2006
@@ -19,6 +19,7 @@
 #define HAVE_AV_CONFIG_H
 #include "avformat.h"
 
+#include "version.h"
 #include "cmdutils.h"
 
 #include <SDL.h>

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Tue Jun 20 12:24:08 2006
@@ -39,6 +39,7 @@
 #include <dlfcn.h>
 #endif
 
+#include "version.h"
 #include "ffserver.h"
 
 /* maximum number of simultaneous HTTP connections */

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Tue Jun 20 12:24:08 2006
@@ -14,9 +14,8 @@
 #include "avutil.h"
 #include <sys/types.h> /* size_t */
 
-//FIXME the following 2 really dont belong in here
+//FIXME: This really doesn't belong in here..
 #define FFMPEG_VERSION_INT      0x000409
-#define FFMPEG_VERSION          "HEAD"
 
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s

Added: trunk/version.sh
==============================================================================
--- (empty file)
+++ trunk/version.sh	Tue Jun 20 12:24:08 2006
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+svn_revision=`svn info | grep Revision | cut -d' ' -f2 || echo UNKNOWN`
+NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\""
+OLD_REVISION=`cat version.h 2> /dev/null`
+
+# Update version.h only on revision changes to avoid spurious rebuilds
+if test "$NEW_REVISION" != "$OLD_REVISION"; then
+    echo "$NEW_REVISION" > version.h
+fi