[nvidia-390xx-kmod] Update Release number and changelog in SPEC file
by Nicolas Viéville
commit 97daf3041c08cb6b0271b103364152670d9bf238
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Feb 16 16:55:19 2025 +0100
Update Release number and changelog in SPEC file
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
nvidia-390xx-kmod.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index df392f1..8674d9a 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -18,7 +18,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.157
# Taken over by kmodtool
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -268,6 +268,10 @@ done
%changelog
+* Sun Feb 16 2025 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 3:390.157-16
+- Add patch for kernel >= 6.13
+- Add patch for kernel >= 6.14
+
* Wed Jan 29 2025 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3:390.157-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
2 weeks, 1 day
[nvidia-390xx-kmod] Add patch for kernel >= 6.14
by Nicolas Viéville
commit ea53307b5ee7cb910f9a9251ef99c85ceeefb98f
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Feb 16 16:53:24 2025 +0100
Add patch for kernel >= 6.14
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
...-6.14-date-removed-from-struct-drm_driver.patch | 31 ++++++++++++++++++++++
nvidia-390xx-kmod.spec | 2 ++
2 files changed, 33 insertions(+)
---
diff --git a/nvidia-390xx-kmod-0095-kernel-6.14-date-removed-from-struct-drm_driver.patch b/nvidia-390xx-kmod-0095-kernel-6.14-date-removed-from-struct-drm_driver.patch
new file mode 100644
index 0000000..8b33423
--- /dev/null
+++ b/nvidia-390xx-kmod-0095-kernel-6.14-date-removed-from-struct-drm_driver.patch
@@ -0,0 +1,31 @@
+From 0570d5da6e41507be44fbd9bc9f9e94f2837bbd2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville(a)uphf.fr>
+Date: Sun, 16 Feb 2025 16:20:41 +0100
+Subject: [PATCH] Linux 6.14: nvidia-drm-drv.c: date from struct drm_driver
+ removed from all drivers in kernel 6.14 from commit cb2e1c2136
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
+---
+ kernel/nvidia-drm/nvidia-drm-drv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
+index a0887ff..e6f4a47 100644
+--- a/kernel/nvidia-drm/nvidia-drm-drv.c
++++ b/kernel/nvidia-drm/nvidia-drm-drv.c
+@@ -772,7 +772,9 @@ static struct drm_driver nv_drm_driver = {
+ .name = "nvidia-drm",
+
+ .desc = "NVIDIA DRM driver",
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0)
+ .date = "20160202",
++#endif
+
+ #if defined(NV_DRM_DRIVER_HAS_DEVICE_LIST)
+ .device_list = LIST_HEAD_INIT(nv_drm_driver.device_list),
+--
+2.48.1
+
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 7e351bd..df392f1 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -108,6 +108,7 @@ Patch157: nvidia-390xx-kmod-0091-fix_warning_old_style_declaration_.patch
Patch158: nvidia-390xx-kmod-0092-fix_index_0_is_out_of_range_kernel_6.8_traces.patch
Patch159: nvidia-390xx-kmod-0093-kernel-6.12-adaptation.patch
Patch160: nvidia-390xx-kmod-0094-kernel-6.13-kbuild-external-module-source-tree-change.patch
+Patch161: nvidia-390xx-kmod-0095-kernel-6.14-date-removed-from-struct-drm_driver.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -231,6 +232,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch -P 158 -p1 -b 158
%patch -P 159 -p1 -b 159
%patch -P 160 -p1 -b 160
+%patch -P 161 -p1 -b 161
%ifarch armv7hl
%patch -P 40 -p1 -b 40 -d kernel
2 weeks, 1 day
[nvidia-390xx-kmod] Add patch for kernel >= 6.13
by Nicolas Viéville
commit 9d22675336482be445cbeab5ea40923e00251059
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sun Feb 16 16:50:56 2025 +0100
Add patch for kernel >= 6.13
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
...kbuild-external-module-source-tree-change.patch | 81 ++++++++++++++++++++++
nvidia-390xx-kmod.spec | 2 +
2 files changed, 83 insertions(+)
---
diff --git a/nvidia-390xx-kmod-0094-kernel-6.13-kbuild-external-module-source-tree-change.patch b/nvidia-390xx-kmod-0094-kernel-6.13-kbuild-external-module-source-tree-change.patch
new file mode 100644
index 0000000..7c29ed1
--- /dev/null
+++ b/nvidia-390xx-kmod-0094-kernel-6.13-kbuild-external-module-source-tree-change.patch
@@ -0,0 +1,81 @@
+From 0fdd8d52a3585f8a63839d767711649b1dd86fe7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville(a)uphf.fr>
+Date: Sun, 16 Feb 2025 16:13:20 +0100
+Subject: [PATCH] Linux 6.13: Kbuild: resolve to absolute path symlink command
+ to abstract away the difference between Linux < 6.13 and kernel >= 6.13 -
+ Inspired from Eric Naim patch for CachyOS
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
+---
+ kernel/Kbuild | 14 ++++++++++++++
+ kernel/nvidia-modeset/nvidia-modeset.Kbuild | 7 ++++---
+ kernel/nvidia/nvidia.Kbuild | 7 ++++---
+ 3 files changed, 22 insertions(+), 6 deletions(-)
+
+diff --git a/kernel/Kbuild b/kernel/Kbuild
+index c74eab9..fdabf38 100644
+--- a/kernel/Kbuild
++++ b/kernel/Kbuild
+@@ -41,6 +41,20 @@ ASSIGN_PER_OBJ_CFLAGS = \
+ $(eval $(addprefix CFLAGS_,$(_cflags_variable)) += $(2)))
+
+
++#
++# Command to create a symbolic link, explicitly resolving the symlink target
++# to an absolute path to abstract away the difference between Linux < 6.13,
++# where the CWD is the Linux kernel source tree for Kbuild extmod builds, and
++# Linux >= 6.13, where the CWD is the external module source tree.
++#
++# This is used to create the nv*-kernel.o -> nv*-kernel.o_binary symlinks for
++# kernel modules which use precompiled binary object files.
++#
++
++quiet_cmd_symlink = SYMLINK $@
++ cmd_symlink = ln -sf $(abspath $<) $@
++
++
+ #
+ # Include the specifics of the individual NVIDIA kernel modules.
+ #
+diff --git a/kernel/nvidia-modeset/nvidia-modeset.Kbuild b/kernel/nvidia-modeset/nvidia-modeset.Kbuild
+index 8a7645d..09afa85 100644
+--- a/kernel/nvidia-modeset/nvidia-modeset.Kbuild
++++ b/kernel/nvidia-modeset/nvidia-modeset.Kbuild
+@@ -38,9 +38,10 @@ NV_KERNEL_MODULE_TARGETS += $(NVIDIA_MODESET_KO)
+ NVIDIA_MODESET_BINARY_OBJECT := $(src)/nvidia-modeset/nv-modeset-kernel.o_binary
+ NVIDIA_MODESET_BINARY_OBJECT_O := nvidia-modeset/nv-modeset-kernel.o
+
+-quiet_cmd_symlink = SYMLINK $@
+-cmd_symlink = ln -sf $< $@
+-
++# Commented for kernel >= 6.13 - see root Kbuild file - Remove will append later
++#quiet_cmd_symlink = SYMLINK $@
++#cmd_symlink = ln -sf $< $@
++#
+ targets += $(NVIDIA_MODESET_BINARY_OBJECT_O)
+
+ $(obj)/$(NVIDIA_MODESET_BINARY_OBJECT_O): $(NVIDIA_MODESET_BINARY_OBJECT) FORCE
+diff --git a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild
+index d6995ca..9805999 100644
+--- a/kernel/nvidia/nvidia.Kbuild
++++ b/kernel/nvidia/nvidia.Kbuild
+@@ -40,9 +40,10 @@ NVIDIA_KO = nvidia/nvidia.ko
+ NVIDIA_BINARY_OBJECT := $(src)/nvidia/nv-kernel.o_binary
+ NVIDIA_BINARY_OBJECT_O := nvidia/nv-kernel.o
+
+-quiet_cmd_symlink = SYMLINK $@
+- cmd_symlink = ln -sf $< $@
+-
++# Commented for kernel >= 6.13 - see root Kbuild file - Remove will append later
++#quiet_cmd_symlink = SYMLINK $@
++# cmd_symlink = ln -sf $< $@
++#
+ targets += $(NVIDIA_BINARY_OBJECT_O)
+
+ $(obj)/$(NVIDIA_BINARY_OBJECT_O): $(NVIDIA_BINARY_OBJECT) FORCE
+--
+2.48.1
+
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 458bb0c..7e351bd 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -107,6 +107,7 @@ Patch156: nvidia-390xx-kmod-0090-fix_warning_suggested_braces_around_empty_body_
Patch157: nvidia-390xx-kmod-0091-fix_warning_old_style_declaration_.patch
Patch158: nvidia-390xx-kmod-0092-fix_index_0_is_out_of_range_kernel_6.8_traces.patch
Patch159: nvidia-390xx-kmod-0093-kernel-6.12-adaptation.patch
+Patch160: nvidia-390xx-kmod-0094-kernel-6.13-kbuild-external-module-source-tree-change.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -229,6 +230,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch -P 157 -p1 -b 157
%patch -P 158 -p1 -b 158
%patch -P 159 -p1 -b 159
+%patch -P 160 -p1 -b 160
%ifarch armv7hl
%patch -P 40 -p1 -b 40 -d kernel
2 weeks, 1 day
[xroar/f41] new version
by Andrea Musuruane
Summary of changes:
2e99157... new version (*)
(*) This commit already existed in another branch; no separate mail sent
2 weeks, 1 day
[xroar/f42] new version
by Andrea Musuruane
Summary of changes:
2e99157... new version (*)
(*) This commit already existed in another branch; no separate mail sent
2 weeks, 2 days
[vcmi/f40] Bump to 1.6.5
by runlevel5
commit f24ecda34d6000784e4d3d8cf4f544389daacda1
Author: Trung Lê <8(a)tle.id.au>
Date: Sun Feb 16 00:11:04 2025 +1100
Bump to 1.6.5
sources | 2 +-
vcmi.spec | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index c568e18..7cb8ed1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vcmi-1.5.7.tar.gz) = 40148acd6499e8f6cb37bbdaabedc1260ff76da33034c9a4c26a420da2502eff34623c0792a6c7748b7a66bc03aedcd8c3c641079040690f2fa4069034973737
+SHA512 (vcmi-1.6.5.tar.gz) = bb13a97bb0616e187b96a3907ad843cd4d7bd510cf380142cb2edfd843367e7cb0ea7b4db5d26fd5ef61cb01bd4090f486035858286d9147f29a92cefb464b25
SHA512 (fuzzylite-7aee562.tar.gz) = f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5
diff --git a/vcmi.spec b/vcmi.spec
index 8fd849e..988a5a0 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -6,7 +6,7 @@ URL: https://vcmi.eu/
%global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7})
%global fuzzylite_version 6.0
-Version: 1.5.7
+Version: 1.6.5
Release: 0%{?dist}
# vcmi is GPL-2.0-or-later, fuzzylight is GPL-3.0-only
@@ -92,7 +92,6 @@ mkdir %{_vpath_builddir}/{launcher,mapeditor}/translation/
mv %{_vpath_builddir}/launcher/*.qm %{_vpath_builddir}/launcher/translation/
mv %{_vpath_builddir}/mapeditor/*.qm %{_vpath_builddir}/mapeditor/translation/
-
%install
%cmake_install
@@ -128,6 +127,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Sun Feb 16 2025 Trung Lê <8(a)tle.id.au> - 1.6.5-0
+- New upstream release
+
* Sat Aug 31 2024 Trung Lê <8(a)tle.id.au> - 1.5.7-0
- New upstream release
2 weeks, 2 days
[xroar] new version
by Andrea Musuruane
commit 2e99157f25c186de507c6f241e7a9e4eae688304
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Feb 15 14:50:13 2025 +0100
new version
.gitignore | 1 +
sources | 2 +-
xroar-1.8.1-gcc15.patch | 11 -----------
xroar.spec | 7 ++++---
4 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 925718f..41258a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ dragon.rom
/xroar-1.7.1.tar.gz
/xroar-1.7.3.tar.gz
/xroar-1.8.1.tar.gz
+/xroar-1.8.2.tar.gz
diff --git a/sources b/sources
index dea1cb9..8ded90c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (dragon.rom) = bbe3dc286a828acd745155ad8b2f8f1dc7d674c10deae619758662a4f45feefd1d1aea6b8b09f4c4db8b40cbaf475ab540d88d8286e1e4f8478692ad08979285
-SHA512 (xroar-1.8.1.tar.gz) = d13e401408d7c241d9d10df6cacaeefc3c998cd199b87ab953185c35b4ae2c50fc1f800341e75241d55dc767e5f9a96c922c8f61d89e26a43bb4b211b8209e7f
+SHA512 (xroar-1.8.2.tar.gz) = 470c2861011ea34a9e375297f7bbe4ea65e8fae99dffa93b74b6c9efbd02fa847c750528cf9e9183facb7e5260edcb23ab019b1a66c1efea33cde8fea0aeded0
diff --git a/xroar.spec b/xroar.spec
index c89cc26..705c66c 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,5 +1,5 @@
Name: xroar
-Version: 1.8.1
+Version: 1.8.2
Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
License: GPLv3+
@@ -9,8 +9,6 @@ Source1: http://www.6809.org.uk/dragon/dragon.rom
Source2: %{name}.desktop
Source3: %{name}-minifirm.desktop
Source4: %{name}.appdata.xml
-# Fix compiling with GCC15
-Patch0: %{name}-1.8.1-gcc15.patch
BuildRequires: gcc
BuildRequires: make
BuildRequires: gtk3-devel
@@ -100,6 +98,9 @@ rm -f %{buildroot}%{_infodir}/dir
%changelog
+* Fri Feb 14 2025 Andrea Musuruane <musuruan(a)gmail.com> - 1.8.2-1
+- new version
+
* Sun Feb 02 2025 Andrea Musuruane <musuruan(a)gmail.com> - 1.8.1-1
- new version
2 weeks, 2 days
[vcmi/f41] Bump to 1.6.5
by runlevel5
commit 1b8a1bb1a2f8be244a01002750a92879baecb912
Author: Trung Lê <8(a)tle.id.au>
Date: Sun Feb 16 00:11:04 2025 +1100
Bump to 1.6.5
sources | 2 +-
vcmi.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index c568e18..7cb8ed1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vcmi-1.5.7.tar.gz) = 40148acd6499e8f6cb37bbdaabedc1260ff76da33034c9a4c26a420da2502eff34623c0792a6c7748b7a66bc03aedcd8c3c641079040690f2fa4069034973737
+SHA512 (vcmi-1.6.5.tar.gz) = bb13a97bb0616e187b96a3907ad843cd4d7bd510cf380142cb2edfd843367e7cb0ea7b4db5d26fd5ef61cb01bd4090f486035858286d9147f29a92cefb464b25
SHA512 (fuzzylite-7aee562.tar.gz) = f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5
diff --git a/vcmi.spec b/vcmi.spec
index 5a0b25b..f3d31da 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -6,7 +6,7 @@ URL: https://vcmi.eu/
%global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7})
%global fuzzylite_version 6.0
-Version: 1.5.7
+Version: 1.6.5
Release: 1%{?dist}
# vcmi is GPL-2.0-or-later, fuzzylight is GPL-3.0-only
@@ -128,6 +128,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Sat Feb 16 2025 Trung Lê <8(a)tle.id.au> - 1.6.5-0
+- New upstream release
+
* Wed Nov 06 2024 Sérgio Basto <sergio(a)serjux.com> - 1.5.7-1
- Rebuild for ffmpeg-7
2 weeks, 2 days
[lives/f42] Rebuild for new opencv
by Leigh Scott
Summary of changes:
dbe3398... Rebuild for new opencv (*)
(*) This commit already existed in another branch; no separate mail sent
2 weeks, 2 days
