Page 1 of 1

Apllying/Installing Patches (scons-mingw)

Posted: Sun May 14, 2006 2:09 am
by mfoxdogg
I would just like to know how to install/apply Patches from wiki to CVS files then comiple the CVS

current build command >scons BF_TOOLSET=mingw BF_BUILDDIR=../Blender_Build

I have alredy been trough the Blender site the methods don't work or out-of-date

Many thanks in advance

Posted: Mon May 15, 2006 3:49 am
by paprmh
ok, I use cygwin but it should be pretty much the same for mingw...

1) I put the patch in my cvs blender folder ( in my case, its D:\prog\bf-blender\blender)
2) then I open a cygwin window and go to my blender folder
3) apply the patch ( patch -p0 < whatever.patch)

in cygwin I get messages telling me if the patch was added successfully or not:

Code: Select all

paprmh@windblows /cygdrive/d/prog/bf-blender/blender
$ patch -p0 < actionbake.2.28.patch
patching file source/blender/blenkernel/BKE_action.h
patching file source/blender/blenkernel/BKE_ipo.h
patching file source/blender/blenkernel/intern/action.c
Hunk #9 FAILED at 785.
Hunk #10 succeeded at 878 (offset 3 lines).
Hunk #11 succeeded at 894 (offset 3 lines).
Hunk #12 succeeded at 941 (offset 3 lines).
Hunk #13 FAILED at 966.
Hunk #14 succeeded at 1035 (offset 4 lines).
Hunk #15 succeeded at 1051 (offset 4 lines).
Hunk #16 succeeded at 1090 (offset 4 lines).
2 out of 16 hunks FAILED -- saving rejects to file source/blender/blenkernel/intern/action.c.rej
patching file source/blender/blenkernel/intern/ipo.c
Hunk #1 succeeded at 1853 (offset 7 lines).
Hunk #2 succeeded at 2253 (offset 7 lines).
patching file source/blender/blenkernel/intern/nla.c
patching file source/blender/blenkernel/intern/object.c
Hunk #2 succeeded at 1850 (offset -2 lines).
Hunk #3 succeeded at 1861 (offset -2 lines).
patching file source/blender/blenlib/BLI_arithb.h
Hunk #1 succeeded at 883 (offset 12 lines).
patching file source/blender/blenloader/intern/readfile.c
Hunk #1 succeeded at 5267 (offset 38 lines).
Hunk #2 succeeded at 5294 (offset 38 lines).
patching file source/blender/include/BIF_editaction.h
patching file source/blender/include/BIF_editnla.h
patching file source/blender/include/BSE_editipo.h
patching file source/blender/include/BSE_time.h
patching file source/blender/makesdna/DNA_action_types.h
Hunk #1 FAILED at 51.
Hunk #2 succeeded at 85 (offset 1 line).
Hunk #3 succeeded at 147 (offset 1 line).
1 out of 3 hunks FAILED -- saving rejects to file source/blender/makesdna/DNA_action_types.h.rej
patching file source/blender/makesdna/DNA_armature_types.h
patching file source/blender/makesdna/DNA_nla_types.h
patching file source/blender/python/api2_2x/Object.c
Hunk #1 FAILED at 2559.
1 out of 1 hunk FAILED -- saving rejects to file source/blender/python/api2_2x/Object.c.rej
patching file source/blender/src/drawnla.c
Hunk #2 FAILED at 452.
1 out of 2 hunks FAILED -- saving rejects to file source/blender/src/drawnla.c.rej
patching file source/blender/src/editaction.c
patching file source/blender/src/editipo.c
Hunk #1 succeeded at 4666 (offset -5 lines).
patching file source/blender/src/editnla.c
patching file source/blender/src/edittime.c
patching file source/gameengine/Converter/BL_ActionActuator.cpp
Hunk #1 succeeded at 384 (offset 1 line).
4) if it's more successful than the above, just run scons

BTW: Harkyman, if you see this, I sent you a pm at about this a while back and now I see that some pms were lost... did you get it?