head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.14
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.12
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.10
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.8
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.6
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.4
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.2
	pkgsrc-2024Q3-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2024.08.03.11.13.27;	author nia;	state Exp;
branches;
next	;
commitid	X6U94ok09D6yQmkF;


desc
@@


1.1
log
@olive-editor: Import patch to paper over the opencolorio API breakage
@
text
@$NetBSD$

From: Tobias Mayer <tobim@@fastmail.fm>
Date: Tue, 24 Oct 2023 18:48:35 +0200
Subject: [PATCH] Add OpenColorIO 2.3 compatibility

The signature of the `getTexture` function changed and the calling
code needs to be adapted.

Signed-off-by: Tobias Mayer <tobim@@fastmail.fm>

--- app/render/renderer.cpp.orig	2023-09-24 11:40:23.000000000 +0000
+++ app/render/renderer.cpp
@@@@ -240,9 +240,17 @@@@ bool Renderer::GetColorContext(const Col
       const char* sampler_name = nullptr;
       unsigned int width = 0, height = 0;
       OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
+#if OCIO_VERSION_HEX >= 0x02030000
+      OCIO::GpuShaderDesc::TextureDimensions dimensions = OCIO::GpuShaderDesc::TEXTURE_2D;
+#endif
       OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR;
 
-      shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel, interpolation);
+      shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel,
+#if OCIO_VERSION_HEX >= 0x02030000
+                              // OCIO::GpuShaderDesc::TextureDimensions
+                              dimensions,
+#endif
+                              interpolation);
 
       if (!tex_name || !*tex_name
           || !sampler_name || !*sampler_name
@