mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-01 14:27:00 +00:00
Merge branch 'main' into feature/filament_id
This commit is contained in:
@@ -276,6 +276,12 @@ modules:
|
||||
sha256: 27b72ba2d5ff3d0a9814ad40d4cb88f8dc89a35491c0866d952473f8f9416b77
|
||||
dest: external-packages/Draco
|
||||
|
||||
# Assimp 5.4.3
|
||||
- type: file
|
||||
url: https://github.com/assimp/assimp/archive/refs/tags/v5.4.3.tar.gz
|
||||
sha256: 66dfbaee288f2bc43172440a55d0235dfc7bf885dda6435c038e8000e79582cb
|
||||
dest: external-packages/Assimp
|
||||
|
||||
# OpenSSL 1.1.1w (GNOME SDK has 3.x; OrcaSlicer requires 1.1.x)
|
||||
- type: file
|
||||
url: https://github.com/openssl/openssl/archive/OpenSSL_1_1_1w.tar.gz
|
||||
@@ -312,6 +318,12 @@ modules:
|
||||
sha256: 0ba163956f2d468b19a91b96c5aba66ee9610843ea41dda628ea44cdafde7db7
|
||||
dest: external-packages/wxInspector
|
||||
|
||||
# FFmpeg n7.0.3
|
||||
- type: file
|
||||
url: https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n7.0.3.tar.gz
|
||||
sha256: deedcabe339165214a3637df4c86a507aef0d793cf8774ff68735f4737e8ddbc
|
||||
dest: external-packages/FFMPEG
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# Fallback archives for deps normally provided by the GNOME SDK.
|
||||
# These are only used if find_package() fails to locate them.
|
||||
|
||||
@@ -25,6 +25,9 @@ export REQUIRED_DEV_PACKAGES=(
|
||||
wayland-protocols
|
||||
webkit2gtk-4.1
|
||||
wget
|
||||
pkgconf
|
||||
yasm
|
||||
nasm
|
||||
)
|
||||
|
||||
if [[ -n "$UPDATE_LIB" ]]
|
||||
|
||||
@@ -25,6 +25,9 @@ export REQUIRED_DEV_PACKAGES=(
|
||||
wayland-protocols
|
||||
webkit2gtk
|
||||
wget
|
||||
pkgconf
|
||||
yasm
|
||||
nasm
|
||||
)
|
||||
|
||||
if [[ -n "$UPDATE_LIB" ]]
|
||||
|
||||
@@ -20,6 +20,7 @@ export REQUIRED_BUNDLES=(
|
||||
perl-basic
|
||||
texinfo
|
||||
wget
|
||||
nasm
|
||||
)
|
||||
|
||||
if [[ -n "$UPDATE_LIB" ]]
|
||||
|
||||
@@ -27,6 +27,9 @@ REQUIRED_DEV_PACKAGES=(
|
||||
ninja-build
|
||||
texinfo
|
||||
wget
|
||||
pkgconf
|
||||
yasm
|
||||
nasm
|
||||
)
|
||||
|
||||
if [[ -n "$UPDATE_LIB" ]]
|
||||
|
||||
@@ -31,6 +31,9 @@ REQUIRED_DEV_PACKAGES=(
|
||||
webkit2gtk4.1-devel
|
||||
wget
|
||||
libcurl-devel
|
||||
pkgconf
|
||||
yasm
|
||||
nasm
|
||||
)
|
||||
|
||||
if [[ -n "$UPDATE_LIB" ]]
|
||||
|
||||
@@ -32,6 +32,9 @@ REQUIRED_DEV_PACKAGES=(
|
||||
sys-devel/m4
|
||||
virtual/libudev
|
||||
x11-libs/gtk+:3
|
||||
dev-util/pkgconf
|
||||
dev-lang/yasm
|
||||
dev-lang/nasm
|
||||
)
|
||||
|
||||
if [[ -n "$UPDATE_LIB" ]]
|
||||
|
||||
@@ -30,6 +30,9 @@ REQUIRED_DEV_PACKAGES=(
|
||||
webkit2gtk4-devel
|
||||
wget
|
||||
libcurl-devel
|
||||
pkgconf
|
||||
yasm
|
||||
nasm
|
||||
)
|
||||
|
||||
if [[ -n "$UPDATE_LIB" ]]
|
||||
|
||||
Reference in New Issue
Block a user