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.

Sign up for GitHub

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

Jump to bottom

openexr: 2.4.1 -> 2.5.2 #88200

Merged
merged 1 commit into from
Aug 12, 2020
Merged

openexr: 2.4.1 -> 2.5.2 #88200

merged 1 commit into from
Aug 12, 2020
+29 −73

Conversation

r-ryantm
Copy link
Contributor

@r-ryantm r-ryantm commented May 19, 2020 •
edited by jtojnar
Loading

Semi-automatic update generated by nixpkgs-update tools. This update was made based on information from https://github.com/AcademySoftwareFoundation/openexr/releases.

meta.description for openexr is: "A high dynamic-range (HDR) image file format"

meta.homepage for openexr is: "https://www.openexr.com/"

Updates performed
  • Version update
To inspect upstream changes
Impact
Checks done (click to expand)
Rebuild report (if merged into master) (click to expand) 
2903 total rebuild path(s)

949 package rebuild(s)

949 x86_64-linux rebuild(s)
838 i686-linux rebuild(s)
287 x86_64-darwin rebuild(s)
829 aarch64-linux rebuild(s)


First fifty rebuilds by attrpath
R
_90secondportraits
abiword
adapta-gtk-theme
aeon
aesop
alembic
almanah
anbox
apostrophe
appleseed
aptly
aravis
arc-icon-theme
arc-theme
ardour
areca
arx-libertatis
asc-key-to-qr-code-gif
asciidoc-full
asciidoc-full-with-plugins
astroid
asymptote
audacious
audaciousQt5
audio-recorder
autotrace
awesome
awesome-4-0
azureus
balsa
bareos
baresip
beets
betterlockscreen
bibata-cursors
bibata-cursors-translucent
bibata-extra-cursors
birdfont
blender
blockhash
bombono
bookworm
brasero
brasero-original
btrbk
byzanz
caffe
caffe2
calibre
Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/20kip7s93fb8f1yg2z552594fcj9h5fy-openexr-2.5.1-bin \
  --option binary-caches 'https://cache.nixos.org/ https://r-ryantm.cachix.org/' \
  --option trusted-public-keys '
  r-ryantm.cachix.org-1:gkUbLkouDAyvBdpBX0JOdIiD2/DP1ldF3Z3Y6Gqcc4c=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(r-ryantm's Cachix cache is only trusted for this store-path realization.)
For the Cachix download to work, your user must be in the trusted-users list or you can use sudo since root is effectively trusted.

Or, build yourself:

nix-build -A openexr https://github.com/r-ryantm/nixpkgs/archive/5e4e4a82c48fa3a17b9cfb7d41468e74af180618.tar.gz

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/20kip7s93fb8f1yg2z552594fcj9h5fy-openexr-2.5.1-bin
ls -la /nix/store/20kip7s93fb8f1yg2z552594fcj9h5fy-openexr-2.5.1-bin/bin

Pre-merge build results

NixPkgs review skipped

Maintainer pings

@veprbl
Copy link
Member

veprbl commented May 23, 2020

@GrahamcOfBorg eval

@jtojnar jtojnar added the 1.severity: security Issues which raise a security issue, or PRs that fix one label May 28, 2020
jtojnar
jtojnar previously requested changes May 28, 2020
View reviewed changes
Copy link
Member

@jtojnar jtojnar left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there has been an regression in pkg-config files: AcademySoftwareFoundation/openexr@0b26a9d

We will need to fix them like here: fmtlib/fmt#1657

@FRidh FRidh added the 2.status: work-in-progress This PR isn't done label Jun 4, 2020
@r-ryantm r-ryantm closed this Jun 11, 2020
@r-ryantm r-ryantm deleted the auto-update/openexr branch June 11, 2020 04:56
@ryantm ryantm restored the auto-update/openexr branch June 11, 2020 05:38
@ryantm ryantm reopened this Jun 11, 2020
@r-ryantm r-ryantm closed this Jun 14, 2020
@r-ryantm r-ryantm deleted the auto-update/openexr branch June 14, 2020 03:30
@ryantm ryantm restored the auto-update/openexr branch June 14, 2020 05:49
@ryantm ryantm reopened this Jun 14, 2020
@r-ryantm r-ryantm closed this Jul 1, 2020
@r-ryantm r-ryantm deleted the auto-update/openexr branch July 1, 2020 04:39
@ryantm ryantm restored the auto-update/openexr branch July 1, 2020 04:54
@ryantm ryantm reopened this Jul 1, 2020
@FRidh
Copy link
Member

FRidh commented Jul 2, 2020

@GrahamcOfBorg eval

@jtojnar jtojnar added 9.needs: upstream fix This PR needs upstream to change something 9.needs: human intervention There were changes that bots cannot deal with. labels Jul 8, 2020
@jtojnar
Copy link
Member

jtojnar commented Aug 11, 2020

Finally opened AcademySoftwareFoundation/openexr#815

@jtojnar jtojnar changed the title openexr: 2.4.1 -> 2.5.1 openexr: 2.4.1 -> 2.5.2 Aug 11, 2020
@jtojnar jtojnar force-pushed the auto-update/openexr branch 3 times, most recently from 1c5ff3d to 986de59 Compare August 11, 2020 18:21
@jtojnar
Copy link
Member

jtojnar commented Aug 11, 2020

cc @glittershark @eraserhd @flokli re #86241
cc @nh2 re #94205

glittershark
glittershark approved these changes Aug 11, 2020
View reviewed changes
Copy link
Member

@glittershark glittershark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested build and execution of all binaries on darwin and everything appears to work. Code also LGTM.

nh2
nh2 reviewed Aug 12, 2020
View reviewed changes
Copy link
Contributor

@nh2 nh2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing this on musl practically requires #95234 because otherwise util-linux (a dependency) does not build.

I'm currently building it on top of that.

@nh2
Copy link
Contributor

nh2 commented Aug 12, 2020

The change to the musl patch seems to not work; pkgsMusl.ilmbase fails with:

applying patch /nix/store/g6ns8r8f7s8cx51asi404fa2wny9sy30-ilmbase-musl-_fpstate.patch.patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- IlmBase/IexMath/IexMathFpu.cpp.orig        2019-12-01 15:42:08.143387128 +0100
|+++ IlmBase/IexMath/IexMathFpu.cpp     2019-12-01 15:43:02.402389927 +0100
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
1 out of 1 hunk ignored
builder for '/nix/store/vsrbwdxfyhsbcvvbfjqz1qhkp2710z31-ilmbase-2.5.2.drv' failed with exit code 1

@jtojnar @nh2
openexr: 2.4.1 -> 2.5.2
6a06f4f 
Needed to apply patch to fix pkg-config files so also removed patch that is unused since the switch to CMake during patches refactoring.
@nh2 nh2 force-pushed the auto-update/openexr branch from 986de59 to 6a06f4f Compare August 12, 2020 18:33
@nh2
Copy link
Contributor

nh2 commented Aug 12, 2020

But I'll force-push that fix into this PR.

Done.

nh2
nh2 approved these changes Aug 12, 2020
View reviewed changes
Copy link
Contributor

@nh2 nh2 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With my force-pushed change, pkgsMusl.ilmbase and pkgsMusl.openexr build on top of #95234.

@jtojnar jtojnar merged commit e4eb966 into NixOS:staging Aug 12, 2020
@jtojnar jtojnar removed the 9.needs: human intervention There were changes that bots cannot deal with. label Aug 12, 2020
@r-ryantm r-ryantm deleted the auto-update/openexr branch August 12, 2020 23:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nh2 nh2

@glittershark glittershark

@jtojnar jtojnar

Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 2.status: work-in-progress This PR isn't done 9.needs: upstream fix This PR needs upstream to change something 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
Staging
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@r-ryantm @veprbl @FRidh @jtojnar @nh2 @glittershark @ryantm