> >> On Sat, 2007-02-24 at 11:51 -0500, Sam Varshavchik wrote: >>> Tony writes: >>> >>> > Since I've never had to do this before, how would one go about >>> applying >>> > this on an FC6 x86-64 system? I've never applied a patch before, first >>> > time so I want to make sure I do this right. This was under the > >>> /ivtv-0.10.0/misc directory. >>> >>> Extract the mplayer source. Change to the top of mplayer's source >>> directory, and type: >>> >>> patch -p1 </path/to/ivtv-0.10/misc/MPlayer-1.0pre7try2-ivtvosd.diff >>> >>>
I actually tried this against MPlayer-1.0rc1 (the latest from the mplayer site) and got the following failures: $tar xvjf MPlayer-1.0rc1.tar.bz2 ... $ cd MPlayer-1.0rc1 patch -p1 < ../MPlayer-1.0pre7try2-ivtvosd.diff patching file libvo/ivtv.h patching file libvo/Makefile Hunk #1 FAILED at 3. 1 out of 1 hunk FAILED -- saving rejects to file libvo/Makefile.rej patching file libvo/video_out.c Hunk #1 succeeded at 91 (offset 5 lines). Hunk #2 succeeded at 140 (offset 6 lines). Hunk #3 succeeded at 244 with fuzz 2 (offset 12 lines). The next patch would create the file libvo/vo_ivtv.c, which already exists! Assume -R? [n] n Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file libvo/vo_ivtv.c.rej patching file libvo/vo_ivtvosd.c patching file mplayer.c Hunk #1 succeeded at 4300 (offset 1857 lines). Hunk #2 FAILED at 4332. 1 out of 2 hunks FAILED -- saving rejects to file mplayer.c.rej How different is pre7try2 from rc1? unpatched, I get errors when trying to compile the ivtv stuff against the 0.10.0 ivtv driver headers. Henry _______________________________________________ ivtv-users mailing list [email protected] http://ivtvdriver.org/mailman/listinfo/ivtv-users
