Fixes for FFmpeg 7, round 1 #340640
Fixes for FFmpeg 7, round 1 #340640
Conversation
pkgs/tools/audio/liquidsoap/full.nix
Outdated
| @@ -7,18 +7,23 @@ | |||
|
|
|||
| let | |||
| pname = "liquidsoap"; | |||
| version = "2.2.5"; | |||
| version = "2.3.x-unstable-2024-09-02"; | |||
There was a problem hiding this comment.
The version is from the rolling-release-v2.3.x branch, per https://github.com/savonet/liquidsoap/tree/rolling-release-v2.3.x?tab=readme-ov-file#release-details. 2.2.4-unstable-… felt misleading as upstream already has a version designation for this separate branch that they would expect users to reference.
There was a problem hiding this comment.
In that case, I think 2.3-unstable... would be more appropriate.
There was a problem hiding this comment.
It’s a bit subtle – usually VERSION-unstable-YYYY-MM-DD means an unstable version after VERSION. In this case, the version was after the birth of the rolling-release-v2.3.x branch and the marking of the 2.3.x release “series” as being available in alpha, but before the release of 2.3.0. So 2.3-unstable-… feels a little misleading to me, as it would be prior to the release of 2.3.0, and we could conceivably use e.g. 2.3.0-unstable-… to designate a commit from the rolling release branch after the release of 2.3.0. (Anyway, I dropped this from the PR.)
|
Thanks for doing this! I think I'd prefer just a pin for liquidsoap for now. We'll bump when the new version get released properly. liquidsoap is developed like a lot of other software and only really maintains one release at a time, so the "being retired soon" is mostly a reflection of that. In any case we likely wont have to wait too long to unpin. I'll experiment with the new version to see if anything will break horribly in the future as well. I just don't think nixpkgs-unstable should force all their users to do that experiment. Again thanks! |
emilazy
force-pushed
the
push-xmyvtxwtlzmz
branch
from
6f94d89
to
dd3a82b
Compare
emilazy
force-pushed
the
push-xmyvtxwtlzmz
branch
from
dd3a82b
to
7f70b94
Compare
emilazy
force-pushed
the
push-xmyvtxwtlzmz
branch
from
7f70b94
to
1c6667a
Compare
|
Since the patches for Xine work well in Master for both FFMPEGs, I put them here: #340813 |
These are forks of WebRTC, so include the same upstream patch we use for FFmpeg 7 support in Qt 5’s WebEngine. I didn’t bother deduplicating it across these two copy‐pasted expressions since the original authors didn’t either.
emilazy
force-pushed
the
push-xmyvtxwtlzmz
branch
from
1c6667a
to
b1a93bb
Compare
|
Dropped the Xine commits since they’ve been split off. |
Description of changes
Fixes build regressions from #337855,
withoutintroducing anyFFmpeg 6 pins. I have built all the packages I directly touched here on top ofstaging(exceptliquidsoap).I didn’t know Xine was still developed, although it seems they’ve gone almost two years without a release. @AndersonTorres would appreciate if you could test it out (rebasing on top of
masterand changing the dependencies toffmpeg_7will work to avoid mass rebuilds).@dali99 @ehmry I don’t use Liquidsoap. I updated the FFmpeg binding package they maintain to the current Git HEAD, as recommended by upstream for those using FFmpeg 7; they are holding off on cutting a new release as their bindings cannot support both FFmpeg 6 and 7. I have had to bump Liquidsoap to therolling-release-v2.3.xbranch to pick up support for the new bindings version. According to their README, our current 2.2.x branch will be retired soon, and minor releases should not cause significant compatibility issues, but there is not a strict guarantee, and they do describe 2.3.x as being in the alpha stage and recommend testing new versions. Please let me know what you think; the alternative is to pin FFmpeg 6 for now.The upstream WebRTC patch has already been deployed to Qt 5 WebEngine without incident, so I’m pretty confident about the Telegram clients.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.