[FFmpeg-devel] Need help submitting a patch

[FFmpeg-devel] Need help submitting a patch

[Traian Coza]

Hi! I am new to contributing to FFmpeg, and I have a technical question.

I'm trying to submit a patch, but it's a fairly large patch, which I've
made in multiple commits. I don't know how to generate the email for this
patch. The example command given on the website (with format-patch) only
generates the email for a single commit. I've searched the web and I don't
really see an easy way to do it. Can someone help me out with this?

Thanks!
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Soft Works]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Traian Coza
> Sent: Tuesday, May 3, 2022 6:12 AM
> To: ffmpeg-devel@ffmpeg.org
> Subject: [FFmpeg-devel] Need help submitting a patch
> 
> Hi! I am new to contributing to FFmpeg, and I have a technical
> question.
> 
> I'm trying to submit a patch, but it's a fairly large patch, which
> I've
> made in multiple commits. I don't know how to generate the email for
> this
> patch. The example command given on the website (with format-patch)
> only
> generates the email for a single commit. I've searched the web and I
> don't
> really see an easy way to do it. Can someone help me out with this?
> 
> Thanks!

For an easier way, you could create a PR against this repository:

https://github.com/ffstaging/FFmpeg

and follow the instructions you'll get from there.

When you want to use "git format-patch", you need to end the statement
with a minus+commitcount followed by the commit id from which the counting 
should originate.

e.g.: git format-patch [...] -4 4535ea46c3f5e6453

softworkz


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Nicolas George]

[-- Attachment #1.1: Type: text/plain, Size: 1026 bytes --]

Traian Coza (12022-05-03):
> Hi! I am new to contributing to FFmpeg, and I have a technical question.
> 
> I'm trying to submit a patch, but it's a fairly large patch, which I've
> made in multiple commits. I don't know how to generate the email for this
> patch. The example command given on the website (with format-patch) only
> generates the email for a single commit. I've searched the web and I don't
> really see an easy way to do it. Can someone help me out with this?

First, make sure your multiple commits are really there: check they are
all visible in `git log`.

Then, what is your git format-patch exact command? If it ends in "-1",
then the result you are seeing is normal: the -1 is telling it to take
the last patch.

You need to tell git format-patch the last commit before yours. You can
get it from `git log`. It would be even simpler if you thought of making
a branch: then you just need to specify the name of the branch from
which you branched.

Regards,

-- 
  Nicolas George

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Traian Coza]

Thanks. I'll use the ffstaging/FFmpeg repo. I didn't know about that, it
seems much simpler. I've tried using -n (n= number of commits), but it only
generates n emails, I only want 1.

I have another concern before I create a pull request. I ran 'make fate'
like it says on the website for regression testing, and I got the following
error:

TEST    source
--- ./tests/ref/fate/source 2022-05-02 12:57:02.707487436 -0400
+++ tests/data/fate/source 2022-05-03 09:22:31.302681114 -0400
@@ -5,6 +5,8 @@
 libavcodec/interplayacm.c
 libavcodec/log2_tab.c
 libavcodec/reverse.c
+libavcodec/text_to_bitmap.c
+libavcodec/text_to_bitmap.h
 libavdevice/file_open.c
 libavdevice/reverse.c
 libavfilter/af_arnndn.c
@@ -20,6 +22,7 @@
 compat/djgpp/math.h
 compat/float/float.h
 compat/float/limits.h
+libavcodec/text_to_bitmap.h
 tools/decode_simple.h
 Use of av_clip() where av_clip_uintp2() could be used:
 Use of av_clip() where av_clip_intp2() could be used:
Test source failed. Look at tests/data/fate/source.err for details.

The source.err file seems to be empty, however. Should I be concerned about
this? It seems to do with the fact that I've added some files.

On Tue, May 3, 2022 at 3:54 AM Nicolas George <george@nsup.org> wrote:

> Traian Coza (12022-05-03):
> > Hi! I am new to contributing to FFmpeg, and I have a technical question.
> >
> > I'm trying to submit a patch, but it's a fairly large patch, which I've
> > made in multiple commits. I don't know how to generate the email for this
> > patch. The example command given on the website (with format-patch) only
> > generates the email for a single commit. I've searched the web and I
> don't
> > really see an easy way to do it. Can someone help me out with this?
>
> First, make sure your multiple commits are really there: check they are
> all visible in `git log`.
>
> Then, what is your git format-patch exact command? If it ends in "-1",
> then the result you are seeing is normal: the -1 is telling it to take
> the last patch.
>
> You need to tell git format-patch the last commit before yours. You can
> get it from `git log`. It would be even simpler if you thought of making
> a branch: then you just need to specify the name of the branch from
> which you branched.
>
> Regards,
>
> --
>   Nicolas George
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Andreas Rheinhardt]

Traian Coza:
> Thanks. I'll use the ffstaging/FFmpeg repo. I didn't know about that, it
> seems much simpler. I've tried using -n (n= number of commits), but it only
> generates n emails, I only want 1.
> 
> I have another concern before I create a pull request. I ran 'make fate'
> like it says on the website for regression testing, and I got the following
> error:
> 
> TEST    source
> --- ./tests/ref/fate/source 2022-05-02 12:57:02.707487436 -0400
> +++ tests/data/fate/source 2022-05-03 09:22:31.302681114 -0400
> @@ -5,6 +5,8 @@
>  libavcodec/interplayacm.c
>  libavcodec/log2_tab.c
>  libavcodec/reverse.c
> +libavcodec/text_to_bitmap.c
> +libavcodec/text_to_bitmap.h
>  libavdevice/file_open.c
>  libavdevice/reverse.c
>  libavfilter/af_arnndn.c
> @@ -20,6 +22,7 @@
>  compat/djgpp/math.h
>  compat/float/float.h
>  compat/float/limits.h
> +libavcodec/text_to_bitmap.h
>  tools/decode_simple.h
>  Use of av_clip() where av_clip_uintp2() could be used:
>  Use of av_clip() where av_clip_intp2() could be used:
> Test source failed. Look at tests/data/fate/source.err for details.
> 
> The source.err file seems to be empty, however. Should I be concerned about
> this? It seems to do with the fact that I've added some files.

This means that your newly added headers use nonstandard inclusion
guards (if they use inclusion guards at all). Look at
tests/fate/source-check.sh to see how the inclusion guard should be.

- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Nicolas George]

[-- Attachment #1.1: Type: text/plain, Size: 760 bytes --]

Traian Coza (12022-05-03):
> Thanks. I'll use the ffstaging/FFmpeg repo. I didn't know about that, it
> seems much simpler.

It is not supported by the core of the project.

>		      I've tried using -n (n= number of commits), but it only
> generates n emails, I only want 1.

Look at how other people submit patches: several commits means several
mails.

> The source.err file seems to be empty, however. Should I be concerned about
> this? It seems to do with the fact that I've added some files.

Yes, you need to fix it.

> On Tue, May 3, 2022 at 3:54 AM Nicolas George <george@nsup.org> wrote:

Top-posting is strictly forbidden on this mailing-list. If you do not
know what it means, look it up.

Regards,

-- 
  Nicolas George

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Traian Coza:
>> Thanks. I'll use the ffstaging/FFmpeg repo. I didn't know about that, it
>> seems much simpler. I've tried using -n (n= number of commits), but it only
>> generates n emails, I only want 1.
>>
>> I have another concern before I create a pull request. I ran 'make fate'
>> like it says on the website for regression testing, and I got the following
>> error:
>>
>> TEST    source
>> --- ./tests/ref/fate/source 2022-05-02 12:57:02.707487436 -0400
>> +++ tests/data/fate/source 2022-05-03 09:22:31.302681114 -0400
>> @@ -5,6 +5,8 @@
>>  libavcodec/interplayacm.c
>>  libavcodec/log2_tab.c
>>  libavcodec/reverse.c
>> +libavcodec/text_to_bitmap.c
>> +libavcodec/text_to_bitmap.h
>>  libavdevice/file_open.c
>>  libavdevice/reverse.c
>>  libavfilter/af_arnndn.c
>> @@ -20,6 +22,7 @@
>>  compat/djgpp/math.h
>>  compat/float/float.h
>>  compat/float/limits.h
>> +libavcodec/text_to_bitmap.h
>>  tools/decode_simple.h
>>  Use of av_clip() where av_clip_uintp2() could be used:
>>  Use of av_clip() where av_clip_intp2() could be used:
>> Test source failed. Look at tests/data/fate/source.err for details.
>>
>> The source.err file seems to be empty, however. Should I be concerned about
>> this? It seems to do with the fact that I've added some files.
> 
> This means that your newly added headers use nonstandard inclusion
> guards (if they use inclusion guards at all). Look at
> tests/fate/source-check.sh to see how the inclusion guard should be.

Addendum/Correction: There is only one header; the above two additions
refer to nonstandard license headers.

- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Soft Works]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Nicolas George
> Sent: Tuesday, May 3, 2022 3:31 PM
> To: FFmpeg development discussions and patches <ffmpeg-
> devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] Need help submitting a patch
> 
> Traian Coza (12022-05-03):
> > Thanks. I'll use the ffstaging/FFmpeg repo. I didn't know about
> that, it
> > seems much simpler.
> 
> It is not supported by the core of the project.

What it essentially does is to handle all the e-mail creation
and handling for you, also it takes care of versioning 
your patchsets when submitting updates.

Once you comment with the /submit command, it will send your
patchset as emails to the mailing list, which IS supported
by the "core of the project".

Kind regards,
softworkz
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Traian Coza]

Sounds great, thanks! It's great that there's this functionality somewhere.
I'm not used to this email stuff.

On Tue, May 3, 2022 at 10:08 AM Soft Works <softworkz@hotmail.com> wrote:

>
>
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> > Nicolas George
> > Sent: Tuesday, May 3, 2022 3:31 PM
> > To: FFmpeg development discussions and patches <ffmpeg-
> > devel@ffmpeg.org>
> > Subject: Re: [FFmpeg-devel] Need help submitting a patch
> >
> > Traian Coza (12022-05-03):
> > > Thanks. I'll use the ffstaging/FFmpeg repo. I didn't know about
> > that, it
> > > seems much simpler.
> >
> > It is not supported by the core of the project.
>
> What it essentially does is to handle all the e-mail creation
> and handling for you, also it takes care of versioning
> your patchsets when submitting updates.
>
> Once you comment with the /submit command, it will send your
> patchset as emails to the mailing list, which IS supported
> by the "core of the project".
>
> Kind regards,
> softworkz
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Traian Coza]

Sorry about the "top posting" my client does it automatically.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Nicolas George]

[-- Attachment #1.1: Type: text/plain, Size: 168 bytes --]

Traian Coza (12022-05-03):
> Sorry about the "top posting" my client does it automatically.

It's a poor craftsman who blames their tools.

-- 
  Nicolas George

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Traian Coza]

Hey Softworks, when I try to open a pull request on that repo it says "An
owner of this repository has limited the ability to open a pull request to
users that are collaborators on this repository." So I am not a
collaborator, can you add me as a collaborator so I can do my pull request?
I've seen that you can do pull requests.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Soft Works]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of
> Traian Coza
> Sent: Tuesday, May 3, 2022 5:37 PM
> To: FFmpeg development discussions and patches <ffmpeg-
> devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] Need help submitting a patch
> 
> Hey Softworks, when I try to open a pull request on that repo it says
> "An
> owner of this repository has limited the ability to open a pull
> request to
> users that are collaborators on this repository." So I am not a
> collaborator, can you add me as a collaborator so I can do my pull
> request?
> I've seen that you can do pull requests.

You need to create your PR against https://github.com/ffstaging/FFmpeg,
not https://github.com/FFmpeg/FFmpeg

sw
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Traian Coza]

[-- Attachment #1.1: Type: text/plain, Size: 242 bytes --]

I know, but when I click on "New Pull Request" on ffstaging/FFmpeg, it
automatically sets the "base repository" to FFmpeg/FFmpeg, and I can't
change it to ffstaging/FFmpeg (see image). Am I doing something wrong,
perhaps?

[image: image.png]

[-- Attachment #1.2: image.png --]
[-- Type: image/png, Size: 23742 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Leo Izen]

On 5/3/22 00:12, Traian Coza wrote:
> Hi! I am new to contributing to FFmpeg, and I have a technical question.
>
> I'm trying to submit a patch, but it's a fairly large patch, which I've
> made in multiple commits. I don't know how to generate the email for this
> patch. The example command given on the website (with format-patch) only
> generates the email for a single commit. I've searched the web and I don't
> really see an easy way to do it. Can someone help me out with this?
>
I find the easiest way to do it for me is to generate the patches with 
"git format-patch" and then send them with "git send-email".

Once you have your patches atop the master branch, you can create a 
directory called outgoing/ and then run something like:

git format-patch -M -o outgoing/ --cover-letter origin/master

In this case, --cover-letter generates a cover letter, which you then 
edit to give a short blurb of what your patch set looks like. Then when 
you run git send-email outgoing/* you will have the patches embedded as 
replies to that cover letter email. "origin/master" is the hash of the 
last commit *before* yours, but it can by any ref, such as 
origin/master, not just a commit hash. You can also just substitute the 
commit hash there if your repositories/branches are named differently.

Since you use Gmail (at least, from your email address), you will need 
to enable Less Secure Apps if you have two-factor authentication 
disabled. If you have it enabled, you will have to generate an App 
Password for git-send-email, and then use that as the account password 
instead of your own.

- Leo Izen (thebombzen)


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Traian Coza]

Thanks, I finally managed to submit my patch with your instructions.
However, I see that the "Less secure apps" setting will no longer be
available in a month. What do you plan on doing then? (I see you also use
gmail)

On Tue, May 3, 2022 at 11:53 AM Leo Izen <leo.izen@gmail.com> wrote:

> On 5/3/22 00:12, Traian Coza wrote:
> > Hi! I am new to contributing to FFmpeg, and I have a technical question.
> >
> > I'm trying to submit a patch, but it's a fairly large patch, which I've
> > made in multiple commits. I don't know how to generate the email for this
> > patch. The example command given on the website (with format-patch) only
> > generates the email for a single commit. I've searched the web and I
> don't
> > really see an easy way to do it. Can someone help me out with this?
> >
> I find the easiest way to do it for me is to generate the patches with
> "git format-patch" and then send them with "git send-email".
>
> Once you have your patches atop the master branch, you can create a
> directory called outgoing/ and then run something like:
>
> git format-patch -M -o outgoing/ --cover-letter origin/master
>
> In this case, --cover-letter generates a cover letter, which you then
> edit to give a short blurb of what your patch set looks like. Then when
> you run git send-email outgoing/* you will have the patches embedded as
> replies to that cover letter email. "origin/master" is the hash of the
> last commit *before* yours, but it can by any ref, such as
> origin/master, not just a commit hash. You can also just substitute the
> commit hash there if your repositories/branches are named differently.
>
> Since you use Gmail (at least, from your email address), you will need
> to enable Less Secure Apps if you have two-factor authentication
> disabled. If you have it enabled, you will have to generate an App
> Password for git-send-email, and then use that as the account password
> instead of your own.
>
> - Leo Izen (thebombzen)
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] Need help submitting a patch

[Leo Izen]

On 5/3/22 12:17, Traian Coza wrote:
> Thanks, I finally managed to submit my patch with your instructions.
> However, I see that the "Less secure apps" setting will no longer be
> available in a month. What do you plan on doing then? (I see you also use
> gmail)
>
You'll have to enable two-factor authentication, and then use app passwords.

Also, please stop top-posting, you've been told about this. If your 
email client automatically top-posts then configure it to not do that, 
or move the text manually.

- Leo Izen (thebombzen)


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".