···

       
1
       
1
       
-
       
diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap

     

       
2
       
2
       
-
       
--- IlmBase/bootstrap	2015-03-31 01:02:41.000000000 -0400

     

       
3
       
3
       
-
       
+++ IlmBase/bootstrap	2015-03-31 01:03:35.000000000 -0400

     

       
4
       
4
       
-
       
@@ -47,11 +47,6 @@

     

       
5
       
5
       
-
       
     fi

     

       
6
       
6
       
-
       
 }

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
-# Check if /usr/local/share/aclocal exists

     

       
9
       
9
       
-
       
-if [ -d /usr/local/share/aclocal ]; then

     

       
10
       
10
       
-
       
-	ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal"

     

       
11
       
11
       
-
       
-fi	

     

       
12
       
12
       
-
       
-

     

       
13
       
13
       
-
       
 run_cmd aclocal -I m4 $ACLOCAL_INCLUDE

     

       
14
       
14
       
-
       
 run_cmd $LIBTOOLIZE --automake --copy

     

       
15
       
15
       
-
       
 run_cmd automake --add-missing --copy

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which,

     

       
2
       
2
       
-
       
  fetchpatch }:

     

       
1
       
1
       
+
       
{ stdenv, lib, buildPackages, automake, autoconf, libtool, which,

     

       
2
       
2
       
+
       
  fetchpatch, openexr }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     

       
5
       
5
       
 
       
  pname = "ilmbase";

     

       
6
       
6
       
-
       
  version = "2.3.0";

     

       
6
       
6
       
+
       
  version = lib.getVersion openexr;

     

       
7
       
7
       
 
       


     

       
8
       
8
       
-
       
  src = fetchurl {

     

       
9
       
9
       
-
       
    url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";

     

       
10
       
10
       
-
       
    sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5";

     

       
11
       
11
       
-
       
  };

     

       
8
       
8
       
+
       
  # the project no longer provides separate tarballs. We may even want to merge

     

       
9
       
9
       
+
       
  # the ilmbase package into openexr in the future.

     

       
10
       
10
       
+
       
  src = openexr.src;

     

       
11
       
11
       
+
       


     

       
12
       
12
       
+
       
  sourceRoot = "source/IlmBase";

     

       
12
       
13
       
 
       


     

       
13
       
14
       
 
       
  outputs = [ "out" "dev" ];

     

       
14
       
15
       
 
       


     
···

       
23
       
24
       
 
       
  NIX_CFLAGS_LINK = "-pthread";

     

       
24
       
25
       
 
       


     

       
25
       
26
       
 
       
  patches = [

     

       
26
       
26
       
-
       
    ./bootstrap.patch

     

       
27
       
27
       
 
       
    ./cross.patch

     

       
28
       
28
       
-
       
    (fetchpatch {

     

       
29
       
29
       
-
       
      name = "CVE-2018-18443.patch";

     

       
30
       
30
       
-
       
      url = "https://github.com/kdt3rd/openexr/commit/5fa930b82cff2db386c64ca512af19e60c14d32a.patch";

     

       
31
       
31
       
-
       
      sha256 = "1j6xd0qkx99acc1szycxaj0wwp01yac67jz48hwc4fwwpz8blx4s";

     

       
32
       
32
       
-
       
      stripLen = 1;

     

       
33
       
33
       
-
       
      excludes = [ "CHANGES.md" ];

     

       
34
       
34
       
-
       
    })

     

       
35
       
28
       
 
       
  ];

     

       
36
       
29
       
 
       


     

       
37
       
30
       
 
       
  # fails 1 out of 1 tests with

     

···

       
1
       
1
       
-
       
diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap

     

       
2
       
2
       
-
       
--- OpenEXR/bootstrap	2015-03-31 01:02:41.000000000 -0400

     

       
3
       
3
       
-
       
+++ OpenEXR/bootstrap	2015-03-31 01:03:35.000000000 -0400

     

       
4
       
4
       
-
       
@@ -47,11 +47,6 @@

     

       
5
       
5
       
-
       
     fi

     

       
6
       
6
       
-
       
 }

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
-# Check if /usr/local/share/aclocal exists

     

       
9
       
9
       
-
       
-if [ -d /usr/local/share/aclocal ]; then

     

       
10
       
10
       
-
       
-	ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal"

     

       
11
       
11
       
-
       
-fi	

     

       
12
       
12
       
-
       
-

     

       
13
       
13
       
-
       
 run_cmd aclocal -I m4 $ACLOCAL_INCLUDE

     

       
14
       
14
       
-
       
 run_cmd $LIBTOOLIZE --automake --copy

     

       
15
       
15
       
-
       
 run_cmd automake --add-missing --copy

     

···

       
1
       
1
       
-
       
{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, libtool, pkgconfig,

     

       
1
       
1
       
+
       
{ lib, stdenv, buildPackages, fetchFromGitHub, autoconf, automake, libtool, pkgconfig,

     

       
2
       
2
       
 
       
  zlib, ilmbase, fetchpatch }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
let

     
···

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
stdenv.mkDerivation rec {

     

       
10
       
10
       
 
       
  pname = "openexr";

     

       
11
       
11
       
-
       
  version = lib.getVersion ilmbase;

     

       
11
       
11
       
+
       
  version = "2.4.1";

     

       
12
       
12
       
 
       


     

       
13
       
13
       
-
       
  src = fetchurl {

     

       
14
       
14
       
-
       
    url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz";

     

       
15
       
15
       
-
       
    sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x";

     

       
13
       
13
       
+
       
  src = fetchFromGitHub {

     

       
14
       
14
       
+
       
    owner = "AcademySoftwareFoundation";

     

       
15
       
15
       
+
       
    repo = "openexr";

     

       
16
       
16
       
+
       
    rev = "v${version}";

     

       
17
       
17
       
+
       
    sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01";

     

       
16
       
18
       
 
       
  };

     

       
17
       
19
       
 
       


     

       
18
       
18
       
-
       
  patches = [

     

       
19
       
19
       
-
       
    ./bootstrap.patch

     

       
20
       
20
       
-
       
    (fetchpatch {

     

       
21
       
21
       
-
       
      name = "CVE-2018-18444.patch";

     

       
22
       
22
       
-
       
      url = "https://github.com/openexr/openexr/commit/1b0f1e5d7dcf2e9d6cbb4e005e803808b010b1e0.patch";

     

       
23
       
23
       
-
       
      sha256 = "0f5m4wdwqqg8wfg7azzsz5yfpdrvws314rd4sqfc74j1g6wrcnqj";

     

       
24
       
24
       
-
       
      stripLen = 1;

     

       
25
       
25
       
-
       
    })

     

       
26
       
26
       
-
       
  ];

     

       
20
       
20
       
+
       
  sourceRoot = "source/OpenEXR";

     

       
27
       
21
       
 
       


     

       
28
       
22
       
 
       
  outputs = [ "bin" "dev" "out" "doc" ];

     

       
29
       
23