From 1d1f55edf7ff2ae7324b5c5aac2c443dfd5436c3 Mon Sep 17 00:00:00 2001
From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 27 Jan 2009 19:35:19 +0100
Subject: [PATCH] Distribute intended ffmpeg revision(s) and include more
 files.

Bring make dist in sync with autogen.sh's retrieval of ffmpeg
checkout, which also includes an update to selected revision
of libswscale external.  Also include *.S files (needed for
e.g. ARM build).
---
 Makefile.am              | 5 +++--
 autogen.sh               | 4 ++--
 configure.ac             | 1 +
 ffmpegrev                | 2 +-
 gst-libs/ext/Makefile.am | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cd36b136a7..56535cca46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-SUBDIRS = $(FFMPEG_SUBDIRS) ext docs common tests
-DIST_SUBDIRS = $(SUBDIRS) gst-libs
+COMMON_SUBDIRS = ext docs common tests
+SUBDIRS = $(FFMPEG_SUBDIRS) $(COMMON_SUBDIRS)
+DIST_SUBDIRS = $(COMMON_SUBDIRS) gst-libs
 
 # include before EXTRA_DIST for win32 assignment
 include $(top_srcdir)/common/win32.mak
diff --git a/autogen.sh b/autogen.sh
index d8aa1e97c4..c9000bb1dc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,13 +25,13 @@ then
 	echo "+ getting ffmpeg from svn"
 	svn -r $FFMPEG_REVISION co $FFMPEG_SVN $FFMPEG_CO_DIR
 	echo "+ updating externals"
-        sh -c "$FFMPEG_EXTERNALS_UPDATE"
+	svn update -r $FFMPEG_EXTERNALS_REVISION $FFMPEG_CO_DIR/libswscale
     else
 	# update ffmpeg from its repository
 	echo "+ updating ffmpeg checkout"
 	svn -r $FFMPEG_REVISION up $FFMPEG_CO_DIR
 	echo "+ updating externals"
-	sh -c "$FFMPEG_EXTERNALS_UPDATE"
+	svn update -r $FFMPEG_EXTERNALS_REVISION $FFMPEG_CO_DIR/libswscale
     fi
 else
     echo "Subversion needed for ffmpeg checkout, please install and/or add to \$PATH"
diff --git a/configure.ac b/configure.ac
index d6487f0fcf..801a70b8fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,6 +332,7 @@ else
   AC_SUBST(FFMPEG_CO_DIR)
   AC_SUBST(FFMPEG_SVN)
   AC_SUBST(FFMPEG_REVISION)
+  AC_SUBST(FFMPEG_EXTERNALS_REVISION)
   AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg)
   AC_MSG_NOTICE([Using included FFMpeg code])
 fi
diff --git a/ffmpegrev b/ffmpegrev
index e74eadf2fe..fb711e8333 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -5,4 +5,4 @@ FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
 # out an old ffmpeg does not check out a corresponding libswscale.
 # Keep the swscale checkout manually synchronized, then. Update this
 # when you update FFMPEG_REVISION.
-FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2009-01-24 17:45:00 +0100}'"
+FFMPEG_EXTERNALS_REVISION=28348
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index 5036878a7b..e4f80317a7 100644
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -29,6 +29,7 @@ distclean: dist-clean
 
 dist-local:
 	svn -r $(FFMPEG_REVISION) co $(FFMPEG_SVN) $(TMP_DIST_DIR)
+	svn update -r $(FFMPEG_EXTERNALS_REVISION) $(TMP_DIST_DIR)/libswscale
 	mkdir $(DIST_DIR)
 	pwd
 	cp $(TMP_DIST_DIR)/*.c $(TMP_DIST_DIR)/*.h $(TMP_DIST_DIR)/Makefile $(TMP_DIST_DIR)/configure $(TMP_DIST_DIR)/version.sh $(DIST_DIR) 
@@ -40,7 +41,7 @@ dist-local:
 		if [ `ls -d $(TMP_DIST_DIR)/$$d*/ | wc -w` != "" ]; \
 		then for id in `cd $(TMP_DIST_DIR)/$$d && ls -d */`; \
 			do mkdir $(DIST_DIR)/$$d$$id; \
-			cp $(TMP_DIST_DIR)/$$d$$id/*.c $(TMP_DIST_DIR)/$$d$$id/*.h $(TMP_DIST_DIR)/$$d$$id/*.asm $(DIST_DIR)/$$d$$id; \
+			cp $(TMP_DIST_DIR)/$$d$$id/*.c $(TMP_DIST_DIR)/$$d$$id/*.h $(TMP_DIST_DIR)/$$d$$id/*.asm $(TMP_DIST_DIR)/$$d$$id/*.S $(DIST_DIR)/$$d$$id; \
 			done \
 		fi \
 	done