PrusaSlicer: fix cross and subpackage deps

This commit is contained in:
John 2019-05-31 23:50:58 +02:00
parent f180bee093
commit 411e7a049a
3 changed files with 18 additions and 8 deletions

View File

@ -1,4 +0,0 @@
Slic3rPE has been renamed to PrusaSlicer
The binary executable has been renamed from
/usr/bin/slic3r-pe to /usr/bin/prusa-slicer

View File

@ -0,0 +1,11 @@
--- src/avrdude/CMakeLists.txt 2019-05-20 18:49:36.000000000 +0200
+++ - 2019-05-31 23:42:15.542838510 +0200
@@ -82,7 +82,7 @@
add_custom_command(
DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf
OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf.h
- COMMAND $<TARGET_FILE:avrdude-conf-gen> avrdude-slic3r.conf avrdude_slic3r_conf > avrdude-slic3r.conf.h
+ COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf > avrdude-slic3r.conf.h
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)

View File

@ -1,8 +1,8 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.0.0
revision=1
wrksrc="PrusaSlicer-version_${version}${_status}"
revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1"
hostmakedepends="pkg-config"
@ -14,9 +14,12 @@ license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
checksum=5d3c7fd745f2875be55f316cd779805ce1b6ce38634f0f4b0ccd01884da731b3
nocross="tries to run avrdude-conf-gen which is compiled for target"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qemu-user-static"
fi
Slic3rPE_package() {
build_style=meta
depends=${pkgname}
depends="${sourcepkg}>=${version}_${revision}"
}