From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 2 Nov 2020 18:41:01 +0000 (+0000)
Subject: wip #4035 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5652e8a41dad9eaeedbbd82220a1fe1d0ff36b91;p=cubeextranet.git

wip #4035 @1
---

diff --git a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll b/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll
index 5e4709653..c7f0bc666 100644
Binary files a/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll and b/fluidbook/compile/_exehtml/_ffmpeg/ffmpeg.dll differ
diff --git a/fluidbook/compile/_exehtml/_ffmpeg/libffmpeg.dylib b/fluidbook/compile/_exehtml/_ffmpeg/libffmpeg.dylib
index e7a330f6e..03951a7b5 100644
Binary files a/fluidbook/compile/_exehtml/_ffmpeg/libffmpeg.dylib and b/fluidbook/compile/_exehtml/_ffmpeg/libffmpeg.dylib differ
diff --git a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
index d5fe9493c..00b793067 100644
--- a/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.mac.exe.html.php
@@ -3,7 +3,7 @@
 class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
 {
     protected $nwplatform = 'osx64';
-    protected $nwversion = '0.29.0';
+    //protected $nwversion = '0.49.2';
     protected $node_platform = 'mac';
     protected $exenameMaxlength = 28;
 
@@ -11,13 +11,12 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
     {
         parent::__construct($book_id);
         $this->version = 'mac-exe-html';
-
     }
 
     public function makePackage($zip)
     {
         $this->preparePackage();
-        $toDelete = ['chromedriver', 'credits.html', 'minidump_stackwalk', 'nwjc', 'payload', 'v8_context_snapshot.bin', 'natives_blob.bin'];
+        $toDelete = ['chromedriver', 'credits.html', 'minidump_stackwalk', 'nwjc', 'payload', 'v8_context_snapshot.bin', 'natives_blob.bin','libffmpeg.dylib'];
         foreach ($toDelete as $item) {
             $p = $this->getFinalPackageDir() . '/' . $item;
             `rm -rf "$p"`;
@@ -71,17 +70,7 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
 
     function replaceFFMpeg()
     {
-        $v = $this->getAppPath() . '/Contents/Versions/';
-        $dr = opendir($v);
-        while ($f = readdir($dr)) {
-            if ($f == '.' || $f == '..') {
-                continue;
-            }
-            $path = $v . '/' . $f;
-            if (is_dir($path)) {
-                copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/libffmpeg.dylib', $path . '/libffmpeg.dylib');
-            }
-        }
+        copy(WS_COMPILE_ASSETS . '/_exehtml/_ffmpeg/libffmpeg.dylib', $this->getAppPath() . '/Contents/Frameworks/nwjs Framework.framework/Versions/Current/libffmpeg.dylib');
     }
 
     protected function signApp()
diff --git a/inc/ws/Util/packager/class.ws.packager.php b/inc/ws/Util/packager/class.ws.packager.php
index 06fc3800f..a381129ff 100644
--- a/inc/ws/Util/packager/class.ws.packager.php
+++ b/inc/ws/Util/packager/class.ws.packager.php
@@ -243,16 +243,6 @@ class wsPackager
 		}
 	}
 
-	protected function moveDatasSWF()
-	{
-		if (file_exists($this->vdir . '/FluidbookDatas.swf')) {
-			rename($this->vdir . '/FluidbookDatas.swf', $this->vdir . '/data/FluidbookDatas.swf');
-		}
-		if (file_exists($this->vdir . '/FluidbookDatasLight.swf')) {
-			rename($this->vdir . '/FluidbookDatasLight.swf', $this->vdir . '/data/FluidbookDatasLight.swf');
-		}
-	}
-
 	protected function postPackage()
 	{