foolscreen/soupe3d - Change 42G2NQSSEKZREY7WY36V6WUVATOPTOWJ6F2UKT5ZRMIGDF5YVX2AC

[guix] tentative Blender upgrade to 3.4.1

Created by foolscreen on February 21, 2023

42G2NQSSEKZREY7WY36V6WUVATOPTOWJ6F2UKT5ZRMIGDF5YVX2AC

Dependencies

In channels

main

Change contents

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

BF:BFD[3.54] → [2.381:437]

BF:BFD[2.437] → [2.438:438]

B:BD[2.438] → [2.439:773]

--- 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}
 )

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

[3.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,6 +54,7 @@
 set(INC_SYS
   ${USD_INCLUDE_DIRS}
   ${BOOST_INCLUDE_DIR}
+  ${PYTHON_INCLUDE_DIR}
   ${TBB_INCLUDE_DIR}
 )

File addition: blender-allow-python-3.9.patch (----------)

[3.54]

--- blender-3.4.1/source/blender/python/intern/bpy_capi_utils.h.orig	2023-02-21 09:51:04.292177926 +0100
+++ blender-3.4.1/source/blender/python/intern/bpy_capi_utils.h	2023-02-21 09:51:39.267961175 +0100
@@ -6,9 +6,6 @@
 
 #pragma once
 
-#if PY_VERSION_HEX < 0x030a0000
-#  error "Python 3.10 or greater is required, you'll need to update your Python."
-#endif
 
 #ifdef __cplusplus
 extern "C" {
--- blender-3.4.1/CMakeLists.txt.orig	2023-02-21 09:57:13.621894957 +0100
+++ blender-3.4.1/CMakeLists.txt	2023-02-21 09:59:04.769209791 +0100
@@ -960,20 +960,6 @@
 endif()
 
 if(WITH_PYTHON)
-  # While we have this as an '#error' in 'bpy_capi_utils.h',
-  # upgrading Python tends to cause confusion for users who build.
-  # Give the error message early to make this more obvious.
-  #
-  # Do this before main 'platform_*' checks,
-  # because UNIX will search for the old Python paths which may not exist.
-  # giving errors about missing paths before this case is met.
-  if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.10")
-    message(
-      FATAL_ERROR
-      "At least Python 3.10 is required to build, but found Python ${PYTHON_VERSION}"
-    )
-  endif()
-
   file(GLOB RESULT "${CMAKE_SOURCE_DIR}/release/scripts/addons")
   list(LENGTH RESULT DIR_LEN)
   if(DIR_LEN EQUAL 0)
--- blender-3.4.1/source/blender/python/mathutils/mathutils.c.orig	2023-02-21 10:52:24.650463493 +0100
+++ blender-3.4.1/source/blender/python/mathutils/mathutils.c	2023-02-21 10:53:40.786047731 +0100
@@ -75,8 +75,8 @@
   x = 0x345678UL;
   i = 0;
   while (--len >= 0) {
-    y = _Py_HashDouble(NULL, (double)(array[i++]));
+    y = _Py_HashDouble((double)(array[i++]));
     if (y == -1) {
       return -1;
     }
--- blender-3.4.1/source/blender/python/intern/bpy_driver.c.orig	2023-02-21 11:30:11.686585212 +0100
+++ blender-3.4.1/source/blender/python/intern/bpy_driver.c	2023-02-21 11:56:30.770353683 +0100
@@ -389,7 +389,6 @@
     OK_OP(BINARY_TRUE_DIVIDE),
     OK_OP(INPLACE_FLOOR_DIVIDE),
     OK_OP(INPLACE_TRUE_DIVIDE),
-    OK_OP(GET_LEN),
     OK_OP(INPLACE_ADD),
     OK_OP(INPLACE_SUBTRACT),
     OK_OP(INPLACE_MULTIPLY),
@@ -407,7 +406,6 @@
     OK_OP(INPLACE_OR),
     OK_OP(LIST_TO_TUPLE),
     OK_OP(RETURN_VALUE),
-    OK_OP(ROT_N),
     OK_OP(BUILD_TUPLE),
     OK_OP(BUILD_LIST),
     OK_OP(BUILD_SET),

Insertion in guix/vfx/packages/pixar.scm at line 6 [4.7932]
[4.8120]
[4.8120]
```
  #:use-module (gnu packages jemalloc)
```
Replacement in guix/vfx/packages/pixar.scm at line 116 [4.7932]
B:BD[4.12339] → [4.12339:12379]
```
         (list "-DBUILD_SHARED_LIBS=ON"
```
[4.12339]
[4.12379]
```
         (list "-DPXR_BUILD_MONOLITHIC=ON"
```

Replacement in guix/vfx/packages/pixar.scm at line 123 [4.7932]

∅:D[5.916] → [4.12614:12757]

B:BD[4.12614] → [4.12614:12757]

               ;;(string-append "-DPXR_MALLOC_LIBRARY="
               ;;              (search-input-file %build-inputs "lib/libjemalloc.so"))

[5.907]

[4.12757]

               (string-append "-DPXR_MALLOC_LIBRARY="
                             (search-input-file %build-inputs "lib/libjemalloc.so"))

Replacement in guix/vfx/packages/pixar.scm at line 164 [4.7932]
B:BD[4.14108] → [4.14108:14126]
```
       ;;jemalloc
```
[4.14108]
[4.14126]
```
       jemalloc
```
Replacement in guix/vfx/packages/main.scm at line 35 [6.33]
B:BD[6.988] → [7.35:57]
```
    (version "3.3.3")
```
[6.988]
[6.1011]
```
    (version "3.4.1")
```

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

B:BD[6.1247] → [7.207:269]

		 "02gmjgy3hsj67ls9qx3x2v52y7r2vq3nb0qzbr8z3k3iwndwbp0j"))))

[6.1247]

[6.1381]

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

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

B:BD[6.2057] → [8.0:100]

B:BD[8.100] → [2.1324:1366]

∅:D[2.1366] → [8.138:234]

B:BD[8.138] → [8.138:234]

B:BD[8.234] → [2.1367:1405]

               (string-append "-DOPENVDB_INCLUDE_DIR="
			      (assoc-ref %build-inputs "openvdb")
                              "/include")
               (string-append "-DOPENVDB_LIBRARY="
			      (assoc-ref %build-inputs "openvdb")
                              "/lib")

[6.2057]

               ;; (string-append "-DOPENVDB_INCLUDE_DIR="
	       ;; 		      (assoc-ref %build-inputs "openvdb")
               ;;                "/include")
               ;; (string-append "-DOPENVDB_LIBRARY="
	       ;; 		      (assoc-ref %build-inputs "openvdb")
               ;;                "/lib")

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

B:BD[7.356] → [8.277:350]

	       (string-append "-DUSD_LIBRARY=" (assoc-ref %build-inputs "usd"))

[7.356]

[2.1406]

	       (string-append "-DUSD_LIBRARY=" (assoc-ref %build-inputs "usd") "/lib/libusd_ms.so")

Replacement in guix/vfx/packages/main.scm at line 119 [6.33]
B:BD[7.379] → [2.1764:1794]
```
       ("freetype" ,freetype)
```
[7.379]
[2.1794]
```
       ("freetype" ,freetype-2.13)
```
Insertion in guix/vfx/packages/main.scm at line 121 [6.33]
[2.1816]
[2.1816]
```
       ("libepoxy" ,libepoxy)
```
Insertion in guix/vfx/packages/base.scm at line 23 [10.799]
[9.3424]
[9.3424]
```
  #:use-module (gnu packages gtk)
```

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

[9.17663]


(define-public freetype-2.13
  (package
   (name "freetype")
   (version "2.13.0")
   (source
    (origin
      (method url-fetch)
      (uri (string-append "https://gitlab.freedesktop.org/freetype/freetype/-/archive/VER-"
			  (string-replace-substring version "." "-")
			  "/freetype-VER-"
			  (string-replace-substring version "." "-")
                          ".tar.gz"))
      (sha256
       (base32 "04mbhf7b1g7fmf3a27mfp085chc7dybjsad9mkgd55gf384z30x6"))))
   (build-system cmake-build-system)
   (arguments
    `(#:tests? #f
      #:configure-flags
      (list "-DBUILD_SHARED_LIBS=true"
	    "-DCMAKE_BUILD_TYPE=Release")))
   (native-inputs
    (list pkg-config))
   (inputs
    ;; These are all in the Requires.private field of freetype2.pc.
    (list bzip2 brotli harfbuzz libpng zlib))
   (synopsis "Font rendering library")
   (description
    "Freetype is a library that can be used by applications to access the
contents of font files.  It provides a uniform interface to access font files.
It supports both bitmap and scalable formats, including TrueType, OpenType,
Type1, CID, CFF, Windows FON/FNT, X11 PCF, and others.  It supports high-speed
anti-aliased glyph bitmap generation with 256 gray levels.")
   (license license:freetype)           ; some files have other licenses
   (home-page "https://www.freetype.org/")))

[guix] tentative Blender upgrade to 3.4.1

Dependencies

In channels

Change contents

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

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

File addition: blender-allow-python-3.9.patch (----------)

Insertion in guix/vfx/packages/pixar.scm at line 6 [4.7932]

Replacement in guix/vfx/packages/pixar.scm at line 116 [4.7932]

Replacement in guix/vfx/packages/pixar.scm at line 123 [4.7932]

Replacement in guix/vfx/packages/pixar.scm at line 164 [4.7932]

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

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

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

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

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

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

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

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