I made a mistake merge. Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.
I reconstructed the "desired" state of staging-next tree by:
- checking out the last commit of the problematic range: 4effe769e2
- `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
merge commit and its revert from that range (while keeping
reapplication from 4effe769e2)
- merging the last unaffected staging-next commit (803ca85c20)
- fortunately no other commits have been pushed to staging-next yet
- applying a diff on staging-next to get it into that state
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.
This update was made based on information from https://repology.org/metapackage/libwebp/versions.
These checks were done:
- built on NixOS
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/dwebp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/cwebp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/gif2webp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/img2webp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/img2webp --help’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/webpmux -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/webpinfo -h’ got 0 exit code
- found 1.0.0 with grep in /nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0
- directory tree listing: https://gist.github.com/a09e2cd5f3d318ac588ecdf308cc9898
This is required to build Chromium. Making it a non-optional dependency
as it shouldn't really hurt other packages using it.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Not sure whether those are really needed for Chromium, but I suppose it
doesn't hurt to have support for conversion.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
