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

NOT READY: imagefree: (embedded libpng): apng support #77655

Closed
wants to merge 1 commit into from

Conversation

colemickens
Copy link
Member

@colemickens colemickens commented Jan 14, 2020

Fixes: #77653

This utilizes the libpng-apng project's patch to apply
apng support to the libpng copy embedded in imagefree's source.

This is less about apng support, and more about the apng patch
carrying necessary fixes for building freeimage (and other
projects using it) on aarch64-linux.

Note, once this is in, we can enable aarch64-linux for imv! Hurray!

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@veprbl
Copy link
Member

veprbl commented Jan 14, 2020

Wouldn't it make more sense to patch freeimage to use our libpng. It already supports apng:

patchVersion = "1.6.37";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz";
sha256 = "1dh0250mw9b2hx7cdmnb2blk7ddl49n6vx8zz7jdmiwxy38v4fw2";
};

There is already patch for this in ArchLinux: https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/freeimage

@colemickens
Copy link
Member Author

Yes, that probably makes more sense, but there was no way I would've come up with that patch so this seemed simpler to implement.

I can try my hand at that, but for now I need to re-confirm that the apng patch is enough to unblock aarch64.

@colemickens colemickens changed the title imagefree: (embedded libpng): apng support NOT READY: imagefree: (embedded libpng): apng support Jan 30, 2020
@stale
Copy link

stale bot commented Jul 28, 2020

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 28, 2020
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 28, 2020
@veprbl veprbl added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 28, 2020
L-as added a commit to L-as/nixpkgs that referenced this pull request Aug 16, 2020
This pretty much just adapts https://src.fedoraproject.org/rpms/freeimage into nixpkgs.
All of the patches except the substream one and doxygen one is included, since the
purpose of the first one is unclear and the second one is just for docs.

It seems to me that freeimage is unfortunately partly abandonware, considering
that there is a patch for a CVE included and that the last release was in 2018.

Fixes NixOS#77653
Replaces NixOS#77655
@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 3, 2020
@veprbl veprbl closed this Jan 5, 2021
L-as added a commit to L-as/nixpkgs that referenced this pull request Jan 10, 2021
…aarch64 support

The unreleased version of freeimage contains many important fixes,
amongst others CVEs, and is taken from the svn repository (r1859).

We also unbundle all the dependencies to make it fit into the Nixpkgs ecosystem.

All the changes needed to unbundle and make it compile with Nix is contained in unbundle.diff.

Fixes NixOS#77653
Replaces NixOS#77655
@colemickens colemickens deleted the nixpkgs-freeimage branch December 30, 2022 01:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

imv fails to build on aarch64 (due to freeimage vendoring libpng)
3 participants