[Ffmpeg-devel] swscale.c compile error[PATCH]

Diego Biurrun diego
Sun Dec 24 00:08:55 CET 2006


On Sat, Dec 23, 2006 at 10:33:51AM +0000, M?ns Rullg?rd wrote:
> Diego Biurrun <diego at biurrun.de> writes:
> 
> > On Wed, Nov 29, 2006 at 03:28:19AM +0100, Diego Biurrun wrote:
> >> On Mon, Nov 06, 2006 at 10:39:16AM +0100, Michel Bardiaux wrote:
> >> > Diego Biurrun wrote:
> >> > >On Thu, Nov 02, 2006 at 05:33:48PM +0100, Michel Bardiaux wrote:
> >> > >>--- Makefile	(revision 6869)
> >> > >>+++ Makefile	(working copy)
> >> > >>@@ -88,7 +88,7 @@
> >> > >> 
> >> > >>-version.h:
> >> > >>+version.h: .svn/entries
> >> > >> 	$(SRC_PATH)/version.sh "$(SRC_PATH)"
> >> > >
> >> > >Won't work if .svn/entries is not present, as in a release or snapshot
> >> > >tarball without .svn directories.
> >> > 
> >> > And to work with out-of-tree builds it should be
> >> > 
> >> > version.h: $(SRC_PATH)/.svn/entries
> >> > 
> >> > OTOH as things stand, there is no rebuild after a svn version change, 
> >> > and that's not good since it will lead people (me!) to flame about an 
> >> > old svn when it's not actually old.
> >> > 
> >> > But I dont have a clue how to achieve that.
> >> 
> >> It's tricky.  I hacked up the following solution, it works kind of, but
> >> it's ugly as heck.  I have no better ideas, though.  Suggestions
> >> welcome.
> >
> > Mans, any better ideas?  Otherwise I'm tempted to commit this.  It's
> > ugly, but it fixes a bug ...
> >
> >> --- Makefile	(revision 7176)
> >> +++ Makefile	(working copy)
> >> @@ -85,7 +85,10 @@
> >>  	cp -p $< $@
> >>  	$(STRIP) $@
> >>  
> >> -version.h:
> >> +$(SRC_PATH_BARE)/.svn/entries:
> >> +	test -f "$@" || mkdir `dirname "$@"` ; touch "$@"
> >> +
> >> +version.h: $(SRC_PATH_BARE)/.svn/entries
> >>  	$(SRC_PATH)/version.sh $(SRC_PATH)
> >>  
> >>  output_example$(EXESUF): output_example.o .libs
> 
> Maybe something like this (untested):
> 
> ifeq ($(wildcard $(SRC_PATH_BARE)/.svn/entries),$(SRC_PATH_BARE)/.svn/entries)
> version.h: $(SRC_PATH_BARE)/.svn/entries
> endif
> 
> version.h:
>         $(SRC_PATH)/version.sh $(SRC_PATH)
> 
> That test isn't pretty, but at least it doesn't create a bogus svn
> file.

Seems to work, commit it.

Diego




More information about the ffmpeg-devel mailing list