[MPlayer-dev-eng] FFmpeg, svn:externals and where to go from here

[compn]

On Mon, 31 Jan 2011 10:54:56 +0100, Diego Biurrun wrote:
>On Sat, Jan 29, 2011 at 01:30:58PM +0100, Reimar Döffinger wrote:
>> On Sat, Jan 29, 2011 at 01:11:31PM +0100, Reimar Döffinger wrote:
>> > On Sat, Jan 29, 2011 at 01:09:14PM +0100, Nicolas George wrote:
>> > > > Just as a reminder to myself (unless someone else implements it), step 3
>> > > > should also depend on at least ffmpeg but possibly also MPlayer being at HEAD
>> > > > to avoid interfering with regression testing.
>> > > 
>> > > Some people may find it really objectionable to have ./configure start
>> > > downloading things on its own accord. A separate script, and just sanity
>> > > checks in ./configure, would probably be better.
>> > 
>> > Those would delete the mp_auto_pull file or just create a checkout
>> > on their own before running configure.
>> > We can ask for ok the first time.
>> 
>> Oh, let's stop wasting time on discussion.
>> Here is a patch, please test it and state anything that annoys you.
>> I'd particularly hear from distro (e.g. Gentoo) maintainers,
>> the intention is that this should not cause issues for you if you
>> somehow prepopulate ffmpeg/ (or just have a dummy one if you somehow
>> can and want to compile against system ffmpeg).
>> 
>> --- configure   (revision 32826)
>> +++ configure   (working copy)
>> @@ -35,6 +35,29 @@
>>  
>> +if test -e ffmpeg/.svn ; then
>> +  echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
>> +  exit 1
>> +fi
>> +
>> +if test -e ffmpeg/mp_auto_pull ; then
>> +  if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
>> +    echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
>> +    exit 1
>> +  fi
>> +fi
>> +
>> +if ! test -e ffmpeg ; then
>> +  echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
>> +  read tmp
>> +  if ! git clone git://git.videolan.org/ffmpeg.git ffmpeg ; then
>
>wrong repo ;-p
>
>Seriously though, that one resides on another server outside of our

mirror git.videolan on git.ffmpeg then.

-compn