Thanks to visit codestin.com
Credit goes to github.com

Skip to content

ffmpeg is available on default ubuntu packages now. #15851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Dec 7, 2019
Merged

ffmpeg is available on default ubuntu packages now. #15851

merged 1 commit into from
Dec 7, 2019
+0 −3

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Dec 7, 2019

... whereas ppa:jonathonf/ffmpeg-3 has gone offline.

will selfmerge yada yada

PR Summary

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

@anntzer
ffmpeg is available on default ubuntu packages now.
182c0b8 
... whereas ppa:jonathonf/ffmpeg-3 has gone offline.
@anntzer anntzer added the Build label Dec 7, 2019
@anntzer
Copy link
Contributor Author

anntzer commented Dec 7, 2019 •
edited
Loading

Looks like selfmerge is not possible anymore? Not a huge deal but heh.

@jklymak jklymak merged commit 803fd69 into matplotlib:master Dec 7, 2019
@anntzer anntzer deleted the ciffmpeg branch December 7, 2019 15:39
@timhoffm
Copy link
Member

timhoffm commented Dec 7, 2019

@meeseeksdev backport to v3.1.x

@lumberbot-app
Copy link

lumberbot-app bot commented Dec 7, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 803fd696661888be487a8342a8266d6f5b95a421
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15851: ffmpeg is available on default ubuntu packages now.'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-15851-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #15851 on branch v3.1.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

timhoffm pushed a commit to timhoffm/matplotlib that referenced this pull request Dec 7, 2019
@jklymak @timhoffm
Backport PR matplotlib#15851: ffmpeg is available on default ubuntu p…
e509cb3 
…ackages now.
@timhoffm timhoffm mentioned this pull request Dec 7, 2019
Merged
@timhoffm
Copy link
Member

timhoffm commented Dec 7, 2019

@meeseeksdev backport to v3.2.x

@timhoffm timhoffm added this to the v3.1.3 milestone Dec 7, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Dec 7, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 803fd696661888be487a8342a8266d6f5b95a421
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #15851: ffmpeg is available on default ubuntu packages now.'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-15851-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

"Backport PR #15851 on branch v3.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

timhoffm pushed a commit to timhoffm/matplotlib that referenced this pull request Dec 7, 2019
@jklymak @timhoffm
Backport PR matplotlib#15851: ffmpeg is available on default ubuntu p…
022b5eb 
…ackages now.
This was referenced Dec 7, 2019
Closed
Merged
@tacaswell
Copy link
Member

@anntzer hmm, interesting side effect of requiring at least one approval to merge...

timhoffm added a commit that referenced this pull request Dec 7, 2019
@timhoffm
Merge pull request #15862 from timhoffm/auto-backport-of-pr-15851-on-…
f1741d3 
…v3.2.x

Backport PR #15851 on branch v3.2.x (ffmpeg is available on default ubuntu packages now)
timhoffm added a commit that referenced this pull request Dec 7, 2019
@timhoffm
Merge pull request #15860 from timhoffm/auto-backport-of-pr-15851-on-…
8120ce5 
…v3.1.x

Backport PR #15851 on branch v3.1.x (ffmpeg is available on default ubuntu packages now)
@timhoffm timhoffm mentioned this pull request Jan 25, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jklymak jklymak jklymak approved these changes

Assignees
No one assigned
Labels
Build
Projects
None yet
Milestone
v3.1.3
Development

Successfully merging this pull request may close these issues.
4 participants
@anntzer @timhoffm @tacaswell @jklymak