bug#72046: [core-updates] OpenImageIO fails to build

[Zheng Junjie]

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> Leo Famulari <leo@famulari.name> writes:
>
>> On Thu, Jul 11, 2024 at 11:32:53AM -0400, Leo Famulari wrote:
>>> Okay, great. I confirm your patch fixes the problem. I'll push it to
>>> core-updates on your behalf.
>>
>> Pushed as 50243774824597dbd141a074a7be0117dc450cef
>>
>> Thanks for your help!
>
> i think also need this patch.
>
> From f781494940c801db6c63e22ea12c43ffec547456 Mon Sep 17 00:00:00 2001
> Message-ID: 
> <f781494940c801db6c63e22ea12c43ffec547456.1720754660.git.zhengjunjie@iscas.ac.cn>
> From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
> Date: Fri, 12 Jul 2024 11:23:34 +0800
> Subject: [PATCH] gnu: opencolorio: Fix cmake file.
>
> * gnu/packages/image-processing.scm (opencolorio)[arguments]: Add
> fix-OpenColorIOConfig phase.
>
> Change-Id: I317870801f77dc59bcd07b0d11a750bbbb63b327
> ---
>  gnu/packages/image-processing.scm | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/image-processing.scm 
> b/gnu/packages/image-processing.scm
> index 32d5b8bb5c..4e83e5c26c 100644
> --- a/gnu/packages/image-processing.scm
> +++ b/gnu/packages/image-processing.scm
> @@ -276,7 +276,18 @@ (define-public opencolorio
>      (build-system cmake-build-system)
>      (arguments
>       ;; XXX: GPU tests are failing.
> -     (list #:configure-flags #~(list "-DOCIO_BUILD_GPU_TESTS=false")))
> +     (list #:configure-flags #~(list "-DOCIO_BUILD_GPU_TESTS=false")
> +           #:phases #~(modify-phases %standard-phases
> +                        (add-after 'install 'fix-OpenColorIOConfig
> +                          (lambda _
> +                            ;; Work around a CMake Zlib-detection bug:
> +                            ;; 
> https://gitlab.kitware.com/cmake/cmake/-/issues/25200
> +                            ;; make OpenColorIOConfig.cmake is a normal 
> cmake file
> +                            (substitute*
> +                                (string-append #$output
> +                                               
> "/lib/cmake/OpenColorIO/OpenColorIOConfig.cmake")
> +                              (("\\.#define ZLIB_VERSION \"1\\.3\"")
> +                               "")))))))
>      (native-inputs
>       ;; XXX: OCIO has unit tests for OpenShadingLanguage, but they fail.
>       ;; They also require OIIO, but OCIO is an optional dependency to it.
>
> base-commit: 50243774824597dbd141a074a7be0117dc450cef
> prerequisite-patch-id: 54dff8d31eca386fe3e0f90879bf9e98dade94d7

and this

From dcf47a64e364fb3c59561d535325020368644223 Mon Sep 17 00:00:00 2001
Message-ID: 
<dcf47a64e364fb3c59561d535325020368644223.1720755723.git.zhengjunjie@iscas.ac.cn>
From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
Date: Fri, 12 Jul 2024 11:41:21 +0800
Subject: [PATCH] gnu: openimageio: Fix cmake file.

* gnu/packages/graphics.scm (openimageio)[arguments]: Add
fix-OpenImageIOConfig phase.

Change-Id: I0a923c8513069dde5cd3e42fde9279cbd177a10a
---
 gnu/packages/graphics.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 22ef878972..7286d27b27 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1359,6 +1359,13 @@ (define-public openimageio
                (add-after 'configure 'fix-zlib-version
                  (lambda _
                    (substitute* "include/imageio_pvt.h"
+                     (("#define ZLIB_VERSION \"1\\.3\"")
+                      ""))))
+               (add-after 'install 'fix-OpenImageIOConfig
+                 (lambda _
+                   (substitute* (string-append
+                                 #$output
+                                 
"/lib/cmake/OpenImageIO/OpenImageIOConfig.cmake")
                      (("#define ZLIB_VERSION \"1\\.3\"")
                       "")))))))
     (native-inputs

base-commit: 50243774824597dbd141a074a7be0117dc450cef
prerequisite-patch-id: 54dff8d31eca386fe3e0f90879bf9e98dade94d7
prerequisite-patch-id: 2499d00ec9751650f8167724c59570ecbf99820d
-- 
2.45.2

signature.asc
Description: PGP signature