From 92822311a8c9fcf9bdd422b2ce533e4ea049ba26 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Thu, 9 May 2024 17:27:52 +0200 Subject: [PATCH] UI: Improve and update app CMake 3 metainfo file CMake 2 path have a newer version of this file. See the following commits for metainfo change details: - 853ae5ea6ec3a3b29bf48cf4e26c7e889b28f3cf - 904fe87f83e60ddff2c46e3cde2ab63f54b53dcd - 0cc6068ed4e673fbade63e954233b00f7862be05 --- ... => com.obsproject.Studio.metainfo.xml.in} | 40 ++++++++++++++----- UI/cmake/os-linux.cmake | 16 +++++++- 2 files changed, 45 insertions(+), 11 deletions(-) rename UI/cmake/linux/{com.obsproject.Studio.appdata.xml.in => com.obsproject.Studio.metainfo.xml.in} (73%) diff --git a/UI/cmake/linux/com.obsproject.Studio.appdata.xml.in b/UI/cmake/linux/com.obsproject.Studio.metainfo.xml.in similarity index 73% rename from UI/cmake/linux/com.obsproject.Studio.appdata.xml.in rename to UI/cmake/linux/com.obsproject.Studio.metainfo.xml.in index b11b1afa0..a59d7946d 100644 --- a/UI/cmake/linux/com.obsproject.Studio.appdata.xml.in +++ b/UI/cmake/linux/com.obsproject.Studio.metainfo.xml.in @@ -3,10 +3,12 @@ com.obsproject.Studio com.obsproject.Studio.desktop CC0-1.0 - GPL-2.0 + GPL-2.0-or-later OBS Studio - OBS Project - Live streaming and video recording software + + OBS Project + + Live stream and record videos

Free and open source software for video capturing, recording, and live streaming.

Features:

@@ -30,17 +32,37 @@ https://github.com/obsproject/obs-studio/issues https://obsproject.com/contribute https://crowdin.com/project/obs-studio + + + always + pointing + keyboard + + + + offline-only + touch + + - https://obsproject.com/assets/images/OBSDemoApp2610.png + https://obsproject.com/assets/images/OBSDemoApp301Flathub.png + The OBS Studio window showing a card game, the project website, a video, and a purple rectangle + + + #284cb8 + + - - ModernToolkit - HiDpiIcon - + - + + https://github.com/obsproject/obs-studio/releases/tag/@OBS_VERSION@ + + + https://github.com/obsproject/obs-studio/blob/@GIT_HASH@/build-aux/ + diff --git a/UI/cmake/os-linux.cmake b/UI/cmake/os-linux.cmake index 91d9175dc..37a02268f 100644 --- a/UI/cmake/os-linux.cmake +++ b/UI/cmake/os-linux.cmake @@ -22,9 +22,21 @@ if(NOT DEFINED APPDATA_RELEASE_DATE) endif() endif() -configure_file(cmake/linux/com.obsproject.Studio.appdata.xml.in com.obsproject.Studio.appdata.xml) +if(NOT DEFINED GIT_HASH) + if(EXISTS "${CMAKE_SOURCE_DIR}/.git") + execute_process( + COMMAND git rev-parse HEAD + OUTPUT_VARIABLE GIT_HASH + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" + OUTPUT_STRIP_TRAILING_WHITESPACE) + else() + set(GIT_HASH "master") + endif() +endif() -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.obsproject.Studio.appdata.xml" +configure_file(cmake/linux/com.obsproject.Studio.metainfo.xml.in com.obsproject.Studio.metainfo.xml) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.obsproject.Studio.metainfo.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") install(FILES cmake/linux/com.obsproject.Studio.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")