From 2ae0a52928312f652f9fbe29df0f23e5257d5d0b Mon Sep 17 00:00:00 2001
From: MackBambu <yongfang.bian@bambulab.com>
Date: Sat, 28 Sep 2024 02:00:31 +0800
Subject: [PATCH] NEW:add ffmepg build Cmake

buildLinuxImage add ffmpeg so file

jira:nojira

Change-Id: I3e1be53aa58a179b8d9ae048ed7538de3ae8d111
(cherry picked from commit 2d70a1bcb6a5ba601525b08a38e7610f018fe106)
---
 CMakeLists.txt                    | 32 +++++++++++++++----------------
 src/slic3r/GUI/AVVideoDecoder.hpp |  2 +-
 src/slic3r/GUI/wxMediaCtrl3.h     |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b81541982..922e113037 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1047,10 +1047,10 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
             ${CMAKE_PREFIX_PATH}/bin/occt/TKXDESTEP.dll
             ${CMAKE_PREFIX_PATH}/bin/occt/TKXSBase.dll
             ${CMAKE_PREFIX_PATH}/bin/freetype.dll
-            ${CMAKE_PREFIX_PATH}/bin/avcodec-59.dll
-            ${CMAKE_PREFIX_PATH}/bin/swresample-4.dll
-            ${CMAKE_PREFIX_PATH}/bin/swscale-6.dll
-            ${CMAKE_PREFIX_PATH}/bin/avutil-57.dll
+            ${CMAKE_PREFIX_PATH}/bin/avcodec-61.dll
+            ${CMAKE_PREFIX_PATH}/bin/swresample-5.dll
+            ${CMAKE_PREFIX_PATH}/bin/swscale-8.dll
+            ${CMAKE_PREFIX_PATH}/bin/avutil-59.dll
          DESTINATION ${_out_dir})
 
     set(${output_dlls}
@@ -1086,10 +1086,10 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
         ${_out_dir}/TKXSBase.dll
 
         ${_out_dir}/freetype.dll
-        ${_out_dir}/avcodec-59.dll
-        ${_out_dir}/swresample-4.dll
-        ${_out_dir}/swscale-6.dll
-        ${_out_dir}/avutil-57.dll
+        ${_out_dir}/avcodec-61.dll
+        ${_out_dir}/swresample-5.dll
+        ${_out_dir}/swscale-8.dll
+        ${_out_dir}/avutil-59.dll
         PARENT_SCOPE
     )
 
@@ -1102,31 +1102,31 @@ function(bambustudio_copy_sos target config postfix output_sos)
 
     file(COPY ${CMAKE_PREFIX_PATH}/lib/libavcodec.so
             ${CMAKE_PREFIX_PATH}/lib/libavcodec.so.61
-            ${CMAKE_PREFIX_PATH}/lib/libavcodec.so.61.10.100
+            ${CMAKE_PREFIX_PATH}/lib/libavcodec.so.61.3.100
             ${CMAKE_PREFIX_PATH}/lib/libavutil.so
             ${CMAKE_PREFIX_PATH}/lib/libavutil.so.59
-            ${CMAKE_PREFIX_PATH}/lib/libavutil.so.59.28.100
+            ${CMAKE_PREFIX_PATH}/lib/libavutil.so.59.8.100
             ${CMAKE_PREFIX_PATH}/lib/libswscale.so
             ${CMAKE_PREFIX_PATH}/lib/libswscale.so.8
-            ${CMAKE_PREFIX_PATH}/lib/libswscale.so.8.2.100
+            ${CMAKE_PREFIX_PATH}/lib/libswscale.so.8.1.100
             ${CMAKE_PREFIX_PATH}/lib/libswresample.so
             ${CMAKE_PREFIX_PATH}/lib/libswresample.so.5
-            ${CMAKE_PREFIX_PATH}/lib/libswresample.so.5.2.100
+            ${CMAKE_PREFIX_PATH}/lib/libswresample.so.5.1.100
          DESTINATION ${_out_dir})
 
     set(${output_dlls}
         ${_out_dir}/libavcodec.so
         ${_out_dir}/libavcodec.so.61
-        ${_out_dir}/libavcodec.so.61.10.100
+        ${_out_dir}/libavcodec.so.61.3.100
         ${_out_dir}/libavutil.so
         ${_out_dir}/libavutil.so.59
-        ${_out_dir}/libavutil.so.59.28.100
+        ${_out_dir}/libavutil.so.59.8.100
         ${_out_dir}/libswscale.so
         ${_out_dir}/libswscale.so.8
-        ${_out_dir}/libswscale.so.8.2.100
+        ${_out_dir}/libswscale.so.8.1.100
         ${_out_dir}/libswresample.so
         ${_out_dir}/libswresample.so.5
-        ${_out_dir}/libswresample.so.5.2.100
+        ${_out_dir}/libswresample.so.5.1.100
         PARENT_SCOPE
     )
 endfunction()
diff --git a/src/slic3r/GUI/AVVideoDecoder.hpp b/src/slic3r/GUI/AVVideoDecoder.hpp
index a32241a62c..99a7349e55 100644
--- a/src/slic3r/GUI/AVVideoDecoder.hpp
+++ b/src/slic3r/GUI/AVVideoDecoder.hpp
@@ -1,7 +1,7 @@
 #ifndef AVVIDEODECODER_HPP
 #define AVVIDEODECODER_HPP
 
-#include "BambuTunnel.h"
+#include "Printer/BambuTunnel.h"
 
 extern "C" {
     #include <libavcodec/avcodec.h>
diff --git a/src/slic3r/GUI/wxMediaCtrl3.h b/src/slic3r/GUI/wxMediaCtrl3.h
index 108c039f45..73224bc384 100644
--- a/src/slic3r/GUI/wxMediaCtrl3.h
+++ b/src/slic3r/GUI/wxMediaCtrl3.h
@@ -23,7 +23,7 @@ void wxMediaCtrl_OnSize(wxWindow * ctrl, wxSize const & videoSize, int width, in
 #else
 
 #define BAMBU_DYNAMIC
-#include <BambuTunnel.h>
+#include "Printer/BambuTunnel.h"
 
 class AVVideoDecoder;