Skip to content
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.

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

ffmpeg(and -full) updates, use SDL2 instead of SDL for versions >3.2 #25132

Closed
wants to merge 5 commits into from

Conversation

MP2E
Copy link

@MP2E MP2E commented Apr 23, 2017

Motivation for this change

ffmpeg released version 3.3 recently so this updates both ffmpeg and ffmpeg-full, this PR also addresses issue #24658

ffmpeg-full had 2 options removed, '--enable-memalign-hack' and '--enable-x11grab'.

x11grab was deprecated and removed in favor of libxcb, the memalign hacks configure option was fully removed from ffmpeg

as a side note, should older ffmpeg 3.x releases get removed?

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Cray Elliott added 3 commits April 22, 2017 18:52
remove legacy x11grab and memalign configure option, both removed
as of 3.3
addresses issue NixOS#24658

special thanks to codyopel who suggested this solution!
@mention-bot
Copy link

@MP2E, thanks for your PR! By analyzing the history of the files in this pull request, we identified @codyopel, @wkennington and @acowley to be potential reviewers.

@grahamc
Copy link
Member

grahamc commented Apr 23, 2017

We should delete any ffmpeg that we can, meaning other packages can upgrade to newer ffmpegs.

@vcunat
Copy link
Member

vcunat commented Apr 23, 2017

The announcement mentions nothing about backwards compatibility. I see a couple of fields removed from struct AVFilterLink. I suspect this won't cause a major problem and we can attempt to just update it like this.

@MP2E
Copy link
Author

MP2E commented Apr 23, 2017

I added another commit removing ffmpeg 3.2 and 3.1 if we would like to go forward with removing them, however, this commit can also be safely ignored if instead it would be better to keep them. Either way is fine by me. ffmpeg 3.1 is not needed anymore because nothing in the tree depends on it, so we could also go the middle ground route and only remove ffmpeg_3_1.

effectively updates them to depend on ffmpeg_3_3
@MP2E
Copy link
Author

MP2E commented Apr 24, 2017

Travis found some programs that were depending on ffmpeg_3_2, changed those to use ffmpeg

@MP2E
Copy link
Author

MP2E commented Apr 30, 2017

After some testing, I went ahead and pushed! Would be happy to follow up with any issues if they arise.

@MP2E MP2E closed this Apr 30, 2017
@MP2E MP2E deleted the ffmpeg_updates branch June 10, 2017 21:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants