foolscreen/soupe3d - Change QSHUFJ7JXIOKKRU24UE5B5E754FLPXUMBUXKQLE3IPBRFXC4XFCQC

[guix] Cycles package can compile now

Created by foolscreen on February 10, 2023

QSHUFJ7JXIOKKRU24UE5B5E754FLPXUMBUXKQLE3IPBRFXC4XFCQC

Dependencies

In channels

main

Change contents

File addition: opencolorio-link-extra.patch (----------)

[3.54]

--- OpenColorIO-2.2.1/src/OpenColorIO/CMakeLists.txt.orig	1970-01-01 01:00:01.000000000 +0100
+++ OpenColorIO-2.2.1/src/OpenColorIO/CMakeLists.txt	2023-02-10 13:44:04.564102461 +0100
@@ -290,6 +290,7 @@
         "$<BUILD_INTERFACE:xxHash>"
         yaml-cpp
         MINIZIP::minizip-ng
+	libzip::zip
 )
 
 if(APPLE)
--- OpenColorIO-2.2.1/share/cmake/modules/FindExtPackages.cmake.orig	1970-01-01 01:00:01.000000000 +0100
+++ OpenColorIO-2.2.1/share/cmake/modules/FindExtPackages.cmake	2023-02-10 14:16:49.817056941 +0100
@@ -139,5 +139,6 @@
 # minizip-ng
 # https://github.com/zlib-ng/minizip-ng
 find_package(minizip-ng 3.0.7 REQUIRED)
+find_package(libzip)
 
 if(OCIO_BUILD_APPS)

Replacement in guix/vfx/packages/rendering.scm at line 103 [5.3885]

B:BD[4.497] → [4.497:537]

B:BD[4.537] → [6.156:264]

∅:D[6.264] → [4.656:672]

B:BD[4.656] → [4.656:672]

B:BD[4.672] → [6.265:341]

        (method url-fetch)
        (uri
	 (string-append "https://github.com/blender/cycles"
	  	        "/archive/refs/tags/v" version ".tar.gz"))
        (sha256
         (base32 "0as2s0pxhk0rm85h9i301c9yprhvq8991lpmxsqciavdr75kz35n"))))

[4.497]

[4.749]

              (method git-fetch)
              (uri (git-reference
                    (url "https://github.com/blender/cycles")
                    (commit "16854e02e0dea1c291c693a9fa782f2907f351c6")))
              (file-name (git-file-name name version))
              (sha256
               (base32
                "1q8mg2781xp4ghn06b47g1izs6drqpm7hszsj64999151z9lnh7b"))))

Replacement in guix/vfx/packages/rendering.scm at line 120 [5.3885]
B:BD[6.367] → [7.919:960]
```
      usd
      openshadinglanguage-1.12
```
[6.367]
[7.960]
```
      ;openshadinglanguage-1.12
```
Replacement in guix/vfx/packages/rendering.scm at line 131 [5.3885]
B:BD[6.516] → [6.516:535]
```
      openvdb-10.0
```
[6.516]
[6.591]
```
      ;openvdb-10.0
```
Insertion in guix/vfx/packages/rendering.scm at line 134 [5.3885]
[7.1036]
[6.619]
```
    (propagated-inputs
     (list usd))
```
Replacement in guix/vfx/packages/rendering.scm at line 137 [5.3885]
B:BD[6.634] → [2.35:56]
```
     `(;;#:tests? #f
```
[6.634]
[2.56]
```
     `(#:tests? #f
```

Insertion in guix/vfx/packages/rendering.scm at line 140 [5.3885]

[7.1078]


	     "-DWITH_CYCLES_OPENVDB=OFF" ; OpenVDB fails linking:
	     "-DWITH_CYCLES_NANOVDB=OFF" ; ld: /gnu/store/2dqnjd3gk53f0gfrqv6cpzvaqcyw4zwx-openvdb-10.0.1/lib/libopenvdb.so:
					 ; undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.4.29'
	     "-DWITH_CYCLES_OSL=OFF" ; OpenShadingLanguage fails linking:
				     ; ld: /gnu/store/hx61w8ys7xn91mmcivnazkjwab64msqs-clang-15.0.6/lib/libclangSema.a(SemaRISCVVectorLookup.cpp.o):
	                             ; undefined reference to symbol '_ZN5clang5RISCV12RVVIntrinsic12getSuffixStrB5cxx11ENS0_9BasicTypeEiN4llvm8ArrayRefINS0_19PrototypeDescriptorEEE'
				     ; ld: /gnu/store/hx61w8ys7xn91mmcivnazkjwab64msqs-clang-15.0.6/lib/libclang-cpp.so.15:
	                             ; error adding symbols: DSO missing from command line

Replacement in guix/vfx/packages/base.scm at line 407 [6.799]

B:BD[7.10943] → [7.10943:11018]

                "03jqp0i08k68gryamg10anh5lwk8is5rphh530j5qkpwhxc7rwin"))))

[7.10943]

[7.11018]

                "03jqp0i08k68gryamg10anh5lwk8is5rphh530j5qkpwhxc7rwin"))
	      (patches (search-patches "vfx/patches/opencolorio-link-extra.patch"))))

Replacement in guix/vfx/packages/base.scm at line 435 [6.799]

B:BD[7.12034] → [7.12034:12158]

     (list mesa glew freeglut expat yaml-cpp-0.7 lcms openexr tinyxml pystring imath zlib-1.2.13 minizip-ng pybind11-2.10))

[7.12034]

[7.12158]

     (list mesa glew freeglut expat yaml-cpp-0.7 lcms openexr tinyxml pystring imath zlib-1.2.13 minizip-ng pybind11-2.10 libzip))

Replacement in guix/vfx/packages/base.scm at line 544 [6.799]

B:BD[7.16463] → [2.370:954]

	 (delete 'check)
         ;; (replace 'check
         ;;   (lambda* (#:key tests? #:allow-other-keys)
         ;;     (when tests?
         ;;       (invoke "ctest" "--exclude-regex"
         ;;               (string-join
         ;;                (list
         ;;                 "texture-udim"      ; file does not exist
         ;;                 "texture-udim.opt"  ; file does not exist
         ;;                 "example-deformer"  ; could not find OSLConfig
         ;;                 "python-oslquery")  ; no module oslquery
         ;;                "|")))))))
	 )))

[7.16463]

[7.16991]

	 (delete 'check))))