Skip to content

Hide HyperHDR from the macOS Dock #1345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
awawa-dev merged 8 commits into from
Nov 16, 2025
Merged

Hide HyperHDR from the macOS Dock #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bfce600
Add replacement for libglib2.0-0 (armhf, Y2038 bug)
awawa-dev Nov 8, 2025
7683f12
Merge branch 'master' into fix_glibc_dependecy_armhf
awawa-dev Nov 12, 2025
8ae3fdc
Hide HyperHDR from the macOS Dock
awawa-dev Nov 11, 2025
5a14df8
Hide HyperHDR from the macOS Dock (2)
awawa-dev Nov 12, 2025
042f99e
Hide HyperHDR from the macOS Dock (3)
awawa-dev Nov 12, 2025
06aec96
Hide HyperHDR from the macOS Dock (4)
awawa-dev Nov 13, 2025
9c6d74a
Hide HyperHDR from the macOS Dock (5)
awawa-dev Nov 16, 2025
aaf00c9
Merge branch 'master' into no_macos_dock
awawa-dev Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/installers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ macro(DeployApple TARGET)
cmake_policy(PUSH)
cmake_policy(SET CMP0009 NEW)
message( "Re-signing bundle's components...")
file(GLOB_RECURSE libSignFramework LIST_DIRECTORIES false "${CMAKE_INSTALL_PREFIX}/hyperhdr.app/Contents/Frameworks/*")
file(GLOB_RECURSE libSignFramework LIST_DIRECTORIES false "${CMAKE_INSTALL_PREFIX}/hyperhdr.app/Contents/Frameworks/*" "${CMAKE_INSTALL_PREFIX}/hyperhdr.app/Contents/plugins/tls/*")
list(APPEND libSignFramework "${CMAKE_INSTALL_PREFIX}/hyperhdr.app/Contents/MacOS/hyperhdr")
foreach(_fileToSign ${libSignFramework})
string(FIND ${_fileToSign} ".framework/Resources" isResources)
Expand All @@ -163,7 +163,7 @@ macro(DeployApple TARGET)
endif()
endforeach()
message( "Perform final verification...")
execute_process(COMMAND bash -c "codesign --verify --deep -vvvv ${CMAKE_INSTALL_PREFIX}/hyperhdr.app" RESULT_VARIABLE CODESIGN_VERIFY)
execute_process(COMMAND bash -c "codesign --verify --strict --verbose=4 ${CMAKE_INSTALL_PREFIX}/hyperhdr.app" RESULT_VARIABLE CODESIGN_VERIFY)
if(NOT CODESIGN_VERIFY EQUAL 0)
message(WARNING "Failed to repair the bundle signature: verification failed")
endif()
Expand Down
15 changes: 12 additions & 3 deletions cmake/osx/Info.plist → cmake/osx/Info.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<string>HyperHDR</string>
<key>CFBundleExecutable</key>
<string>hyperhdr</string>
<key>CFBundleShortVersionString</key>
<string>@BUNDLE_SHORT_VERSION@</string>
<key>CFBundleVersion</key>
<string>@HYPERHDR_VERSION@</string>
<key>CFBundleIconFile</key>
<string>Hyperhdr.icns</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand All @@ -16,8 +20,13 @@
<string>APPL</string>
<key>NSCameraUsageDescription</key>
<string>HyperHDR needs your permission to access the video capture devices.</string>
<key>NSScreenCaptureUsageDescription</key>
<string>HyperHDR needs your permission to capture the screen.</string>
<key>NSMicrophoneUsageDescription</key>
<string>HyperHDR needs your permission to access the sound capture devices.
NEXT PLEASE RESTART HYPERHDR!</string>
<string>HyperHDR requires microphone access for audio-reactive effects. Once granted, a restart is required to apply the permission.</string>
<key>NSLocalNetworkUsageDescription</key>
<string>HyperHDR needs access to your local network to discover and communicate with other devices.</string>
<key>LSUIElement</key>
<true/>
</dict>
</plist>
</plist>
34 changes: 21 additions & 13 deletions cmake/packages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ if(USE_STANDARD_INSTALLER_NAME AND UNIX AND NOT APPLE)
endif()

if ( APPLE )
SET ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/osx/LICENSE" )
SET ( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/osx/background.png" )
SET ( CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/osx/autorun.scpt" )
SET ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/cmake/osx/LICENSE" )
SET ( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/cmake/osx/background.png" )
SET ( CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_SOURCE_DIR}/cmake/osx/autorun.scpt" )
ELSE()
SET ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" )
SET ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE" )
ENDIF()

SET ( CPACK_PACKAGE_EXECUTABLES "hyperhdr;HyperHDR" )
Expand All @@ -105,7 +105,7 @@ ENDIF()
# Specific CPack Package Generators
# https://cmake.org/Wiki/CMake:CPackPackageGenerators
# .deb files for apt
SET ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux/debian/preinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux/debian/prerm" )
SET ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/linux/debian/preinst;${CMAKE_SOURCE_DIR}/cmake/linux/debian/postinst;${CMAKE_SOURCE_DIR}/cmake/linux/debian/prerm" )
SET ( CPACK_DEBIAN_PACKAGE_DEPENDS "xz-utils, libglib2.0-0 | libglib2.0-0t64" )

SET ( CPACK_DEBIAN_PACKAGE_SUGGESTS "libx11-6" )
Expand All @@ -121,9 +121,9 @@ SET ( CPACK_RPM_PACKAGE_LICENSE "MIT")
SET ( CPACK_RPM_PACKAGE_GROUP "Applications")
SET ( CPACK_RPM_PACKAGE_REQUIRES "xz" )
SET ( CPACK_RPM_PACKAGE_AUTOREQPROV 0 )
SET ( CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux/rpm/preinst" )
SET ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux/rpm/postinst" )
SET ( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux/rpm/prerm" )
SET ( CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/cmake/linux/rpm/preinst" )
SET ( CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/cmake/linux/rpm/postinst" )
SET ( CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_SOURCE_DIR}/cmake/linux/rpm/prerm" )
SET ( CPACK_RPM_SPEC_MORE_DEFINE "%define _build_id_links none" )
if ( ENABLE_SYSTRAY )
SET( CPACK_RPM_PACKAGE_SUGGESTS "gtk3")
Expand Down Expand Up @@ -153,11 +153,19 @@ if ( APPLE )
SET ( CPACK_DMG_FORMAT "ULMO" )

unset(CPACK_PACKAGE_ICON)
set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/osx/Hyperhdr.icns")
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/osx/Hyperhdr.icns")

set(BUNDLE_SHORT_VERSION "${HYPERHDR_VERSION_MAJOR}.${HYPERHDR_VERSION_MINOR}.${HYPERHDR_VERSION_PATCH}")

configure_file(
${CMAKE_SOURCE_DIR}/cmake/osx/Info.plist.in
${CMAKE_CURRENT_BINARY_DIR}/Info.plist
@ONLY
)

set_target_properties(hyperhdr PROPERTIES
MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/cmake/osx/Info.plist
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES"
XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
MACOSX_BUNDLE_COPYRIGHT "awawa-dev"
Expand All @@ -174,9 +182,9 @@ if(WIN32)
file(TO_NATIVE_PATH ${CPACK_PACKAGE_ICON} CPACK_PACKAGE_ICON)
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
endif()
file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows/installer.ico" NSIS_HYP_ICO)
file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows/hyperhdr-logo.bmp" NSIS_HYP_LOGO_HORI)
file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows/hyperhdr-logo-vert.bmp" NSIS_HYP_LOGO_VERT)
file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/cmake/windows/installer.ico" NSIS_HYP_ICO)
file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/cmake/windows/hyperhdr-logo.bmp" NSIS_HYP_LOGO_HORI)
file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/cmake/windows/hyperhdr-logo-vert.bmp" NSIS_HYP_LOGO_VERT)
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" NSIS_HYP_ICO "${NSIS_HYP_ICO}")
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" NSIS_HYP_LOGO_VERT "${NSIS_HYP_LOGO_VERT}")
STRING(REGEX REPLACE "\\\\" "\\\\\\\\" NSIS_HYP_LOGO_HORI "${NSIS_HYP_LOGO_HORI}")
Expand Down
3 changes: 2 additions & 1 deletion sources/webserver/WebSocketClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ WebSocketClient::WebSocketClient(
+ QString("Connection: Upgrade\r\n")
+ QString("Sec-WebSocket-Accept: ") + QString(hash.data()) + "\r\n\r\n";

_socket->write(QSTRING_CSTR(data), data.size());
QByteArray payload = data.toUtf8();
_socket->write(payload);
_socket->flush();

// Init JsonAPI
Expand Down