foolscreen/soupe3d - Change AFGBPBXIJET6S27JFQ7UQDKBAODRCVJBEWW5N4TZ2ZIDSVQBYPUAC

[guix] Blender 3.4.1 (without add-ons)

Created by foolscreen on February 23, 2023

AFGBPBXIJET6S27JFQ7UQDKBAODRCVJBEWW5N4TZ2ZIDSVQBYPUAC

Dependencies

In channels

main

Change contents

File deletion: blender-fix-python-includes.patch

BF:BFD[5.54] → [4.0:57]

BF:BFD[4.57] → [4.58:58]

B:BD[4.58] → [4.59:711]

--- 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}
 )
--- blender-3.3.3/source/blender/io/usd/CMakeLists.txt.orig	2023-02-18 09:18:24.547600307 +0100
+++ blender-3.3.3/source/blender/io/usd/CMakeLists.txt	2023-02-18 09:18:50.595462877 +0100
@@ -54,6 +54,7 @@
 set(INC_SYS
   ${USD_INCLUDE_DIRS}
   ${BOOST_INCLUDE_DIR}
+  ${PYTHON_INCLUDE_DIR}
   ${TBB_INCLUDE_DIR}
 )

File addition: blender-fix-cmake-for-python.patch (----------)

[5.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}
 )
--- blender-3.3.3/source/blender/io/usd/CMakeLists.txt.orig	2023-02-18 09:18:24.547600307 +0100
+++ blender-3.3.3/source/blender/io/usd/CMakeLists.txt	2023-02-18 09:18:50.595462877 +0100
@@ -54,5 +54,6 @@
 set(INC_SYS
   ${USD_INCLUDE_DIRS}
   ${BOOST_INCLUDE_DIR}
+  ${PYTHON_INCLUDE_DIR}
   ${TBB_INCLUDE_DIR}
 )
--- blender-3.4.1/build_files/cmake/platform/platform_unix.cmake.orig	2023-02-23 06:34:25.079892639 +0100
+++ blender-3.4.1/build_files/cmake/platform/platform_unix.cmake	2023-02-23 06:35:24.184660737 +0100
@@ -365,7 +365,7 @@
       set(Boost_USE_STATIC_LIBS ON)
     endif()
     set(Boost_USE_MULTITHREADED ON)
-    set(__boost_packages filesystem regex thread date_time)
+    set(__boost_packages filesystem regex thread date_time python)
     if(WITH_CYCLES AND WITH_CYCLES_OSL)
       if(NOT (${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6"))
         list(APPEND __boost_packages wave)

Insertion in guix/vfx/patches/blender-allow-python-3.9.patch at line 71 [4.767]

[4.3108]


--- blender-3.4.1/release/scripts/startup/bl_ui/space_view3d_toolbar.py.orig	2023-02-23 20:40:39.889617867 +0100
+++ blender-3.4.1/release/scripts/startup/bl_ui/space_view3d_toolbar.py	2023-02-23 21:05:42.698898588 +0100
@@ -469,68 +469,69 @@
 
         have_image = False
 
-        match getattr(mode_settings, self.canvas_source_attr_name):
-            case 'MATERIAL':
-                if len(ob.material_slots) > 1:
-                    layout.template_list(
-                        "MATERIAL_UL_matslots", "layers",
-                        ob, "material_slots",
-                        ob, "active_material_index", rows=2,
-                    )
-                mat = ob.active_material
-                if mat and mat.texture_paint_images:
-                    row = layout.row()
-                    row.template_list(
-                        "TEXTURE_UL_texpaintslots", "",
-                        mat, "texture_paint_slots",
-                        mat, "paint_active_slot", rows=2,
-                    )
-
-                    if mat.texture_paint_slots:
-                        slot = mat.texture_paint_slots[mat.paint_active_slot]
-                    else:
-                        slot = None
+        source_type = getattr(mode_settings, self.canvas_source_attr_name)
 
-                    have_image = slot is not None
-                else:
-                    row = layout.row()
-
-                    box = row.box()
-                    box.label(text="No Textures")
-
-                sub = row.column(align=True)
-                sub.operator_menu_enum("paint.add_texture_paint_slot", "type", icon='ADD', text="")
+        if source_type == 'MATERIAL':
+            if len(ob.material_slots) > 1:
+                layout.template_list(
+                    "MATERIAL_UL_matslots", "layers",
+                    ob, "material_slots",
+                    ob, "active_material_index", rows=2,
+                )
+            mat = ob.active_material
+            if mat and mat.texture_paint_images:
+                row = layout.row()
+                row.template_list(
+                    "TEXTURE_UL_texpaintslots", "",
+                    mat, "texture_paint_slots",
+                    mat, "paint_active_slot", rows=2,
+                )
 
-            case 'IMAGE':
-                mesh = ob.data
-                uv_text = mesh.uv_layers.active.name if mesh.uv_layers.active else ""
-                layout.template_ID(mode_settings, self.canvas_image_attr_name, new="image.new", open="image.open")
-                if settings.missing_uvs:
-                    layout.operator("paint.add_simple_uvs", icon='ADD', text="Add UVs")
+                if mat.texture_paint_slots:
+                    slot = mat.texture_paint_slots[mat.paint_active_slot]
                 else:
-                    layout.menu("VIEW3D_MT_tools_projectpaint_uvlayer", text=uv_text, translate=False)
-                have_image = getattr(settings, self.canvas_image_attr_name) is not None
+                    slot = None
 
-                self.draw_image_interpolation(layout=layout, mode_settings=mode_settings)
+                have_image = slot is not None
+            else:
+                row = layout.row()
 
-            case 'COLOR_ATTRIBUTE':
-                mesh = ob.data
+                box = row.box()
+                box.label(text="No Textures")
 
-                row = layout.row()
-                col = row.column()
-                col.template_list(
-                    "MESH_UL_color_attributes_selector",
-                    "color_attributes",
-                    mesh,
-                    "color_attributes",
-                    mesh.color_attributes,
-                    "active_color_index",
-                    rows=3,
-                )
+            sub = row.column(align=True)
+            sub.operator_menu_enum("paint.add_texture_paint_slot", "type", icon='ADD', text="")
 
-                col = row.column(align=True)
-                col.operator("geometry.color_attribute_add", icon='ADD', text="")
-                col.operator("geometry.color_attribute_remove", icon='REMOVE', text="")
+        elif source_type == 'IMAGE':
+            mesh = ob.data
+            uv_text = mesh.uv_layers.active.name if mesh.uv_layers.active else ""
+            layout.template_ID(mode_settings, self.canvas_image_attr_name, new="image.new", open="image.open")
+            if settings.missing_uvs:
+                layout.operator("paint.add_simple_uvs", icon='ADD', text="Add UVs")
+            else:
+                layout.menu("VIEW3D_MT_tools_projectpaint_uvlayer", text=uv_text, translate=False)
+            have_image = getattr(settings, self.canvas_image_attr_name) is not None
+
+            self.draw_image_interpolation(layout=layout, mode_settings=mode_settings)
+
+        elif source_type == 'COLOR_ATTRIBUTE':
+            mesh = ob.data
+
+            row = layout.row()
+            col = row.column()
+            col.template_list(
+                "MESH_UL_color_attributes_selector",
+                "color_attributes",
+                mesh,
+                "color_attributes",
+                mesh.color_attributes,
+                "active_color_index",
+                rows=3,
+            )
+
+            col = row.column(align=True)
+            col.operator("geometry.color_attribute_add", icon='ADD', text="")
+            col.operator("geometry.color_attribute_remove", icon='REMOVE', text="")
 
         if settings.missing_uvs:
             layout.separator()

Insertion in guix/vfx/packages/main.scm at line 3 [6.33]
[6.99]
[7.1201]
```
  #:use-module (gnu packages pkg-config)
```
Insertion in guix/vfx/packages/main.scm at line 21 [6.33]
[6.667]
[6.667]
```
  #:use-module (gnu packages fonts)
```

Insertion in guix/vfx/packages/main.scm at line 31 [6.33]

[6.839]

  #:use-module (guix git-download)
  #:use-module (guix build-system copy)

Replacement in guix/vfx/packages/main.scm at line 36 [6.33]

B:BD[6.933] → [6.933:956]

(define-public blender

[6.933]

[6.956]

(define blender-translations-3.4
  ;; because translations are in a separate repo 
  ;; (will disappear in 3.5: moved to Blender repo)
  (package
    (name "blender-translations")
    (version "3.4.1")
    (source
         (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://projects.blender.org/blender/blender-translations")
		    ;; use the commit referenced by blender repo in v3.4.1
                    (commit "e398d3c4969a37ae2ecff388344dd780bc1cfe82")))
              (file-name (git-file-name name version))
              (sha256
               (base32
		"04f1vs4f592s9fxawb3fj8gnvhp2c759cgnm4cgn7mvmjg7fj8ly"))))
    (build-system copy-build-system)
    (home-page "https://blender.org/")
    (synopsis "All languages translation files for Blender")
    (description
     "Blender is a 3D graphics creation suite.  It supports the entirety of
the 3D pipeline—modeling, rigging, animation, simulation, rendering,
compositing and motion tracking, even video editing and game creation.  The
application can be customized via its API for Python scripting.")
    (license license:gpl2+)))    
(define-public blender-3.4

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

B:BD[6.1064] → [8.58:206]

              (uri (string-append "https://github.com/blender/blender"
                                  "/archive/refs/tags/v" version ".tar.gz"))

[6.1064]

[6.1202]

              (uri (string-append "https://projects.blender.org/blender/blender"
                                  "/archive/v" version ".tar.gz"))

Replacement in guix/vfx/packages/main.scm at line 73 [6.33]

B:BD[6.1247] → [4.3373:3432]

		"0kwsw2zrg6ba8da0j5mlz86wzl2gw1acyf6kb9sjdb50dm8apbdd"))

[6.1247]

[4.3432]

		"06pw0g55j6y5q7qk81qbzkwdkj7rmiq8jii3p8zzy2ql91c5p0s1"))

Replacement in guix/vfx/packages/main.scm at line 75 [6.33]

B:BD[4.3455] → [4.3455:3593]

               (search-patches "vfx/patches/blender-fix-python-includes.patch"
			       "vfx/patches/blender-allow-python-3.9.patch"))))

[4.3455]

[6.1381]

               (search-patches
		;; make python3.9 work until Guix has python3.10
		"vfx/patches/blender-allow-python-3.9.patch"
		;; fix Python includes and unresolved symbols
		"vfx/patches/blender-fix-cmake-for-python.patch"))))

Replacement in guix/vfx/packages/main.scm at line 85 [6.33]

B:BD[6.1638] → [6.1638:1753]

B:BD[6.1753] → [8.292:331]

         (list "-DWITH_CODEC_FFMPEG=ON"
               "-DWITH_CODEC_SNDFILE=ON"
               "-DWITH_CYCLES=ON"
               "-DWITH_CYCLES_OSL=OFF"

[6.1638]

[6.1753]

         (list "-DWITH_CYCLES_OSL=OFF"

Replacement in guix/vfx/packages/main.scm at line 87 [6.33]

B:BD[6.1792] → [6.1792:2057]

B:BD[6.2057] → [4.3594:3902]

∅:D[9.276] → [6.2057:2095]

∅:D[7.1405] → [6.2057:2095]

∅:D[4.3902] → [6.2057:2095]

B:BD[6.2057] → [6.2057:2095]

B:BD[6.2095] → [8.332:356]

               "-DWITH_FFTW3=ON"
               "-DWITH_IMAGE_OPENJPEG=ON"
               "-DWITH_INPUT_NDOF=ON"
               "-DWITH_INSTALL_PORTABLE=OFF"
               "-DWITH_JACK=ON"
               "-DWITH_MOD_OCEANSIM=ON"
               "-DWITH_OPENVDB=ON"
               ;; (string-append "-DOPENVDB_INCLUDE_DIR="
	       ;; 		      (assoc-ref %build-inputs "openvdb")
               ;;                "/include")
               ;; (string-append "-DOPENVDB_LIBRARY="
	       ;; 		      (assoc-ref %build-inputs "openvdb")
               ;;                "/lib")
               "-DWITH_OPENSUBDIV=ON"
	       "-DWITH_USD=ON"

[6.1792]

[4.3903]

               "-DWITH_INSTALL_PORTABLE=OFF" ; no FHS installation (use CMAKE_INSTALL_PREFIX)

Replacement in guix/vfx/packages/main.scm at line 91 [6.33]

B:BD[7.1407] → [7.1407:1621]

	       "-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

[7.1407]

[6.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

Replacement in guix/vfx/packages/main.scm at line 110 [6.33]

B:BD[6.3423] → [6.3423:4329]

           (add-after 'set-paths 'add-ilmbase-include-path
             (lambda* (#:key inputs #:allow-other-keys)
               ;; OpenEXR propagates ilmbase, but its include files do not
               ;; appear in the C_INCLUDE_PATH, so we need to add
               ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to satisfy
               ;; the dependency on "half.h" and "Iex.h".
               (let ((headers (string-append
                               (assoc-ref inputs "ilmbase")
                               "/include/OpenEXR")))
                 (setenv "C_INCLUDE_PATH"
                         (string-append headers ":"
                                        (or (getenv "C_INCLUDE_PATH") "")))
                 (setenv "CPLUS_INCLUDE_PATH"
                         (string-append headers ":"
                                        (or (getenv "CPLUS_INCLUDE_PATH") ""))))))))))

[6.3048]

[7.1622]

	  (add-after 'configure 'link-translations
	   ;; integrate external translation files into the sources
           (lambda* (#:key inputs #:allow-other-keys)
		    (let ((translations (assoc-ref inputs "blender-translations"))
			  (locale-folder "../blender/release/datafiles/locale"))
		      (rmdir locale-folder)
                      (symlink translations locale-folder)
		      #t)))))))

Replacement in guix/vfx/packages/main.scm at line 119 [6.33]

B:BD[7.1641] → [7.1641:1683]

     (list
      ld-gold-wrapper))

[7.1641]

[6.4329]

     (list pkg-config
           blender-translations-3.4
           ld-gold-wrapper))

Insertion in guix/vfx/packages/main.scm at line 129 [6.33]
[6.4479]
[8.357]
```
       ("font-dejavu" ,font-dejavu)
```

Insertion in guix/vfx/packages/main.scm at line 133 [6.33]

[7.1816]

[4.4033]

       ;("wayland" ,wayland)
       ;("libxkbcommon" ,libxkbcommon)

Replacement in guix/vfx/packages/main.scm at line 136 [6.33]
∅:D[4.4063] → [7.1816:1842]
B:BD[7.1816] → [7.1816:1842]
```
       ("python" ,python)
```
[4.4063]
[7.1842]
```
       ("python-wrapper" ,python-wrapper)
```
Replacement in guix/vfx/packages/main.scm at line 141 [6.33]
B:BD[6.4559] → [6.4559:4589]
```
       ("openexr" ,openexr-2)
```
[6.4559]
[6.4589]
```
       ("openexr" ,openexr)
       ("imath" ,imath)
```

Replacement in guix/vfx/packages/main.scm at line 144 [6.33]

B:BD[6.4627] → [8.380:437]

       ("openshadinglanguage" ,openshadinglanguage-1.12)

[6.4627]

[7.1914]

       ;("openshadinglanguage" ,openshadinglanguage-1.12)

Insertion in guix/vfx/packages/main.scm at line 147 [6.33]
[8.457]
[8.457]
```
       ("embree" ,embree)
```
Deletion in guix/vfx/packages/main.scm at line 149 [6.33]
∅:D[8.485] → [6.4627:4655]
B:BD[6.4627] → [6.4627:4655]
```
       ("ilmbase" ,ilmbase)
```
Replacement in guix/vfx/packages/main.scm at line 158 [6.33]
B:BD[6.4821] → [6.4821:4884]
```
       ("gmp" ,gmp) ;; needed for boolean operations on meshes
```
[6.4821]
[6.4884]
```
       ("gmp" ,gmp)
```
Replacement in guix/vfx/packages/main.scm at line 165 [6.33]
B:BD[6.5192] → [6.5192:5248]
```
       ("zstd" ,zstd "lib")
       ("embree" ,embree)))
```
[6.5192]
[6.5248]
```
       ("zstd" ,zstd "lib")))
```

Replacement in guix/vfx/packages/base.scm at line 190 [10.799]

B:BD[10.1423] → [11.3855:3975]

 	      (string-append "https://github.com/wdas/ptex/archive/refs/tags/"
	  	                   "v" version ".tar.gz"))

[10.1423]

[10.1600]

 	  (string-append "https://github.com/wdas/ptex/archive/refs/tags/"
	                 "v" version ".tar.gz"))

Deletion in guix/vfx/packages/base.scm at line 236 [10.799]
B:BD[8.546] → [8.546:563]
```
      ;;gcc-12))
```
Insertion in guix/vfx/packages/base.scm at line 241 [10.799]
[10.3014]
[10.3014]
```
      tbb-2020
      ilmbase
```
Deletion in guix/vfx/packages/base.scm at line 244 [10.799]
B:BD[10.3028] → [10.3028:3042]
B:BD[10.3042] → [2.185:200]
```
      ilmbase
      tbb-2020
```
Deletion in guix/vfx/packages/base.scm at line 245 [10.799]
B:BD[10.3063] → [10.3063:3064]

Replacement in guix/vfx/packages/base.scm at line 292 [10.799]

B:BD[11.6008] → [11.6008:6127]

     '(;;#:configure-flags '("-DYAML_BUILD_SHARED_LIBS=ON")))
        #:phases
        (modify-phases %standard-phases

[11.6008]

[11.6127]

     '(#:phases
       (modify-phases %standard-phases

Replacement in guix/vfx/packages/base.scm at line 467 [10.799]

B:BD[11.13703] → [11.13703:13890]

       #:configure-flags (list ;;(string-append "-DImath_DIR="
			 	;;	      (assoc-ref %build-inputs "ilmbase")
			 	;;	      "/include/OpenEXR")
			       "-DUSE_EXTERNAL_PUGIXML=1")))

[11.13703]

[11.13890]

       #:configure-flags
       (list "-DUSE_EXTERNAL_PUGIXML=1")))

Replacement in guix/vfx/packages/base.scm at line 527 [10.799]

B:BD[11.15740] → [11.15740:16463]

         (add-after 'set-paths 'add-ilmbase-include-path
           (lambda* (#:key inputs #:allow-other-keys)
             ;; OpenEXR 2 propagates ilmbase, but its include files do not
             ;; appear in the C_INCLUDE_PATH.
             (let ((headers (string-append
                             (assoc-ref inputs "ilmbase")
                             "/include/OpenEXR")))
               (setenv "C_INCLUDE_PATH"
                       (string-append headers ":"
                                      (or (getenv "C_INCLUDE_PATH") "")))
               (setenv "CPLUS_INCLUDE_PATH"
                       (string-append headers ":"
                                      (or (getenv "CPLUS_INCLUDE_PATH") ""))))))

[11.15740]

[12.2328]

         ;; (add-after 'set-paths 'add-ilmbase-include-path
         ;;   (lambda* (#:key inputs #:allow-other-keys)
         ;;     ;; OpenEXR 2 propagates ilmbase, but its include files do not
         ;;     ;; appear in the C_INCLUDE_PATH.
         ;;     (let ((headers (string-append
         ;;                     (assoc-ref inputs "ilmbase")
         ;;                     "/include/OpenEXR")))
         ;;       (setenv "C_INCLUDE_PATH"
         ;;               (string-append headers ":"
         ;;                              (or (getenv "C_INCLUDE_PATH") "")))
         ;;       (setenv "CPLUS_INCLUDE_PATH"
         ;;               (string-append headers ":"
         ;;                              (or (getenv "CPLUS_INCLUDE_PATH") ""))))))

Replacement in guix/vfx/packages/base.scm at line 550 [10.799]
B:BD[11.17159] → [11.17159:17197]
```
           imath
           openexr-2
```
[11.17159]
[13.955]
```
           openexr
```

Replacement in README.md at line 9 [14.34]

B:BD[14.703] → [3.320:436]

This project just started, it only provides Blender and Pixar USD packages (and their dependencies) for Guix now.

[14.703]

[14.773]

This project started recently, it just provides latest Blender and Pixar USD for Guix now.

Replacement in README.md at line 13 [14.34]
B:BD[15.346] → [15.346:388]
```
+ Asset editor            (Blender 3.3.3)
```
[15.346]
[15.388]
```
+ Asset editor            (Blender 3.4.1)
```

[guix] Blender 3.4.1 (without add-ons)

Dependencies

In channels

Change contents

File deletion: blender-fix-python-includes.patch

File addition: blender-fix-cmake-for-python.patch (----------)

Insertion in guix/vfx/patches/blender-allow-python-3.9.patch at line 71 [4.767]

Insertion in guix/vfx/packages/main.scm at line 3 [6.33]

Insertion in guix/vfx/packages/main.scm at line 21 [6.33]

Insertion in guix/vfx/packages/main.scm at line 31 [6.33]

Replacement in guix/vfx/packages/main.scm at line 36 [6.33]

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

Replacement in guix/vfx/packages/main.scm at line 73 [6.33]

Replacement in guix/vfx/packages/main.scm at line 75 [6.33]

Replacement in guix/vfx/packages/main.scm at line 85 [6.33]

Replacement in guix/vfx/packages/main.scm at line 87 [6.33]

Replacement in guix/vfx/packages/main.scm at line 91 [6.33]

Replacement in guix/vfx/packages/main.scm at line 110 [6.33]

Replacement in guix/vfx/packages/main.scm at line 119 [6.33]

Insertion in guix/vfx/packages/main.scm at line 129 [6.33]

Insertion in guix/vfx/packages/main.scm at line 133 [6.33]

Replacement in guix/vfx/packages/main.scm at line 136 [6.33]

Replacement in guix/vfx/packages/main.scm at line 141 [6.33]

Replacement in guix/vfx/packages/main.scm at line 144 [6.33]

Insertion in guix/vfx/packages/main.scm at line 147 [6.33]

Deletion in guix/vfx/packages/main.scm at line 149 [6.33]

Replacement in guix/vfx/packages/main.scm at line 158 [6.33]

Replacement in guix/vfx/packages/main.scm at line 165 [6.33]

Replacement in guix/vfx/packages/base.scm at line 190 [10.799]

Deletion in guix/vfx/packages/base.scm at line 236 [10.799]

Insertion in guix/vfx/packages/base.scm at line 241 [10.799]

Deletion in guix/vfx/packages/base.scm at line 244 [10.799]

Deletion in guix/vfx/packages/base.scm at line 245 [10.799]

Replacement in guix/vfx/packages/base.scm at line 292 [10.799]

Replacement in guix/vfx/packages/base.scm at line 467 [10.799]

Replacement in guix/vfx/packages/base.scm at line 527 [10.799]

Replacement in guix/vfx/packages/base.scm at line 550 [10.799]

Replacement in README.md at line 9 [14.34]

Replacement in README.md at line 13 [14.34]