You are here: Home » Reply

Reply To: ivorbis

#9430

MrE
Participant

Hi,

Thanks for posting this updated version of the patch.

Unfortunately I’m having difficulties applying the patch.

At first I got a number of “malformed patch at line x” errors

# patch -p1 < oggdec_tremor.patch

patching file Makefile.in
patch: **** malformed patch at line 5: USE_NLS = @[email protected]

I fixed them by getting rid of the 4 spaces that somehow automatically get inserted in front of all the lines when copying and pasting it from the website into a text file. When that didn’t work, I looked at the previous version of the patch and noticed that the lines giving me the malformed patch errors were all prefixed with a single space, and indeed adding a space got rid of those errors.

Then I got the following error:


# patch -p1 < oggdec_tremor.patch

patching file Makefile.in
patching file oggdec/oggdec.c
patch: **** malformed patch at line 25: @@ -30,10 +30,7 @@ struct option long_options[] = {

I tried inserting a space in front of this line to but that resulted in the following error:

# patch -p1 < oggdec_tremor.patch

patching file Makefile.in
Reversed (or previously applied) patch detected! Assume -R? [n] y
patching file oggdec/oggdec.c
Hunk #1 FAILED at 22.
1 out of 1 hunk FAILED -- saving rejects to file oggdec/oggdec.c.rej
missing header for unified diff at line 36 of patch
can't find file to patch at input line 36
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
| {"version", 0, 0, 'v'},
|- {"bits", 1, 0, 'b'},
|- {"endianness", 1, 0, 'e'},
| {"raw", 0, 0, 'R'},
|- {"sign", 1, 0, 's'},
| {"output", 1, 0, 'o'},
| {NULL,0,0,0}
|};
File to patch:

I’m completely stuck at this point for I don’t know how patch files work and can’t see what could be wrong with the mentioned lines.

Has anyone else managed to apply this patch correctly?

I’m running Debian Lenny on a Linksys NSLU2 and have installed the latest Tremor SVN trunk (revision 15934) as well as the source for vorbis-tools-1.2.0

Any hints will be greatly appreciated!

Thanks
Emile