uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
62
pkgs/applications/graphics/openimageio/2.x.nix
Normal file
62
pkgs/applications/graphics/openimageio/2.x.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, boost
|
||||
, cmake
|
||||
, giflib
|
||||
, ilmbase
|
||||
, libjpeg
|
||||
, libpng
|
||||
, libtiff
|
||||
, opencolorio_1
|
||||
, openexr
|
||||
, robin-map
|
||||
, unzip
|
||||
, fmt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openimageio";
|
||||
version = "2.2.17.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenImageIO";
|
||||
repo = "oiio";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "0jqpb1zci911wdm928addsljxx8zsh0gzbhv9vbw6man4wi93h6h";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
unzip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
giflib
|
||||
ilmbase
|
||||
libjpeg
|
||||
libpng
|
||||
libtiff
|
||||
opencolorio_1
|
||||
openexr
|
||||
robin-map
|
||||
fmt
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_PYTHON=OFF"
|
||||
"-DUSE_QT=OFF"
|
||||
# GNUInstallDirs
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config
|
||||
];
|
||||
|
||||
meta = with 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;
|
||||
};
|
||||
}
|
||||
31
pkgs/applications/graphics/openimageio/2539_backport.patch
Normal file
31
pkgs/applications/graphics/openimageio/2539_backport.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
diff --git a/src/libOpenImageIO/exif.cpp b/src/libOpenImageIO/exif.cpp
|
||||
index 10b75c21..0287d9c5 100644
|
||||
--- a/src/libOpenImageIO/exif.cpp
|
||||
+++ b/src/libOpenImageIO/exif.cpp
|
||||
@@ -213,6 +213,9 @@ static const EXIF_tag_info exif_tag_table[] = {
|
||||
|
||||
|
||||
|
||||
+// libtiff > 4.1.0 defines these in tiff.h. For older libtiff, let's define
|
||||
+// them ourselves.
|
||||
+#ifndef GPSTAG_VERSIONID
|
||||
enum GPSTag {
|
||||
GPSTAG_VERSIONID = 0,
|
||||
GPSTAG_LATITUDEREF = 1, GPSTAG_LATITUDE = 2,
|
||||
@@ -237,6 +240,7 @@ enum GPSTag {
|
||||
GPSTAG_DIFFERENTIAL = 30,
|
||||
GPSTAG_HPOSITIONINGERROR = 31
|
||||
};
|
||||
+#endif
|
||||
|
||||
static const EXIF_tag_info gps_tag_table[] = {
|
||||
{ GPSTAG_VERSIONID, "GPS:VersionID", TIFF_BYTE, 4 },
|
||||
@@ -270,7 +274,7 @@ static const EXIF_tag_info gps_tag_table[] = {
|
||||
{ GPSTAG_AREAINFORMATION, "GPS:AreaInformation", TIFF_UNDEFINED, 1 },
|
||||
{ GPSTAG_DATESTAMP, "GPS:DateStamp", TIFF_ASCII, 0 },
|
||||
{ GPSTAG_DIFFERENTIAL, "GPS:Differential", TIFF_SHORT, 1 },
|
||||
- { GPSTAG_HPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 },
|
||||
+ { GPSTAG_GPSHPOSITIONINGERROR, "GPS:HPositioningError",TIFF_RATIONAL, 1 },
|
||||
{ -1, NULL } // signal end of table
|
||||
};
|
||||
|
||||
48
pkgs/applications/graphics/openimageio/default.nix
Normal file
48
pkgs/applications/graphics/openimageio/default.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{ lib, stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff
|
||||
, opencolorio_1, openexr, unzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openimageio";
|
||||
version = "1.8.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenImageIO";
|
||||
repo = "oiio";
|
||||
rev = "Release-${version}";
|
||||
sha256 = "0zq34szprgkrrayg5sl3whrsx2l6lr8nw4hdrnwv2qhn70jbi2w2";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" "doc" ];
|
||||
|
||||
nativeBuildInputs = [ cmake unzip ];
|
||||
buildInputs = [
|
||||
boost ilmbase libjpeg libpng
|
||||
libtiff opencolorio_1 openexr
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_PYTHON=OFF"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"ILMBASE_HOME=${ilmbase.dev}"
|
||||
"OPENEXR_HOME=${openexr.dev}"
|
||||
"USE_PYTHON=0"
|
||||
"INSTALLDIR=${placeholder "out"}"
|
||||
"dist_dir="
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Backported from https://github.com/OpenImageIO/oiio/pull/2539 for 1.8.17
|
||||
./2539_backport.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://www.openimageio.org";
|
||||
description = "A library and tools for reading and writing images";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.goibhniu ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue