Display problems with clip+

[rokkon]

Code: [Select]

patch --binary -p1 < pastie-1029292.diff 

gives this:

Code: [Select]

patching file firmware/target/arm/as3525/lcd-ssd1303.c
patching file firmware/target/arm/as3525/sansa-clip/lcd-clip.c
patching file firmware/target/arm/as3525/sansa-clip/lcd-clip.h
Hunk #1 FAILED at 22.
1 out of 1 hunk FAILED -- saving rejects to file firmware/target/arm/as3525/sansa-clip/lcd-clip.h.rej
patching file firmware/target/arm/as3525/sansa-clipplus/lcd-clip-plus.c
Hunk #1 succeeded at 26 with fuzz 2.
patching file firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h
Hunk #1 FAILED at 21.
1 out of 1 hunk FAILED -- saving rejects to file firmware/target/arm/as3525/sansa-clipplus/lcd-clip.h.rej
patching file firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h
Hunk #1 FAILED at 21.
1 out of 1 hunk FAILED -- saving rejects to file firmware/target/arm/as3525/sansa-clipv2/lcd-clip.h.rej
patching file firmware/target/arm/as3525/sansa-clipv2/lcd-clipv2.c

[funman]

Try this one

[rokkon]

same problem

[funman]

Are you applying on clean tree ?

I downloaded the patch from the forum and it worked well, I have r27255

Try this:

Code: [Select]

cd /path/to/rocbox
svn revert . -R
svn up

And then apply the patch.

Which system are you using? I saw you use --binary so is it cygwin/mingw ? Perhaps try to remove the --binary because my patch likely use UNIX line endings

[rokkon]

i was using the stable release for patching, with r2755 from svn the last patch downloaded form the forums works fine!

[funman]

Thanks for testing! r27257 and newer should work out of the box

[rokkon]

...and it does! Thanks for fixing.