CVS commit: pkgsrc/multimedia/olive-editor

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug  3 11:13:27 UTC 2024

Modified Files:
        pkgsrc/multimedia/olive-editor: distinfo
Added Files:
        pkgsrc/multimedia/olive-editor/patches: patch-app_render_renderer.cpp

Log Message:
olive-editor: Import patch to paper over the opencolorio API breakage


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/olive-editor/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/olive-editor/patches/patch-app_render_renderer.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/olive-editor/distinfo
diff -u pkgsrc/multimedia/olive-editor/distinfo:1.6 pkgsrc/multimedia/olive-editor/distinfo:1.7
--- pkgsrc/multimedia/olive-editor/distinfo:1.6 Sun Oct 15 19:57:54 2023
+++ pkgsrc/multimedia/olive-editor/distinfo     Sat Aug  3 11:13:27 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2023/10/15 19:57:54 ryoon Exp $
+$NetBSD: distinfo,v 1.7 2024/08/03 11:13:27 nia Exp $
 
 BLAKE2s (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 28d9d3c9998990f318b55ab15310c6a395841fd32e073db336dc6f4f97df9f44
 SHA512 (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 
36e3284f7b4a0f563c6e62078f5ec901e5edcdd97230097537003b0b7b3cdcaad773e8b081e7b1af2fc5d0f3b0f5fc1740eb957ef95760cc7338c9ef20f528dc
@@ -11,5 +11,6 @@ SHA512 (olive-editor-core-27779282480149
 Size (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 76408 bytes
 SHA1 (patch-CMakeLists.txt) = 6995fddfb1dfb3c7e663f8a1c61db701c9601f85
 SHA1 (patch-app_CMakeLists.txt) = d01fc5269c79fef9f8b4aa65dd128c58f2e0dc61
+SHA1 (patch-app_render_renderer.cpp) = 5dcf685ab7c9f3a84a0d5df13b4b2058bda320cf
 SHA1 (patch-cmake_FindFFMPEG.cmake) = 2f2aef426f7a3e93e66ff500840dcadec5e499e3
 SHA1 (patch-ext_core_src_util_timecodefunctions.cpp) = 81e20605774b8463f7d53fe1dc448dee2cb3e5e9

Added files:

Index: pkgsrc/multimedia/olive-editor/patches/patch-app_render_renderer.cpp
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-app_render_renderer.cpp:1.1
--- /dev/null   Sat Aug  3 11:13:27 2024
+++ pkgsrc/multimedia/olive-editor/patches/patch-app_render_renderer.cpp        Sat Aug  3 11:13:27 2024
@@ -0,0 +1,32 @@
+$NetBSD: patch-app_render_renderer.cpp,v 1.1 2024/08/03 11:13:27 nia Exp $
+
+From: Tobias Mayer <tobim%fastmail.fm@localhost>
+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@localhost>
+
+--- 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