Merge branch 'main' into stsdc/process-gpu-usage

Author: ryonakano

README.md

@@ -38,13 +38,13 @@ Monitor will be available from the Applications menu.
 If you plan to install WITH a wingpanel-indicator
 
 ```bash
-sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev libwingpanel-dev meson xvfb
+sudo apt install sassc valac libgtk-3-dev libgtk-4-dev libgee-0.8-dev libgranite-7-dev libgtop2-dev libadwaita-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-2-dev libpci-dev libwingpanel-dev meson
 ```
 
 Alternatively, if you plan to install WITHOUT a wingpanel-indicator
 
 ```bash
-sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev libgranite-dev libgtop2-dev libhandy-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-1-dev libpci-dev meson xvfb
+sudo apt install sassc valac libgtk-4-dev libgee-0.8-dev libgranite-7-dev libgtop2-dev libadwaita-1-dev libudisks2-dev libjson-glib-dev libflatpak-dev libxnvctrl-dev liblivechart-2-dev libpci-dev meson
 ```
 
 
@@ -58,11 +58,11 @@ sudo apt install build-essential cmake sassc valac libgtk-3-dev libgee-0.8-dev l
 
 2. To build with the wingpanel indicator:
    ```bash
-   meson setup -Dindicator-wingpanel=enabled build
+   meson setup build --prefix=/usr -Dindicator-wingpanel=enabled
    ```
    Alternatively, to build without the wingpanel indicator:
    ```bash
-   meson setup build
+   meson setup build --prefix=/usr
    ```
 
 3. Install:

meson.build

@@ -14,7 +14,13 @@ vapidir = meson.current_source_dir() / 'vapi/'
 
 add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language: 'c')
 
-add_project_arguments(['--vapidir', vapidir], language: 'vala')
+vala_flags = ['--vapidir', vapidir]
+
+if get_option('nvidia').enabled()
+    vala_flags += ['--define', 'NVIDIA_SUPPORT']
+endif
+
+add_project_arguments(vala_flags, language: 'vala')
 
 # subprojects should be skipped: https://mesonbuild.com/Release-notes-for-0-58-0.html#skip-subprojects-installation
 # needs meson 0.58.0
@@ -48,8 +54,10 @@ app_dependencies = [
     meson.get_compiler('c').find_library('pci'),
     meson.get_compiler('vala').find_library('pci', dirs: vapidir),
 
-    meson.get_compiler('c').find_library('XNVCtrl'),
-    meson.get_compiler('vala').find_library('libxnvctrl', dirs: vapidir),
+    # Allow building without nvidia libraries because they're not packaged or does not run
+    # on some distros due to incompatibility with muslc. Also they're not needed on ARM architecture
+    meson.get_compiler('c').find_library('XNVCtrl', required: get_option('nvidia').enabled()),
+    meson.get_compiler('vala').find_library('libxnvctrl', dirs: vapidir, required: get_option('nvidia').enabled()),
 ]
 
 config_data = configuration_data()

meson_options.txt

@@ -1 +1,2 @@
-option('indicator-wingpanel', type : 'feature', value : 'disabled', description : 'Enables the Indicator for Wingpanel.')
+option('indicator-wingpanel', type : 'feature', value : 'disabled', description : 'Enables the Indicator for Wingpanel.')
+option('nvidia', type : 'feature', value : 'enabled', description : 'Build with NVIDIA support.')

po/extra/sl.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2026-01-18 13:52+0000\n"
-"PO-Revision-Date: 2025-10-04 22:55+0000\n"
-"Last-Translator: anonymous <noreply@weblate.org>\n"
+"PO-Revision-Date: 2026-01-19 16:55+0000\n"
+"Last-Translator: Jernej Virag <jernej@virag.si>\n"
 "Language-Team: Slovenian <https://l10n.elementaryos.org/projects/desktop/"
 "monitor-extra/sl/>\n"
 "Language: sl\n"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: data/io.elementary.monitor.metainfo.xml.in:9 data/monitor.desktop.in:6
 msgid "Monitor"
-msgstr ""
+msgstr "Nadzornik"
 
 #: data/io.elementary.monitor.metainfo.xml.in:10
 msgid "Manage processes and monitor system resources"