| View previous topic :: View next topic |
| Author |
Message |
Heimdall
Joined: 10 Nov 2005
Posts: 259
Location: Netherlands
|
|
| Back to top |
|
 |
ooPo
Site Admin
Joined: 17 Jan 2004
Posts: 2032
Location: Canada
|
 Posted: Tue Oct 14, 2008 11:13 pm Post subject: |
 |
|
I tried to apply the patch, but it failed in a lot of places.
I don't have time to look at in depth right now, but I'll see what I can do later on. |
|
| Back to top |
|
|
Heimdall
Joined: 10 Nov 2005
Posts: 259
Location: Netherlands
|
| Posted: Tue Oct 14, 2008 11:25 pm Post subject: |
|
|
That is strange, because I apply it on a clean SVN checkout without problems. I generated it directly from TortoiseSVN, so it's not a diff -Naur patch but a SVN patch, but that shouldn't matter.
here my output:
| Code: | jetcube@funstation ~
$ svn checkout http://psp.jim.sh/svn/psp/trunk/pspsdk
A pspsdk\config.h.in
A pspsdk\tools
A pspsdk\tools\unpack-pbp.c
...
A pspsdk\bootstrap
A pspsdk\aclocal
A pspsdk\aclocal\ac_doxygen.m4
A pspsdk\aclocal\pspdev.m4
A pspsdk\aclocal\version.m4
U pspsdk
Checked out revision 2432.
jetcube@funstation ~
$ wget "http://minpspw.svn.sourceforge.net/viewvc/minpspw/trunk/mingw/patches/p
spsdk-doc.patch?revision=52"
--15:23:11-- http://minpspw.svn.sourceforge.net/viewvc/minpspw/trunk/mingw/patc
=> `pspsdk-doc.patch@revision=52'
Resolving minpspw.svn.sourceforge.net... 216.34.181.65
Connecting to minpspw.svn.sourceforge.net|216.34.181.65|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: unspecified [text/plain]
0K .......... .......... .......... .......... .......... 61.58 KB/s
50K .......... .......... .......... ..... 434.84 KB/s
15:23:14 (95.92 KB/s) - `pspsdk-doc.patch@revision=52' saved [87835]
jetcube@funstation ~
$ patch -p1 -d pspsdk -i ~/pspsdk-doc.patch\@revision\=52
patching file `src/atrac3/pspatrac3.h'
patching file `src/audio/pspaudio.h'
patching file `src/audio/pspaudio_kernel.h'
patching file `src/ctrl/pspctrl.h'
patching file `src/ctrl/pspctrl_kernel.h'
patching file `src/debug/pspdebug.h'
patching file `src/display/pspdisplay.h'
patching file `src/ge/pspge.h'
patching file `src/gu/pspgu.h'
patching file `src/kernel/pspaudiorouting.h'
patching file `src/kernel/pspinit.h'
patching file `src/kernel/psploadcore.h'
patching file `src/kernel/psploadexec_kernel.h'
patching file `src/kernel/pspmodulemgr_kernel.h'
patching file `src/kernel/pspsysmem_kernel.h'
patching file `src/mp3/pspmp3.h'
patching file `src/mpeg/pspjpeg.h'
patching file `src/mpeg/pspmpeg.h'
patching file `src/net/psphttp.h'
patching file `src/net/pspnet_adhocctl.h'
patching file `src/net/pspnet_adhocmatching.h'
patching file `src/net/pspssl.h'
patching file `src/power/psppower.h'
patching file `src/registry/pspreg.h'
patching file `src/sdk/pspsdk.h'
patching file `src/usb/pspusbcam.h'
patching file `src/user/pspintrman.h'
patching file `src/user/pspmodulemgr.h'
patching file `src/user/pspsysmem.h'
patching file `src/user/pspthreadman.h'
patching file `src/utility/psputility_gamesharing.h'
patching file `src/utility/psputility_htmlviewer.h'
patching file `src/utility/psputility_msgdialog.h'
patching file `src/utility/psputility_netparam.h'
patching file `src/utility/psputility_osk.h'
patching file `src/utility/psputility_savedata.h'
patching file `src/utility/psputility_sysparam.h'
patching file `src/vsh/pspchnnlsv.h'
jetcube@funstation ~
$
|
|
|
| Back to top |
|
|
Insert_witty_name
Joined: 10 May 2006
Posts: 376
|
| Posted: Wed Oct 15, 2008 12:38 am Post subject: |
|
|
This is the output I get:
| Code: | davidperrys-macbook-pro-15:~ davidperry$ patch -p1 -d pspsdk -i ~/pspsdk-doc.patch?revision=52
(Stripping trailing CRs from patch.)
patching file src/atrac3/pspatrac3.h
(Stripping trailing CRs from patch.)
patching file src/audio/pspaudio.h
(Stripping trailing CRs from patch.)
patching file src/audio/pspaudio_kernel.h
(Stripping trailing CRs from patch.)
patching file src/ctrl/pspctrl.h
(Stripping trailing CRs from patch.)
patching file src/ctrl/pspctrl_kernel.h
(Stripping trailing CRs from patch.)
patching file src/debug/pspdebug.h
(Stripping trailing CRs from patch.)
patching file src/display/pspdisplay.h
(Stripping trailing CRs from patch.)
patching file src/ge/pspge.h
(Stripping trailing CRs from patch.)
patching file src/gu/pspgu.h
(Stripping trailing CRs from patch.)
patching file src/kernel/pspaudiorouting.h
Hunk #1 FAILED at 17.
1 out of 1 hunk FAILED -- saving rejects to file src/kernel/pspaudiorouting.h.rej
(Stripping trailing CRs from patch.)
patching file src/kernel/pspinit.h
Hunk #1 FAILED at 42.
Hunk #2 FAILED at 57.
2 out of 2 hunks FAILED -- saving rejects to file src/kernel/pspinit.h.rej
(Stripping trailing CRs from patch.)
patching file src/kernel/psploadcore.h
(Stripping trailing CRs from patch.)
patching file src/kernel/psploadexec_kernel.h
(Stripping trailing CRs from patch.)
patching file src/kernel/pspmodulemgr_kernel.h
(Stripping trailing CRs from patch.)
patching file src/kernel/pspsysmem_kernel.h
(Stripping trailing CRs from patch.)
patching file src/mp3/pspmp3.h
Hunk #1 FAILED at 44.
Hunk #2 FAILED at 53.
Hunk #3 FAILED at 76.
Hunk #4 FAILED at 86.
Hunk #5 FAILED at 98.
Hunk #6 FAILED at 108.
Hunk #7 FAILED at 117.
Hunk #8 FAILED at 127.
Hunk #9 FAILED at 136.
Hunk #10 FAILED at 145.
Hunk #11 FAILED at 154.
Hunk #12 FAILED at 163.
Hunk #13 FAILED at 172.
Hunk #14 FAILED at 181.
Hunk #15 FAILED at 190.
15 out of 15 hunks FAILED -- saving rejects to file src/mp3/pspmp3.h.rej
(Stripping trailing CRs from patch.)
patching file src/mpeg/pspjpeg.h
Hunk #1 FAILED at 21.
Hunk #2 FAILED at 38.
Hunk #3 FAILED at 58.
3 out of 3 hunks FAILED -- saving rejects to file src/mpeg/pspjpeg.h.rej
(Stripping trailing CRs from patch.)
patching file src/mpeg/pspmpeg.h
(Stripping trailing CRs from patch.)
patching file src/net/psphttp.h
(Stripping trailing CRs from patch.)
patching file src/net/pspnet_adhocctl.h
(Stripping trailing CRs from patch.)
patching file src/net/pspnet_adhocmatching.h
(Stripping trailing CRs from patch.)
patching file src/net/pspssl.h
Hunk #1 FAILED at 22.
Hunk #2 FAILED at 38.
Hunk #3 FAILED at 47.
3 out of 3 hunks FAILED -- saving rejects to file src/net/pspssl.h.rej
(Stripping trailing CRs from patch.)
patching file src/power/psppower.h
(Stripping trailing CRs from patch.)
patching file src/registry/pspreg.h
(Stripping trailing CRs from patch.)
patching file src/sdk/pspsdk.h
(Stripping trailing CRs from patch.)
patching file src/usb/pspusbcam.h
Hunk #1 FAILED at 251.
Hunk #2 FAILED at 260.
Hunk #3 FAILED at 271.
Hunk #4 FAILED at 283.
Hunk #5 FAILED at 305.
Hunk #6 FAILED at 323.
Hunk #7 FAILED at 334.
Hunk #8 FAILED at 359.
Hunk #9 FAILED at 371.
Hunk #10 FAILED at 393.
Hunk #11 FAILED at 402.
Hunk #12 FAILED at 411.
Hunk #13 FAILED at 420.
Hunk #14 FAILED at 429.
Hunk #15 FAILED at 438.
Hunk #16 FAILED at 447.
Hunk #17 FAILED at 456.
Hunk #18 FAILED at 465.
Hunk #19 FAILED at 474.
Hunk #20 FAILED at 483.
Hunk #21 FAILED at 492.
Hunk #22 FAILED at 510.
Hunk #23 FAILED at 519.
Hunk #24 FAILED at 528.
Hunk #25 FAILED at 537.
Hunk #26 FAILED at 547.
26 out of 26 hunks FAILED -- saving rejects to file src/usb/pspusbcam.h.rej
(Stripping trailing CRs from patch.)
patching file src/user/pspintrman.h
(Stripping trailing CRs from patch.)
patching file src/user/pspmodulemgr.h
(Stripping trailing CRs from patch.)
patching file src/user/pspsysmem.h
(Stripping trailing CRs from patch.)
patching file src/user/pspthreadman.h
(Stripping trailing CRs from patch.)
patching file src/utility/psputility_gamesharing.h
(Stripping trailing CRs from patch.)
patching file src/utility/psputility_htmlviewer.h
(Stripping trailing CRs from patch.)
patching file src/utility/psputility_msgdialog.h
(Stripping trailing CRs from patch.)
patching file src/utility/psputility_netparam.h
(Stripping trailing CRs from patch.)
patching file src/utility/psputility_osk.h
(Stripping trailing CRs from patch.)
patching file src/utility/psputility_savedata.h
(Stripping trailing CRs from patch.)
patching file src/utility/psputility_sysparam.h
(Stripping trailing CRs from patch.)
patching file src/vsh/pspchnnlsv.h
davidperrys-macbook-pro-15:~ davidperry$ |
|
|
| Back to top |
|
|
Heimdall
Joined: 10 Nov 2005
Posts: 259
Location: Netherlands
|
| Posted: Wed Oct 15, 2008 12:53 am Post subject: |
|
|
| Humm, i guess it is something related with the fact that i am checking out the code from psp.jim.sh mirror, i'll try again later when I'm at home and i can access the svn from svn.ps2dev.org |
|
| Back to top |
|
|
Heimdall
Joined: 10 Nov 2005
Posts: 259
Location: Netherlands
|
| Posted: Wed Oct 15, 2008 3:58 am Post subject: |
|
|
| Well it works with SVN from ps2dev.org using tortoisesvn, I'm using svn 1.5.3 if that makes a difference (i guess it does...) |
|
| Back to top |
|
|
ne0h
Joined: 21 Feb 2008
Posts: 386
|
| Posted: Wed Oct 15, 2008 4:01 am Post subject: |
|
|
Why does you use a patch? Cannot upload all the docs?
_________________
Get Xplora! |
|
| Back to top |
|
|
Heimdall
Joined: 10 Nov 2005
Posts: 259
Location: Netherlands
|
| Posted: Wed Oct 15, 2008 5:12 am Post subject: |
|
|
| because I don't have write access to the SVN reppo :) |
|
| Back to top |
|
|
J.F.
Joined: 22 Feb 2004
Posts: 2906
|
| Posted: Wed Oct 15, 2008 5:44 am Post subject: |
|
|
Sounds like the patch is for Windows mode file endings. Be CAREFUL! I don't want to suddenly find all the god-damn files suddenly Windows format. :(
Two things I really hate about people using Windows editing - they convert the line endings to Windows format without realizing it, and they convert the character encoding to Windows instead of Unicode/ISO. God! I saw one idiot who was so clueless he was using "smart" quotes on strings! :lmao: |
|
| Back to top |
|
|
Heimdall
Joined: 10 Nov 2005
Posts: 259
Location: Netherlands
|
| Posted: Wed Oct 15, 2008 6:17 pm Post subject: |
|
|
Ok, I've been checking the encodings and line terminations and this new patch seems to work an a linux VM on my machine:
http://www.box.net/shared/lnh3hyxdp2 |
|
| Back to top |
|
|
Insert_witty_name
Joined: 10 May 2006
Posts: 376
|
| Posted: Wed Oct 15, 2008 8:00 pm Post subject: |
|
|
| Code: | Sending src/atrac3/pspatrac3.h
Sending src/audio/pspaudio.h
Sending src/audio/pspaudio_kernel.h
Sending src/ctrl/pspctrl.h
Sending src/ctrl/pspctrl_kernel.h
Sending src/debug/pspdebug.h
Sending src/display/pspdisplay.h
Sending src/ge/pspge.h
Sending src/gu/pspgu.h
Sending src/kernel/pspaudiorouting.h
Sending src/kernel/pspinit.h
Sending src/kernel/psploadcore.h
Sending src/kernel/psploadexec_kernel.h
Sending src/kernel/pspmodulemgr_kernel.h
Sending src/kernel/pspsysmem_kernel.h
Sending src/mp3/pspmp3.h
Sending src/mpeg/pspjpeg.h
Sending src/mpeg/pspmpeg.h
Sending src/net/psphttp.h
Sending src/net/pspnet_adhocctl.h
Sending src/net/pspnet_adhocmatching.h
Sending src/net/pspssl.h
Sending src/power/psppower.h
Sending src/registry/pspreg.h
Sending src/sdk/pspsdk.h
Sending src/usb/pspusbcam.h
Sending src/user/pspintrman.h
Sending src/user/pspmodulemgr.h
Sending src/user/pspsysmem.h
Sending src/user/pspthreadman.h
Sending src/utility/psputility_gamesharing.h
Sending src/utility/psputility_htmlviewer.h
Sending src/utility/psputility_msgdialog.h
Sending src/utility/psputility_netparam.h
Sending src/utility/psputility_osk.h
Sending src/utility/psputility_savedata.h
Sending src/utility/psputility_sysparam.h
Sending src/vsh/pspchnnlsv.h
Transmitting file data ......................................
Committed revision 2433. |
Thanks. |
|
| Back to top |
|
|
|
FAQ
Search
Memberlist
Usergroups
Register
Profile
Log in to check your private messages
Log in
