[ekiga/gnome-2-26] [windows] Fix ffmpeg svn retrieval during building

[Eugen Dedu <ededu src gnome org>]

commit 1788a4e6c2bae011bdda8a6381571a1be523a60c
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Apr 19 00:30:24 2010 +0200

    [windows] Fix ffmpeg svn retrieval during building
    
    Also use the latest known version which work, as given at
    http://www.mail-archive.com/ekiga-devel-list gnome org/msg02788.html

 win32/Makefile |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index f0d2c14..7e0dc93 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -192,7 +192,8 @@ ICONV_VER := 1.9.2-1
 ICONV_URL := http://downloads.sourceforge.net/project/gnuwin32/libiconv/$(ICONV_VER)
 ICONV_ARCHIVE := libiconv-$(ICONV_VER)-bin.zip
 
-FFMPEG_VER := 14200
+# use date for FFMPEG_VER, because it has two "repositories"
+FFMPEG_VER := {2009-04-14}
 FFMPEG_URL := svn://svn.mplayerhq.hu/ffmpeg/trunk
 FFMPEG_DIR := $(BUILDROOT)/ffmpeg
 FFMPEG_ARCHIVE := ffmpeg
@@ -442,7 +443,14 @@ $(LIBDIR)/libspeex.a: binaries $(SPEEX_DIR)/config.status
 ### ffmpeg
 update-sources::
 	@echo --- Getting FFMPEG ...
+	# ffmpeg has two "repositories" (ffmpeg and libswscale) into their
+	# repository, so process them separately
+ifeq ($(wildcard $(SRCDIR)/$(FFMPEG_ARCHIVE)),)
 	$(SVN) co $(FFMPEG_URL) $(SRCDIR)/$(FFMPEG_ARCHIVE) -r $(FFMPEG_VER)
+else
+	cd $(SRCDIR)/$(FFMPEG_ARCHIVE); $(SVN) up --ignore-externals -r $(FFMPEG_VER)
+endif
+	cd $(SRCDIR)/$(FFMPEG_ARCHIVE); $(SVN) up -r $(FFMPEG_VER) libswscale
 
 $(FFMPEG_DIR)/config.status: $(SRCDIR)/$(FFMPEG_ARCHIVE)
 	rm -rf $(FFMPEG_DIR)