[nvidia-kmod/f40: 9/9] Merge branch 'master' into f40
by Leigh Scott
commit afb8f013ffcfabc1342725524544ca06bb1d3ce7
Merge: 0b28dc4 853d6c1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Feb 23 07:22:53 2025 +0000
Merge branch 'master' into f40
make_modeset_default.patch | 26 +++++++++-----------------
noautobuild | 1 +
nvidia-kmod.spec | 21 ++++++++++++++++++---
remove_unused_date.patch | 21 +++++++++++++++++++++
4 files changed, 49 insertions(+), 20 deletions(-)
---
1 week, 1 day
[nvidia-kmod/f40] (9 commits) ...Merge branch 'master' into f40
by Leigh Scott
Summary of changes:
37b3fdf... Update to 570.86.10 cuda release (*)
59899b3... Fix patch (*)
c7c60a3... add noautobuild (*)
bc98c5b... Update to 570.86.16 beta (*)
a0e47c8... fix (*)
29ad34a... Force build to use std=gnu17 (*)
e17709c... Remove unused date (*)
853d6c1... Redo patch so it still builds on kernels < 6.11 (*)
afb8f01... Merge branch 'master' into f40
(*) This commit already existed in another branch; no separate mail sent
1 week, 1 day
[nvidia-kmod/f41] (8 commits) ...Redo patch so it still builds on kernels < 6.11
by Leigh Scott
Summary of changes:
37b3fdf... Update to 570.86.10 cuda release (*)
59899b3... Fix patch (*)
c7c60a3... add noautobuild (*)
bc98c5b... Update to 570.86.16 beta (*)
a0e47c8... fix (*)
29ad34a... Force build to use std=gnu17 (*)
e17709c... Remove unused date (*)
853d6c1... Redo patch so it still builds on kernels < 6.11 (*)
(*) This commit already existed in another branch; no separate mail sent
1 week, 1 day
[xorg-x11-drv-nvidia/f40: 18/18] Merge branch 'master' into f40
by Leigh Scott
commit d7fdfa3e0d6b97c660ec0c498bf0439ded552bb5
Merge: a9db35c b389926
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Feb 22 14:23:14 2025 +0000
Merge branch 'master' into f40
70-nvidia.preset | 1 +
sources | 4 +--
xorg-x11-drv-nvidia.spec | 67 +++++++++++++++++++++++++++++++++++-------------
3 files changed, 52 insertions(+), 20 deletions(-)
---
1 week, 2 days
[xorg-x11-drv-nvidia/f40] (18 commits) ...Merge branch 'master' into f40
by Leigh Scott
Summary of changes:
1f6ca84... Update to 570.86.10 cuda release (*)
8a7a349... Add changes for 570.86.10 (*)
1ee58e0... add noautobuild.txt (*)
649d053... Revert "add noautobuild.txt" (*)
9432802... Update to 570.86.16 beta (*)
2151d10... Fix requires and provides (*)
2d138a4... fix sbin merge issue (*)
f412d4c... fix (*)
c416ffd... fix (*)
abefee4... Revert "fix" (*)
b406687... Revert "fix" (*)
1b6ff2a... Revert vulkan icd name change (*)
4e26fef... fix (*)
26bb9bb... Revert "fix" (*)
76d71d3... Revert "Revert vulkan icd name change" (*)
8ea6338... Revert the icd changes (*)
b389926... Revert last change (*)
d7fdfa3... Merge branch 'master' into f40
(*) This commit already existed in another branch; no separate mail sent
1 week, 2 days
[xorg-x11-drv-nvidia/f41] (17 commits) ...Revert last change
by Leigh Scott
Summary of changes:
1f6ca84... Update to 570.86.10 cuda release (*)
8a7a349... Add changes for 570.86.10 (*)
1ee58e0... add noautobuild.txt (*)
649d053... Revert "add noautobuild.txt" (*)
9432802... Update to 570.86.16 beta (*)
2151d10... Fix requires and provides (*)
2d138a4... fix sbin merge issue (*)
f412d4c... fix (*)
c416ffd... fix (*)
abefee4... Revert "fix" (*)
b406687... Revert "fix" (*)
1b6ff2a... Revert vulkan icd name change (*)
4e26fef... fix (*)
26bb9bb... Revert "fix" (*)
76d71d3... Revert "Revert vulkan icd name change" (*)
8ea6338... Revert the icd changes (*)
b389926... Revert last change (*)
(*) This commit already existed in another branch; no separate mail sent
1 week, 2 days
[mpd/f42] Patch for new libnfs
by Leigh Scott
Summary of changes:
dd647aa... Patch for new libnfs (*)
(*) This commit already existed in another branch; no separate mail sent
1 week, 3 days
[mpd] Patch for new libnfs
by Leigh Scott
commit dd647aa21bc5df026a480df9bf0eb5f48be20057
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Feb 21 13:11:44 2025 +0000
Patch for new libnfs
libnfsv6.patch | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mpd.spec | 6 +-
2 files changed, 231 insertions(+), 1 deletion(-)
---
diff --git a/libnfsv6.patch b/libnfsv6.patch
new file mode 100644
index 0000000..8780d53
--- /dev/null
+++ b/libnfsv6.patch
@@ -0,0 +1,226 @@
+From 913e1ac84800439060d44db5b0a3a3c0c99b59c8 Mon Sep 17 00:00:00 2001
+From: BlackEagle <ike.devolder(a)gmail.com>
+Date: Wed, 29 Jan 2025 20:27:04 +0100
+Subject: [PATCH 1/2] Minimal backport to support libnfs 6 on v0.23
+
+This is based on the following commits in master:
+- https://github.com/MusicPlayerDaemon/MPD/commit/31e583e9f8d14b9e67eab2581...
+- https://github.com/MusicPlayerDaemon/MPD/commit/58e3b830e9a6826fef8950bcc...
+
+also changed cpp_std=c++20 to facilitate the use of span
+---
+ meson.build | 4 ++--
+ src/lib/nfs/Connection.cxx | 33 +++++++++++++++++++++++++++++----
+ src/lib/nfs/Connection.hxx | 15 +++++++++++++--
+ src/lib/nfs/FileReader.cxx | 13 +++++++++++++
+ src/lib/nfs/FileReader.hxx | 8 ++++++++
+ src/lib/nfs/meson.build | 7 +++++++
+ 6 files changed, 72 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 6777a12f78..0e0be7226d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -6,8 +6,8 @@ project(
+ default_options: [
+ 'c_std=c11',
+ 'build.c_std=c11',
+- 'cpp_std=c++17',
+- 'build.cpp_std=c++17',
++ 'cpp_std=c++20',
++ 'build.cpp_std=c++20',
+ 'warning_level=3',
+
+ # If we build those libraries as Meson subproject, they shall be
+diff --git a/src/lib/nfs/Connection.cxx b/src/lib/nfs/Connection.cxx
+index c9d7985f7d..a44004ba6e 100644
+--- a/src/lib/nfs/Connection.cxx
++++ b/src/lib/nfs/Connection.cxx
+@@ -103,11 +103,25 @@ NfsConnection::CancellableCallback::Stat(nfs_context *ctx,
+
+ inline void
+ NfsConnection::CancellableCallback::Read(nfs_context *ctx, struct nfsfh *fh,
+- uint64_t offset, size_t size)
++ uint64_t offset,
++#ifdef LIBNFS_API_2
++ std::span<std::byte> dest
++#else
++ std::size_t size
++#endif
++ )
+ {
+ assert(connection.GetEventLoop().IsInside());
+
+- int result = nfs_pread_async(ctx, fh, offset, size, Callback, this);
++ int result = nfs_pread_async(ctx, fh,
++#ifdef LIBNFS_API_2
++ dest.data(), dest.size(),
++#endif
++ offset,
++#ifndef LIBNFS_API_2
++ size,
++#endif
++ Callback, this);
+ if (result < 0)
+ throw FormatRuntimeError("nfs_pread_async() failed: %s",
+ nfs_get_error(ctx));
+@@ -329,7 +343,12 @@ NfsConnection::Stat(struct nfsfh *fh, NfsCallback &callback)
+ }
+
+ void
+-NfsConnection::Read(struct nfsfh *fh, uint64_t offset, size_t size,
++NfsConnection::Read(struct nfsfh *fh, uint64_t offset,
++#ifdef LIBNFS_API_2
++ std::span<std::byte> dest,
++#else
++ std::size_t size,
++#endif
+ NfsCallback &callback)
+ {
+ assert(GetEventLoop().IsInside());
+@@ -337,7 +356,13 @@ NfsConnection::Read(struct nfsfh *fh, uint64_t offset, size_t size,
+
+ auto &c = callbacks.Add(callback, *this, false);
+ try {
+- c.Read(context, fh, offset, size);
++ c.Read(context, fh, offset,
++#ifdef LIBNFS_API_2
++ dest
++#else
++ size
++#endif
++ );
+ } catch (...) {
+ callbacks.Remove(c);
+ throw;
+diff --git a/src/lib/nfs/Connection.hxx b/src/lib/nfs/Connection.hxx
+index 49987e2c35..0fea1f3036 100644
+--- a/src/lib/nfs/Connection.hxx
++++ b/src/lib/nfs/Connection.hxx
+@@ -71,7 +71,13 @@ class NfsConnection {
+ void Open(nfs_context *context, const char *path, int flags);
+ void Stat(nfs_context *context, struct nfsfh *fh);
+ void Read(nfs_context *context, struct nfsfh *fh,
+- uint64_t offset, size_t size);
++ uint64_t offset,
++#ifdef LIBNFS_API_2
++ std::span<std::byte> dest
++#else
++ std::size_t size
++#endif
++ );
+
+ /**
+ * Cancel the operation and schedule a call to
+@@ -193,7 +199,12 @@ public:
+ /**
+ * Throws std::runtime_error on error.
+ */
+- void Read(struct nfsfh *fh, uint64_t offset, size_t size,
++ void Read(struct nfsfh *fh, uint64_t offset,
++#ifdef LIBNFS_API_2
++ std::span<std::byte> dest,
++#else
++ std::size_t size,
++#endif
+ NfsCallback &callback);
+
+ void Cancel(NfsCallback &callback) noexcept;
+diff --git a/src/lib/nfs/FileReader.cxx b/src/lib/nfs/FileReader.cxx
+index 6e9457d791..6bd75e9ea7 100644
+--- a/src/lib/nfs/FileReader.cxx
++++ b/src/lib/nfs/FileReader.cxx
+@@ -129,7 +129,15 @@ NfsFileReader::Read(uint64_t offset, size_t size)
+ {
+ assert(state == State::IDLE);
+
++#ifdef LIBNFS_API_2
++ assert(!read_buffer);
++ // TOOD read into caller-provided buffer
++ read_buffer = std::make_unique<std::byte[]>(size);
++ connection->Read(fh, offset, {read_buffer.get(), size}, *this);
++#else
+ connection->Read(fh, offset, size, *this);
++#endif
++
+ state = State::READ;
+ }
+
+@@ -137,7 +145,12 @@ void
+ NfsFileReader::CancelRead() noexcept
+ {
+ if (state == State::READ) {
++#ifdef LIBNFS_API_2
++ assert(read_buffer);
++ read_buffer.release();
++#endif
+ connection->Cancel(*this);
++
+ state = State::IDLE;
+ }
+ }
+diff --git a/src/lib/nfs/FileReader.hxx b/src/lib/nfs/FileReader.hxx
+index 8d257efdd5..a2b9e9c60c 100644
+--- a/src/lib/nfs/FileReader.hxx
++++ b/src/lib/nfs/FileReader.hxx
+@@ -32,6 +32,10 @@
+
+ #include <sys/stat.h>
+
++#ifdef LIBNFS_API_2
++#include <memory>
++#endif
++
+ struct nfsfh;
+ class NfsConnection;
+
+@@ -68,6 +72,10 @@ class NfsFileReader : NfsLease, NfsCallback {
+ */
+ InjectEvent defer_open;
+
++#ifdef LIBNFS_API_2
++ std::unique_ptr<std::byte[]> read_buffer;
++#endif
++
+ public:
+ NfsFileReader() noexcept;
+ ~NfsFileReader() noexcept;
+diff --git a/src/lib/nfs/meson.build b/src/lib/nfs/meson.build
+index 274ee7b47b..45738dcb58 100644
+--- a/src/lib/nfs/meson.build
++++ b/src/lib/nfs/meson.build
+@@ -4,6 +4,13 @@ if not nfs_dep.found()
+ subdir_done()
+ endif
+
++if nfs_dep.version().version_compare('>=6')
++ # libnfs has no version macro therefore we must detect the API
++ # version 2 at configure time
++ nfs_dep = declare_dependency(compile_args: '-DLIBNFS_API_2',
++ dependencies: nfs_dep)
++endif
++
+ nfs = static_library(
+ 'nfs',
+ 'Connection.cxx',
+
+From 19e9310ded81942542643bb54dae3221d034de16 Mon Sep 17 00:00:00 2001
+From: BlackEagle <ike.devolder(a)gmail.com>
+Date: Thu, 30 Jan 2025 07:22:17 +0100
+Subject: [PATCH 2/2] Revert "lib/nfs/meson.build: reject libnfs 6"
+
+This reverts commit c48dbd5dd43506842e4f1478f386e9a744663d5a.
+---
+ src/lib/nfs/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/nfs/meson.build b/src/lib/nfs/meson.build
+index 45738dcb58..586a713915 100644
+--- a/src/lib/nfs/meson.build
++++ b/src/lib/nfs/meson.build
+@@ -1,4 +1,4 @@
+-nfs_dep = dependency('libnfs', version: ['>= 4', '< 6'], required: get_option('nfs'))
++nfs_dep = dependency('libnfs', version: '>= 4', required: get_option('nfs'))
+ conf.set('ENABLE_NFS', nfs_dep.found())
+ if not nfs_dep.found()
+ subdir_done()
diff --git a/mpd.spec b/mpd.spec
index 4963cf1..70e8f8d 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -17,7 +17,7 @@
Name: mpd
Epoch: 1
Version: 0.23.17
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
URL: https://www.musicpd.org
@@ -36,6 +36,7 @@ Source6: mpd.sysusers
Patch0: mpd-0.23-mpdconf.patch
Patch1: mpd-0.20-remove_NoNewPrivileges.patch
Patch2: timidity_path.patch
+Patch3: https://github.com/MusicPlayerDaemon/MPD/pull/2198.patch#/libnfsv6.patch
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
@@ -248,6 +249,9 @@ rm -rf %{buildroot}%{_docdir}/mpd/
%endif
%changelog
+* Fri Feb 21 2025 Leigh Scott <leigh123linux(a)gmail.com> - 1:0.23.17-3
+- Patch for new libnfs
+
* Thu Feb 13 2025 Leigh Scott <leigh123linux(a)gmail.com> - 1:0.23.17-2
- Rebuild for firewalld change
1 week, 3 days
[mesa-freeworld/f41] Add archless provides for mesa-vulkan-drivers
by Thorsten Leemhuis
commit 8c8911c74ea1c154d4ede9f46847f3680bc1a42a
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Thu Feb 20 20:03:31 2025 +0100
Add archless provides for mesa-vulkan-drivers
Signed-off-by: Björn Esser <besser82(a)fedoraproject.org>
mesa-freeworld.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index ff088b0..0b5bc6f 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -72,7 +72,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 25.0.0
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: http://www.mesa3d.org
@@ -206,6 +206,7 @@ Conflicts: %{srcname}-vdpau-drivers%{?_isa}
Summary: Mesa Vulkan drivers
Requires: vulkan%{_isa}
Requires: %{srcname}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}
+Provides: %{srcname}-vulkan-drivers = %{?epoch:%{epoch}:}%{version}
Provides: %{srcname}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}
Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release}
# the following conflict is needed until we can find a way to install freeworld
@@ -418,6 +419,9 @@ echo -e "%{_libdir}/dri-freeworld/ \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d
%endif
%changelog
+* Thu Feb 20 2025 Björn Esser <besser82(a)fedoraproject.org> - 25.0.0-4
+- Add archless provides for mesa-vulkan-drivers
+
* Thu Feb 20 2025 Björn Esser <besser82(a)fedoraproject.org> - 25.0.0-3
- Fix mesa-filesystem requires in mesa-vulkan-drivers-freeworld
1 week, 4 days