mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
ctl: Update to 1.5.2
This commit is contained in:
parent
e9c1a56f97
commit
f94d0c3aa7
@ -1,29 +1,22 @@
|
||||
{ stdenv, fetchurl, ilmbase }:
|
||||
{ stdenv, callPackage, cmake, pkgconfig, ilmbase, libtiff, openexr }:
|
||||
|
||||
let
|
||||
source = callPackage ./source.nix { };
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "ctl-1.4.1";
|
||||
name = "ctl-${source.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = mirror://sourceforge/ampasctl/ctl-1.4.1.tar.gz;
|
||||
sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
|
||||
};
|
||||
src = source.src;
|
||||
|
||||
patches = [ ./patch.patch ./gcc47.patch ];
|
||||
buildInputs = [ cmake pkgconfig libtiff ilmbase openexr ];
|
||||
|
||||
propagatedBuildInputs = [ ilmbase ];
|
||||
|
||||
configureFlags = "--with-ilmbase-prefix=${ilmbase}";
|
||||
|
||||
#configurePhase = "
|
||||
#export CXXFLAGS=\"-I${ilmbase}/include -L${ilmbase}/lib\"
|
||||
#echo $CXXFLAGS
|
||||
#unset configurePhase; configurePhase
|
||||
#";
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Color Transformation Language";
|
||||
homepage = http://ampasctl.sourceforge.net;
|
||||
license = "SOME OPEN SOURCE LICENSE"; # TODO which exactly is this?
|
||||
license = "A.M.P.A.S";
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ wkennington ];
|
||||
};
|
||||
|
||||
passthru.source = source;
|
||||
}
|
||||
|
@ -1,15 +0,0 @@
|
||||
https://bugs.gentoo.org/426368
|
||||
|
||||
IlmCtl/CtlInterpreter.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
--- a/IlmCtl/CtlInterpreter.cpp
|
||||
+++ b/IlmCtl/CtlInterpreter.cpp
|
||||
@@ -64,6 +64,7 @@
|
||||
#include <fstream>
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
+#include <unistd.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#include <io.h>
|
@ -1,24 +0,0 @@
|
||||
diff --git a/IlmCtl/CtlLex.cpp b/IlmCtl/CtlLex.cpp
|
||||
index e662d22..a47311a 100644
|
||||
--- a/IlmCtl/CtlLex.cpp
|
||||
+++ b/IlmCtl/CtlLex.cpp
|
||||
@@ -57,6 +57,7 @@
|
||||
#include <CtlLContext.h>
|
||||
#include <iomanip>
|
||||
#include <cassert>
|
||||
+#include <stdlib.h>
|
||||
|
||||
|
||||
#if 0
|
||||
diff --git a/IlmCtlSimd/CtlSimdReg.h b/IlmCtlSimd/CtlSimdReg.h
|
||||
index 6b000b2..8a39f7c 100644
|
||||
--- a/IlmCtlSimd/CtlSimdReg.h
|
||||
+++ b/IlmCtlSimd/CtlSimdReg.h
|
||||
@@ -52,6 +52,7 @@
|
||||
#include <typeinfo>
|
||||
#include <CtlExc.h>
|
||||
#include <Iex.h>
|
||||
+#include <memory.h>
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
//
|
11
pkgs/development/libraries/ctl/source.nix
Normal file
11
pkgs/development/libraries/ctl/source.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{ fetchFromGitHub }:
|
||||
rec {
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ampas";
|
||||
repo = "CTL";
|
||||
rev = "ctl-${version}";
|
||||
sha256 = "0a698rd1cmixh3mk4r1xa6rjli8b8b7dbx89pb43xkgqxy67glwx";
|
||||
};
|
||||
}
|
@ -6885,7 +6885,7 @@ let
|
||||
};
|
||||
|
||||
# this ctl version is needed by openexr_viewers
|
||||
openexr_ctl = callPackage ../development/libraries/openexr_ctl { };
|
||||
openexr_ctl = ctl;
|
||||
|
||||
openexr = callPackage ../development/libraries/openexr { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user