commit a0a88e6285076f27debdbfabae02c8d272eb413c Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Thu Apr 15 09:28:30 2021 +0100 Update AppStream metadata generation parse-readme.py | 82 ++++++++++++++++++++-------------------- xorg-x11-drv-nvidia.metainfo.xml | 22 ++++++++--- xorg-x11-drv-nvidia.spec | 11 +++--- 3 files changed, 63 insertions(+), 52 deletions(-) --- diff --git a/parse-readme.py b/parse-readme.py index 0baff3c..3a5d140 100755 --- a/parse-readme.py +++ b/parse-readme.py @@ -1,61 +1,61 @@ #!/usr/bin/python3 # -*- coding: utf-8 -*- # -# Copyright (C) 2016 Richard Hughes <richard(a)hughsie.com&gt; +# Copyright (C) 2021 Simone Caronni <negativo17(a)gmail.com&gt; # Licensed under the GNU General Public License Version or later -from __future__ import print_function import sys def main(): - if len(sys.argv) != 3: - print("usage: %s README.txt \"header to match\"" % sys.argv[0]) + if len(sys.argv) != 2: + print("usage: %s README.txt" % sys.argv[0]) return 1 - # open file f = open(sys.argv[1]) in_section = False in_table = False pids = [] - for line in f.readlines(): - - # find the right data table - if line.find(sys.argv[2]) != -1: - in_section = True - continue - if not in_section: - continue - - # remove Windows and Linux line endings - line = line.replace('\r', '') - line = line.replace('\n', '') - - # end of section - if len(line) > 0 and not line.startswith(' '): - in_section = False - in_table = False - continue - - # empty line - if len(line) == 0: - continue - - # skip the header - if line.startswith(' ---'): - in_table = True - continue - if not in_table: - continue - - # get name - pid = int(line[42:46], 16) - if not pid in pids: - pids.append(pid) - - # output + sections = ["NVIDIA GEFORCE GPUS", "NVIDIA RTX/QUADRO GPUS", "NVIDIA NVS GPUS", "NVIDIA TESLA GPUS", "NVIDIA GRID GPUS"] + for section in sections: + + for line in f.readlines(): + + # Find the right data tables + if line.find(section) != -1: + in_section = True + continue + if not in_section: + continue + + # Remove Windows and Linux line endings + line = line.replace('\r', '') + line = line.replace('\n', '') + + # End of section + if len(line) > 0 and not line.startswith(' '): + in_section = False + in_table = False + continue + + if len(line) == 0: + continue + + # Skip the header + if line.startswith(' ---'): + in_table = True + continue + if not in_table: + continue + + # PCI ID + pid = int(line[50:54], 16) + if not pid in pids: + pids.append(pid) + for pid in pids: vid = 0x10de print("pci:v%08Xd%08Xsv*sd*bc*sc*i*" % (vid, pid)) if __name__ == "__main__": main() + diff --git a/xorg-x11-drv-nvidia.metainfo.xml b/xorg-x11-drv-nvidia.metainfo.xml index 9c8248a..858cc5c 100644 --- a/xorg-x11-drv-nvidia.metainfo.xml +++ b/xorg-x11-drv-nvidia.metainfo.xml @@ -17,20 +17,32 @@ graphics driver supports all modern NVIDIA GPUs. </p> </description> - <translation/> <url type="homepage">http://www.nvidia.com/</url> <icon type="local" width="128" height="128">/usr/share/pixmaps/xorg-x11-drv-nvidia.png</icon> <metadata_license>CC0-1.0</metadata_license> <project_license>LicenseRef-proprietary:NVIDIA</project_license> <developer_name>NVIDIA Corporation</developer_name> <keywords> - <keyword>NVIDIA</keyword> - <keyword>driver</keyword> - <keyword>GeForce</keyword> <keyword>CUDA</keyword> + <keyword>GeForce</keyword> + <keyword>NVIDIA</keyword> + <keyword>OpenGL</keyword> <keyword>Quadro</keyword> + <keyword>Tesla</keyword> + <keyword>Video</keyword> <keyword>Vulkan</keyword> - <keyword>OpenGL</keyword> + <keyword>av1</keyword> + <keyword>avc</keyword> + <keyword>driver</keyword> + <keyword>h264</keyword> + <keyword>h265</keyword> + <keyword>hevc</keyword> + <keyword>jpeg</keyword> + <keyword>mpeg2</keyword> + <keyword>vaapi</keyword> + <keyword>vc-1</keyword> + <keyword>vp8</keyword> + <keyword>vp9</keyword> </keywords> <url type="bugtracker">https://bugzilla.rpmfusion.org</url> <update_contact&gt;xorg-x11-drv-nvidia-owner(a)rpmfusion.org&lt;/update_contact&gt; diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 18db718..1b92612 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -22,7 +22,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 Version: 465.24.02 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -332,11 +332,7 @@ EOF # install AppData and add modalias provides mkdir -p %{buildroot}%{_metainfodir}/ install -pm 0644 %{SOURCE8} %{buildroot}%{_metainfodir}/ -#fn=%{buildroot}%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml -#%{SOURCE9} README.txt "NVIDIA GEFORCE GPUS" | xargs appstream-util add-provide ${fn} modalias -#%{SOURCE9} README.txt "NVIDIA RTX/QUADRO GPUS" | xargs appstream-util add-provide ${fn} modalias -#%{SOURCE9} README.txt "NVIDIA NVS GPUS" | xargs appstream-util add-provide ${fn} modalias -#%{SOURCE9} README.txt "NVIDIA TESLA GPUS" | xargs appstream-util add-provide ${fn} modalias +%{SOURCE9} README.txt | xargs appstream-util add-provide %{buildroot}%{_metainfodir}/xorg-x11-drv-nvidia.metainfo.xml modalias mkdir -p %{buildroot}%{_datadir}/pixmaps install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %endif @@ -531,6 +527,9 @@ fi ||: %{_libdir}/libnvidia-encode.so %changelog +* Thu Apr 15 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3:465.24.02-2 +- Update AppStream metadata generation + * Wed Apr 14 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3:465.24.02-1 - Update to 465.24.02 release