> On Wed, Aug 26, 2009 at 09:06:17PM -0500, Peter Miller wrote:
> > > > can you apply the following diff, do `cat > /dev/audio < /dev/zero',
> > > > and send me the messages? thanks.
> >
> > I must have messed something up. The third file looks like it was
> > patched, but not the others. I'm new to patching, so I appreciate any
> > help.
> >
> > I got the source tree
> > cd /usr
> > cvs -qd anon...@anoncvs3.usa.openbsd.org:/cvs get -P src
> >
> > then applied the patch from /usr/src
> > I had tried -p3 (which looked right) and -p2 and both times was asked
> > for the "file to patch" so I switched to -p0 for the heck of it and did.
>
> I think your understanding of -p is reversed ;)
>
> cd /usr/src/sys/dev
> patch -p 0 < audio.patch
>
> but you should probably do this first:
>
> cd /usr/src/sys/dev
> rm audio.c pci/azalia.{c,h}
> cvs -q up audio.c pci/azalia.{c,h}
>
> to make sure those files are clean
I got the same result with a clean set of files.
# patch -p 0 < audio.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: audio.c
|===================================================================
|RCS file: /cvs/src/sys/dev/audio.c,v
|retrieving revision 1.104
|diff -u -p audio.c
|--- audio.c 18 Jun 2009 22:55:56 -0000 1.104
|+++ audio.c 26 Aug 2009 19:43:36 -0000
--------------------------
Patching file audio.c using Plan A...
Hunk #1 failed at 89.
1 out of 1 hunks failed--saving rejects to audio.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: pci/azalia.c
|===================================================================
|RCS file: /cvs/src/sys/dev/pci/azalia.c,v
|retrieving revision 1.143
|diff -u -p pci/azalia.c
|--- pci/azalia.c 13 Aug 2009 23:59:15 -0000 1.143
|+++ pci/azalia.c 26 Aug 2009 19:43:37 -0000
--------------------------
Patching file pci/azalia.c using Plan A...
Hunk #1 failed at 78.
1 out of 1 hunks failed--saving rejects to pci/azalia.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: pci/azalia.h
|===================================================================
|RCS file: /cvs/src/sys/dev/pci/azalia.h,v
|retrieving revision 1.52
|diff -u -p pci/azalia.h
|--- pci/azalia.h 9 Jun 2009 05:16:42 -0000 1.52
|+++ pci/azalia.h 26 Aug 2009 19:43:37 -0000
--------------------------
Patching file pci/azalia.h using Plan A...
Hunk #1 succeeded at 534 with fuzz 2.
done
