Merge pull request #2 from prusa3d/master

Update to upstream master.

CMakeLists.txt

@@ -393,6 +393,7 @@ endif ()
 
 find_package(PNG REQUIRED)
 
+set(OpenGL_GL_PREFERENCE "LEGACY")
 find_package(OpenGL REQUIRED)
 
 # Find glew or use bundled version
@@ -509,11 +510,14 @@ endif()
 if (WIN32)
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 elseif (SLIC3R_FHS)
+    # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
     set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/PrusaSlicer")
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${SLIC3R_FHS_RESOURCES}")
     install(FILES src/platform/unix/PrusaSlicer.desktop DESTINATION ${SLIC3R_FHS_RESOURCES}/applications)
+    install(FILES src/platform/unix/PrusaGcodeviewer.desktop DESTINATION ${SLIC3R_FHS_RESOURCES}/applications)
 else ()
     install(FILES src/platform/unix/PrusaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
+    install(FILES src/platform/unix/PrusaGcodeviewer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 endif ()
 

deps/CGAL/CGAL.cmake

@@ -15,6 +15,17 @@ include(GNUInstallDirs)
 # If this file is not present, it will not consider the stored absolute path
 ExternalProject_Add_Step(dep_CGAL dep_CGAL_relocation_fix
     DEPENDEES install
+
     COMMAND ${CMAKE_COMMAND} -E remove CGALConfig-installation-dirs.cmake
     WORKING_DIRECTORY "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL"
 )
+
+# Again, for whatever reason, CGAL thinks that its version is not relevant if
+# configured as a header only library. Fixing it by placing a cmake version file
+# besides the installed config file.
+ExternalProject_Add_Step(dep_CGAL dep_CGAL_version_fix
+    DEPENDEES install
+
+    COMMAND ${CMAKE_COMMAND} -E copy cgal/CGALConfigVersion.cmake "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/CGAL/CGALConfigVersion.cmake"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
+)

deps/CGAL/cgal/CGALConfigVersion.cmake

@@ -0,0 +1,37 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "5.0.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()

deps/PNG/PNG.cmake

@@ -1,7 +1,3 @@
-set(_prefix_line "")
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(_prefix_line "-DPNG_PREFIX=prusaslicer_")
-endif()
 
 prusaslicer_add_cmake_project(PNG 
     GIT_REPOSITORY https://github.com/glennrp/libpng.git 
@@ -10,7 +6,7 @@ prusaslicer_add_cmake_project(PNG
     CMAKE_ARGS
         -DPNG_SHARED=OFF
         -DPNG_STATIC=ON
-        ${_prefix_line}
+        -DPNG_PREFIX=prusaslicer_
         -DPNG_TESTS=OFF
 )
 

resources/data/flatpak/com.prusa3d.PrusaSlicer.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=PrusaSlicer
+GenericName=3D Printing Software
+Icon=com.prusa3d.PrusaSlicer
+Exec=prusa-slicer %F
+Terminal=false
+Type=Application
+MimeType=model/stl;model/x-wavefront-obj;model/3mf;model/x-geomview-off;application/x-amf;
+Categories=Graphics;3DGraphics;Engineering;
+Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
+StartupNotify=false
+StartupWMClass=prusa-slicer

resources/data/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+    <id>com.prusa3d.PrusaSlicer</id>
+    <launchable type="desktop-id">com.prusa3d.PrusaSlicer.desktop</launchable>
+    <provides>
+        <id>prusa-slicer.desktop</id>
+    </provides>
+    <name>PrusaSlicer</name>
+    <summary>Powerful 3D printing slicer optimized for Prusa printers</summary>
+    <metadata_license>0BSD</metadata_license>
+    <project_license>AGPL-3.0-only</project_license>
+    <description>
+        <p>
+            PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code
+            instructions for FFF printers or PNG layers for mSLA 3D printers. It's
+            compatible with any modern printer based on the RepRap toolchain, including all
+            those based on the Marlin, Prusa, Sprinter and Repetier firmware. It also works
+            with Mach3, LinuxCNC and Machinekit controllers.
+        </p>
+        <p>
+            PrusaSlicer is based on Slic3r by Alessandro Ranelucci and the RepRap community.
+        </p>
+        <p>
+            What are some of PrusaSlicer's main features?
+        </p>
+        <ul>
+            <li>multi-platform (Linux/Mac/Win) and packaged as standalone-app with no dependencies required</li>
+            <li>complete command-line interface to use it with no GUI</li>
+            <li>multi-material (multiple extruders) object printing</li>
+            <li>multiple G-code flavors supported (RepRap, Makerbot, Mach3, Machinekit etc.)</li>
+            <li>ability to plate multiple objects having distinct print settings</li>
+            <li>multithread processing</li>
+            <li>STL auto-repair (tolerance for broken models)</li>
+            <li>wide automated unit testing</li>
+        </ul>
+    </description>
+    <url type="homepage">https://www.prusa3d.com/prusaslicer/</url>
+    <url type="help">https://help.prusa3d.com</url>
+    <url type="bugtracker">https://github.com/prusa3d/PrusaSlicer/issues</url>
+    <screenshots>
+        <screenshot type="default">
+            <image>https://user-images.githubusercontent.com/590307/78981854-24d07580-7b21-11ea-9441-77923534a659.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://user-images.githubusercontent.com/590307/78981860-2863fc80-7b21-11ea-8c2d-8ff79ced2578.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://user-images.githubusercontent.com/590307/78981862-28fc9300-7b21-11ea-9b0d-d03e16b709d3.png</image>
+        </screenshot>
+    </screenshots>
+    <content_rating type="oars-1.1" />
+    <releases>
+        <release version="2.2.0" date="2020-03-21">
+            <description>
+                <p>This is final release of PrusaSlicer 2.2.0 introducing SLA hollowing and hole drilling, support for 3rd party printer vendors, 3Dconnexion support, 
+                automatic variable layer height, macOS dark mode support, greatly improved ColorPrint feature and much, much more.
+                Several bugs found in the previous release candidate are fixed in this final release. See the respective change logs of the previous releases for all the 
+                new features, improvements and bugfixes in the 2.2.0 series.</p>
+            </description>
+        </release>
+  </releases>
+</component>