From de2d97a0f808d600940faaca9fd2f3bf76afe4d1 Mon Sep 17 00:00:00 2001 From: Kevin Chi Yan Tang Date: Fri, 23 Feb 2024 11:39:37 +0100 Subject: [PATCH 1/2] Added Blender LTS releases as of 20240223 --- blender.sls | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/blender.sls b/blender.sls index fd507857f..57b84a3d2 100644 --- a/blender.sls +++ b/blender.sls @@ -19,8 +19,9 @@ blender: # Note: Since April/May 2021, installer name has changed slightly (windows64 -> windows-x64). # Note2: Newer versions of Blender do not provide 32-bit installers anymore. {% for version, patches in [ - ('3.6', ['4', '3', '2', '1', '0']), - ('3.3', ['11', '10', '9', '8', '7', '6', '5', '4', '3', '2', '1', '0']), + ('4.0', ['2', '1', '0']), + ('3.6', ['9', '8', '7', '5', '4', '3', '2', '1', '0']), + ('3.3', ['16', '15', '14', '12', '11', '10', '9', '8', '7', '6', '5', '4', '3', '2', '1', '0']), ('2.93', ['14', '13', '12', '11', '10', '9', '8', '7', '6', '5', '4', '3', '2', '1', '0']), ('2.83', ['18', '17', '16', '15', '14']) ] %} From 3a9492c6c670f8206e623dfd104663e9529d77d6 Mon Sep 17 00:00:00 2001 From: Dafydd Jones Date: Thu, 29 Feb 2024 00:11:28 +0000 Subject: [PATCH 2/2] blender: fixes --- blender.sls | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/blender.sls b/blender.sls index 57b84a3d2..e97eb61e1 100644 --- a/blender.sls +++ b/blender.sls @@ -1,39 +1,32 @@ # both 32-bit (x86) AND a 64-bit (AMD64) installer available -{% set PROGRAM_FILES = "%ProgramFiles%" %} +{% set PROGRAM_FILES = "%ProgramFiles%" -%} blender: '2.78': full_name: 'Blender' - {% if grains['cpuarch'] == 'AMD64' %} + {% if grains['cpuarch'] == 'AMD64' -%} installer: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender2.78/blender-2.78-windows64.msi' - uninstaller: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender2.78/blender-2.78-windows64.msi' - {% else %} + {% else -%} installer: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender2.78/blender-2.78-windows32.msi' - uninstaller: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender2.78/blender-2.78-windows32.msi' - {% endif %} + {% endif -%} install_flags: '/qn /norestart' uninstall_flags: '/qn /norestart' msiexec: True - locale: en_US - reboot: False # Note: Since April/May 2021, installer name has changed slightly (windows64 -> windows-x64). # Note2: Newer versions of Blender do not provide 32-bit installers anymore. -{% for version, patches in [ + {% for version, patches in [ ('4.0', ['2', '1', '0']), ('3.6', ['9', '8', '7', '5', '4', '3', '2', '1', '0']), ('3.3', ['16', '15', '14', '12', '11', '10', '9', '8', '7', '6', '5', '4', '3', '2', '1', '0']), ('2.93', ['14', '13', '12', '11', '10', '9', '8', '7', '6', '5', '4', '3', '2', '1', '0']), ('2.83', ['18', '17', '16', '15', '14']) ] %} - {% for patch in patches %} - '{{ version }}.{{ patch }}': - full_name: 'blender' - installer: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender{{version}}/blender-{{version}}.{{patch}}-windows-x64.msi' - uninstaller: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender{{version}}/blender-{{version}}.{{patch}}-windows-x64.msi' - install_flags: '/qn /norestart' - uninstall_flags: '/qn /norestart' - msiexec: True - locale: en_US - reboot: False + {% for patch in patches %} + '{{ version }}.{{ patch }}': + full_name: 'blender' + installer: 'https://ftp.nluug.nl/pub/graphics/blender/release/Blender{{version}}/blender-{{version}}.{{patch}}-windows-x64.msi' + install_flags: '/qn /norestart' + uninstall_flags: '/qn /norestart' + msiexec: True + {% endfor %} {% endfor %} -{% endfor %}