[FFmpeg-devel] [PATCH] tests: Download lena.pnm if its missing from the source tree

[Michael Niedermayer]

On Thu, Sep 04, 2014 at 03:36:03PM +0200, Michael Niedermayer wrote:
> On Wed, Sep 03, 2014 at 07:30:49PM +0200, Michael Niedermayer wrote:
> > On Thu, Aug 28, 2014 at 01:28:18PM +0200, Andreas Cadhalpun wrote:
> > > On 28.08.2014 04:36, Michael Niedermayer wrote:
> > > >On Wed, Aug 27, 2014 at 05:21:18PM -0800, Lou Logan wrote:
> > > >>On Tue, 26 Aug 2014 13:41:42 +0200, Michael Niedermayer wrote:
> > > >>
> > > >>>Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > > >>>---
> > > >>>  tests/Makefile |    5 ++++-
> > > >>>  1 file changed, 4 insertions(+), 1 deletion(-)
> > > >>>
> > > >>>diff --git a/tests/Makefile b/tests/Makefile
> > > >>>index 07557f9..2f095df 100644
> > > >>>--- a/tests/Makefile
> > > >>>+++ b/tests/Makefile
> > > >>>@@ -24,13 +24,16 @@ $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
> > > >>>  $(AREF): tests/audiogen$(HOSTEXESUF) | tests/data
> > > >>>  	$(M)./$< $@
> > > >>>
> > > >>>+$(SRC_PATH)/tests/lena.pnm:
> > > >>>+	wget -O $@  http://samples.ffmpeg.org/image-samples/lena.pnm
> > > >>
> > > >>I feel like I'm missing something, but what about this suggestion from
> > > >>Nicolas?
> > > >>
> > > >>>>ffmpeg -f data -i http://samples.ffmpeg.org/image-samples/lena.pnm -c copy -f data -map 0 -y lena.pnm
> > > >>
> > > >>From:
> > > >><https://lists.ffmpeg.org/pipermail/ffmpeg-devel/2014-August/161881.html>
> > > >
> > > >possible
> > > >
> > > >but would this make andreas / debian happy ?
> > > 
> > > No.
> > > 
> > > >IIRC theres no net access from the build deamons and andreas wants
> > > >to run the subset of tests that dont need fate samples or at least
> > > >thats how i understood it ...
> > > >andreas, please correct me if iam wrong
> > > 
> > > That's correct.
> > > But I'm fine with moving lena.pnm to the FATE samples, which are
> > > downloaded with 'make fate-rsync'.
> > > Attached patch removes tests/lena.pnm and adapts the tests, assuming
> > > lena.pnm would be added to the top-level of the SAMPLES directory.
> > 
> > in absence of better ideas ill apply this patch soon
> 
> no other ideas it seems ...
> applied

also note, we can improve on top of this solution if people have
ideas / patches

i just didnt want to leave a potentially LGPL incompatible file
in git master even if its de facto free to use and distribute for
what we use it for

IANAL

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

There will always be a question for which you do not know the correct answer.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140904/794a6f12/attachment.asc>