commit 0f29a2833180a0efa697aa3a2a4129b72ea12f99 Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Sat Oct 6 15:51:57 2018 -0500 Add nvidia-xsettings-390xx subpackage. nvidia-settings-user.desktop | 12 +++++++++ nvidia-settings.appdata.xml | 43 +++++++++++++++++++++++++++++++++ xorg-x11-drv-nvidia-390xx.spec | 55 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 108 insertions(+), 2 deletions(-) --- diff --git a/nvidia-settings-user.desktop b/nvidia-settings-user.desktop new file mode 100644 index 0000000..838914b --- /dev/null +++ b/nvidia-settings-user.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Exec=nvidia-settings -l +Icon=nvidia-settings +Hidden=false +NoDisplay=false +Name[en_GB]=nvidia-settings +Name=nvidia-settings +Comment[en_GB]=Load user settings +Comment=Load user settings +X-GNOME-Autostart-Delay=30 +X-GNOME-Autostart-enabled=true diff --git a/nvidia-settings.appdata.xml b/nvidia-settings.appdata.xml new file mode 100644 index 0000000..45b54a9 --- /dev/null +++ b/nvidia-settings.appdata.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop"> + <id>nvidia-settings.desktop</id> + <name>NVIDIA Graphics Drivers Control Panel</name> + <summary>Accelerated Linux Graphics Driver Control Panel</summary> + <description> + <p> + The NVIDIA Accelerated Linux Graphics Driver brings accelerated 2D + functionality and high-performance OpenGL support to Linux with the + use of NVIDIA graphics processing units. + </p> + <p> + These drivers provide optimized hardware acceleration for OpenGL and X + applications and support nearly all recent NVIDIA GPU products. + The NVIDIA graphics driver uses a Unified Driver Architecture: the single + graphics driver supports all modern NVIDIA GPUs. + </p> + <p> + The nvidia-settings utility is a tool for configuring the NVIDIA graphics + driver. It operates by communicating with the NVIDIA X driver, querying + and updating state as appropriate. This communication is done via the + NV-CONTROL, GLX, XVideo, and RandR X extensions. + </p> + <p> + Values such as brightness and gamma, XVideo attributes, temperature, and + OpenGL settings can be queried and configured via nvidia-settings. + </p> + </description> + <translation/> + <url type="homepage">http://www.nvidia.com/</url> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0+</project_license> + <developer_name>NVIDIA Corporation</developer_name> + <keywords> + <keyword>NVIDIA</keyword> + <keyword>driver</keyword> + <keyword>GeForce</keyword> + <keyword>Quadro</keyword> + <keyword>Vulkan</keyword> + <keyword>OpenGL</keyword> + </keywords> + <update_contact&gt;nvidia-settings-owner(a)rpmfusion.org&lt;/update_contact&gt; +</component> diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec index 1676b34..cc94ad4 100644 --- a/xorg-x11-drv-nvidia-390xx.spec +++ b/xorg-x11-drv-nvidia-390xx.spec @@ -37,7 +37,7 @@ Name: xorg-x11-drv-nvidia-390xx Epoch: 3 Version: 390.87 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's 390xx series proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -59,9 +59,14 @@ Source15: nvidia-uvm.conf Source16: 99-nvidia-dracut.conf Source20: 10-nvidia.rules Source21: nvidia-fallback.service +Source22: nvidia-settings-user.desktop +Source23: nvidia-settings.appdata.xml ExclusiveArch: i686 x86_64 armv7hl +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib + %if 0%{?rhel} > 6 || 0%{?fedora} Buildrequires: systemd Requires(post): systemd @@ -83,7 +88,7 @@ Requires(post): ldconfig Requires(postun): ldconfig Requires(post): grubby Requires: which -#Requires: nvidia-settings%{?_isa} = %{version} +Requires: nvidia-settings-390xx%{?_isa} = %{?epoch}:%{version} #if 0%{?fedora} #Suggests: nvidia-xconfig%{?_isa} = %{version} #else @@ -204,6 +209,16 @@ Requires: vulkan-filesystem This package provides the shared libraries for %{name}. +%package -n nvidia-settings-390xx +Summary: Configure the NVIDIA 390xx series graphics driver +Conflicts: nvidia-settings + +%description -n nvidia-settings-390xx +The nvidia-settings utility is a tool for configuring the NVIDIA graphics +driver. It operates by communicating with the NVIDIA X driver, querying +and updating state as appropriate. + + %prep %setup -q -c -T #Only extract the needed arch @@ -219,6 +234,9 @@ sh %{SOURCE2} \ --extract-only --target nvidiapkg-%{_target_cpu} ln -s nvidiapkg-%{_target_cpu} nvidiapkg +sed -i -e "s/__UTILS_PATH__\///" \ + -e "s/__PIXMAP_PATH__\///" nvidiapkg/nvidia-settings.desktop + %build # Nothing to build @@ -399,6 +417,25 @@ install -p -m 0644 %{SOURCE20} %{buildroot}%{_udevrulesdir} install -p -m 0644 %{SOURCE21} %{buildroot}%{_unitdir} %endif +# Install nvidia-settings and dependencies +mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart \ + %{buildroot}%{_bindir} \ + %{buildroot}%{_datadir}/{applications,pixmaps} \ + %{buildroot}%{_mandir}/man1 \ + %{buildroot}%{_metainfodir} + +install -pm 0644 %{SOURCE22} %{buildroot}%{_sysconfdir}/xdg/autostart/ +install -pm 0755 nvidia-settings %{buildroot}%{_bindir}/ +install -pm 0755 libnvidia-gtk3.so.%{version} %{buildroot}%{_libdir}/ +install -pm 0644 %{SOURCE23} %{buildroot}%{_metainfodir}/ +install -pm 0644 nvidia-settings.desktop %{buildroot}%{_datadir}/applications/ +install -pm 0644 nvidia-settings.1.gz %{buildroot}%{_mandir}/man1/ +install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/ + +%check +desktop-file-validate %{buildroot}/%{_datadir}/applications/nvidia-settings.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml + %pre if [ "$1" -eq "1" ]; then @@ -578,12 +615,26 @@ fi ||: %{_libdir}/libnvidia-opencl.so.%{version} %endif +%files -n nvidia-settings-390xx +%{_sysconfdir}/xdg/autostart/nvidia-settings-user.desktop +%{_bindir}/nvidia-settings +%{_datadir}/applications/nvidia-settings.desktop +%{_datadir}/pixmaps/nvidia-settings.png +%{_libdir}/libnvidia-gtk3.so.%{version} +%{_mandir}/man1/nvidia-settings.1* +%{_metainfodir}/nvidia-settings.appdata.xml + + + %files devel %{_includedir}/nvidia/ %{_libdir}/libnvcuvid.so %{_libdir}/libnvidia-encode.so %changelog +* Sat Oct 06 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 3:390.87-2 +- Add nvidia-xsettings-390xx subpackage. + * Sun Sep 23 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 3:390.87-1 - Update to 390.87.