From 34d12e46573ceded049f59983e714dd6a9de4978 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Sun, 17 Nov 2024 10:35:09 +0100
Subject: [PATCH] bambu-studio: 01.09.07.52 > 01.10.01.50

(cherry picked from commit 1dd96bb0f4ab4e539f6a1caf8941513c5bb12287)
---
 .../misc/bambu-studio/default.nix             | 15 +++++++------
 .../patches/meshboolean-const.patch           | 21 -------------------
 2 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch

diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix
index 168c3ccf72f9..d5aafeb2bb8f 100644
--- a/pkgs/applications/misc/bambu-studio/default.nix
+++ b/pkgs/applications/misc/bambu-studio/default.nix
@@ -8,11 +8,12 @@
   wrapGAppsHook3,
   boost180,
   cereal,
-  cgal_5,
+  cgal,
   curl,
   dbus,
   eigen,
   expat,
+  ffmpeg,
   gcc-unwrapped,
   glew,
   glfw,
@@ -55,13 +56,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bambu-studio";
-  version = "01.09.07.52";
+  version = "01.10.01.50";
 
   src = fetchFromGitHub {
     owner = "bambulab";
     repo = "BambuStudio";
     rev = "v${version}";
-    hash = "sha256-fhH4N29P/ysdHHbZt+FnBl3+QtTNhbVE3j4ZnFJyJH0=";
+    hash = "sha256-7mkrPl2CQSfc1lRjl1ilwxdYcK5iRU//QGKmdCicK30=";
   };
 
   nativeBuildInputs = [
@@ -74,11 +75,12 @@ stdenv.mkDerivation rec {
     binutils
     boost180
     cereal
-    cgal_5
+    cgal
     curl
     dbus
     eigen
     expat
+    ffmpeg
     gcc-unwrapped
     glew
     glfw
@@ -109,8 +111,6 @@ stdenv.mkDerivation rec {
   patches = [
     # Fix for webkitgtk linking
     ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch
-    # Fix build with cgal-5.6.1+
-    ./patches/meshboolean-const.patch
     # Fix an issue with
     ./patches/dont-link-opencv-world-bambu.patch
   ];
@@ -149,6 +149,9 @@ stdenv.mkDerivation rec {
     "-DSLIC3R_FHS=1"
     "-DSLIC3R_GTK=3"
 
+    # Skips installing ffmpeg, since we BYO.
+    "-DFLATPAK=1"
+
     # BambuStudio-specific
     "-DBBL_RELEASE_TO_PUBLIC=1"
     "-DBBL_INTERNAL_TESTING=0"
diff --git a/pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch b/pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch
deleted file mode 100644
index 68e72591d8f4..000000000000
--- a/pkgs/applications/misc/bambu-studio/patches/meshboolean-const.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix build with cgal 5.6.1+
-
-diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp
-index 50bbc099..b05245d3 100644
---- a/src/libslic3r/MeshBoolean.cpp
-+++ b/src/libslic3r/MeshBoolean.cpp
-@@ -200,12 +200,12 @@ indexed_triangle_set cgal_to_indexed_triangle_set(const _Mesh &cgalmesh)
-     const auto &vertices = cgalmesh.vertices();
-     int vsize = int(vertices.size());
-
--    for (auto &vi : vertices) {
-+    for (const auto &vi : vertices) {
-         auto &v = cgalmesh.point(vi); // Don't ask...
-         its.vertices.emplace_back(to_vec3f(v));
-     }
-
--    for (auto &face : faces) {
-+    for (const auto &face : faces) {
-         auto vtc = cgalmesh.vertices_around_face(cgalmesh.halfedge(face));
-
-         int i = 0;