From f7bef968df26231222dd546776f84d4297506d06 Mon Sep 17 00:00:00 2001
From: Alex <boberfly@gmail.com>
Date: Sat, 18 Feb 2023 19:04:57 +1100
Subject: [PATCH] OpenImageDenoise + ISPC added

---
 Changes.md                 |  2 +
 Cycles/config.py           |  4 +-
 ISPC/config.py             | 46 +++++++++++++++++++++++
 OpenImageDenoise/config.py | 75 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 ISPC/config.py
 create mode 100644 OpenImageDenoise/config.py

diff --git a/Changes.md b/Changes.md
index f7855a46ff..32325bb477 100644
--- a/Changes.md
+++ b/Changes.md
@@ -8,6 +8,8 @@
 - MaterialX : Added version 1.38.4.
 - USD : Updated to version 23.05.
 - Xerces : Removed.
+- ISPC : Added version 1.20.0.
+- OpenImageDenoise : Added version 1.4.3.
 
 7.0.0a2 (relative to 7.0.0a1)
 -------
diff --git a/Cycles/config.py b/Cycles/config.py
index fbe2e86134..661513e534 100644
--- a/Cycles/config.py
+++ b/Cycles/config.py
@@ -10,7 +10,7 @@
 
 	"license" : "LICENSE",
 
-	"dependencies" : [ "Boost", "OpenJPEG", "OpenImageIO", "TBB", "Alembic", "Embree", "OpenColorIO", "OpenVDB", "OpenShadingLanguage", "OpenSubdiv", "OpenPGL" ],
+	"dependencies" : [ "Boost", "OpenJPEG", "OpenImageIO", "TBB", "Alembic", "Embree", "OpenColorIO", "OpenVDB", "OpenShadingLanguage", "OpenSubdiv", "OpenPGL", "OpenImageDenoise" ],
 
 	"commands" : [
 
@@ -20,7 +20,7 @@
 			" -D CMAKE_INSTALL_PREFIX={buildDir}/cycles"
 			" -D CMAKE_PREFIX_PATH={buildDir}"
 			" -D CMAKE_BUILD_TYPE=Release"
-			" -D WITH_CYCLES_OPENIMAGEDENOISE=OFF"
+			" -D WITH_CYCLES_OPENIMAGEDENOISE=ON"
 			" -D WITH_CYCLES_PATH_GUIDING=ON"
 			" -D WITH_CYCLES_DEVICE_CUDA=OFF"
 			" -D WITH_CYCLES_DEVICE_OPTIX=OFF"
diff --git a/ISPC/config.py b/ISPC/config.py
new file mode 100644
index 0000000000..6de609581b
--- /dev/null
+++ b/ISPC/config.py
@@ -0,0 +1,46 @@
+{
+
+	"url" : "https://ispc.github.io/",
+
+	"license" : "LICENSE.txt",
+
+	"dependencies" : [],
+
+	"commands" : [
+
+		"cp bin/ispc {buildDir}/bin/ispc",
+
+	],
+
+	"platform:linux" : {
+
+		"downloads" : {
+
+			"https://github.com/ispc/ispc/releases/download/v1.20.0/ispc-v1.20.0-linux.tar.gz"
+
+		},
+
+
+	},
+
+	"platform:macos" : {
+
+		"downloads" : {
+
+			"https://github.com/ispc/ispc/releases/download/v1.20.0/ispc-v1.20.0-macOS.tar.gz"
+
+		},
+
+	},
+
+	"platform:windows" : {
+
+		"downloads" : {
+
+			"https://github.com/ispc/ispc/releases/download/v1.20.0/ispc-v1.20.0-windows.zip"
+
+		},
+
+	},
+
+}
diff --git a/OpenImageDenoise/config.py b/OpenImageDenoise/config.py
new file mode 100644
index 0000000000..ca410be71b
--- /dev/null
+++ b/OpenImageDenoise/config.py
@@ -0,0 +1,75 @@
+{
+
+	"downloads" : [
+
+		"https://github.com/OpenImageDenoise/oidn/releases/download/v1.4.3/oidn-1.4.3.src.tar.gz"
+
+	],
+
+	"url" : "https://www.openimagedenoise.org/",
+
+	"license" : "LICENSE.txt",
+
+	"dependencies" : ["ISPC"],
+
+	"environment" : {
+
+		"PATH" : "{buildDir}/bin:$PATH",
+		"LD_LIBRARY_PATH" : "{buildDir}/lib:$LD_LIBRARY_PATH",
+
+	},
+
+	"commands" : [
+
+		"mkdir gafferBuild",
+		"cd gafferBuild &&"
+			" cmake"
+            " -G {cmakeGenerator}"
+			" -D CMAKE_INSTALL_PREFIX={buildDir}"
+			" -D CMAKE_PREFIX_PATH={buildDir}"
+			" -D CMAKE_BUILD_TYPE=Release"
+			" -D CMAKE_INSTALL_LIBDIR={buildDir}/lib"
+			" ..",
+		"cd gafferBuild && cmake --build . --config Release --target install -- -j {jobs}",
+
+	],
+
+	"manifest" : [
+
+		"cmake/OpenImageDenoise*",
+		"include/OpenImageDenoise*",
+		"lib/*OpenImageDenoise*",
+
+	],
+
+	"platform:linux" : {
+
+		"environment" : {
+
+			"LD_LIBRARY_PATH" : "{buildDir}/lib:$LD_LIBRARY_PATH",
+
+		},
+
+	},
+
+	"platform:osx" : {
+
+		"environment" : {
+
+			"LD_LIBRARY_PATH" : "{buildDir}/lib:$LD_LIBRARY_PATH",
+
+		},
+
+	},
+
+	"platform:windows" : {
+
+		"environment" : {
+
+			"PATH" : "{buildDir}/lib;%PATH%",
+
+		},
+
+	},
+
+}