When you're creating patches, it's best to do it the following way:
1. untar SDL-1.2.6 (or whatever version you're basing it on) into it's own
directory.
2. cp -av the original SDL tree to a new name (SDL-mod, for example).
3. Apply the existing patches to the SDL-mod tree, make sure you're happy
with them (fix rejects, etc.). Remove stray files (*.orig, *.rej)
when you're done.
4. Then generate new patches. You can one of two ways.
First cd to the parent directory containing both trees.
a. Unified patch. Just do a 'diff -Naur SDL SDL-mod > [patch-name]'
This will create a patch file containing all changed files.
b. For each file that you want to patch, do a
'diff -Naur SDL/[filename] SDl-mod/[filename] > [filename-patch-name]'
This generates separate patch files for each file. You may
combine them by using 'cat' to generate patch sets for specific
functions.
'[' and ']' above are placeholders, don't type them in your command.
5. Submit the patch to freevo-devel list (preferred), someone from
the developer group can then upload it to CVS.
This ensures that the generated patch will apply cleanly next time.
T.C.
----
Wan Tat Chee (Lecturer)
School of Computer Science, Univ. of Science Malaysia,
11800 USM, Penang, Malaysia. Rm.625 Ofc Ph: +604 653-3888 x 3617
NRG Lab Admin: +604 659-4757 Rm.601-E Ofc Ph: +604 653-4396
Internet: [EMAIL PROTECTED] Web: http://nrg.cs.usm.my/~tcwan
GPG Key : http://nrg.cs.usm.my/~tcwan/tcw_gpg-20030322.asc
F'print : DCF2 B9B2 FA4D 1208 AD59 14CA 9A8F F54D B2C4 63C7
On Tue, 23 Dec 2003 [EMAIL PROTECTED] wrote:
> OK, I have fixed the dxr3 patch, I have also chaned the gcc3 patch. How do I up them
> to the cvs?
>
> Tim, apply the patches in this order.
> nokey, dxr3, gcc3 ... when it askes about "Reversed (or previously applied) patch
> detected! Assume -R? [n]" Just type in "y" and then follow the rest of the
> instructions. I am currently recompiling them now but im 90% sure it'll work. I'll
> keep you updated.
> > question about this patch this is for 1.2.5 only right? I need to not use
> > SDL 1.2.6 correct?
> >
> > as when applying this to 1.2.6 it is asking if I want to revert the previous
> > patch on a cleanly untarred SDL 1.2.6.
> >
> > -----Original Message-----
> > From: [EMAIL PROTECTED]
> > [mailto:[EMAIL PROTECTED] Behalf Of Justin T
> > Wetherell
> > Sent: Tuesday, December 23, 2003 9:59 AM
> > To: [EMAIL PROTECTED]
> > Subject: Re: [Freevo-users] Problem with runtime 0.3
> >
> >
> > You need the SDL gcc patch then, right? SDL-1.2.5-gcc3.patch, I'll
> > attach it.
> >
> >
> >
> > Gray, Tim wrote:
> >
> > >SDL 1.2.6 will not even compile on it's own on a slackware 9.1 machine
> > >because of GCC 3.2.3 because of syntax errors in SDL that GCC now will not
> > >allow to slide.
> > >
> > >
> > >-----Original Message-----
> > >From: [EMAIL PROTECTED]
> > >[mailto:[EMAIL PROTECTED] Behalf Of Justin T
> > >Wetherell
> > >Sent: Tuesday, December 23, 2003 9:45 AM
> > >To: [EMAIL PROTECTED]
> > >Subject: Re: [Freevo-users] Problem with runtime 0.3
> > >
> > >
> > >If you follow this page:
> > >http://freevo.sourceforge.net/cgi-bin/moin.cgi/Dxr3Page and then fix the
> > >third chunk on the dxr3 patch manually, note that SDL 1.2.6 will only
> > >compile with 0.4.6. I did it last weekend and it worked fine, is this
> > >the wrong thing to do? I can give people a hand if they need it with
> > >DXR3 compilation.
> > >
> > >Gray, Tim wrote:
> > >
> > >
> > >
> > >>I also am using slack 9.1 but I have also done this with redhat 9.0.
> > >>
> > >>Although, I finally got a SDL cvs checkout to mostly compile... it fail at
> > >>the linking portion.... grumble grumble...
> > >>
> > >>I'm going to try another checkout today and then freeze it and offer it up
> > >>as a working SDL+dxr3 for freevo users source tarball. maybe someone can
> > >>make a better patch from it.
> > >>
> > >>There has to be a solution to this. and I am still kicking myself for
> > >>
> > >>
> > >losing
> > >
> > >
> > >>that cvs checkout of SDL I had from last month that actually worked.
> > >>
> > >>-----Original Message-----
> > >>From: Justin T Wetherell [mailto:[EMAIL PROTECTED]
> > >>Sent: Monday, December 22, 2003 6:13 PM
> > >>To: [EMAIL PROTECTED]
> > >>Subject: Re: [Freevo-users] Problem with runtime 0.3
> > >>
> > >>
> > >>Well, That isn't true at all. I Did build and install all the
> > >>dependencies myself and ended up with a worthless system, look back
> > >>about a week ago and you'll notice all my emails. I ended up Python
> > >>segfaults all over the place and just reformatted and started over. I
> > >>just recompiled ffmpeg, SDL, and mplayer and leave it at that. I have
> > >>compiled and ran fine on my other two non-dxr3 boxes. I am running Slack
> > >>9.1 but I dont see how it will be different for others unless they are
> > >>running an extremely old OS.
> > >>
> > >>Rob Shortt wrote:
> > >>
> > >>
> > >>
> > >>
> > >>
> > >>>Justin T Wetherell wrote:
> > >>>
> > >>>
> > >>>
> > >>>
> > >>>
> > >>>>I have found that I can run dxr3 with the current runtime. All you
> > >>>>have to do is follow the instructions in the wiki then copy the libs
> > >>>>to the runtime directory and tit works fine. I even updated the wiki
> > >>>>about a week ago when retrying it.
> > >>>>
> > >>>>
> > >>>>
> > >>>>
> > >>>That only works for you because you are lucky. For most people it
> > >>>will fail because more often than not the user will compile their
> > >>>libSDL against a different libc than the rest of the runtime libs. If
> > >>>you can patch and build your own libSDL you should be able to build or
> > >>>install the rest of the Freevo dependencies for your system.
> > >>>
> > >>>-Rob
> > >>>
> > >>>
> > >>>
> > >>>-------------------------------------------------------
> > >>>This SF.net email is sponsored by: IBM Linux Tutorials.
> > >>>Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
> > >>>Free Linux Tutorials. Learn everything from the bash shell to sys admin.
> > >>>Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> > >>>_______________________________________________
> > >>>Freevo-users mailing list
> > >>>[EMAIL PROTECTED]
> > >>>https://lists.sourceforge.net/lists/listinfo/freevo-users
> > >>>
> > >>>
> > >>>
> > >>>
> > >>>
> > >>
> > >>-------------------------------------------------------
> > >>This SF.net email is sponsored by: IBM Linux Tutorials.
> > >>Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
> > >>Free Linux Tutorials. Learn everything from the bash shell to sys admin.
> > >>Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> > >>_______________________________________________
> > >>Freevo-users mailing list
> > >>[EMAIL PROTECTED]
> > >>https://lists.sourceforge.net/lists/listinfo/freevo-users
> > >>
> > >>
> > >>-------------------------------------------------------
> > >>This SF.net email is sponsored by: IBM Linux Tutorials.
> > >>Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
> > >>Free Linux Tutorials. Learn everything from the bash shell to sys admin.
> > >>Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> > >>_______________________________________________
> > >>Freevo-users mailing list
> > >>[EMAIL PROTECTED]
> > >>https://lists.sourceforge.net/lists/listinfo/freevo-users
> > >>
> > >>
> > >>
> > >>
> > >>
> > >
> > >
> > >
> > >-------------------------------------------------------
> > >This SF.net email is sponsored by: IBM Linux Tutorials.
> > >Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
> > >Free Linux Tutorials. Learn everything from the bash shell to sys admin.
> > >Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> > >_______________________________________________
> > >Freevo-users mailing list
> > >[EMAIL PROTECTED]
> > >https://lists.sourceforge.net/lists/listinfo/freevo-users
> > >
> > >
> > >-------------------------------------------------------
> > >This SF.net email is sponsored by: IBM Linux Tutorials.
> > >Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
> > >Free Linux Tutorials. Learn everything from the bash shell to sys admin.
> > >Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> > >_______________________________________________
> > >Freevo-users mailing list
> > >[EMAIL PROTECTED]
> > >https://lists.sourceforge.net/lists/listinfo/freevo-users
> > >
> > >
> > >
> >
> >
> > -------------------------------------------------------
> > This SF.net email is sponsored by: IBM Linux Tutorials.
> > Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
> > Free Linux Tutorials. Learn everything from the bash shell to sys admin.
> > Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
> > _______________________________________________
> > Freevo-users mailing list
> > [EMAIL PROTECTED]
> > https://lists.sourceforge.net/lists/listinfo/freevo-users
>
>
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
Freevo-users mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-users
