[PR] fix build for Apple MacOS

Author: awawa-dev

CMakeLists.txt

@@ -102,7 +102,7 @@ if ( "${PLATFORM}" MATCHES "osx" )
 	FIRSTSUBDIR(SUBDIRQT "/usr/local/Cellar/qt")
 	SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${SUBDIRQT} "/usr/local/opt/qt5" )
 	include_directories("/opt/X11/include/")
-	SET ( DEFAULT_USB_HID    ON )
+	SET ( DEFAULT_USB_HID    OFF )
 elseif ( "${PLATFORM}" MATCHES "rpi" )	
 	SET ( DEFAULT_WS281XPWM  ON )
 

CompileHowto.md

@@ -13,8 +13,8 @@ sometimes on RPI you may need the videocore IV headers
 sudo apt-get install libraspberrypi-dev
 ```
 
-## Windows (WIP)
-We assume a 64bit Windows 7 or higher. Install the following;
+## Windows
+We assume a 64bit Windows 10. Install the following;
 - [Git](https://git-scm.com/downloads) (Check: Add to PATH)
 - [CMake (Windows win64-x64 Installer)](https://cmake.org/download/) (Check: Add to PATH)
 - [Visual Studio 2019 Build Tools](https://go.microsoft.com/fwlink/?linkid=840931) ([direct link](https://aka.ms/vs/16/release/vs_buildtools.exe))
@@ -25,6 +25,13 @@ We assume a 64bit Windows 7 or higher. Install the following;
   - Now we can download Qt to _C:\Qt_ `mkdir c:\Qt && aqt install -O c:\Qt 5.15.0 windows desktop win64_msvc2019_64`
 - Optional for package creation: [NSIS 3.x](https://sourceforge.net/projects/nsis/files/NSIS%203/) ([direct link](https://sourceforge.net/projects/nsis/files/latest/download))
 
+## MacOs
+First install brew manager.
+Next:
+- brew install qt@5
+- brew install cmake
+- brew install jpeg-turbo
+
 # Compiling and installing HyperHDR
 
 ### The general quick way (without big comments)

assets/webconfig/js/content_dashboard.js

@@ -98,15 +98,23 @@ $(document).ready( function() {
 
 
 	//determine platform
-	var grabbers = window.serverInfo.grabbers.active;
 	var html = "";
-
-  if (grabbers.indexOf('V4L2:Media Foundation') > -1)
-    html += 'Windows (Microsoft Media Foundation)';
-  else if (grabbers.indexOf('V4L2') > -1)
-    html += 'Linux (V4L2)';
+	
+	if (window.serverInfo.grabbers != null && window.serverInfo.grabbers != undefined &&
+	    window.serverInfo.grabbers.active != null && window.serverInfo.grabbers.active != undefined)
+	{
+		var grabbers = window.serverInfo.grabbers.active;
+		if (grabbers.indexOf('V4L2:Media Foundation') > -1)
+			html += 'Windows (Microsoft Media Foundation)';
+		else if (grabbers.indexOf('V4L2') > -1)
+			html += 'Linux (V4L2)';
+		else
+			html += 'Unknown';
+	}
 	else
-		html += 'Unknown';
+	{
+		html = 'None';
+	}
 
 	$('#dash_platform').html(html);
 

cmake/osxbundle/Info.plist

@@ -18,11 +18,11 @@
     <string>Hyperion.icns</string>
 
     <key>CFBundleIdentifier</key>
-    <string>com.hyperion-project.Hyperion</string>
+    <string>com.hyperhdr.HyperHDR</string>
     <key>CFBundleName</key>
-    <string>Hyperion</string>
+    <string>HyperHDR</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.0</string>
+    <string>16.0</string>
 
     <key>BuildMachineOSBuild</key>
     <string>11G63</string>
@@ -57,6 +57,8 @@
     <string>NSApplication</string>
     <key>NSHighResolutionCapable</key>
     <true/>
+    <key>NSCameraUsageDescription</key>
+    <string>HyperHDR needs permission to access the grabber to capture video/camera stream.</string>
 
     <key>SUEnableAutomaticChecks</key>
     <true/>

…bsrc/hyperhdrbase/LinearColorSmoothing.h …lude/hyperhdrbase/LinearColorSmoothing.hlibsrc/hyperhdrbase/LinearColorSmoothing.h renamed to include/hyperhdrbase/LinearColorSmoothing.h libsrc/hyperhdrbase/LinearColorSmoothing.h renamed to include/hyperhdrbase/LinearColorSmoothing.h

@@ -276,8 +276,7 @@ class Image
 	}
 
 private:
-	template<class T>
-	friend class Image;
+	
 
 	///
 	/// Translate x and y coordinate to index of the underlying vector

include/utils/Image.h

@@ -19,8 +19,12 @@ typedef SSIZE_T ssize_t;
 #endif
 
 
+
 class ImageData : public QSharedData
-{
+{	
+	template<class T>
+	friend class Image;
+
 public:
 	ImageData(unsigned width, unsigned height)://, const ColorRgb background) :
 		_width(width),

include/utils/ImageData.h

@@ -77,8 +77,8 @@ public slots:
 	bool                 _inited = false;
 
 	const QString        WEBSERVER_DEFAULT_PATH	    = ":/webconfig";
-	const QString        WEBSERVER_DEFAULT_CRT_PATH = ":/hyperion.crt";
-	const QString        WEBSERVER_DEFAULT_KEY_PATH = ":/hyperion.key";
+	const QString        WEBSERVER_DEFAULT_CRT_PATH = ":/hyperhdrcrt.pem";
+	const QString        WEBSERVER_DEFAULT_KEY_PATH = ":/hyperhdrkey.pem";
 	quint16              WEBSERVER_DEFAULT_PORT     = 8090;
 
 	BonjourServiceRegister * _serviceRegister = nullptr;

include/webserver/WebServer.h

@@ -1,6 +1,8 @@
 #include <effectengine/Animation_MoodBlobs.h>
 
-#define M_PI           3.14159265358979323846
+#ifndef M_PI
+	#define M_PI           3.14159265358979323846
+#endif
 
 Animation_MoodBlobs::Animation_MoodBlobs(QString name) :
 	AnimationBase(name)

libsrc/effectengine/Animation_MoodBlobs.cpp

@@ -21,7 +21,7 @@
 #include <leddevice/LedDeviceWrapper.h>
 
 #include <hyperhdrbase/MultiColorAdjustment.h>
-#include "LinearColorSmoothing.h"
+#include <hyperhdrbase/LinearColorSmoothing.h>
 
 // effect engine includes
 #include <effectengine/EffectEngine.h>