Remove usage of SVN now that we use git submodules for libav

diff --git a/Makefile.am b/Makefile.am
index b19b38f..de80f09 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ DIST_SUBDIRS = $(COMMON_SUBDIRS) gst-libs
 include $(top_srcdir)/common/win32.mak
 
 EXTRA_DIST = \
-       gst-ffmpeg.spec depcomp ffmpegrev autogen.sh \
+       gst-ffmpeg.spec depcomp autogen.sh \
        AUTHORS COPYING NEWS README ChangeLog gst-ffmpeg.doap \
        $(win32)
 

diff --git a/autogen.sh b/autogen.sh
index 3b31e80..43b6731 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,9 +4,6 @@
 DIE=0
 package=gst-ffmpeg
 srcfile=configure.ac
-have_svn=`which svn`
-# FFMPEG specific properties
-. ./ffmpegrev
 
 # make sure we have common
 if test ! -f common/gst-autogen.sh; 
@@ -16,38 +13,6 @@ then
 fi
 git submodule update
 
-if test -x $have_svn && [ $have_svn ];
-then
-    co_ffmpeg=no
-
-    if test ! -f $FFMPEG_CO_DIR/configure; then
-      co_ffmpeg=yes
-    else
-      if ! svn info gst-libs/ext/ffmpeg | grep "URL: $FFMPEG_SVN" > /dev/null; then
-        echo "FFmpeg checkout is on the wrong branch. Re-fetching."
-        co_ffmpeg=yes
-      fi
-    fi
-
-    if [ "$co_ffmpeg" = "yes" ]; then
-       # checkout ffmpeg from its repository
-       rm -rf $FFMPEG_CO_DIR
-       echo "+ getting ffmpeg from svn"
-       svn -r $FFMPEG_REVISION co $FFMPEG_SVN $FFMPEG_CO_DIR
-    else
-       # update ffmpeg from its repository
-       echo "+ updating ffmpeg checkout"
-       svn -r $FFMPEG_REVISION up $FFMPEG_CO_DIR
-    fi
-    if [ "x$FFMPEG_EXTERNALS_REVISION" != "x" ]; then
-       echo "+ updating externals"
-       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"
-    exit 0
-fi
-
 # source helper functions
 if test ! -f common/gst-autogen.sh;
 then

diff --git a/ffmpegrev b/ffmpegrev
deleted file mode 100644 (file)
index b5f2c5e..0000000
--- a/ffmpegrev
+++ /dev/null
@@ -1,9 +0,0 @@
-FFMPEG_REVISION=26402
-FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
-FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk/
-# Because ffmpeg trunk checks out libswscale via an svn:externals, checking
-# 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. Set it to empty if there's no
-# external to update (as on ffmpeg 0.5 branch)
-FFMPEG_EXTERNALS_REVISION=

diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index 95167f7..cbd1274 100644 (file)
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -1,5 +1,5 @@
 # we have to put in a little hack here for integration to work well
-# ffmpeg can't be in SUBDIRS, because then automake will try to descend in it
+# libav can't be in SUBDIRS, because then automake will try to descend in it
 # and find conditionals it doesn't know.
 
 # so,
@@ -9,24 +9,24 @@
 # this also satisfies make distcheck
 
 SUBDIRS = 
-DIST_SUBDIRS = ffmpeg
-TMP_DIST_DIR=ffmpeg-dist
-DIST_DIR=$(TMP_DIST_DIR)/.ffmpeg
+DIST_SUBDIRS = libav
+TMP_DIST_DIR=libav-dist
+DIST_DIR=$(TMP_DIST_DIR)/.libav
 EXTRA_DIST=Makefile.am
 MAINTAINERCLEANDIRS = $(DIST_SUBDIRS)
 
 all-local:
-       cd ffmpeg && $(MAKE)
+       cd libav && $(MAKE)
 
 clean-local:
-       cd ffmpeg && $(MAKE) clean
+       cd libav && $(MAKE) clean
 
 dist-clean:
-       cd ffmpeg && $(MAKE) distclean
+       cd libav && $(MAKE) distclean
        rm -rf $(TMP_DIST_DIR)
        rm -f Makefile
-       rm -f ffmpeg/.version
-       rm -f ffmpeg/.config
+       rm -f libav/.version
+       rm -f libav/.config
 
 distclean: dist-clean
 
@@ -36,22 +36,19 @@ maintainer-clean: distclean
 maintainerclean: maintainer-clean
 
 dist-local:
-       svn -r $(FFMPEG_REVISION) export $(FFMPEG_SVN) $(TMP_DIST_DIR)/ffmpeg/
-       @if [ "x$(FFMPEG_EXTERNALS_REVISION)" != x ]; then \
-               svn update -r $(FFMPEG_EXTERNALS_REVISION) $(TMP_DIST_DIR)/ffmpeg/libswscale; \
-       fi
-       touch $(TMP_DIST_DIR)/ffmpeg/config.mak
-       echo "Patching ffmpeg ./configure"
-       sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/ffmpeg/configure > $(TMP_DIST_DIR)/ffmpeg/configure.tmp
-       mv $(TMP_DIST_DIR)/ffmpeg/configure.tmp $(TMP_DIST_DIR)/ffmpeg/configure
-       chmod +x $(TMP_DIST_DIR)/ffmpeg/configure
+       GIT_DIR=libav/.git git checkout-index --prefix=$(TMP_DIST_DIR)/libav/ -a
+       touch $(TMP_DIST_DIR)/libav/config.mak
+       echo "Patching libav ./configure"
+       sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/libav/configure > $(TMP_DIST_DIR)/libav/configure.tmp
+       mv $(TMP_DIST_DIR)/libav/configure.tmp $(TMP_DIST_DIR)/libav/configure
+       chmod +x $(TMP_DIST_DIR)/libav/configure
 
 distdir: dist-local
-       cp -r $(TMP_DIST_DIR)/ffmpeg ${distdir}
+       cp -r $(TMP_DIST_DIR)/libav ${distdir}
        cp -f $(top_srcdir)/gst-libs/ext/Makefile.am $(top_srcdir)/gst-libs/ext/Makefile.in ${distdir}
        rm -rf $(TMP_DIST_DIR)
 
 dist: dist-local
-       cd $(TMP_DIST_DIR) && tar -czf ffmpeg.tar.gz ffmpeg
-       mv $(TMP_DIST_DIR)/ffmpeg.tar.gz ./
+       cd $(TMP_DIST_DIR) && tar -czf libav.tar.gz libav
+       mv $(TMP_DIST_DIR)/libav.tar.gz ./
        rm -rf $(TMP_DIST_DIR)