From 42bfe1315be1a851434c4675a0c2c38863bb8e6c Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 21 Jul 2024 23:58:54 +0200
Subject: Fix gpu vendor check, rename desktop file to same format as flatpak
---
com.dec05eba.gpu_screen_recorder.desktop | 10 ++++++++++
gpu-screen-recorder-gtk.desktop | 10 ----------
meson.build | 2 +-
src/main.cpp | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
create mode 100644 com.dec05eba.gpu_screen_recorder.desktop
delete mode 100644 gpu-screen-recorder-gtk.desktop
diff --git a/com.dec05eba.gpu_screen_recorder.desktop b/com.dec05eba.gpu_screen_recorder.desktop
new file mode 100644
index 0000000..0a83558
--- /dev/null
+++ b/com.dec05eba.gpu_screen_recorder.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=GPU Screen Recorder
+GenericName=Screen recorder
+Comment=A gpu based screen recorder / streaming program
+Icon=com.dec05eba.gpu_screen_recorder
+Exec=gpu-screen-recorder-gtk
+Terminal=false
+Keywords=gpu-screen-recorder;screen recorder;streaming;twitch;replay;
+Categories=AudioVideo;Recorder;
diff --git a/gpu-screen-recorder-gtk.desktop b/gpu-screen-recorder-gtk.desktop
deleted file mode 100644
index 0a83558..0000000
--- a/gpu-screen-recorder-gtk.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GPU Screen Recorder
-GenericName=Screen recorder
-Comment=A gpu based screen recorder / streaming program
-Icon=com.dec05eba.gpu_screen_recorder
-Exec=gpu-screen-recorder-gtk
-Terminal=false
-Keywords=gpu-screen-recorder;screen recorder;streaming;twitch;replay;
-Categories=AudioVideo;Recorder;
diff --git a/meson.build b/meson.build
index 5851485..c762460 100644
--- a/meson.build
+++ b/meson.build
@@ -23,7 +23,7 @@ executable('gpu-screen-recorder-gtk', src, dependencies : dep, install : true)
prefix = get_option('prefix')
datadir = get_option('datadir')
-install_data(files('gpu-screen-recorder-gtk.desktop'), install_dir : join_paths(prefix, datadir, 'applications'))
+install_data(files('com.dec05eba.gpu_screen_recorder.desktop'), install_dir : join_paths(prefix, datadir, 'applications'))
install_data(files('com.dec05eba.gpu_screen_recorder.appdata.xml'), install_dir : join_paths(prefix, datadir, 'metainfo'))
install_subdir('icons/hicolor', install_dir : join_paths(prefix, datadir, 'icons'))
diff --git a/src/main.cpp b/src/main.cpp
index a86f254..90c642e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2456,7 +2456,7 @@ static void parse_gpu_info_line(GsrInfo *gsr_info, const std::string &line) {
const StringView attribute_name = {line.c_str(), space_index};
const StringView attribute_value = {line.c_str() + space_index + 1, line.size() - (space_index + 1)};
- if(attribute_name == "gpu") {
+ if(attribute_name == "vendor") {
if(attribute_value == "amd")
gsr_info->gpu_info.vendor = GpuVendor::AMD;
else if(attribute_value == "intel")
--
cgit v1.2.3-70-g09d2