Merge pull request #62237 from jtojnar/openimageio2

openimageio2: init at 2.0.8
This commit is contained in:
Jan Tojnar 2019-05-31 13:53:05 +02:00 committed by GitHub
commit 2c347116b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 101 additions and 14 deletions

View File

@ -0,0 +1,60 @@
{ stdenv
, fetchFromGitHub
, boost
, cmake
, ilmbase
, libjpeg
, libpng
, libtiff
, opencolorio
, openexr
, robin-map
, unzip
}:
stdenv.mkDerivation rec {
pname = "openimageio";
version = "2.0.8";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
sha256 = "0nk72h7q1n664b268zkhibb7a3i7fb3nl2z7fg31ys5r9zlq6mnp";
};
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [
cmake
unzip
];
buildInputs = [
boost
ilmbase
libjpeg
libpng
libtiff
opencolorio
openexr
robin-map
];
cmakeFlags = [
"-DUSE_PYTHON=OFF"
"-DUSE_QT=OFF"
# GNUInstallDirs
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
"-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include"
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig
];
meta = with stdenv.lib; {
homepage = http://www.openimageio.org;
description = "A library and tools for reading and writing images";
license = licenses.bsd3;
maintainers = with maintainers; [ goibhniu jtojnar ];
platforms = platforms.unix;
};
}

View File

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
name = "openimageio-${version}";
pname = "openimageio";
version = "1.8.16";
src = fetchFromGitHub {
@ -15,28 +15,25 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "out" "dev" "doc" ];
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake unzip ];
buildInputs = [
boost ilmbase libjpeg libpng
libtiff opencolorio openexr
unzip
];
cmakeFlags = [
"-DUSE_PYTHON=OFF"
# GNUInstallDirs
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
];
preBuild = ''
makeFlags="ILMBASE_HOME=${ilmbase.dev} OPENEXR_HOME=${openexr.dev} USE_PYTHON=0
INSTALLDIR=$out dist_dir="
'';
postInstall = ''
mkdir -p $bin
mv $out/bin $bin/
'';
enableParallelBuilding = true;
makeFlags = [
"ILMBASE_HOME=${ilmbase.dev}"
"OPENEXR_HOME=${openexr.dev}"
"USE_PYTHON=0"
"INSTALLDIR=${placeholder "out"}"
"dist_dir="
];
meta = with stdenv.lib; {
homepage = http://www.openimageio.org;

View File

@ -0,0 +1,26 @@
{ stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "robin-map";
version = "0.6.1";
src = fetchFromGitHub {
owner = "Tessil";
repo = pname;
rev = "v${version}";
sha256 = "0blvvbr14f0drbd6dp0cs8x4ng3ppb5i72dmhk43ylg6yjgh4fhq";
};
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
homepage = https://github.com/Tessil/robin-map;
description = "C++ implementation of a fast hash map and hash set using robin hood hashing";
license = licenses.mit;
maintainers = with maintainers; [ goibhniu jtojnar ];
platforms = platforms.unix;
};
}

View File

@ -19375,6 +19375,8 @@ in
stdenv = overrideCC stdenv gcc6;
};
openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { };
openjump = callPackage ../applications/misc/openjump { };
openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
@ -23509,6 +23511,8 @@ in
redis-desktop-manager = libsForQt5.callPackage ../applications/misc/redis-desktop-manager { };
robin-map = callPackage ../development/libraries/robin-map { };
robo3t = callPackage ../applications/misc/robo3t { };
rucksack = callPackage ../development/tools/rucksack { };