diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2009-06-06 15:14:45 +0100 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2009-06-06 15:14:45 +0100 |
| commit | 60ee556217c97c56a2676f8f9f8a5e19e80d94ed (patch) | |
| tree | 435f3b86dcabe7042b989c2d981a4c2f9193ca11 /gst-libs | |
| parent | 8e961ec5efe86e037e60e84be9d9bac029007aee (diff) | |
| download | gstreamer-60ee556217c97c56a2676f8f9f8a5e19e80d94ed.tar.gz | |
build: Fix the dist - libswscale isn't an external on the 0.5 branch
The 0.5 ffmpeg branch includes libswscale directly, not as an external,
breaking the dist (and warning in autogen.sh) about not being able to
update its revision.
Add some code to not update the svn external if the
FFMPEG_EXTERNALS_REVISION variable is empty.
Also, in autogen.sh check that the current FFmpeg checkout is from the
right branch according to ffmpegrev, and check it out again if
it's not.
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/ext/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am index cbafe3ac7a..d11bc963d4 100644 --- a/gst-libs/ext/Makefile.am +++ b/gst-libs/ext/Makefile.am @@ -29,7 +29,9 @@ 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 + @if [ "x$(FFMPEG_EXTERNALS_REVISION)" != x ]; then \ + svn update -r $(FFMPEG_EXTERNALS_REVISION) $(TMP_DIST_DIR)/libswscale; \ + fi 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) |