[xorg-x11-drv-nvidia] Drop tweaks for /etc/default/grub - rfbz#7034
by Nicolas Chauvet
commit bb1a8cf1f801d1a7df8b37e9ff609d809e787b42
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Aug 21 13:39:00 2024 +0200
Drop tweaks for /etc/default/grub - rfbz#7034
Add --remove-args for deprecated/old cmdline options in triggerin
xorg-x11-drv-nvidia.spec | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ccac764..bccba22 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -10,6 +10,7 @@
%global _firmwarepath %{_prefix}/lib/firmware
%global _winedir %{_libdir}/nvidia/wine
%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau
+%global _dracutopts_removed initcall_blacklist=simpledrm_platform_driver_init nvidia-drm.modeset=1
%if 0%{?rhel}
%global _systemd_util_dir %{_prefix}/lib/systemd
%endif
@@ -22,7 +23,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 560.31.02
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -423,31 +424,14 @@ fi
%post
if [ "$1" -eq "1" ]; then
%{_grubby} --remove-args='nomodeset' --args='%{_dracutopts}' &>/dev/null
- sed -i -e 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="%{_dracutopts} /g' /etc/default/grub
fi || :
-%triggerun -- xorg-x11-drv-nvidia < 3:545.23.06-1
-if [ -f %{_sysconfdir}/default/grub ] ; then
- sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub
- . %{_sysconfdir}/default/grub
- if [ -z "${GRUB_CMDLINE_LINUX}" ]; then
- echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub
- else
- for i in %{_dracutopts} ; do
- _has_string=$(echo ${GRUB_CMDLINE_LINUX} | grep -F -c $i)
- if [ x"$_has_string" = x0 ] ; then
- GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} ${i}"
- fi
- done
- sed -i -e "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"${GRUB_CMDLINE_LINUX}\"|g" %{_sysconfdir}/default/grub
- fi
-fi
-%{_grubby} --args='%{_dracutopts}' &>/dev/null || :
+%triggerun -- xorg-x11-drv-nvidia < 3:560.31.02-5
+%{_grubby} --remove-args='%{_dracutopts_remove}' &>/dev/null || :
%preun
if [ "$1" -eq "0" ]; then
%{_grubby} --remove-args='%{_dracutopts}' &>/dev/null
- sed -i -e 's/%{_dracutopts} //g' /etc/default/grub
# Backup and disable previously used xorg.conf
[ -f %{_sysconfdir}/X11/xorg.conf ] && mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.nvidia_uninstalled &>/dev/null
fi ||:
@@ -625,6 +609,10 @@ fi ||:
%endif
%changelog
+* Wed Aug 21 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 3:560.31.02-5
+- Drop tweaks for /etc/default/grub - rfbz#7034
+- Add --remove-args for deprecated/old cmdline options in triggerin
+
* Tue Aug 20 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 3:560.31.02-4
- Add nvidia-open-560
- Add missing conflicts
4 weeks, 1 day
[xorg-x11-drv-nvidia] Fix triggerun scriptlet
by Leigh Scott
commit 507088ca97ae75f3b560603b58fa4b46c03cfd6b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Aug 21 08:07:03 2024 +0100
Fix triggerun scriptlet
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index d4243fd..ccac764 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -430,7 +430,7 @@ fi || :
if [ -f %{_sysconfdir}/default/grub ] ; then
sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub
. %{_sysconfdir}/default/grub
- if [ -z "${GRUB_CMDLINE_LINUX+x}" ]; then
+ if [ -z "${GRUB_CMDLINE_LINUX}" ]; then
echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub
else
for i in %{_dracutopts} ; do
4 weeks, 1 day
[xorg-x11-drv-nvidia] Bump release
by Nicolas Chauvet
commit 1326a0f7f921a461d33ab7e6548157862e2270f0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Aug 20 18:35:13 2024 +0200
Bump release
xorg-x11-drv-nvidia.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index e79cff9..d4243fd 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: 560.31.02
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -625,6 +625,10 @@ fi ||:
%endif
%changelog
+* Tue Aug 20 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 3:560.31.02-4
+- Add nvidia-open-560
+- Add missing conflicts
+
* Sun Aug 18 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-3
- Use system egl-wayland and egl-gbm
- Remove old rhel conditionals
1 month
[xorg-x11-drv-nvidia] Add conflicts
by Nicolas Chauvet
commit d0ed206c962f3b1aa0cbca0b7c62a0c5a1bbf85d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Aug 20 18:34:59 2024 +0200
Add conflicts
xorg-x11-drv-nvidia.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 827e759..e79cff9 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -76,6 +76,7 @@ Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
Provides: %{_nvidia_serie}-open-kmod-common = %{?epoch}:%{version}
Conflicts: xorg-x11-drv-nvidia-340xx
Conflicts: xorg-x11-drv-nvidia-390xx
+Conflicts: xorg-x11-drv-nvidia-470xx
%global __provides_exclude ^(lib.*GL.*\\.so.*)$
%global __requires_exclude ^libglxserver_nvidia.so|^(lib.*GL.*\\.so.*)$
@@ -122,6 +123,8 @@ Requires: ocl-icd%{?_isa}
Requires: opencl-filesystem
Conflicts: xorg-x11-drv-nvidia-340xx-cuda
+Conflicts: xorg-x11-drv-nvidia-390xx-cuda
+Conflicts: xorg-x11-drv-nvidia-470xx-cuda
#Don't put an epoch here
Provides: cuda-drivers-%(echo %{version} | cut -f 1 -d .) = %{version}
1 month
[xorg-x11-drv-nvidia] Add nvidia-open-560
by Nicolas Chauvet
commit d96c31a950f3254655b4329f5272d4f5c0328b36
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Aug 20 18:14:15 2024 +0200
Add nvidia-open-560
xorg-x11-drv-nvidia.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 30e5282..827e759 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -134,6 +134,7 @@ Provides: nvidia-drivers = %{?epoch}:%{version}-100
Provides: nvidia-drivers%{?_isa} = %{?epoch}:%{version}-100
Provides: nvidia-open = %{?epoch}:%{version}-100
Provides: nvidia-open%{?_isa} = %{?epoch}:%{version}-100
+Provides: nvidia-open-%(echo %{version} | cut -f 1 -d .) = %{version}
%description cuda
This package provides the CUDA driver.
1 month
[kodi/f40] (5 commits) ...fix
by Leigh Scott
Summary of changes:
235505e... Rebuilt for Python 3.13 (*)
521d0cd... Fix python 3.13 build (*)
977d66f... Rebuild for new fmt (*)
746a517... Update to 21.1 (*)
2116059... fix (*)
(*) This commit already existed in another branch; no separate mail sent
1 month
[kodi/f41] fix
by Leigh Scott
Summary of changes:
2116059... fix (*)
(*) This commit already existed in another branch; no separate mail sent
1 month
[kodi] fix
by Leigh Scott
commit 211605985f8171c22d56bb1e8ebce01122d46ba9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 20 14:35:45 2024 +0100
fix
kodi.spec | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/kodi.spec b/kodi.spec
index 8b28978..908e37a 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -363,21 +363,21 @@ export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
%cmake_install
# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
-rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
+rm -r %{buildroot}/%{_datadir}/doc/
desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications \
- $RPM_BUILD_ROOT%{_datadir}/applications/kodi.desktop
+ %{buildroot}%{_datadir}/applications/kodi.desktop
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.xbmc.kodi.metainfo.xml
# Stop shipping the duplicate xsession file
-rm -f $RPM_BUILD_ROOT/%{_datadir}/xsessions/xbmc.desktop
+rm -f %{buildroot}/%{_datadir}/xsessions/xbmc.desktop
# Normally we are expected to build these manually. But since we are using
# the system Python interpreter, we also want to use the system libraries
-install -d $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib
-ln -s %{python3_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL
+install -d %{buildroot}%{_libdir}/kodi/addons/script.module.pil/lib
+ln -s %{python3_sitearch}/PIL %{buildroot}%{_libdir}/kodi/addons/script.module.pil/lib/PIL
# Move man-pages into system dir
mkdir -p %{buildroot}%{_mandir}/
1 month
[kodi/f41] Update to 21.1
by Leigh Scott
Summary of changes:
746a517... Update to 21.1 (*)
(*) This commit already existed in another branch; no separate mail sent
1 month
[kodi] Update to 21.1
by Leigh Scott
commit 746a5175a4fe158a6a156fdd6748c009aec0301d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Aug 20 14:30:11 2024 +0100
Update to 21.1
kodi-21-find-if.patch | 10 ---------
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 49 ++++++++++++++++++++++++---------------------
sources | 2 +-
4 files changed, 28 insertions(+), 35 deletions(-)
---
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 6b6e215..ded006e 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=21
-MINORVERSION=0
+MINORVERSION=1
#GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583
#GITSHORT=b6daed5
CODENAME=Omega
diff --git a/kodi.spec b/kodi.spec
index 9d90c4c..8b28978 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -38,8 +38,8 @@
%endif
Name: kodi
-Version: 21.0
-Release: 3%{?dist}
+Version: 21.1
+Release: 1%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -75,13 +75,10 @@ Source5: ffmpeg-5.1.2-Nexus-Alpha3.tar.gz
Source6: apache-groovy-binary-4.0.16.zip
# Set program version parameters
-Patch1: kodi-20-versioning.patch
-
-# Compiler error
-Patch2: kodi-21-find-if.patch
+Patch0: kodi-20-versioning.patch
# Python-3.13 fix
-Patch3: fix_py313.patch
+Patch1: fix_py313.patch
%ifarch x86_64
%global _with_crystalhd 1
@@ -147,6 +144,7 @@ BuildRequires: libXinerama-devel
BuildRequires: libXmu-devel
BuildRequires: libXrandr-devel
BuildRequires: libXtst-devel
+BuildRequires: libappstream-glib
BuildRequires: libass-devel >= 0.9.7
%if 0%{?_with_libbluray}
BuildRequires: libbluray-devel
@@ -315,9 +313,8 @@ This package contains FirewallD files for Kodi.
pushd ..
unzip %{SOURCE6}
popd
-%patch -P 1 -p1 -b.versioning
-%patch -P 2 -p1 -b.find-if
-%patch -P 3 -p1 -b.py313
+%patch -P 0 -p1 -b.versioning
+%patch -P 1 -p1 -b.py313
# Fix up Python shebangs
%py3_shebang_fix \
@@ -369,9 +366,11 @@ export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
desktop-file-install \
- --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+ --dir=%{buildroot}%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/kodi.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.xbmc.kodi.metainfo.xml
+
# Stop shipping the duplicate xsession file
rm -f $RPM_BUILD_ROOT/%{_datadir}/xsessions/xbmc.desktop
@@ -381,16 +380,16 @@ install -d $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib
ln -s %{python3_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL
# Move man-pages into system dir
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/
-mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
+mkdir -p %{buildroot}%{_mandir}/
+mv docs/manpages %{buildroot}%{_mandir}/man1/
# Remove wiiremote man page if support was disabled
%if ! 0%{?_with_cwiid}
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1
+rm -f %{buildroot}%{_mandir}/man1/kodi-wiiremote.1
%endif
# Remove duplicate binary
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker
+rm -f %{buildroot}%{_bindir}/TexturePacker
%post firewalld
@@ -409,11 +408,12 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker
%{_datadir}/xsessions/kodi.desktop
%{_datadir}/applications/kodi.desktop
%{_datadir}/icons/hicolor/*/*/*.png
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
-%{_mandir}/man1/kodi.1.gz
-%{_mandir}/man1/kodi.bin.1.gz
-%{_mandir}/man1/kodi-standalone.1.gz
-%{_mandir}/man1/kodi-TexturePacker.1.gz
+%{_datadir}/icons/hicolor/scalable/apps/kodi.svg
+%{_metainfodir}/org.xbmc.kodi.metainfo.xml
+%{_mandir}/man1/kodi.1.*
+%{_mandir}/man1/kodi.bin.1.*
+%{_mandir}/man1/kodi-standalone.1.*
+%{_mandir}/man1/kodi-TexturePacker.1.*
%files devel
@@ -430,10 +430,10 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker
%if 0%{?_with_cwiid}
%{_bindir}/kodi-wiiremote
%endif
-%{_mandir}/man1/kodi-ps3remote.1.gz
-%{_mandir}/man1/kodi-send.1.gz
+%{_mandir}/man1/kodi-ps3remote.1.*
+%{_mandir}/man1/kodi-send.1.*
%if 0%{?_with_cwiid}
-%{_mandir}/man1/kodi-wiiremote.1.gz
+%{_mandir}/man1/kodi-wiiremote.1.*
%endif
@@ -449,6 +449,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker
%changelog
+* Tue Aug 20 2024 Leigh Scott <leigh123linux(a)gmail.com> - 21.1-1
+- Update to 21.1
+
* Sat Jul 27 2024 Leigh Scott <leigh123linux(a)gmail.com> - 21.0-3
- Rebuild for new fmt
diff --git a/sources b/sources
index 1acfd14..6addf32 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (kodi-21.0-patched.tar.xz) = 654bdd757a3c38078c4b9ddc2910120fb75cf2db67c1f8152b556f0948c48a133e4d87fb565e1165d8e3415ff05a166bce16640339fa3c730fd1653e8fca0bb7
+SHA512 (kodi-21.1-patched.tar.xz) = 9d1cb59a2d32a5716a3669675c1a01f825848801125c59d65b37cff61770db9ccc13b753aa109f4b9e36bbe5c240c9c771333ac558b7d6f199e1407e08d4ef1e
SHA512 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d
SHA512 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e
SHA512 (apache-groovy-binary-4.0.16.zip) = 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0
1 month