mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Hyperion "Light", Build improvements and minor fixes (#1400)
* Allow build, if no grabbers are enabled * Align available functions to right Qt version * Update to next development version * Align available functions to right Qt version * fix workflows (apt/nightly) * Disable QNetworkConfigurationManager deprecation warnings * Initial go on Smart Pointers * Add Deallocation * Correct QT_WARNING_DISABLE_DEPRECATED (available since 5.9) * Cluster Build Variables * Hyperion Light * Address build warnings * Hyperion Light - UI * Update Protobuf to latest master * Removed compiler warnings * Added restart ability to systray * Correct Protobuf * Ignore 'no-return' warning on protobuf build * hyperion-remote: Fix auto discovery of hyperion server * Fix Qt version override * Update changelog * Remove Grabber Components, if no Grabber exists * Standalone Grabber - Fix fps default * Remote Control - Have Source Selction accrosswhole screen * Enable Blackborder detection only, if relevant input sources available * Enable Blackborder detection only, if relevant input sources available * Remote UI - rearrange containers * - QT5/6 path for arm64 added - Remove ZLib Dependency - Fix macOS bundle info details - Cleanup Co-authored-by: Paulchen Panther <16664240+Paulchen-Panther@users.noreply.github.com> Co-authored-by: Paulchen Panther <Paulchen-Panter@protonmail.com>
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
# - Find the native BCM includes and library
|
||||
# Find Broadcom VideoCore firmware installation
|
||||
#
|
||||
|
||||
# This module defines
|
||||
# BCM_INCLUDE_DIR, where to find png.h, etc.
|
||||
# BCM_LIBRARIES, the libraries to link against to use PNG.
|
||||
# BCM_FOUND, If false, do not try to use PNG.
|
||||
# BCM_INCLUDE_DIR - The Broadcom VideoCore include directory
|
||||
# BCM_LIBRARIES - The Broadcom VideoCore BCM_HOST library.
|
||||
# BCM_FOUND - BCM_HOST is available
|
||||
#
|
||||
|
||||
FIND_PATH(BCM_INCLUDE_DIR
|
||||
|
@@ -1,60 +0,0 @@
|
||||
# - Find the native PNG includes and library
|
||||
#
|
||||
|
||||
# This module defines
|
||||
# PNG_INCLUDE_DIR, where to find png.h, etc.
|
||||
# PNG_LIBRARIES, the libraries to link against to use PNG.
|
||||
# PNG_DEFINITIONS - You should ADD_DEFINITONS(${PNG_DEFINITIONS}) before compiling code that includes png library files.
|
||||
# PNG_FOUND, If false, do not try to use PNG.
|
||||
# also defined, but not for general use are
|
||||
# PNG_LIBRARY, where to find the PNG library.
|
||||
# None of the above will be defined unles zlib can be found.
|
||||
# PNG depends on Zlib
|
||||
#
|
||||
|
||||
INCLUDE(FindZLIB)
|
||||
|
||||
SET(PNG_FOUND "NO")
|
||||
|
||||
IF(ZLIB_FOUND)
|
||||
FIND_PATH(PNG_PNG_INCLUDE_DIR png.h
|
||||
/usr/local/include
|
||||
/usr/include
|
||||
/usr/local/include/libpng # OpenBSD
|
||||
)
|
||||
|
||||
SET(PNG_NAMES ${PNG_NAMES} png libpng)
|
||||
FIND_LIBRARY(PNG_LIBRARY
|
||||
NAMES ${PNG_NAMES}
|
||||
PATHS /usr/lib64 /usr/lib /usr/local/lib
|
||||
)
|
||||
|
||||
IF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
|
||||
# png.h includes zlib.h. Sigh.
|
||||
SET(PNG_INCLUDE_DIR ${PNG_PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
|
||||
SET(PNG_LIBRARIES ${PNG_LIBRARY} ${ZLIB_LIBRARY})
|
||||
SET(PNG_FOUND "YES")
|
||||
SET(HAVE_PNG_H)
|
||||
IF (CYGWIN)
|
||||
IF(BUILD_SHARED_LIBS)
|
||||
# No need to define PNG_USE_DLL here, because it's default for Cygwin.
|
||||
ELSE(BUILD_SHARED_LIBS)
|
||||
SET (PNG_DEFINITIONS -DPNG_STATIC)
|
||||
ENDIF(BUILD_SHARED_LIBS)
|
||||
ENDIF (CYGWIN)
|
||||
|
||||
ENDIF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
|
||||
|
||||
ENDIF(ZLIB_FOUND)
|
||||
|
||||
IF (PNG_FOUND)
|
||||
IF (NOT PNG_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Found PNG: ${PNG_LIBRARY}")
|
||||
ENDIF (NOT PNG_FIND_QUIETLY)
|
||||
ELSE (PNG_FOUND)
|
||||
IF (PNG_FIND_REQUIRED)
|
||||
MESSAGE(FATAL_ERROR "Could not find PNG library")
|
||||
ENDIF (PNG_FIND_REQUIRED)
|
||||
ENDIF (PNG_FOUND)
|
||||
|
||||
MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR PNG_LIBRARY )
|
@@ -5,19 +5,27 @@
|
||||
<key>CFBundleDeveloperRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.hyperion-project.hyperiond</string>
|
||||
<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>Hyperion</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>Hyperion</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>Hyperion.icns</string>
|
||||
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
|
||||
<key>CFBundleLongVersionString</key>
|
||||
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>MIT License</string>
|
||||
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
|
||||
<key>Source Code</key>
|
||||
<string>"https://github.com/hyperion-project/hyperion.ng"</string>
|
||||
</dict>
|
Reference in New Issue
Block a user