From e7a8d48ccacb2fdb3ba08a5edaa9e0426a098d39 Mon Sep 17 00:00:00 2001
From: Bruno <bruno.herbelin@gmail.com>
Date: Wed, 26 Oct 2022 09:44:10 +0200
Subject: [PATCH 1/2] Packaging fix (Cpack OSX)

---
 CMakeLists.txt     | 3 +++
 src/CMakeLists.txt | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8797b8..fc5e193 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,9 @@ if(UNIX)
 
         # CPACK
         set(CPACK_SYSTEM_NAME  "OSX_${CMAKE_OSX_DEPLOYMENT_TARGET}_${CMAKE_OSX_ARCHITECTURES}")
+        set(CPACK_GENERATOR DragNDrop)
+        set(CPACK_BINARY_DRAGNDROP ON)
+        set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/osx/entitlements.plist")
 
         # find icu4c in OSX (pretty well hidden...)
         set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/icu4c/lib/pkgconfig")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 724629f..0d0083c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -164,10 +164,6 @@ target_link_libraries(${VMIX_BINARY} LINK_PRIVATE
 
 IF(APPLE)
 
-    # Bundle target
-    set(CPACK_GENERATOR DragNDrop)
-    set(CPACK_BINARY_DRAGNDROP ON)
-
     install(TARGETS ${VMIX_BINARY}
             CONFIGURATIONS Release RelWithDebInfo
             BUNDLE  DESTINATION . COMPONENT Runtime
@@ -236,7 +232,6 @@ IF(APPLE)
             COMPONENT Runtime
     )
 
-    set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/osx/entitlements.plist")
     set(APPLE_CODESIGN_IDENTITY "" CACHE STRING "")
     string(LENGTH "${APPLE_CODESIGN_IDENTITY}" APPLE_CODESIGN_IDENTITY_LENGHT)
     if( ${APPLE_CODESIGN_IDENTITY_LENGHT} LESS 40 )

From f841e78dcf585d37b4c4d8c1620044f3af9d1726 Mon Sep 17 00:00:00 2001
From: Bruno <bruno.herbelin@gmail.com>
Date: Wed, 26 Oct 2022 10:01:28 +0200
Subject: [PATCH 2/2] Bundle fix (OSX)

---
 osx/Info.plist | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/osx/Info.plist b/osx/Info.plist
index 14328ba..6dd646e 100644
--- a/osx/Info.plist
+++ b/osx/Info.plist
@@ -54,13 +54,12 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
         </dict>
+        <key>NSHighResolutionCapable</key>
+        <true/>
         <key>NSCameraUsageDescription</key>
         <string>vimix needs to access the camera to enable camera sources.</string>
-        <key>NSHighResolutionCapable</key>
         <key>NSMicrophoneUsageDescription</key>
         <string>vimix needs to access the microphone to enable sound sources.</string>
-        <key>NSMicrophoneUsageDescription</key>
-	<true/>
 	<key>NSHumanReadableCopyright</key>
         <string>Copyright © 2022 Bruno Herbelin. All rights reserved.</string>
 	<key>NSPrincipalClass</key>