Skip to content

imlib2: 1.7.5 -> 1.8.1#166452

Merged
risicle merged 2 commits intoNixOS:stagingfrom
nagy:imlib2-181
May 2, 2022
Merged

imlib2: 1.7.5 -> 1.8.1#166452
risicle merged 2 commits intoNixOS:stagingfrom
nagy:imlib2-181

Conversation

@nagy
Copy link
Member

@nagy nagy commented Mar 30, 2022

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from spwhitt March 30, 2022 18:56
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Mar 30, 2022
@risicle
Copy link
Contributor

risicle commented Apr 3, 2022

This will need to be re-targeted at the staging branch.

@nagy
Copy link
Member Author

nagy commented Apr 3, 2022

So I rebase and force push onto staging like normally, or is there another way? Because last time I did that, it pulled in a million different people via mention and I want to avoid that.

@risicle
Copy link
Contributor

risicle commented Apr 3, 2022

I'm told the trick is documented in #166472

@nagy nagy changed the base branch from master to staging April 3, 2022 22:38
@nagy
Copy link
Member Author

nagy commented Apr 3, 2022

It has worked. Thank you.

@nagy
Copy link
Member Author

nagy commented Apr 4, 2022

I have updated this to now also support SVG and the HEIF image format. Both of which are recent additions to imlib2.

@jtojnar
Copy link
Member

jtojnar commented Apr 4, 2022

@nagy
Copy link
Member Author

nagy commented Apr 4, 2022

The LZMA Loader is already active

Build Output
------------------------------------------------------------------------
imlib2 1.8.1
------------------------------------------------------------------------

Configuration Options Summary:

Image loaders:
Regular image loaders
GIF.....................: yes
HEIF....................: yes
JPEG....................: yes
PNG.....................: yes
SVG.....................: yes
TIFF....................: yes
WEBP....................: yes
Decompressors
BZIP2...................: yes
LZMA(XZ)................: yes
ZLIB....................: yes
Containers
ID3.....................: yes

Build for X11.............: yes
Use X MIT-SHM FD-passing..: yes

Use X86 MMX for speed.....: no
Use AMD64 for speed.......: yes

Use visibility hiding.....: yes

Installation path.........: /nix/store/by1584shbcr2vwmlz17mj0lraaapb8af-imlib2-1.8.1

@risicle
Copy link
Contributor

risicle commented Apr 6, 2022

On macos 10.15:

  CCLD     bz2.la
ld: unknown option: -z
clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
make[4]: *** [Makefile:741: heif.la] Error 1
make[4]: *** Waiting for unfinished jobs....
  CCLD     lzma.la
ld: unknown option: -z
clang-11: error: linker command failed with exit code 1 (use -v to see invocation)
make[4]: *** [Makefile:765: svg.la] Error 1
make[4]: Leaving directory '/private/tmp/nix-build-imlib2-1.8.1.drv-0/imlib2-1.8.1/src/modules/loaders'
make[3]: *** [Makefile:401: all-recursive] Error 1
make[3]: Leaving directory '/private/tmp/nix-build-imlib2-1.8.1.drv-0/imlib2-1.8.1/src/modules'
make[2]: *** [Makefile:401: all-recursive] Error 1
make[2]: Leaving directory '/private/tmp/nix-build-imlib2-1.8.1.drv-0/imlib2-1.8.1/src'
make[1]: *** [Makefile:523: all-recursive] Error 1
make[1]: Leaving directory '/private/tmp/nix-build-imlib2-1.8.1.drv-0/imlib2-1.8.1'
make: *** [Makefile:430: all] Error 2
builder for '/nix/store/9h4qw6713796w2jk1adj4m7qqm8f0b27-imlib2-1.8.1.drv' failed with exit code 2

Edit: this doesn't occur with the HEIF/SVG commit reverted

@risicle
Copy link
Contributor

risicle commented Apr 6, 2022

Think this is probably caused by the line https://git.enlightenment.org/legacy/imlib2.git/tree/src/modules/loaders/Makefile.am?h=v1.8.1#n110. Darwin clang apparently doesn't support this. So we either patch it out (not fully understanding why it's there) or disable svg on macos.

@nagy
Copy link
Member Author

nagy commented Apr 6, 2022

Should I take out the SVG and HEIF commit? I cannot test on Darwin.

@risicle
Copy link
Contributor

risicle commented Apr 7, 2022

No I'd simply disable the svg support if stdenv.isDarwin for now. Preferably with a comment explaining why.

We should probably notify upstream of this, but their phabricator instance https://phab.enlightenment.org/ is a bit annoying about getting an account.

@nagy
Copy link
Member Author

nagy commented Apr 7, 2022

I have updated it. Lets see if it is right now.

@risicle
Copy link
Contributor

risicle commented Apr 8, 2022

@ofborg eval

@nagy
Copy link
Member Author

nagy commented Apr 9, 2022

Ofborg seems to fail because it cannot evaluate passthru.tests on Darwin. I don't understand, there are no passthru tests defined.

@risicle
Copy link
Contributor

risicle commented Apr 9, 2022

#167079 Yes there are 😁

It's evaluating the result merged with staging.

Honestly I don't usually expect staging PRs to pass ofborg completely because of the huge volume of rebuilds that can be involved. Though it's usually worth taking a look at them for glaring errors anyway.

I do wonder if we should maybe be using lib.availableOn in some way for passthru.tests.

@risicle
Copy link
Contributor

risicle commented Apr 9, 2022

Hold on... that's not merged yet. Which error were you referring to?

@nagy
Copy link
Member Author

nagy commented Apr 9, 2022

From the Ofborg evaluation in this box down below with a click on "Details". https://github.com/NixOS/nixpkgs/pull/166452/checks?check_run_id=5893102214 . It says:


Unexpected error: command failed with exit code 1

Attempted: imlib2

The following builds were skipped because they don't evaluate on aarch64-darwin: imlib2.passthru.tests

@risicle
Copy link
Contributor

risicle commented Apr 9, 2022

Yep I think that's just staging being staging. I think the error message is a bit wrong because it really fails due to its build of many dependencies timing out.

@risicle
Copy link
Contributor

risicle commented May 2, 2022

Let's try and get this in to 22.05

@risicle risicle merged commit 09ab2e0 into NixOS:staging May 2, 2022
@nagy nagy deleted the imlib2-181 branch May 3, 2022 08:55
@vcunat
Copy link
Member

vcunat commented May 7, 2022

Perhaps the workaround should've been tested (e.g. atop master) before merging.

@risicle
Copy link
Contributor

risicle commented May 7, 2022

Yeah teach me to assume something not tested for 24 days would stay the same.

Guessing one of the existing dependencies now pulls in librsvg itself. This is why we should use explicit "enable" flags when we can identify them.

@risicle
Copy link
Contributor

risicle commented May 7, 2022

For an added treat, upstream's git appears to have just fallen off the face of the earth too.

@nagy
Copy link
Member Author

nagy commented May 7, 2022

Version 1.9.0 is out already, which may address the issue. I see some mentionings of the svg loader in the changelog. I can make a PR for that as well.

https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.9.0/

@risicle
Copy link
Contributor

risicle commented May 7, 2022

I've already tried this and it doesn't help.

@risicle
Copy link
Contributor

risicle commented May 7, 2022

Hold on - I think this may be the HEIF support too...

@risicle
Copy link
Contributor

risicle commented May 7, 2022

Think I've got this fixed in #171947

@nagy by all means create a 1.9.0 PR though, got to update sometime

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants