frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor/Create APT/DNF Repository (#1648)

Browse Source
This commit is contained in:
Paulchen-Panther
2023-11-16 21:05:56 +01:00
committed by GitHub
parent c9518db597
commit 91270966f9
165 changed files with 1918 additions and 2924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
src/hyperiond/CMakeLists.txt
View File

@@ -1,41 +1,32 @@
if (APPLE)
if(APPLE)
project(Hyperion)
else()
project(hyperiond)
endif()
if(ENABLE_EFFECTENGINE)
if (NOT CMAKE_VERSION VERSION_LESS "3.12")
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
include_directories(${Python3_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}/..)
else()
find_package (PythonLibs ${PYTHON_VERSION_STRING} EXACT) # Maps PythonLibs to the PythonInterp version of the main cmake
include_directories(${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}/..)
endif()
endif ()
#####################################
############ Preparation ############
#####################################
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Network Gui Widgets REQUIRED)
if(WIN32)
# generate windows .rc file for this binary
string(REPLACE "/" "\\\\" WIN_RC_ICON_PATH ${CMAKE_SOURCE_DIR}/cmake/nsis/installer.ico)
configure_file(${CMAKE_SOURCE_DIR}/cmake/win/win.rc.in ${CMAKE_BINARY_DIR}/win.rc)
set(WIN_RC_FILE ${CMAKE_BINARY_DIR}/win.rc)
# generate windows .rc file for this binary
if (WIN32)
include(${CMAKE_SOURCE_DIR}/cmake/win/win_rc.cmake)
generate_win_rc_file(${PROJECT_NAME})
endif(WIN32)
# include resource files for macos bundle (copy LICENSE file and correct line breaks)
if (APPLE)
# promote hyperiond as GUI app
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup")
elseif(APPLE)
# include resource files for macos bundle (copy LICENSE file and correct line breaks)
configure_file(${CMAKE_SOURCE_DIR}/LICENSE ${CMAKE_BINARY_DIR}/LICENSE COPYONLY)
execute_process(COMMAND bash -c "perl -pi -e 's/\n/\r/g' ${CMAKE_BINARY_DIR}/LICENSE")
set(BUNDLE_RESOURCE_FILES ${CMAKE_SOURCE_DIR}/cmake/osxbundle/Hyperion.icns ${CMAKE_BINARY_DIR}/LICENSE)
set_source_files_properties(${BUNDLE_RESOURCE_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif(APPLE)
set(MACOS_BUNDLE_RESOURCE_FILES ${CMAKE_SOURCE_DIR}/cmake/osxbundle/Hyperion.icns ${CMAKE_BINARY_DIR}/LICENSE)
set_source_files_properties(${MACOS_BUNDLE_RESOURCE_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
endif()
if (UNIX)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus QUIET )
if (Qt${QT_VERSION_MAJOR}DBus_FOUND)
set(hyperiond_POWER_MNG_DBUS "Qt${QT_VERSION_MAJOR}::DBus")
endif()
endif(UNIX)
#####################################
########### General steps ###########
#####################################
add_executable(${PROJECT_NAME}
console.h
@@ -45,19 +36,10 @@ add_executable(${PROJECT_NAME}
systray.cpp
SuspendHandler.cpp
main.cpp
${hyperiond_WIN_RC_PATH}
${BUNDLE_RESOURCE_FILES}
${WIN_RC_FILE}
${MACOS_BUNDLE_RESOURCE_FILES}
)
if (UNIX AND NOT APPLE AND Qt${QT_VERSION_MAJOR}DBus_FOUND)
target_compile_definitions(${PROJECT_NAME} PUBLIC HYPERION_HAS_DBUS)
endif()
# promote hyperiond as GUI app
if (WIN32)
target_link_options(${PROJECT_NAME} PUBLIC /SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup)
endif(WIN32)
target_link_libraries(${PROJECT_NAME}
commandline
hyperion
@@ -70,18 +52,16 @@ target_link_libraries(${PROJECT_NAME}
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Network
Qt${QT_VERSION_MAJOR}::Widgets
${hyperiond_POWER_MNG_DBUS}
)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS DBus QUIET)
if(Qt${QT_VERSION_MAJOR}DBus_FOUND)
target_link_libraries(${PROJECT_NAME} "Qt${QT_VERSION_MAJOR}::DBus")
endif()
if(ENABLE_EFFECTENGINE)
target_link_libraries(${PROJECT_NAME} effectengine python)
if (NOT CMAKE_VERSION VERSION_LESS "3.12")
target_link_libraries( ${PROJECT_NAME} ${Python3_LIBRARIES} )
else()
target_link_libraries( ${PROJECT_NAME} ${PYTHON_LIBRARIES} )
endif()
endif ()
endif()
if(ENABLE_FLATBUF_SERVER)
target_link_libraries(${PROJECT_NAME} flatbufserver)
@@ -91,71 +71,71 @@ if(ENABLE_PROTOBUF_SERVER)
target_link_libraries(${PROJECT_NAME} protoserver)
endif()
if (ENABLE_AMLOGIC)
target_link_libraries(${PROJECT_NAME}
#Qt${QT_VERSION_MAJOR}::Core
pcre16 dl z
)
if(ENABLE_AMLOGIC)
target_link_libraries(${PROJECT_NAME} pcre16 dl z)
endif(ENABLE_AMLOGIC)
if (ENABLE_DISPMANX)
if(ENABLE_DISPMANX)
target_link_libraries(${PROJECT_NAME} dispmanx-grabber)
endif (ENABLE_DISPMANX)
if (ENABLE_FB)
if(ENABLE_FB)
target_link_libraries(${PROJECT_NAME} framebuffer-grabber)
endif (ENABLE_FB)
if (ENABLE_OSX)
if(ENABLE_OSX)
target_link_libraries(${PROJECT_NAME} osx-grabber)
endif (ENABLE_OSX)
if (ENABLE_V4L2)
if(ENABLE_V4L2)
target_link_libraries(${PROJECT_NAME} v4l2-grabber)
endif ()
endif()
if (ENABLE_MF)
if(ENABLE_MF)
target_link_libraries(${PROJECT_NAME} mf-grabber)
endif (ENABLE_MF)
if (ENABLE_AUDIO)
if(ENABLE_AUDIO)
target_link_libraries(hyperiond audio-grabber)
endif()
if (ENABLE_AMLOGIC)
if(ENABLE_AMLOGIC)
target_link_libraries(${PROJECT_NAME} amlogic-grabber)
endif (ENABLE_AMLOGIC)
if (ENABLE_X11)
if(ENABLE_X11)
if(APPLE)
include_directories("/opt/X11/include")
endif(APPLE)
target_link_libraries(${PROJECT_NAME} x11-grabber)
endif (ENABLE_X11)
if (ENABLE_XCB)
if(ENABLE_XCB)
target_link_libraries(${PROJECT_NAME} xcb-grabber)
endif (ENABLE_XCB)
if (ENABLE_QT)
if(ENABLE_QT)
target_link_libraries(${PROJECT_NAME} qt-grabber)
endif (ENABLE_QT)
if (ENABLE_DX)
include_directories(${DIRECTX9_INCLUDE_DIRS})
if(ENABLE_DX)
target_link_libraries(${PROJECT_NAME} directx-grabber)
endif (ENABLE_DX)
if (ENABLE_CEC)
target_link_libraries(${PROJECT_NAME} cechandler)
if(ENABLE_CEC)
target_link_libraries(${PROJECT_NAME} cechandler)
endif (ENABLE_CEC)
if (ENABLE_MDNS)
if(ENABLE_MDNS)
target_link_libraries(${PROJECT_NAME} mdns)
endif()
if (APPLE)
set_target_properties( ${PROJECT_NAME} PROPERTIES
#####################################
########### Install steps ###########
#####################################
if(APPLE)
set_target_properties(${PROJECT_NAME} PROPERTIES
MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/osxbundle/Info.plist.in
MACOSX_BUNDLE_BUNDLE_NAME "Hyperion"
@@ -168,69 +148,83 @@ if (APPLE)
MACOSX_BUNDLE_LONG_VERSION_STRING ${HYPERION_VERSION}
)
install ( TARGETS ${PROJECT_NAME} DESTINATION . COMPONENT "Hyperion")
install (TARGETS ${PROJECT_NAME} DESTINATION . COMPONENT "Hyperion")
elseif(NOT WIN32)
install ( TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin" COMPONENT "Hyperion" )
install ( DIRECTORY ${CMAKE_SOURCE_DIR}/bin/service DESTINATION "share/hyperion/" COMPONENT "Hyperion" )
install ( FILES ${CMAKE_SOURCE_DIR}/effects/readme.txt DESTINATION "share/hyperion/effects" COMPONENT "Hyperion" )
install ( FILES ${CMAKE_SOURCE_DIR}/resources/icons/hyperion-icon-32px.png DESTINATION "share/hyperion/icons" COMPONENT "Hyperion" )
# install Hyperion/service files/effect folder
install (TARGETS ${PROJECT_NAME} DESTINATION "share/hyperion/bin" COMPONENT "Hyperion")
install (DIRECTORY ${CMAKE_SOURCE_DIR}/bin/service DESTINATION "share/hyperion" COMPONENT "Hyperion")
install (FILES ${CMAKE_SOURCE_DIR}/effects/readme.txt DESTINATION "share/hyperion/effects" COMPONENT "Hyperion")
# Desktop file for Hyperion
install ( FILES ${CMAKE_SOURCE_DIR}/cmake/desktop/hyperiond_128.png DESTINATION "share/hyperion/desktop" COMPONENT "Hyperion" )
install ( FILES ${CMAKE_SOURCE_DIR}/cmake/desktop/hyperiond.desktop DESTINATION "share/hyperion/desktop" COMPONENT "Hyperion" )
# install Hyperion icons
set(ICON_SIZES 16 22 24 32 36 48 64 72 96 128 192 256 512)
foreach(size ${ICON_SIZES})
set(ICONS_FROM "${CMAKE_SOURCE_DIR}/resources/icons/hyperion-${size}px.png")
set(ICONS_TO "share/hyperion/icons/${size}x${size}/apps/")
install(FILES ${ICONS_FROM} DESTINATION ${ICONS_TO} RENAME "hyperion.png" COMPONENT "Hyperion")
endforeach(size)
# install desktop/appstream file
install (FILES ${CMAKE_SOURCE_DIR}/cmake/desktop/hyperion.metainfo.xml DESTINATION "share/hyperion/desktop" COMPONENT "Hyperion")
install (FILES ${CMAKE_SOURCE_DIR}/cmake/desktop/hyperion.desktop DESTINATION "share/hyperion/desktop" COMPONENT "Hyperion")
else()
install ( TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT "Hyperion" )
install ( FILES ${CMAKE_SOURCE_DIR}/effects/readme.txt DESTINATION "effects" COMPONENT "Hyperion" )
#set( CMAKE_INSTALL_UCRT_LIBRARIES TRUE )
#set( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE )
#include( InstallRequiredSystemLibraries )
install (TARGETS ${PROJECT_NAME} DESTINATION "bin" COMPONENT "Hyperion")
install (FILES ${CMAKE_SOURCE_DIR}/effects/readme.txt DESTINATION "effects" COMPONENT "Hyperion")
endif()
if (CMAKE_HOST_UNIX AND NOT APPLE)
install( CODE "EXECUTE_PROCESS(COMMAND ln -sf \"../share/hyperion/bin/${PROJECT_NAME}\" \"${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}\" )" COMPONENT "Hyperion" )
install( FILES "${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}" DESTINATION "bin" RENAME ${PROJECT_NAME} COMPONENT "Hyperion" )
install( CODE "FILE (REMOVE ${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME})" COMPONENT "Hyperion" )
install( FILES ${CMAKE_SOURCE_DIR}/bin/scripts/updateHyperionUser.sh DESTINATION "share/hyperion/scripts" COMPONENT "Hyperion" )
if(CMAKE_HOST_UNIX AND NOT APPLE)
install(CODE "execute_process(COMMAND ln -sf \"../share/hyperion/bin/${PROJECT_NAME}\" \"${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}\")" COMPONENT "Hyperion")
install(FILES "${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME}" DESTINATION "bin" RENAME ${PROJECT_NAME} COMPONENT "Hyperion")
install(CODE "file (REMOVE ${CMAKE_BINARY_DIR}/symlink_${PROJECT_NAME})" COMPONENT "Hyperion")
install(FILES ${CMAKE_SOURCE_DIR}/bin/scripts/updateHyperionUser.sh DESTINATION "share/hyperion/scripts" COMPONENT "Hyperion")
endif()
######################################
########## Additional steps ##########
######################################
# Deploy Qt DLLs into the binary folder.
# This is necessary for starting the application from within the IDE
if (WIN32)
if(WIN32)
get_target_property(QT_QMAKE_EXECUTABLE Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
get_filename_component(QT_BIN_DIR "${QT_QMAKE_EXECUTABLE}" DIRECTORY)
find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${QT_BIN_DIR}")
if (NOT WINDEPLOYQT_EXECUTABLE)
if(NOT WINDEPLOYQT_EXECUTABLE)
find_program(WINDEPLOYQT_EXECUTABLE windeployqt)
endif()
if (WINDEPLOYQT_EXECUTABLE AND NOT CMAKE_GITHUB_ACTION)
if(WINDEPLOYQT_EXECUTABLE AND NOT CMAKE_GITHUB_ACTION)
set(WINDEPLOYQT_PARAMS_RUNTIME --verbose 0 --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler)
message(STATUS "Found windeployqt: ${WINDEPLOYQT_EXECUTABLE} PATH_HINT:${QT_BIN_DIR}")
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${WINDEPLOYQT_EXECUTABLE} ${WINDEPLOYQT_PARAMS_RUNTIME} "$<TARGET_FILE:${PROJECT_NAME}>")
endif()
find_package(OpenSSL REQUIRED)
if (OPENSSL_FOUND)
if(OPENSSL_FOUND)
string(REGEX MATCHALL "[0-9]+" openssl_versions "${OPENSSL_VERSION}")
list(GET openssl_versions 0 openssl_version_major)
list(GET openssl_versions 1 openssl_version_minor)
set(library_suffix "-${openssl_version_major}_${openssl_version_minor}")
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
string(APPEND library_suffix "-x64")
set(open_ssl_version_suffix)
if(openssl_version_major VERSION_EQUAL 1 AND openssl_version_minor VERSION_EQUAL 1)
set(open_ssl_version_suffix "-1_1")
else()
set(open_ssl_version_suffix "-3")
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
string(APPEND open_ssl_version_suffix "-x64")
endif()
find_file(OPENSSL_SSL
NAMES "libssl${library_suffix}.dll"
NAMES "libssl${open_ssl_version_suffix}.dll"
PATHS ${OPENSSL_INCLUDE_DIR}/.. ${OPENSSL_INCLUDE_DIR}/../bin
NO_DEFAULT_PATH
)
find_file(OPENSSL_CRYPTO
NAMES "libcrypto${library_suffix}.dll"
NAMES "libcrypto${open_ssl_version_suffix}.dll"
PATHS ${OPENSSL_INCLUDE_DIR}/.. ${OPENSSL_INCLUDE_DIR}/../bin
NO_DEFAULT_PATH
)
@@ -248,11 +242,11 @@ if(ENABLE_DEPLOY_DEPENDENCIES)
# Deploy all dependencies for package creation
include(${CMAKE_SOURCE_DIR}/cmake/Dependencies.cmake)
if (APPLE) #macOS
if(APPLE) #macOS
DeployMacOS(${PROJECT_NAME})
elseif (NOT WIN32) # Linux
DeployLinux(${PROJECT_NAME})
elseif(WIN32) # Windows
DeployWindows(${PROJECT_NAME})
endif ()
endif()
endif(ENABLE_DEPLOY_DEPENDENCIES)

22
src/hyperiond/hyperiond.h
View File

@@ -7,62 +7,62 @@
#include <hyperion/HyperionIManager.h>
#ifdef ENABLE_DISPMANX
#include <grabber/DispmanxWrapper.h>
#include <grabber/dispmanx/DispmanxWrapper.h>
#else
typedef QObject DispmanxWrapper;
#endif
#if defined(ENABLE_V4L2) || defined(ENABLE_MF)
#include <grabber/VideoWrapper.h>
#include <grabber/video/VideoWrapper.h>
#else
typedef QObject VideoWrapper;
#endif
#ifdef ENABLE_FB
#include <grabber/FramebufferWrapper.h>
#include <grabber/framebuffer/FramebufferWrapper.h>
#else
typedef QObject FramebufferWrapper;
#endif
#ifdef ENABLE_AMLOGIC
#include <grabber/AmlogicWrapper.h>
#include <grabber/amlogic/AmlogicWrapper.h>
#else
typedef QObject AmlogicWrapper;
#endif
#ifdef ENABLE_OSX
#include <grabber/OsxWrapper.h>
#include <grabber/osx/OsxWrapper.h>
#else
typedef QObject OsxWrapper;
#endif
#ifdef ENABLE_X11
#include <grabber/X11Wrapper.h>
#include <grabber/x11/X11Wrapper.h>
#else
typedef QObject X11Wrapper;
#endif
#ifdef ENABLE_XCB
#include <grabber/XcbWrapper.h>
#include <grabber/xcb/XcbWrapper.h>
#else
typedef QObject XcbWrapper;
#endif
#ifdef ENABLE_QT
#include <grabber/QtWrapper.h>
#include <grabber/qt/QtWrapper.h>
#else
typedef QObject QtWrapper;
#endif
#ifdef ENABLE_DX
#include <grabber/DirectXWrapper.h>
#include <grabber/directx/DirectXWrapper.h>
#else
typedef QObject DirectXWrapper;
#endif
#include <hyperion/GrabberWrapper.h>
#ifdef ENABLE_AUDIO
#include <grabber/AudioWrapper.h>
#include <grabber/audio/AudioWrapper.h>
#else
typedef QObject AudioWrapper;
#endif
@@ -211,8 +211,8 @@ private:
OsxWrapper* _osxGrabber;
QtWrapper* _qtGrabber;
DirectXWrapper* _dxGrabber;
AudioWrapper* _audioGrabber;
SSDPHandler* _ssdp;
AudioWrapper* _audioGrabber;
#ifdef ENABLE_CEC
CECHandler* _cecHandler;
#endif

2
src/hyperiond/main.cpp
View File

@@ -115,7 +115,7 @@ QCoreApplication* createApplication(int &argc, char *argv[])
app->addLibraryPath(QApplication::applicationDirPath() + "/../lib");
app->setApplicationDisplayName("Hyperion");
#ifndef __APPLE__
app->setWindowIcon(QIcon(":/hyperion-icon-32px.png"));
app->setWindowIcon(QIcon(":/hyperion-32px.png"));
#endif
return app;
}

4
src/hyperiond/systray.cpp
View File

@@ -33,8 +33,8 @@ SysTray::SysTray(HyperionDaemon *hyperiond)
, _hyperiond(hyperiond)
, _hyperion(nullptr)
, _instanceManager(HyperionIManager::getInstance())
, _suspendHandler (hyperiond->getSuspendHandlerInstance())
, _webPort(8090)
, _suspendHandler (hyperiond->getSuspendHandlerInstance())
{
Q_INIT_RESOURCE(resources);
@@ -281,7 +281,7 @@ void SysTray::handleInstanceStateChange(InstanceState state, quint8 instance, co
connect(quitAction, &QAction::triggered, _trayIcon, &QSystemTrayIcon::hide, Qt::DirectConnection);
connect(&_colorDlg, &QColorDialog::currentColorChanged, this, &SysTray::setColor);
QIcon icon(":/hyperion-icon-32px.png");
QIcon icon(":/hyperion-32px.png");
_trayIcon->setIcon(icon);
_trayIcon->show();
setWindowIcon(icon);