mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-09-03 02:33:53 +00:00
ffmpeg updates
Original commit message from CVS: ffmpeg updates
This commit is contained in:
parent
8ba3ae3970
commit
4fe0d4ef76
2 changed files with 16 additions and 11 deletions
1
gst-libs/ext/Makefile.am
Normal file
1
gst-libs/ext/Makefile.am
Normal file
|
@ -0,0 +1 @@
|
||||||
|
SUBDIRS = ffmpeg
|
|
@ -1,4 +1,4 @@
|
||||||
dnl slurp-ffmpeg.m4 0.1.2
|
dnl slurp-ffmpeg.m4 0.1.1
|
||||||
dnl a macro to slurp in ffmpeg's cvs source inside a project tree
|
dnl a macro to slurp in ffmpeg's cvs source inside a project tree
|
||||||
dnl taken from Autostar Sandbox, http://autostars.sourceforge.net/
|
dnl taken from Autostar Sandbox, http://autostars.sourceforge.net/
|
||||||
|
|
||||||
|
@ -18,29 +18,33 @@ dnl a date spec)
|
||||||
AC_DEFUN([AS_SLURP_FFMPEG],
|
AC_DEFUN([AS_SLURP_FFMPEG],
|
||||||
[
|
[
|
||||||
# save original dir
|
# save original dir
|
||||||
|
FAILED=""
|
||||||
DIRECTORY=`pwd`
|
DIRECTORY=`pwd`
|
||||||
# get/update cvs
|
# get/update cvs
|
||||||
if test ! -d $1; then mkdir -p $1; fi
|
if test ! -d $1; then mkdir -p $1; fi
|
||||||
cd $1
|
dnl we need to check $srcdir/$1 or it will always checkout ffmpeg even if it is there
|
||||||
|
dnl at least when top_srcdir != top_builddir.
|
||||||
|
dnl FIXME: unfortunately this makes the checkout go into top_srcdir
|
||||||
|
cd $srcdir/$1
|
||||||
|
|
||||||
if test ! -d ffmpeg/CVS; then
|
if test ! -e ffmpeg/README; then
|
||||||
# check out cvs code
|
# check out cvs code
|
||||||
AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1)
|
AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1)
|
||||||
cvs -Q -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes
|
cvs -Q -z4 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes
|
||||||
cd ffmpeg
|
|
||||||
else
|
else
|
||||||
# compare against Tag file and see if it needs updating
|
# compare against Tag file and see if it needs updating
|
||||||
if diff -q Tag ffmpeg/CVS/Tag > /dev/null 2> /dev/null
|
if test "`cat Tag`" == "$2"; then
|
||||||
then
|
|
||||||
# diff returned no problem
|
|
||||||
AC_MSG_NOTICE(ffmpeg cvs code in sync)
|
AC_MSG_NOTICE(ffmpeg cvs code in sync)
|
||||||
else
|
else
|
||||||
# diff says they differ
|
|
||||||
cd ffmpeg
|
cd ffmpeg
|
||||||
AC_MSG_NOTICE(updating ffmpeg cvs code)
|
AC_MSG_NOTICE(updating ffmpeg cvs code to $2)
|
||||||
cvs -Q update -dP -D '$2' || FAILED=yes
|
cvs -Q -z4 update -dP -D '$2' || FAILED=yes
|
||||||
|
cd ..
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if test "x$FAILED" != "xyes"; then
|
||||||
|
echo "$2" > Tag
|
||||||
|
fi
|
||||||
|
|
||||||
# now go back
|
# now go back
|
||||||
cd $DIRECTORY
|
cd $DIRECTORY
|
||||||
|
|
Loading…
Reference in a new issue