mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,869 Commits 3 Branches 0 Tags 638 MiB
Commit Graph

47 Commits

Author SHA1 Message Date
Mack dc041c1321 FIX:github workflow fix 
jira: nojia
Change-Id: Ifa79d713cb09ca927797160c7fbb53f266501f84
(cherry picked from commit b059336940dd038b30e1cf0a44ebcd33df771a8c)
 2025-04-25 14:23:40 +08:00
Bastien Nocera bea2746f1a FIX: occt build failure 
Pick up build error fix from upstream:
7236e83dcc

/run/build/BambuStudio/deps/build/dep_OCCT-prefix/src/dep_OCCT/src/StdPrs/StdPrs_BRepFont.cxx: In member function ‘Standard_Boolean StdPrs_BRepFont::renderGlyph(Standard_Utf32Char, TopoDS_Shape&)’:
/run/build/BambuStudio/deps/build/dep_OCCT-prefix/src/dep_OCCT/src/StdPrs/StdPrs_BRepFont.cxx:465:30: error: invalid conversion from ‘unsigned char*’ to ‘const char*’ [-fpermissive]
  465 |     const char* aTags      = &anOutline->tags[aStartIndex];
      |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |                              |
      |                              unsigned char*
 2025-03-17 10:38:41 +08:00
MackBambu 2d70a1bcb6 NEW:add ffmepg build Cmake 
buildLinuxImage add ffmpeg so file

jira:nojira

Change-Id: I3e1be53aa58a179b8d9ae048ed7538de3ae8d111
 2024-10-15 15:50:26 +08:00
Mack 82919f53a4 FIX: occt build error 
JIRA:STUDIO-7170
GITHUB:#4158

Can't find the git command in the debain

Change-Id: I0a0de9691f6ed6a6c3a056fd3470bf4be5f4e4eb
(cherry picked from commit da0267305a2cc2f28e37b0da58c929307c3aeee2)
 2024-08-26 17:23:33 +08:00
Mack a078ccefc4 ENH: add depend logic of curl to openssl for all platform 
JIRA: STUDIO-6329
Change-Id: Id0251b4862c6b718e885437c036511358be04748
 2024-06-18 14:55:27 +08:00
Mack a181250668 ci: change wxWidgets source to official repository 
JIRA: STUDIO-6329
Change-Id: I31e0c891b24b4ba89993fcd7c3d1a5c67d2d117f
 2024-06-18 14:55:27 +08:00
Mack c8378296fa ci: using the flatpak patch 
JIRA: STUDIO-6329
Change-Id: I6625659017ca84113a3bba8656abea87cc0bebd8
 2024-06-18 14:55:27 +08:00
Mack 5c6c68e051 ci: update openssl version 3.1.2 
JIRA: STUDIO-6329
Change-Id: Ic4e6a02e7077579fb540e408d635ba890a779a48
 2024-06-18 14:55:27 +08:00
Mack 1acea099e7 ci: unstable download of OSSPlanet freetype files 
JIRA: STUDIO-6329
Change-Id: Ia8ee9eb723aaff3bb91e81e0a838847cde664894
 2024-06-18 14:55:27 +08:00
Mack 57e7714bfb ci: support vs2022 17.1x.y 
JIRA: STUDIO-6329
Change-Id: I788b6967a31a79542410e16a3d8bae2b53c24553
 2024-06-18 14:55:27 +08:00
lane.wei 0dd63500b1 ENH: add depend logic of curl to openssl for all platform 
JIRA: no-jira

Change-Id: I06f48a7299e542d1a01ef4464c7be4a50aecfe52
(cherry picked from commit 4a2cb5003ddc6115b315a96e6fd9a0d7201f58db)
 2024-06-11 18:17:08 +08:00
astrolemonade 2a7368776b Update OpenCV.cmake 
This is a port of https://github.com/SoftFever/OrcaSlicer/pull/5311 which is a fix for https://github.com/SoftFever/OrcaSlicer/issues/5194 which happens to apply to Bambu Studio as well
 2024-05-31 15:21:35 +08:00
zhou.xu fa71471920 NEW:add OpenCV.cmake in deps 
jira: none
Change-Id: I1ae4a2bd5618e9e620b08a937904d6af5d00bc41
 2024-04-23 20:59:30 +08:00
lane.wei 3cee03b6f1 FIX: fix a typo when building glfw 
Change-Id: Ica11dba33f963230566ceceb65c8d51dea2446e8
 2024-03-25 15:29:19 +08:00
lane.wei cc1ce2ccb5 ENH: linux: set openssl back to 1.1.1k 
currently openssl 3.1 can not work successfully on OpenSUSE
github: https://github.com/bambulab/BambuStudio/issues/2663

Change-Id: Ib71cf6fea9ed442681f15826e1ac6844d180fbd0
(cherry picked from commit b462f04b4500ba100bbd52bc9ed686d2d9c4b650)
 2024-03-25 10:42:29 +08:00
lane.wei aee2df691c FIX: Boost: fix the building error on github workflow 
the original url can not be used
create a new one on bambulab

Change-Id: Ie8c1fc52c717307a2a7f8475f5686b6a231002af
 2024-01-08 17:39:18 +08:00
Bastien Nocera 89203fd4b4 deps: Remove unused wxWidgets build option 
CMake Warning:
  Manually-specified variables were not used by the project:

    wxUSE_LIBXPM
 2024-01-08 08:40:28 +08:00
Bastien Nocera 9f69b21b5c deps: Build wxWidgets without mspack support 
We don't use wxWidgets' CHM support, so don't require libmspack's
development libraries, and disable building wxWidgets with the support.
 2024-01-08 08:40:28 +08:00
lane.wei 50c43d10ca FIX: deps: fix the compiling issue under windows 
caused by previous gcc patch from linux
github: https://github.com/bambulab/BambuStudio/issues/3064

Change-Id: If6075068b961b956fc2e0ca369adc01b2f50b0db
 2023-12-21 10:59:47 +08:00
lane.wei 4723c47bc6 FIX: fix the compiling issue under windows 
github: https://github.com/bambulab/BambuStudio/issues/3028
Change-Id: Iafde9d2086c0cd31aa12e39cef7ded1e19e9d3e7
 2023-12-08 09:20:41 +08:00
lane.wei b6a2dcc057 ENH: deps: update some import libraries 
1. update openssl to 3.1
2. update zlib to 1.2.13
3. update expat to 2.5

Change-Id: I46ac38f8e5acab4abae42645a56eec7d9381865e
(cherry picked from commit 34013820d325c41e1514d0f334f3c2be53145852)
 2023-11-01 09:11:19 +08:00
lane.wei eca0d78dbe FIX: CURL: don't build curl.exe 
on ubuntu 20.04, link curl.exe will cause an error

Change-Id: Ic854abdf020d36148394552eccc76dd7be19208f
 2023-07-20 21:08:36 +08:00
lane.wei e39fca1923 ENH: deps: fix the compiling issue caused by gmp downloading fail 
download GMP from github directly for gmp blocking the access from
github

Change-Id: I344f14dded450c5a7549b2a94cafe46c25db9448
 2023-07-14 18:04:21 +08:00
chunmao.guo ef111ab597 FIX: boost build on macos 
Change-Id: I9ac1f05b93581f5c88cec12291049e77f441cb8b
(cherry picked from commit ebe0a67ffc578035510c3f231a085bd8ebe5b787)
 2023-07-13 10:35:05 +08:00
Arthur 3d8383f127 ENH: upgrade some deps libraries 
CGAL to 5.4
 TBB to 2021.5
 OpenVDB to 8.2

Change-Id: I08992fce104e6f56001643c3c5dbf6c3f59ffc3d
(cherry picked from commit 1571f176fc37dda1c3e889776e13fa49bba4ae42)
 2023-07-07 17:25:51 +08:00
Maciej Lisiewski fbe776aaaa Fix OpenEXR build with GCC13 2023-06-14 10:43:35 +08:00
Maciej Lisiewski 58e9996105 Backport TBB fix to allow building on GCC13 2023-06-14 10:43:35 +08:00
lane.wei a2f88ac9d5 ENH: deps: add a flag to select jpeg lib's version under linux 
by default use libjpeg.so.8

Change-Id: I2602820e7ef901badc7e27b6108b02eaf3597ffe
 2023-02-24 17:44:15 +08:00
lane.wei 7e9ccefcaa FIX: boost: fix the patch failed issue of boost 
Change-Id: I6f689cd6dc08964cb759d09798b2bbe64c7aae85
 2023-01-17 19:37:56 +08:00
Joshua Wise 89d38fc6f6 deps/wxWidgets: avoid patching too many times 
Each time the dependency build was run, previously, the build system
attempted to patch wxWidgets after checking it out from Git.  The problem,
of course, is that if this happened once, it would not succeed a second
time, so the only workaround was to blow away the wxWidgets source tree.

The real solution to this is to create a BBL fork of wxWidgets (or to
upstream the changes...).  But for now, we add a file to determine whether
the patch has taken place already, and if it's there, we don't apply the
patch again.  This will mean that all kinds of exciting things happen if you
change Git revisions of wxWidgets or the patch changes (in those cases,
you'll have to blow away the build), but at least this makes it possible to
build twice in the same repository in the best case.

To update an existing checkout, run:

  $ touch deps/build/dep_wxWidgets-prefix/src/dep_wxWidgets/WXWIDGETS_PATCHED
 2023-01-12 14:23:37 +08:00
Joshua Wise fe13ca0b52 Linux: update GLEW to 2.2.0, and enable EGL support in GLEW to match wxWidgets 
On Linux, wxGTK by default attempts to use EGL if it is available on the
system, rather than GLX.  Unfortunately, the ancient version of GLEW that we
packaged in did not support EGL, and even if it did, the configuration was
not set up to enable EGL.  To solve this, we:

  * upgrade GLEW to version 2.2.0, from upstream GitHub

  * modify the Bambu build process to enforce that we use GLEW from the
    built dependency

  * remove the "extra" even older GLEW that was packaged

  * modify GLEW's CMake configuration to enable EGL support when it is
    available on the system (using the same test as wxWidgets uses to decide
    whether to enable EGL support); if EGL isn't available at compile time,
    both GLEW and wxWidgets will fall back on GLX

Note that you probably will have to blow away your CMakeCache for this to
work correctly -- otherwise, you may end up with the system GLEW, if you
have one installed (which is probably not what you want -- on Ubuntu, the
system GLEW is GLX, not EGL).
 2023-01-12 12:29:59 +08:00
chunmao.guo dfc1eec49b FIX: patch boost limit_handles 
Change-Id: Id155b1c23e19b4cbf7c4bea18ce138511d5f2b8f
 2023-01-10 19:08:26 +08:00
chunmao.guo a953442c9e ENH: update WebView2 to 1.0.1418.22 
Change-Id: I76d4747f8e135368e9dae6ee9f3e980bf4ec6f81
 2023-01-10 19:08:26 +08:00
lane.wei e03ac4957b ENH: curl: set backend to openssl for windows 
Change-Id: I64c3b9f29ec7e986585e7e8361931599d5398125
 2022-12-19 06:13:10 -05:00
tamasmeszaros c87fda7f7a Fix Boost build not forwarding osx sdk flags to the compiler 
(cherry picked from commit 8c6f67a1645c596189d6601c5ed758e70adfd172)
 2022-12-16 22:51:07 -05:00
tamasmeszaros d5a8db72ff Really fix boost build 
(cherry picked from commit 8d25bf680165f5db0cfd398525199fad64e7642e)
 2022-12-16 22:51:07 -05:00
tamasmeszaros 2f39bb0c2b Fix boost build 
(cherry picked from commit d3cf765a24cf54d0e2bae790cefb8d77444998f4)
 2022-12-16 22:51:07 -05:00
tamasmeszaros 6be5c9b3f8 Fix boost with clang on Linux and fix exclude rules for bad tests 
(cherry picked from commit 62fb70d1cb9513f4e54481fac31a1c0771d2a30a)
 2022-12-16 22:51:07 -05:00
tamasmeszaros a5f9ab614a Update Boost to v1.78 
(cherry picked from commit 776a125b9b5fb4af1d9c57b78063012ad6421f4b)
 2022-12-16 22:51:07 -05:00
enricoturri1966 a89d896679 Updated deps-windows.cmake and Boost.cmake to be able to build dependencies using Visual Studio 2022 
(cherry picked from commit 1376c9cffdb23351d35270ef5673ea98789dcaaf)
 2022-12-16 22:51:07 -05:00
lane.wei 5d013a40a4 ENH: use openssl in mac 
Change-Id: Idbd5fe9232d6acc1aaa7ddeb1e6f312c1a6fcb44
 2022-12-15 04:38:15 -05:00
lane.wei 27d2008037 ENH: use wxFont::AddPrivateFont to load fonts for linux 
Change-Id: Iefe1753a08fd188a274b4d555c5fcda8fca6d719
 2022-12-15 04:38:15 -05:00
lane.wei 1c1e5f8ef8 Set the deploy target version to 10.15 of deps 
Change-Id: I50c0ff6f306aaa039fa76ae601331fedb541b13a
 2022-09-13 19:42:32 +08:00
lane.wei 5b7cf54cf5 fix some building issues under linux 
Change-Id: I787024a74e15ef3904dcffe233e4387bdfc139b3
 2022-09-08 21:49:36 +08:00
yifan.wu 13b711602c ENH: add freetype for occt 
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I3adcf4b27deb0953e059c3e7fa9b9d49e447c57b
(cherry picked from commit 400cff06210c62e4019ff6f7174216d2faeaa8e2)
 2022-08-26 09:25:59 +08:00
gerrit cc1a6ee635 support linux build for wxWidgets 
Change-Id: I7d4e84c4e82371c6e688b607ac0658c6319d1216
(cherry picked from commit 6ff1613c3997628ea932d4956f874c2356da0056)
 2022-08-26 09:25:59 +08:00
lane.wei 1555904bef Add the full source of BambuStudio 
using version 1.0.10
 2022-07-15 23:42:08 +08:00