[vlc-devel] Another "whoops" patch -- live-config.patch

Rafaël Carré funman at videolan.org
Mon Sep 17 02:05:50 CEST 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mark Moriarty a écrit :
> When live-config.patch is getting applied, multiple patches get applied,
> then:
> patching file live/config.uClinux
> patching file live/config.armlinux
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file live/config.armlinux.rej
> patching file live/config.armeb-uclibc
> make[2]: *** [live] Error 1
> make[2]: Leaving directory `/home/mfm/vlc-trunk/extras/contrib/src'
> make[1]: *** [src] Error 2
> 
> I opened and saved the file, works OK now.
> (someone's been submitting things with that DOS CR-LF -- it's a learning
> experience for all of us on Windows)

In fact the patches need to have the DOS CR-LF, because the original
files got them.
I regenerated the patches for live & faac, now it should patch fine

- --
Rafaël Carré
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFG7cTeYWCeGMCv8Q8RAo5BAKC+Rc7S32KdiPKuxcgX4W4LmdJl+QCgkt/7
WQC3ekia3JcZQ80hANT+dT4=
=XVaC
-----END PGP SIGNATURE-----



More information about the vlc-devel mailing list