OpenImageDenoise + ISPC added

Changes.md

@@ -2,6 +2,8 @@
 -----
 
 - Xerces : Removed.
+- ISPC : Added version 1.20.0.
+- OpenImageDenoise : Added version 1.4.3.
 
 7.0.0a2 (relative to 7.0.0a1)
 -------

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"

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"
+
+		},
+
+	},
+
+}

OpenImageDenoise/config.py

@@ -0,0 +1,80 @@
+{
+
+	"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"
+			" -D CMAKE_INSTALL_PREFIX={buildDir}"
+			" -D CMAKE_PREFIX_PATH={buildDir}"
+			" -D CMAKE_BUILD_TYPE=Release"
+			" -D CMAKE_INSTALL_LIBDIR={installLibdir}"
+			" ..",
+		"cd gafferBuild && cmake --build . --config Release --target install -- -j {jobs}",
+
+	],
+
+	"manifest" : [
+
+		"cmake/OpenImageDenoise*",
+		"include/OpenImageDenoise*",
+		"lib/libOpenImageDenoise*",
+
+	],
+
+	"platform:linux" : {
+
+		"environment" : {
+
+			"LD_LIBRARY_PATH" : "{buildDir}/lib:$LD_LIBRARY_PATH",
+
+		},
+
+		"publicVariables" : {
+
+			"installLibdir" : "{buildDir}/lib"
+
+		},
+
+	},
+
+	"platform:osx" : {
+
+		"environment" : {
+
+			"LD_LIBRARY_PATH" : "{buildDir}/lib:$LD_LIBRARY_PATH",
+
+		},
+
+	},
+
+	"platform:windows" : {
+
+		"environment" : {
+
+			"PATH" : "{buildDir}/lib;%PATH",
+
+		},
+
+	},
+
+}