diff options
author | Karsten Pufahl | 2019-11-26 11:30:29 +0100 |
---|---|---|
committer | Karsten Pufahl | 2019-11-26 11:31:00 +0100 |
commit | 85725d5317da08ffc96c43cea9f8e162ed2c4544 (patch) | |
tree | 0b79f2d1240afcb92c2de74bb3655435a4259be9 | |
download | aur-85725d5317da08ffc96c43cea9f8e162ed2c4544.tar.gz |
initial commit
-rw-r--r-- | .SRCINFO | 23 | ||||
-rw-r--r-- | .gitignore | 8 | ||||
-rw-r--r-- | 5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch | 26 | ||||
-rw-r--r-- | PKGBUILD | 48 | ||||
-rw-r--r-- | gcc9.patch | 40 |
5 files changed, 145 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..9bb263e58de3 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,23 @@ +pkgbase = bcn3dcuraengine-git + pkgdesc = CuraEngine is a powerful, fast and robust engine for processing 3D models into 3D printing instruction for Ultimaker and other GCode based 3D printers. Modified version for BCN3DCura. + pkgver = r5200.7abc629e + pkgrel = 1 + epoch = 1 + url = https://github.com/Ultimaker/CuraEngine + arch = i686 + arch = x86_64 + license = GPL3 + makedepends = cmake + makedepends = git + depends = libarcus-git + provides = curaengine + conflicts = curaengine + source = git+https://github.com/Ultimaker/CuraEngine.git#tag=3.2.1 + source = gcc9.patch + source = 5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch + md5sums = SKIP + md5sums = bf99eb9e5907a55caa65064114e47672 + md5sums = 74779d285eb559a779a332ac3d9c11f8 + +pkgname = bcn3dcuraengine-git + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..a511893ac991 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +CuraEngine +src +pkg +*.tar.xz +*.tar.gz +*.zip +*.log +.psci_modules diff --git a/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch b/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch new file mode 100644 index 000000000000..3ea68d97e845 --- /dev/null +++ b/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch @@ -0,0 +1,26 @@ +From 5aad55bf67e52ce5bdb27a3925af8a4cab441b38 Mon Sep 17 00:00:00 2001 +From: Ghostkeeper <rubend@tutanota.com> +Date: Mon, 18 Jun 2018 15:39:01 +0200 +Subject: [PATCH] Remove outdated copy of command_line_settings.json + +This entire directory doesn't exist. +--- + CMakeLists.txt | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c579388fc..4c55e6f398 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -251,11 +251,6 @@ if (BUILD_TESTS) + endforeach() + endif() + +- +-add_custom_command(TARGET CuraEngine POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_directory +- ${CMAKE_SOURCE_DIR}/resources $<TARGET_FILE_DIR:CuraEngine>) +- + # Installing CuraEngine. + include(GNUInstallDirs) + install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..3c495ff4e216 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Adam Goldsmith <contact@adamgoldsmith.name> +# Original Author: Grey Christoforo <first name [at] last name [dot] net> + +pkgname=bcn3dcuraengine-git +pkgver=r5200.7abc629e +pkgrel=1 +epoch=1 +pkgdesc="CuraEngine is a powerful, fast and robust engine for processing 3D models into 3D printing instruction for Ultimaker and other GCode based 3D printers. Modified version for BCN3DCura." +url="https://github.com/Ultimaker/CuraEngine" +arch=('i686' 'x86_64') +license=('GPL3') +provides=('curaengine') +conflicts=('curaengine') +depends=('libarcus-git') +makedepends=('cmake' 'git') +source=('git+https://github.com/Ultimaker/CuraEngine.git#tag=3.2.1' + 'gcc9.patch' + '5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch') +md5sums=('SKIP' + 'bf99eb9e5907a55caa65064114e47672' + '74779d285eb559a779a332ac3d9c11f8') + +prepare() { + cd $srcdir + patch --forward --strip=0 --input="${srcdir}/gcc9.patch" + cd $srcdir/CuraEngine + patch --forward --strip=1 --input="${srcdir}/5aad55bf67e52ce5bdb27a3925af8a4cab441b38.patch" +} + +pkgver() { + cd CuraEngine + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + +build() { + mkdir -p CuraEngine/build + cd CuraEngine/build + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd CuraEngine/build + make DESTDIR="${pkgdir}" install + #install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/gcc9.patch b/gcc9.patch new file mode 100644 index 000000000000..bb3170d110ba --- /dev/null +++ b/gcc9.patch @@ -0,0 +1,40 @@ +--- CuraEngine.orig/src/layerPart.cpp 2019-08-15 12:47:55.000000000 +0200 ++++ CuraEngine/src/layerPart.cpp 2019-08-15 12:57:49.000000000 +0200 +@@ -46,7 +46,7 @@ + { + const auto total_layers = slicer->layers.size(); + assert(mesh.layers.size() == total_layers); +-#pragma omp parallel for default(none) shared(mesh,slicer) firstprivate(union_layers,union_all_remove_holes) schedule(dynamic) ++#pragma omp parallel for shared(mesh,slicer) firstprivate(union_layers,union_all_remove_holes) schedule(dynamic) + for (unsigned int layer_nr = 0; layer_nr < total_layers; layer_nr++) + { + SliceLayer& layer_storage = mesh.layers[layer_nr]; +--- CuraEngine.orig/src/support.cpp 2019-08-15 12:47:55.000000000 +0200 ++++ CuraEngine/src/support.cpp 2019-08-15 12:58:42.590264508 +0200 +@@ -720,7 +720,7 @@ + const double support_angle = mesh.getSettingInAngleRadians("support_angle"); + const double tan_angle = tan(support_angle) - 0.01; //The X/Y component of the support angle. 0.01 to make 90 degrees work too. + const coord_t max_dist_from_lower_layer = tan_angle * layer_height; //Maximum horizontal distance that can be bridged. +- #pragma omp parallel for default(none) shared(storage, mesh) schedule(dynamic) ++ #pragma omp parallel for shared(storage, mesh) schedule(dynamic) + for (unsigned int layer_idx = 1; layer_idx < storage.print_layer_count; layer_idx++) + { + std::pair<Polygons, Polygons> basic_and_full_overhang = computeBasicAndFullOverhang(storage, mesh, layer_idx, max_dist_from_lower_layer); +@@ -775,7 +775,7 @@ + const double tan_angle = tan(angle) - 0.01; // the XY-component of the supportAngle + xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, false).offset(xy_distance); + // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area +- #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) ++ #pragma omp parallel for shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) + for (unsigned int layer_idx = 1; layer_idx < layer_count; layer_idx++) + { + Polygons outlines = storage.getLayerOutlines(layer_idx, false); +@@ -978,7 +978,7 @@ + const int max_checking_layer_idx = std::min(static_cast<int>(storage.support.supportLayers.size()) + , static_cast<int>(layer_count - (layer_z_distance_top - 1))); + const size_t max_checking_idx_size_t = std::max(0, max_checking_layer_idx); +-#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic) ++#pragma omp parallel for shared(support_areas, storage) schedule(dynamic) + for (size_t layer_idx = 0; layer_idx < max_checking_idx_size_t; layer_idx++) + { + support_areas[layer_idx] = support_areas[layer_idx].difference(storage.getLayerOutlines(layer_idx + layer_z_distance_top - 1, false)); |