[MPlayer-dev-eng] Merging old pre7try2 and newest pre8 releases

[Rickard Närström]

tisdag 13 juni 2006 12:01 skrev du:
> tisdag 13 juni 2006 11:44 skrev Serhiy Tkachenko:
> > Hi all,
> >
> > This probably is a newbie question, so sorry in
> > advance.
> >
> > I have working copy of mplayer1.0pre7try2. I did not
> > take it from CVS but just downloaded .tar file,
> > unpacked and configured it.
> >
> > I have made a couple of modifications in it to satisfy
> > my needs. It's a small number of 2-3 line changes in
> > some files including configure script and makefiles. I
> > also added some new audio drivers. Generally, those
> > changes are a quick hack and are not interested for
> > the public :)
> >
> > How can can I now safely merge newest 1.0pre8 version
> > into my working copy preserving my changes?
> >
> > Sincerely,
> >
> > Serg
>
Download a clean copy of pre7try2, generate a patch and aplay the patch on
pre8:

# diff -Naur MPlayer-pre7try2_orig MPlayer-pre7try2_changed >mplayer.patch
# cd MPlayer-pre8
# patch -p1 <../mplayer.patch

Thiss will make all aplayabal changes, and generate *.rejected files for thing 
that couden't be aplayed --- check output of patch.

(sorry for the 2 mails --- my mistake)