forked from mirrors/nixpkgs
openimageio_1: drop
This commit is contained in:
parent
33d98d5497
commit
b50af45b4c
|
@ -1,80 +0,0 @@
|
|||
{ 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;
|
||||
knownVulnerabilities = [
|
||||
# all discovered in 2.x but there is no reason to
|
||||
# believe that these or similar vulnerabilties aren't
|
||||
# present in the totally unmaintained 1.x branch
|
||||
"CVE-2022-36354"
|
||||
"CVE-2022-38143"
|
||||
"CVE-2022-41639"
|
||||
"CVE-2022-41649"
|
||||
"CVE-2022-41684"
|
||||
"CVE-2022-41794"
|
||||
"CVE-2022-41837"
|
||||
"CVE-2022-41838"
|
||||
"CVE-2022-41977"
|
||||
"CVE-2022-41981"
|
||||
"CVE-2022-41988"
|
||||
"CVE-2022-41999"
|
||||
"CVE-2022-43592"
|
||||
"CVE-2022-43593"
|
||||
"CVE-2022-43594"
|
||||
"CVE-2022-43595"
|
||||
"CVE-2022-43596"
|
||||
"CVE-2022-43597"
|
||||
"CVE-2022-43598"
|
||||
"CVE-2022-43599"
|
||||
"CVE-2022-43600"
|
||||
"CVE-2022-43601"
|
||||
"CVE-2022-43602"
|
||||
"CVE-2022-43603"
|
||||
"CVE-2023-22845"
|
||||
"CVE-2023-24472"
|
||||
"CVE-2023-24473"
|
||||
];
|
||||
};
|
||||
}
|
|
@ -1,31 +0,0 @@
|
|||
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
|
||||
};
|
||||
|
|
@ -1206,6 +1206,7 @@ mapAliases ({
|
|||
openexr_ctl = throw "'openexr_ctl' has been renamed to/replaced by 'ctl'"; # Converted to throw 2022-02-22
|
||||
openimagedenoise_1_2_x = throw "'openimagedenoise_1_2_x' has been renamed to/replaced by 'openimagedenoise'"; # Added 2023-06-07
|
||||
openimageio2 = openimageio; # Added 2023-01-05
|
||||
openimageio_1 = throw "'openimageio_1' has been removed, please update to 'openimageio' 2"; # Added 2023-06-14
|
||||
openisns = open-isns; # Added 2020-01-28
|
||||
openjpeg_1 = throw "openjpeg_1 has been removed, use openjpeg_2 instead"; # Added 2021-01-24
|
||||
openjpeg_2 = openjpeg; # Added 2021-01-25
|
||||
|
|
|
@ -33400,10 +33400,6 @@ with pkgs;
|
|||
|
||||
openfx = callPackage ../development/libraries/openfx { };
|
||||
|
||||
openimageio_1 = callPackage ../development/libraries/openimageio/1.x.nix {
|
||||
boost = boost175;
|
||||
};
|
||||
|
||||
openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { };
|
||||
|
||||
openjump = callPackage ../applications/misc/openjump { };
|
||||
|
|
Loading…
Reference in a new issue