[packages/CuraEngine] - updated to 4.13.2
qboosh
qboosh at pld-linux.org
Fri Sep 27 21:20:44 CEST 2024
commit 09150cf42ccf1666e9b81af58c81268d08aacf8f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 27 21:23:47 2024 +0200
- updated to 4.13.2
CuraEngine-rpath.patch | 24 ------------------------
CuraEngine.spec | 27 +++++++++++++++------------
local-stb.patch | 10 +++++-----
3 files changed, 20 insertions(+), 41 deletions(-)
---
diff --git a/CuraEngine.spec b/CuraEngine.spec
index 0d0c1cb..f8ce1e1 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -4,29 +4,31 @@
Summary: Engine for processing 3D models into G-code instructions for 3D printers
Summary(pl.UTF-8): Silnik do przetwarzania modeli 3D na instrukcje G-code dla drukarek 3D
+# keep in sync with cura, libArcus, libSavitar, python3-Uranium
Name: CuraEngine
-Version: 4.5.0
-Release: 5
+Version: 4.13.2
+Release: 1
Epoch: 1
License: AGPL v3
Group: Applications/Engineering
-#Source0Download: https://github.com/Ultimaker/CuraEngine/releases
+#Source0Download: https://github.com/Ultimaker/CuraEngine/tags
Source0: https://github.com/Ultimaker/CuraEngine/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 63df14853c6a183acc1153176423c2a7
+# Source0-md5: 85b46d4282dc061345d4efda822fae19
Source1: https://raw.githubusercontent.com/nothings/stb/master/stb_image.h
-# Source1-md5: a1170ba8b5f36154a8b9859f17ee8470
-Patch0: %{name}-rpath.patch
+# Source1-md5: 27932e6fb3a2f26aee2fc33f2cb4e696
Patch1: %{name}-static-libstdcpp.patch
Patch2: local-stb.patch
URL: https://github.com/Ultimaker/CuraEngine
-BuildRequires: cmake >= 3.6.0
+BuildRequires: cmake >= 3.8.0
+%{?with_tests:BuildRequires: gmock-devel >= 1.8.0}
BuildRequires: libArcus-devel = %{version}
BuildRequires: libgomp-devel
-BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: polyclipping-devel >= 6.1.2
BuildRequires: protobuf-devel >= 3.0.0
%{?with_tests:BuildRequires: python3 >= 1:3}
BuildRequires: rapidjson-devel
+%requires_eq libArcus
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -49,7 +51,6 @@ pakiecie cura.
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -67,10 +68,12 @@ cp -p %{SOURCE1} stb/
mkdir build
cd build
%cmake .. \
- -DStb_INCLUDE_DIRS:STRING="$(pwd)/.." \
- -DUSE_SYSTEM_LIBS:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=OFF \
- -DCURA_ENGINE_VERSION:STRING=%{version}
+ %{?with_tests:-DBUILD_TESTS:BOOL=ON} \
+ -DCURA_ENGINE_VERSION:STRING=%{version} \
+ -DSET_RPATH:BOOL=OFF \
+ -DStb_INCLUDE_DIRS:STRING="$(pwd)/.." \
+ -DUSE_SYSTEM_LIBS:BOOL=ON
%{__make}
diff --git a/CuraEngine-rpath.patch b/CuraEngine-rpath.patch
deleted file mode 100644
index 105ac1e..0000000
--- a/CuraEngine-rpath.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c9ee5ceb2fb3e25c7c58e2f988f66f91e6fdad37 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Wed, 3 May 2017 14:00:36 +0200
-Subject: [PATCH 1/3] Do not RPATH
-
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2316d6..1ec537d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,7 +21,6 @@ if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- if(NOT DEFINED LIB_SUFFIX)
- set(LIB_SUFFIX "")
- endif()
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-
- set(CURA_ENGINE_VERSION "master" CACHE STRING "Version name of Cura")
-
---
-2.11.0
-
diff --git a/local-stb.patch b/local-stb.patch
index cc4ec0f..5852099 100644
--- a/local-stb.patch
+++ b/local-stb.patch
@@ -1,7 +1,7 @@
---- CuraEngine-4.5.0/CMakeLists.txt.orig 2022-07-08 20:39:09.872656739 +0200
-+++ CuraEngine-4.5.0/CMakeLists.txt 2022-07-08 20:40:19.215614409 +0200
-@@ -24,8 +24,6 @@ if(ENABLE_ARCUS)
- add_definitions(-DARCUS)
+--- CuraEngine-4.13.2/CMakeLists.txt.orig 2024-09-26 21:13:45.678247207 +0200
++++ CuraEngine-4.13.2/CMakeLists.txt 2024-09-26 21:14:33.027990691 +0200
+@@ -28,8 +28,6 @@ if(ENABLE_ARCUS)
+ endif()
endif()
-#For reading image files.
@@ -9,7 +9,7 @@
include_directories(${Stb_INCLUDE_DIRS})
option(USE_SYSTEM_LIBS "Use the system libraries if available" OFF)
-@@ -262,9 +260,6 @@ endif ()
+@@ -277,9 +275,6 @@ endif ()
# Compiling CuraEngine itself.
add_library(_CuraEngine STATIC ${engine_SRCS} ${engine_PB_SRCS}) #First compile all of CuraEngine as library, allowing this to be re-used for tests.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/CuraEngine.git/commitdiff/09150cf42ccf1666e9b81af58c81268d08aacf8f
More information about the pld-cvs-commit
mailing list