USB patch failures alsa-driver git

USB patch failures alsa-driver git

[Eliot Blennerhassett]

Greetings,

trying to build alsa-driver, I get the following patch failures???
Maybe recent alsa-kernel usb changes have broken the patches in alsa-driver?
(for now, I get around the problem by copying the original files instead
of patching)

uname -a
Linux 2.6.28-16-generic #55-Ubuntu SMP Tue Oct 20 19:48:24 UTC 2009 i686
GNU/Linux


copying file alsa-kernel/usb/usbmidi.c
patching file usbmidi.c
Hunk #2 succeeded at 245 (offset 8 lines).
Hunk #3 FAILED at 269.
Hunk #4 FAILED at 392.
Hunk #5 succeeded at 1699 (offset 97 lines).
Hunk #6 succeeded at 2070 (offset 102 lines).
2 out of 6 hunks FAILED -- saving rejects to file usbmidi.c.rej
make[1]: *** [usbmidi.c] Error 1
make[1]: Leaving directory `/home/eliot/src/alsagit/alsa-driver/usb'
make: *** [modules] Error 2

copying file alsa-kernel/usb/usx2y/usX2Yhwdep.c
patching file usX2Yhwdep.c
Hunk #5 FAILED at 196.
Hunk #6 succeeded at 252 with fuzz 2.
1 out of 7 hunks FAILED -- saving rejects to file usX2Yhwdep.c.rej
make[2]: *** [usX2Yhwdep.c] Error 1
make[2]: Leaving directory `/home/eliot/src/alsagit/alsa-driver/usb/usx2y'
make[1]: *** [prepare] Error 1
make[1]: Leaving directory `/home/eliot/src/alsagit/alsa-driver/usb'
make: *** [modules] Error 2

copying file alsa-kernel/usb/usx2y/usbusx2y.c
patching file usbusx2y.c
Hunk #4 succeeded at 268 with fuzz 1.
Hunk #5 FAILED at 281.
Hunk #7 succeeded at 391 with fuzz 2 (offset -1 lines).
Hunk #8 succeeded at 415 (offset -2 lines).
Hunk #9 succeeded at 441 (offset -1 lines).
Hunk #10 succeeded at 462 (offset -1 lines).
Hunk #11 succeeded at 522 (offset -2 lines).
Hunk #12 succeeded at 542 (offset -2 lines).

copying file alsa-kernel/usb/usx2y/usbusx2yaudio.c
patching file usbusx2yaudio.c
Hunk #3 succeeded at 316 (offset 1 line).
Hunk #4 succeeded at 349 (offset 1 line).
Hunk #5 succeeded at 365 (offset 1 line).
Hunk #6 succeeded at 391 (offset 1 line).
Hunk #7 succeeded at 407 (offset 1 line).
Hunk #8 succeeded at 524 (offset 1 line).
Hunk #9 succeeded at 547 (offset 1 line).
Hunk #10 succeeded at 696 (offset 1 line).
Hunk #11 FAILED at 1059.
0

Re: USB patch failures alsa-driver git

[Takashi Iwai]

At Tue, 24 Nov 2009 14:29:21 +1300,
Eliot Blennerhassett wrote:
> 
> Greetings,
> 
> trying to build alsa-driver, I get the following patch failures???
> Maybe recent alsa-kernel usb changes have broken the patches in alsa-driver?
> (for now, I get around the problem by copying the original files instead
> of patching)

It seems depending on the patch version.  On mine, it works as is.

Anyway, Jaroslav already refreshed patches and I pulled the changes now.


thanks,

Takashi

> 
> uname -a
> Linux 2.6.28-16-generic #55-Ubuntu SMP Tue Oct 20 19:48:24 UTC 2009 i686
> GNU/Linux
> 
> 
> copying file alsa-kernel/usb/usbmidi.c
> patching file usbmidi.c
> Hunk #2 succeeded at 245 (offset 8 lines).
> Hunk #3 FAILED at 269.
> Hunk #4 FAILED at 392.
> Hunk #5 succeeded at 1699 (offset 97 lines).
> Hunk #6 succeeded at 2070 (offset 102 lines).
> 2 out of 6 hunks FAILED -- saving rejects to file usbmidi.c.rej
> make[1]: *** [usbmidi.c] Error 1
> make[1]: Leaving directory `/home/eliot/src/alsagit/alsa-driver/usb'
> make: *** [modules] Error 2
> 
> copying file alsa-kernel/usb/usx2y/usX2Yhwdep.c
> patching file usX2Yhwdep.c
> Hunk #5 FAILED at 196.
> Hunk #6 succeeded at 252 with fuzz 2.
> 1 out of 7 hunks FAILED -- saving rejects to file usX2Yhwdep.c.rej
> make[2]: *** [usX2Yhwdep.c] Error 1
> make[2]: Leaving directory `/home/eliot/src/alsagit/alsa-driver/usb/usx2y'
> make[1]: *** [prepare] Error 1
> make[1]: Leaving directory `/home/eliot/src/alsagit/alsa-driver/usb'
> make: *** [modules] Error 2
> 
> copying file alsa-kernel/usb/usx2y/usbusx2y.c
> patching file usbusx2y.c
> Hunk #4 succeeded at 268 with fuzz 1.
> Hunk #5 FAILED at 281.
> Hunk #7 succeeded at 391 with fuzz 2 (offset -1 lines).
> Hunk #8 succeeded at 415 (offset -2 lines).
> Hunk #9 succeeded at 441 (offset -1 lines).
> Hunk #10 succeeded at 462 (offset -1 lines).
> Hunk #11 succeeded at 522 (offset -2 lines).
> Hunk #12 succeeded at 542 (offset -2 lines).
> 
> copying file alsa-kernel/usb/usx2y/usbusx2yaudio.c
> patching file usbusx2yaudio.c
> Hunk #3 succeeded at 316 (offset 1 line).
> Hunk #4 succeeded at 349 (offset 1 line).
> Hunk #5 succeeded at 365 (offset 1 line).
> Hunk #6 succeeded at 391 (offset 1 line).
> Hunk #7 succeeded at 407 (offset 1 line).
> Hunk #8 succeeded at 524 (offset 1 line).
> Hunk #9 succeeded at 547 (offset 1 line).
> Hunk #10 succeeded at 696 (offset 1 line).
> Hunk #11 FAILED at 1059.
> 0
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>