foolscreen/soupe3d - Change N5MTDBGC3LLTCPBZYJHXOAJLKDEZ42CEILC47D44MNFQBVNFEWLQC

[guix] blender update

Created by foolscreen on February 17, 2023

N5MTDBGC3LLTCPBZYJHXOAJLKDEZ42CEILC47D44MNFQBVNFEWLQC

Dependencies

In channels

main

Change contents

File addition: usd-use-normal-python.patch (----------)

[4.54]

--- USD-23.02/pxr/base/tf/pySafePython.h.orig	2023-02-17 15:43:10.766070777 +0100
+++ USD-23.02/pxr/base/tf/pySafePython.h	2023-02-17 15:43:34.653837327 +0100
@@ -41,7 +41,7 @@
 ARCH_PRAGMA_PUSH_MACRO(slots)
 #undef slots
 
-#include <boost/python/detail/wrap_python.hpp>
+#include <Python.h>
 
 ARCH_PRAGMA_POP_MACRO(slots)

File addition: blender-fix-alembic-python.patch (----------)

[4.54]

--- blender-3.3.3/source/blender/io/alembic/CMakeLists.txt.orig	2023-02-17 16:56:11.252109270 +0100
+++ blender-3.3.3/source/blender/io/alembic/CMakeLists.txt	2023-02-17 21:03:13.638150916 +0100
@@ -21,6 +21,7 @@
 set(INC_SYS
   ${ALEMBIC_INCLUDE_DIRS}
   ${BOOST_INCLUDE_DIR}
+  ${PYTHON_INCLUDE_DIR}
   ${OPENEXR_INCLUDE_DIRS}
 )

Replacement in guix/vfx/packages/pixar.scm at line 99 [5.7932]

∅:D[2.104] → [5.11816:12035]

B:BD[5.11816] → [5.11816:12035]

B:BD[5.12035] → [2.105:196]

∅:D[2.196] → [6.925:1004]

B:BD[6.925] → [6.925:1004]

    (source (origin
                (method url-fetch)
                (uri (string-append "https://github.com/PixarAnimationStudios/USD/"
                                      "archive/refs/tags/v" version ".tar.gz"))
                (sha256 (base32 "0pakwyf25kbf0934rm7i3jgmdwspr76hpf8ibg7682fv4bvzzvm8"))))
		;;(patches (search-patches "vfx/patches/usd-fix-hgiinterop-vulkan.patch"))))

[2.104]

[5.12206]

    (source
     (origin
      (method url-fetch)
      (uri
       (string-append "https://github.com/PixarAnimationStudios/USD/"
                      "archive/refs/tags/v" version ".tar.gz"))
       (sha256
        (base32 "0pakwyf25kbf0934rm7i3jgmdwspr76hpf8ibg7682fv4bvzzvm8"))
       (patches
        (search-patches ;"vfx/patches/usd-fix-hgiinterop-vulkan.patch"
		        "vfx/patches/usd-use-normal-python.patch"))))

Insertion in guix/vfx/packages/main.scm at line 3 [7.33]
[7.99]
[7.99]
```
  #:use-module (gnu packages commencement)
```
Replacement in guix/vfx/packages/main.scm at line 22 [7.33]
B:BD[7.741] → [7.741:742]
[7.741]
[7.742]
```
  #:use-module (gnu packages pdf)
  #:use-module (gnu packages pulseaudio)
  
```

Replacement in guix/vfx/packages/main.scm at line 62 [7.33]

B:BD[3.100] → [3.100:138]

                              "/lib")

[3.100]

[3.138]

                              "/include")

Replacement in guix/vfx/packages/main.scm at line 65 [7.33]

B:BD[3.234] → [3.234:276]

                              "/include")

[3.234]

[7.2057]

                              "/lib")

Replacement in guix/vfx/packages/main.scm at line 69 [7.33]

∅:D[3.350] → [7.2095:2138]

∅:D[8.356] → [7.2095:2138]

B:BD[7.2095] → [7.2095:2138]

               "-DWITH_PYTHON_INSTALL=OFF"

[3.350]

[7.2138]


	       "-DWITH_PYTHON_INSTALL=OFF" ; Don't copy system python into the blender install folder
	       "-DWITH_DRACO=OFF" ; Can't enable Draco without copying system python into the blender install folder

Insertion in guix/vfx/packages/main.scm at line 104 [7.33]

[7.4329]

    (native-inputs
     (list
      ld-gold-wrapper))

Replacement in guix/vfx/packages/main.scm at line 109 [7.33]

B:BD[7.4341] → [7.4341:4395]

     `(("boost" ,boost)
       ("jemalloc" ,jemalloc)

[7.4341]

[7.4395]

     `(("jemalloc" ,jemalloc)
       ("boost" ,boost)
       ("tbb" ,tbb-2020)

Insertion in guix/vfx/packages/main.scm at line 116 [7.33]

[8.379]

[7.4479]

       ("freetype" ,freetype)
       ("glew" ,glew)
       ("python" ,python)
       ("python-numpy" ,python-numpy)
       ("openvdb" ,openvdb-10.0)

Insertion in guix/vfx/packages/main.scm at line 126 [7.33]
[8.437]
[8.437]
```
       ("alembic" ,alembic)
```

Insertion in guix/vfx/packages/main.scm at line 135 [7.33]

[7.4799]

       ("libwebp" ,libwebp)
       ("potrace" ,potrace)
       ("libharu" ,libharu)

Insertion in guix/vfx/packages/main.scm at line 141 [7.33]
[7.4908]
[7.4908]
```
       ("pulseaudio" ,pulseaudio)
```
Deletion in guix/vfx/packages/main.scm at line 143 [7.33]
B:BD[7.4942] → [7.4942:4994]
```
       ("freetype" ,freetype)
       ("glew" ,glew)
```

Deletion in guix/vfx/packages/main.scm at line 145 [7.33]

B:BD[7.5048] → [7.5048:5170]

       ("python" ,python)
       ("python-numpy" ,python-numpy)
       ("openvdb" ,openvdb-10.0)
       ("tbb" ,tbb-2020)