diff options
Diffstat (limited to 'release/freedesktop')
-rw-r--r-- | release/freedesktop/org.blender.Blender.appdata.xml | 19 | ||||
-rw-r--r-- | release/freedesktop/snap/README.md | 17 | ||||
-rw-r--r-- | release/freedesktop/snap/README.txt | 38 | ||||
-rw-r--r-- | release/freedesktop/snap/blender-snapcraft-template.yaml (renamed from release/freedesktop/snap/snapcraft.yaml.in) | 16 | ||||
-rwxr-xr-x | release/freedesktop/snap/bundle.py | 21 |
5 files changed, 42 insertions, 69 deletions
diff --git a/release/freedesktop/org.blender.Blender.appdata.xml b/release/freedesktop/org.blender.Blender.appdata.xml index f6d17834150..7a5a252e4ca 100644 --- a/release/freedesktop/org.blender.Blender.appdata.xml +++ b/release/freedesktop/org.blender.Blender.appdata.xml @@ -40,6 +40,25 @@ </screenshot> </screenshots> <releases> + <release version="2.93" date="2021-06-02"> + <description> + <p>New features:</p> + <ul> + <li>Mesh primitive nodes</li> + <li>Line Art</li> + <li>EEVEE Realistic depth of field and volumetrics</li> + <li>Spreadsheet editor</li> + </ul> + <p>Enhancements:</p> + <ul> + <li>Geometry nodes 22 new nodes and imrpoved attribute search</li> + <li>Mask loops, textures and patterns for sculpting</li> + <li>Grease pencil interpolate refactored and SVG and PDF support</li> + <li>Persistent Data rendering settings for Cycles</li> + <li>Video Sequencer Editor auto-proxy system</li> + </ul> + </description> + </release> <release version="2.92" date="2021-02-25"> <description> <p>New features:</p> diff --git a/release/freedesktop/snap/README.md b/release/freedesktop/snap/README.md new file mode 100644 index 00000000000..742b265ada6 --- /dev/null +++ b/release/freedesktop/snap/README.md @@ -0,0 +1,17 @@ +Snap Configuration +=================== + +Files used by Buildbot's `package-code-store-snap` and `deliver-code-store-snap` steps. + +Build pipeline snap tracks and channels + +``` + <track>/stable + - Latest stable release for the specified track + <track>/candidate + - Test builds for the upcoming stable release - *not used for now* + <track>/beta + - Nightly automated builds provided by a release branch + <track>/egde/<branch> + - Nightly or on demand builds - will also make use of branch +``` diff --git a/release/freedesktop/snap/README.txt b/release/freedesktop/snap/README.txt deleted file mode 100644 index 2e8822f32dc..00000000000 --- a/release/freedesktop/snap/README.txt +++ /dev/null @@ -1,38 +0,0 @@ - -Snap Package Instructions -========================= - -This folder contains the scripts for creating and uploading the snap on: -https://snapcraft.io/blender - - -Setup ------ - -This has only been tested to work on Ubuntu. - -# Install required packages -sudo apt install snapd snapcraft - - -Steps ------ - -# Build the snap file -python3 bundle.py --version 2.XX --url https://download.blender.org/release/Blender2.XX/blender-2.XX-x86_64.tar.bz2 - -# Install snap to test -# --dangerous is needed since the snap has not been signed yet -# --classic is required for installing Blender in general -sudo snap install --dangerous --classic blender_2.XX_amd64.snap - -# Upload -snapcraft push --release=stable blender_2.XX_amd64.snap - - -Release Values --------------- - -stable: final release -candidate: release candidates - diff --git a/release/freedesktop/snap/snapcraft.yaml.in b/release/freedesktop/snap/blender-snapcraft-template.yaml index eb3ef97eba8..882f9081c09 100644 --- a/release/freedesktop/snap/snapcraft.yaml.in +++ b/release/freedesktop/snap/blender-snapcraft-template.yaml @@ -10,12 +10,7 @@ description: | scientists, students, VFX experts, animators, game artists, modders, and the list goes on. - The standard snap channels are used in the following way: - - stable - Latest stable release. - candidate - Test builds for the upcoming stable release. - -icon: ../icons/scalable/apps/blender.svg +icon: @ICON_PATH@ passthrough: license: GPL-3.0 @@ -27,13 +22,14 @@ apps: command: ./blender-wrapper desktop: ./blender.desktop +base: core18 version: '@VERSION@' grade: @GRADE@ parts: blender: plugin: dump - source: @URL@ + source: @PACKAGE_PATH@ build-attributes: [keep-execstack, no-patchelf] override-build: | snapcraftctl build @@ -47,7 +43,7 @@ parts: - libxrender1 - libxxf86vm1 wrapper: - plugin: copy + plugin: dump source: . - files: - blender-wrapper: blender-wrapper + stage: + - ./blender-wrapper diff --git a/release/freedesktop/snap/bundle.py b/release/freedesktop/snap/bundle.py deleted file mode 100755 index c3ecc5af561..00000000000 --- a/release/freedesktop/snap/bundle.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python3 - -import argparse -import os -import pathlib -import subprocess - -parser = argparse.ArgumentParser() -parser.add_argument("--version", required=True) -parser.add_argument("--url", required=True) -parser.add_argument("--grade", default="stable", choices=["stable", "devel"]) -args = parser.parse_args() - -yaml_text = pathlib.Path("snapcraft.yaml.in").read_text() -yaml_text = yaml_text.replace("@VERSION@", args.version) -yaml_text = yaml_text.replace("@URL@", args.url) -yaml_text = yaml_text.replace("@GRADE@", args.grade) -pathlib.Path("snapcraft.yaml").write_text(yaml_text) - -subprocess.call(["snapcraft", "clean"]) -subprocess.call(["snapcraft", "snap"]) |