search

zmwangx / rust-ffmpeg-sys

FFmpeg bindings for Rust.
113 stars 75 forks source link

Add ffmpeg 6.0 support #50

Closed AdrianEddy closed 1 year ago

AdrianEddy commented 1 year ago

Even though 6.0 is not officially released yet, the API changes are frozen and releases/6.0 is branched. This PR adds support for the 6.0 branch

svenstaro commented 1 year ago

@zmwangx Could you take a look at this? The incompatibility with ffmpeg 6 is currently blocking a rebuild in Arch Linux.

Polochon-street commented 1 year ago

thanks for starting this, it completely went over my head. I've fixed the clippy lint errors, could you rebase on master so we can check the build results?

The CI is also blocked by https://github.com/jrottenberg/ffmpeg/issues/365 - does anyone has experience on how long it usually takes for them to have the new ffmpeg version? It would be nice to be able to simply test this with the CI

AdrianEddy commented 1 year ago

Sure, updated. No idea about the CI, but for what it's worth, I'm building it fine for Windows, Linux and macOS on github actions, so it should be all good

Polochon-street commented 1 year ago

Thanks. I'll wait a few days to see if there's some progress on the docker image front, otherwise I guess we'll need to find other solutions for the CI's interim

Polochon-street commented 1 year ago

hi @AdrianEddy! I made a temporary CI build for ffmpeg 6 here https://github.com/zmwangx/rust-ffmpeg-sys/pull/53/commits/8e2e4f219dfb62e51e109028fa0a9606a95935af - could you cherry-pick that commit onto your branch, and remove the 6.0 from here? https://github.com/zmwangx/rust-ffmpeg-sys/pull/50/files#diff-5c3fa597431eda03ac3339ae6bf7f05e1a50d6fc7333679ec38e21b337cb6721R14

I'll run the CI, and hopefully it'll work so I can merge, publish, and get working on rust-ffmpeg :)

Polochon-street commented 1 year ago

awesome, thanks! Could you rebase everything so there's only one "Add ffmpeg 6 support" commit? Then I'll just merge and publish :)

AdrianEddy commented 1 year ago

awesome, thanks! Could you rebase everything so there's only one "Add ffmpeg 6 support" commit? Then I'll just merge and publish :)

Not sure how to rebase, since the commit was not from master, but I reverted that commit, will that work?

Polochon-street commented 1 year ago

I'll merge and fiddle with the commits a little bit more. Thanks a lot! :)