diff --git a/cmake/Deployment/Linux/Flatpak/io.ossia.score.metainfo.xml b/cmake/Deployment/Linux/Flatpak/io.ossia.score.metainfo.xml deleted file mode 100644 index 31912e3255..0000000000 --- a/cmake/Deployment/Linux/Flatpak/io.ossia.score.metainfo.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - io.ossia.score - CC-BY-SA-4.0 - GPL-3.0 - ossia score - Sequencer for media artists - - ossia.io - - - ossia score is a sequencer for audio-visual artists, designed to enable the creation of interactive shows, museum installations, intermedia digital artworks, interactive music and more in an intuitive user interface. - - - - io.ossia.score.desktop - - https://github.com/ossia/score/issues - https://discord.gg/8Hzm4UduaS - https://ossia.io/project.html - https://opencollective.com/ossia - https://ossia.io/docs.html - https://ossia.io - https://github.com/ossia/score - - - https://github.com/ossia/score/raw/master/docs/score.png?raw=true - Sequence all kinds of media in ossia score - - - - - https://github.com/ossia/score/releases/tag/v3.2.2 - - ossia score 3.2.2 is a bugfix release with mostly non-Linux-related improvements. -
    -
  • Protocol fixes to CoAP and OSC
    • -
  • Avnd API improvements
    • -
  • Fix keyboard shortcut regressions
    • -
- - - - \ No newline at end of file diff --git a/cmake/Deployment/Linux/ossia-score.appdata.xml b/cmake/Deployment/Linux/ossia-score.appdata.xml index 1d8ee5b9c9..2b2fd43448 100644 --- a/cmake/Deployment/Linux/ossia-score.appdata.xml +++ b/cmake/Deployment/Linux/ossia-score.appdata.xml @@ -1,21 +1,50 @@ - ossia-score - CC0-1.0 - GPL-3.0 - ossia score - Interactive intermedia sequencer - -

With ossia score you can sequence OSC, MIDI, etc. parameters between multiple software and hardware, to create interactive and intermedia scores.

- - ossia-score.desktop - http://ossia.io/ - - - https://raw.githubusercontent.com/ossia/score/master/Documentation/score.png - - - - ossia-score.desktop - + io.ossia.score + CC-BY-SA-4.0 + GPL-3.0 + ossia score + Sequencer for media artists + + ossia.io + + +

ossia score is a sequencer for audio-visual artists, designed to enable the creation of interactive shows, museum installations, intermedia digital artworks, interactive music and more in an intuitive user interface.

+ + + + io.ossia.score.desktop + + https://github.com/ossia/score/issues + https://discord.gg/8Hzm4UduaS + https://ossia.io/project.html + https://opencollective.com/ossia + https://ossia.io/docs.html + https://ossia.io + https://github.com/ossia/score + + + https://github.com/ossia/score/raw/master/docs/score.png?raw=true + Sequence all kinds of media in ossia score + + + + + https://github.com/ossia/score/releases/tag/v3.2.3 + +

ossia score 3.2.3 is a bugfix release which enables Flatpak support.

+
    +
  • Update dependencies to be flatpak-compatible
    • +
  • A bugfix to Nix support
    • +
+ + + diff --git a/cmake/ScoreDeployment.cmake b/cmake/ScoreDeployment.cmake index d8260c30a2..903b560ce4 100644 --- a/cmake/ScoreDeployment.cmake +++ b/cmake/ScoreDeployment.cmake @@ -35,11 +35,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android") include(ScoreDeploymentAndroid) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - if(GENERIC_LINUX_DEPLOYMENT_BUILD) - include(ScoreDeploymentGenericLinux) - else() - include(ScoreDeploymentLinux) - endif() + include(ScoreDeploymentLinux) elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") include(ScoreDeploymentWindows) include(ScoreDeploymentWindowsStore) diff --git a/cmake/ScoreDeploymentGenericLinux.cmake b/cmake/ScoreDeploymentGenericLinux.cmake deleted file mode 100644 index b77b31bc9a..0000000000 --- a/cmake/ScoreDeploymentGenericLinux.cmake +++ /dev/null @@ -1,43 +0,0 @@ -if(UNIX) - -set(SCORE_BIN_INSTALL_DIR ".") - -# Qt Libraries -get_target_property(QtCore_LOCATION ${QT_PREFIX}::Core LOCATION) -get_filename_component(QT_SO_DIR ${QtCore_LOCATION} PATH) -# TODO Same than for windows deployment -file(GLOB ICU_SOS "${QT_SO_DIR}/libicu*.so*") -file(GLOB QT_SOS - "${QT_SO_DIR}/libQt6Core.so*" - "${QT_SO_DIR}/libQt6Gui.so*" - "${QT_SO_DIR}/libQt6Widgets.so*" - "${QT_SO_DIR}/libQt6Network.so*" - "${QT_SO_DIR}/libQt6Xml.so*" - "${QT_SO_DIR}/libQt6Svg.so*" - "${QT_SO_DIR}/libQt6Qml.so*" - "${QT_SO_DIR}/libQt6OpenGL.so*" - "${QT_SO_DIR}/libQt6WebSockets.so*" - "${QT_SO_DIR}/libQt6XcbQpa.so*") - -install(FILES - ${ICU_SOS} - ${QT_SOS} - DESTINATION ${SCORE_BIN_INSTALL_DIR}) - -# Qt Platform Plugin -install(FILES - "${QT_SO_DIR}/../plugins/platforms/libqxcb.so" - "${QT_SO_DIR}/../plugins/imageformats/libqsvg.so" - "${QT_SO_DIR}/../plugins/imageformats/libqjpeg.so" - "${QT_SO_DIR}/../plugins/generic/libqevdevkeyboardplugin.so" - "${QT_SO_DIR}/../plugins/generic/libqevdevmouseplugin.so" - "${QT_SO_DIR}/../plugins/xcbglintegrations/libqxcb-glx-integration.so" - - DESTINATION ${SCORE_BIN_INSTALL_DIR}/plugins/platforms) - -# Qt helper script - -install(PROGRAMS "${SCORE_SRC}/app/score.sh" - DESTINATION ".") - -endif() diff --git a/cmake/ScoreDeploymentLinux.cmake b/cmake/ScoreDeploymentLinux.cmake index 4606856eb2..a99280f172 100644 --- a/cmake/ScoreDeploymentLinux.cmake +++ b/cmake/ScoreDeploymentLinux.cmake @@ -92,7 +92,12 @@ install(FILES "${PROJECT_BINARY_DIR}/ossia-score.desktop" install(FILES "${CMAKE_SOURCE_DIR}/src/lib/resources/ossia-score.png" DESTINATION share/pixmaps COMPONENT OssiaScore) - +install(FILES "${CMAKE_SOURCE_DIR}/src/lib/resources/ossia-score.png" + DESTINATION icons/hicolor/512x512/apps + COMPONENT OssiaScore) +install(FILES "${CMAKE_SOURCE_DIR}/cmake/Deployment/Linux/ossia-score.appdata.xml" + DESTINATION share/metainfo + COMPONENT OssiaScore) execute_process( COMMAND