[Cin] UPD: Current CinGG git fails to build with current ffmpeg.git, but may be this is not a problem yet

[Andrew Randrianasulu]

moving patch to NO_patch with mv right before configure stage solved patching problem, so build continues ..

# temporariry remove ffmpeg.git patch #2
mv thirdparty/src/ffmpeg.git.patch2 thirdparty/src/NO_patch

from slackbuild I modified

I wonder what exactly this patch was trying to workaround, some long-duration dvb->blu-ray transcoding?

As far as I understand usual practice when upstreaming (or asking for comments on) patches is
to make one thing per patch, even if it will made their number grow.

I'm not a programmer, so I am puzzled even by beginning of patch:

https://git.cinelerra-gg.org/git/?p=goodguy/cinelerra.git;a=blob;f=cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2;h=1c1e293af6eabec3c3fbb93c388973779bd27b48;hb=HEAD

 -    int pcr_pid;
 -    int pcr_packet_count;
 -    int pcr_packet_period;
 +    int64_t pcr, pcr_packet_timer, pcr_packet_period;
 +    int pcr_sid, pcr_pid;


does this mean int was not big enough?

and end  a bit puzzling for me too, i see new options added but I can't reformulate why they were needed..?

+    { "mpegts_pcr_start_pid", "Set the first pid of the PCR.",

and more

+    { "mpegts_pcr_offset", "clock offset.",

real developers probably will understand what those must do, but 
I usually try to understand something so I can make some slightly 
more intelligent noise about it ....

----------  Пересланное сообщение  ----------

Тема: Current CinGG git fails to build with current ffmpeg.git, but may be this is not a problem yet
Дата: Понедельник 04 ноября 2019
Отправитель: Andrew Randrianasulu <randrianasulu at gmail.com>
Получатель:  cin at lists.cinelerra-gg.org

I remember those git patches updated mostly ar ~rc/branching (for ffmpeg) time, I just tried my luck  one more time and yeah ... nope:

patch -d ffmpeg* -p1 < src/ffmpeg.git.patch1
patching file libavformat/bluray.c
patch -d ffmpeg* -p1 < src/ffmpeg.git.patch2
patching file libavformat/mpegtsenc.c
Hunk #1 FAILED at 56.
Hunk #2 FAILED at 78.
Hunk #3 FAILED at 95.
Hunk #4 FAILED at 111.
Hunk #5 succeeded at 217 with fuzz 2 (offset -5 lines).
Hunk #6 succeeded at 763 with fuzz 2 (offset 33 lines).
Hunk #7 FAILED at 745.
Hunk #8 FAILED at 777.
Hunk #9 succeeded at 853 (offset 68 lines).
Hunk #10 succeeded at 879 with fuzz 1 (offset 39 lines).
Hunk #11 FAILED at 927.
Hunk #12 FAILED at 966.
Hunk #13 FAILED at 1052.
Hunk #14 succeeded at 1082 (offset -27 lines).
Hunk #15 succeeded at 1100 (offset -27 lines).
Hunk #16 FAILED at 1196.
Hunk #17 FAILED at 1207.
Hunk #18 succeeded at 1245 (offset 7 lines).
Hunk #19 FAILED at 1253.
Hunk #20 FAILED at 1261.
Hunk #21 succeeded at 1372 (offset 3 lines).
Hunk #22 FAILED at 1546.
Hunk #23 FAILED at 1567.
Hunk #24 FAILED at 1764.
Hunk #25 succeeded at 1908 (offset -25 lines).
Hunk #26 FAILED at 1982.
17 out of 26 hunks FAILED -- saving rejects to file libavformat/mpegtsenc.c.rej
make[2]: *** [/dev/shm/tmp/cinelerra-goodguy-20191104/cinelerra-5.1/thirdparty/../thirdparty/build/ffmpeg.source] Ошибка 1

This is related to reporting possible incosistences in libavcodec/libavformat - because obviously libav devs  prefer to look at current git ...

Probably I should revisit this at ffmpeg 4.3's rc time.

Just for your information.

-------------------------------------------------------