Merge pull request #209104 from risicle/ris-openimageio-1-to-2

openimageio: default to openimageio2, rename 1.x to openimageio_1

3 files changed, 0 insertions, 155 deletions

diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix
deleted file mode 100644
index 88d99a0fae76e..0000000000000
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, fetchpatch
-, boost
-, cmake
-, giflib
-, ilmbase
-, libjpeg
-, libpng
-, libtiff
-, opencolorio
-, openexr
-, robin-map
-, unzip
-, fmt
-}:
-
-stdenv.mkDerivation rec {
-  pname = "openimageio";
-  version = "2.4.6.1";
-
-  src = fetchFromGitHub {
-    owner = "OpenImageIO";
-    repo = "oiio";
-    rev = "v${version}";
-    sha256 = "sha256-oBICukkborxXFHXyM2rIn5qSbCWECjwDQI9MUg13IRU=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "arm-fix-signed-unsigned-simd-mismatch.patch";
-      url = "https://github.com/OpenImageIO/oiio/commit/726c51181a2888b0bd1edbef5ac8451e9cc3f893.patch";
-      hash = "sha256-G4vexf0OHZ/sbcRob5X92tajkmAv72ok8rcVQtIE9XE=";
-    })
-  ];
-
-  outputs = [ "bin" "out" "dev" "doc" ];
-
-  nativeBuildInputs = [
-    cmake
-    unzip
-  ];
-
-  buildInputs = [
-    boost
-    giflib
-    ilmbase
-    libjpeg
-    libpng
-    libtiff
-    opencolorio
-    openexr
-    robin-map
-    fmt
-  ];
-
-  cmakeFlags = [
-    "-DUSE_PYTHON=OFF"
-    "-DUSE_QT=OFF"
-    # GNUInstallDirs
-    "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkg-config
-  ];
-
-  postFixup = ''
-    substituteInPlace $dev/lib/cmake/OpenImageIO/OpenImageIOTargets-*.cmake \
-      --replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib"
-  '';
-
-  meta = with lib; {
-    homepage = "https://openimageio.org";
-    description = "A library and tools for reading and writing images";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ goibhniu ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/applications/graphics/openimageio/2539_backport.patch b/pkgs/applications/graphics/openimageio/2539_backport.patch
deleted file mode 100644
index c484b2ef9cf98..0000000000000
--- a/pkgs/applications/graphics/openimageio/2539_backport.patch
+++ /dev/null
@@ -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
- };
- 
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
deleted file mode 100644
index e5262ab98d0a9..0000000000000
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ /dev/null
@@ -1,48 +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;
-  };
-}