On Tuesday, July 13, 2021, Andrea paz via Cin <[email protected]> wrote:
> I'm ashamed to say this, but I always have trouble applying patches. I > get the following error: try patch - p1 from directory level above? it seems to find files in current dir ( cinelerra/) correctly but does not look up one level (i think this is logical behavior) > $ patch -p3 < 0003-Attempt-at-differenciating-601-pal-and-ntsc.patch > > patching file appearanceprefs.h > patching file ffmpeg.C > Hunk #1 succeeded at 1589 (offset -4 lines). > Hunk #2 succeeded at 1719 (offset -4 lines). > Hunk #3 succeeded at 2640 (offset -4 lines). > Hunk #4 succeeded at 2653 (offset -4 lines). > Hunk #5 succeeded at 2896 (offset -12 lines). > patching file preferences.C > can't find file to patch at input line 116 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/cinelerra-5.1/guicast/bccolors.C > b/cinelerra-5.1/guicast/bccolors.C > |index e587321d..94dfd20b 100644 > |--- a/cinelerra-5.1/guicast/bccolors.C > |+++ b/cinelerra-5.1/guicast/bccolors.C > -------------------------- > File to patch: bccolors.C > bccolors.C: No such file or directory > Skip this patch? [y] y > Skipping patch. > 1 out of 1 hunk ignored > can't find file to patch at input line 130 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/cinelerra-5.1/guicast/bccolors.h > b/cinelerra-5.1/guicast/bccolors.h > |index 94be40bc..820b977d 100644 > |--- a/cinelerra-5.1/guicast/bccolors.h > |+++ b/cinelerra-5.1/guicast/bccolors.h > -------------------------- > File to patch: /cinelerra-5.1/guicast/bccolors.h > /cinelerra-5.1/guicast/bccolors.h: No such file or directory > Skip this patch? [y] y > Skipping patch. > 1 out of 1 hunk ignored > can't find file to patch at input line 148 > Perhaps you used the wrong -p or --strip option? > The text leading up to this was: > -------------------------- > |diff --git a/cinelerra-5.1/guicast/bccolors.inc > b/cinelerra-5.1/guicast/bccolors.inc > |index 010faca5..58afbaee 100644 > |--- a/cinelerra-5.1/guicast/bccolors.inc > |+++ b/cinelerra-5.1/guicast/bccolors.inc > -------------------------- > File to patch: > ... > -- > Cin mailing list > [email protected] > https://lists.cinelerra-gg.org/mailman/listinfo/cin >
-- Cin mailing list [email protected] https://lists.cinelerra-gg.org/mailman/listinfo/cin
