CVS commit: pkgsrc/multimedia/olive-editor

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Dec 19 20:10:58 UTC 2025

Modified Files:
        pkgsrc/multimedia/olive-editor: Makefile distinfo
        pkgsrc/multimedia/olive-editor/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/multimedia/olive-editor/patches:
            patch-app_codec_oiio_oiiodecoder.cpp

Log Message:
olive-editor: Fix build with openimageio 3.x

Disable pedantic errors, and pull patch submitted upstream by rathann.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/multimedia/olive-editor/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/multimedia/olive-editor/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/olive-editor/patches/patch-app_codec_oiio_oiiodecoder.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/Makefile
diff -u pkgsrc/multimedia/olive-editor/Makefile:1.62 pkgsrc/multimedia/olive-editor/Makefile:1.63
--- pkgsrc/multimedia/olive-editor/Makefile:1.62        Thu Oct 23 20:38:39 2025
+++ pkgsrc/multimedia/olive-editor/Makefile     Fri Dec 19 20:10:58 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2025/10/23 20:38:39 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2025/12/19 20:10:58 maya Exp $
 
 DISTNAME=      olive-editor-0.2.0pre20230924
 PKGREVISION=   28
@@ -27,9 +27,6 @@ CMAKE_CONFIGURE_ARGS+=        -DFFMPEG_LIB_ROOT
 CMAKE_CONFIGURE_ARGS+= -DPORTAUDIO_INCLUDE_DIR=${BUILDLINK_DIR}/include/portaudio2
 CMAKE_CONFIGURE_ARGS+= -DPORTAUDIO_LIBRARY=${BUILDLINK_DIR}/lib/portaudio2/libportaudiocpp.so
 
-# https://github.com/olive-editor/olive/issues/2392
-BROKEN=                "Does not build with openimageio 3"
-
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"

Index: pkgsrc/multimedia/olive-editor/distinfo
diff -u pkgsrc/multimedia/olive-editor/distinfo:1.8 pkgsrc/multimedia/olive-editor/distinfo:1.9
--- pkgsrc/multimedia/olive-editor/distinfo:1.8 Tue Feb  4 08:31:24 2025
+++ pkgsrc/multimedia/olive-editor/distinfo     Fri Dec 19 20:10:58 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2025/02/04 08:31:24 wiz Exp $
+$NetBSD: distinfo,v 1.9 2025/12/19 20:10:58 maya Exp $
 
 BLAKE2s (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 28d9d3c9998990f318b55ab15310c6a395841fd32e073db336dc6f4f97df9f44
 SHA512 (olive-editor-0.2.0pre20230924-55eedbfce909dfd7df97611a2eea1d1958385f9c.tar.gz) = 
36e3284f7b4a0f563c6e62078f5ec901e5edcdd97230097537003b0b7b3cdcaad773e8b081e7b1af2fc5d0f3b0f5fc1740eb957ef95760cc7338c9ef20f528dc
@@ -9,8 +9,9 @@ Size (olive-editor-KDDockWidgets-8d2d0a5
 BLAKE2s (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 1dbe8adfcb84e8b96d59794ccf48360f3aa0f10f76a5392e83eafc8cad755a60
 SHA512 (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 
13163da75959e0a3ee817307391207e0a8f534f9f48b0225e199c217ed7f4020a0f5f2b1759c63f4b33f3076285110fefad01636736bcb7e22817088c5a88c14
 Size (olive-editor-core-277792824801495e868580ca86f6e7a1b53e4779.tar.gz) = 76408 bytes
-SHA1 (patch-CMakeLists.txt) = 6995fddfb1dfb3c7e663f8a1c61db701c9601f85
+SHA1 (patch-CMakeLists.txt) = 5c5d3e9064c40b8842c3190aff92217b11f2a1d1
 SHA1 (patch-app_CMakeLists.txt) = d01fc5269c79fef9f8b4aa65dd128c58f2e0dc61
+SHA1 (patch-app_codec_oiio_oiiodecoder.cpp) = 813c42fd961d3081083fcdb48301ee97137132e8
 SHA1 (patch-app_render_renderer.cpp) = 5dcf685ab7c9f3a84a0d5df13b4b2058bda320cf
 SHA1 (patch-cmake_FindFFMPEG.cmake) = 2f2aef426f7a3e93e66ff500840dcadec5e499e3
 SHA1 (patch-ext_core_src_util_rational.cpp) = f701a87c2e6bc374d90dc61931a9432b605a332b

Index: pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt
diff -u pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt:1.3 pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt:1.3     Sun Oct 15 19:57:54 2023
+++ pkgsrc/multimedia/olive-editor/patches/patch-CMakeLists.txt Fri Dec 19 20:10:58 2025
@@ -1,10 +1,19 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2023/10/15 19:57:54 ryoon Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2025/12/19 20:10:58 maya Exp $
 
 Don't try to find the git hash.
+Avoid erroring because of issues in headers (openimageio)
 
 --- CMakeLists.txt.orig        2023-09-24 11:40:23.000000000 +0000
 +++ CMakeLists.txt
-@@ -233,21 +233,6 @@ elseif(UNIX)
+@@ -59,7 +59,6 @@ else()
+   set(OLIVE_COMPILE_OPTIONS
+     "$<$<CONFIG:RELEASE>:-O2>"
+     -Wuninitialized
+-    -pedantic-errors
+     -Wall
+     -Wextra
+     -Wno-unused-parameter
+@@ -233,21 +232,6 @@ elseif(UNIX)
    list(APPEND OLIVE_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
  endif()
  

Added files:

Index: pkgsrc/multimedia/olive-editor/patches/patch-app_codec_oiio_oiiodecoder.cpp
diff -u /dev/null pkgsrc/multimedia/olive-editor/patches/patch-app_codec_oiio_oiiodecoder.cpp:1.1
--- /dev/null   Fri Dec 19 20:10:58 2025
+++ pkgsrc/multimedia/olive-editor/patches/patch-app_codec_oiio_oiiodecoder.cpp Fri Dec 19 20:10:58 2025
@@ -0,0 +1,28 @@
+$NetBSD: patch-app_codec_oiio_oiiodecoder.cpp,v 1.1 2025/12/19 20:10:58 maya Exp $
+
+Fix build with openimageio 3.x
+
+From https://github.com/olive-editor/olive/pull/2393
+
+
+--- app/codec/oiio/oiiodecoder.cpp.orig        2023-09-24 11:40:23.000000000 +0000
++++ app/codec/oiio/oiiodecoder.cpp
+@@ -134,10 +134,18 @@ TexturePtr OIIODecoder::RetrieveVideoInt
+ 
+     if (p.divider == 1) {
+       // Just upload straight to the buffer
++#if OIIO_VERSION >= OIIO_MAKE_VERSION(3,0,0)
++      image_->read_image(0, 0, 0, -1, oiio_pix_fmt_, buffer_.data(), OIIO::AutoStride, buffer_.linesize_bytes());
++#else
+       image_->read_image(oiio_pix_fmt_, buffer_.data(), OIIO::AutoStride, buffer_.linesize_bytes());
++#endif
+     } else {
+       OIIO::ImageBuf buf(image_->spec());
++#if OIIO_VERSION >= OIIO_MAKE_VERSION(3,0,0)
++      image_->read_image(0, 0, 0, -1, image_->spec().format, buf.localpixels(), buf.pixel_stride(), buf.scanline_stride(), buf.z_stride());
++#else
+       image_->read_image(image_->spec().format, buf.localpixels(), buf.pixel_stride(), buf.scanline_stride(), buf.z_stride());
++#endif
+ 
+       // Roughly downsample image for divider (for some reason OIIO::ImageBufAlgo::resample failed here)
+       int px_sz = vp.GetBytesPerPixel();