[nvidia-390xx-kmod] Fix warning: suggest braces around empty body in an ‘if’ statement
by Nicolas Viéville
commit 0908afbb83c57e453f0b7e3700df2a2f4603c7a7
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Mon Aug 19 16:02:40 2024 +0200
Fix warning: suggest braces around empty body in an ‘if’ statement
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
..._suggested_braces_around_empty_body_in_if.patch | 107 +++++++++++++++++++++
nvidia-390xx-kmod.spec | 2 +
2 files changed, 109 insertions(+)
---
diff --git a/nvidia-390xx-kmod-0090-fix_warning_suggested_braces_around_empty_body_in_if.patch b/nvidia-390xx-kmod-0090-fix_warning_suggested_braces_around_empty_body_in_if.patch
new file mode 100644
index 0000000..b6488db
--- /dev/null
+++ b/nvidia-390xx-kmod-0090-fix_warning_suggested_braces_around_empty_body_in_if.patch
@@ -0,0 +1,107 @@
+From 05dfb0c51b0078275ff47714a9e75c38ca336ca7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville(a)uphf.fr>
+Date: Mon, 19 Aug 2024 15:14:13 +0200
+Subject: [PATCH] nv-linux.h: fix warning about suggested braces around empty
+ body in if
+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/common/inc/nv-linux.h | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index ddbc68b..4626976 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -544,7 +544,9 @@ static inline void *nv_vmalloc(unsigned long size)
+ void *ptr = __vmalloc(size, GFP_KERNEL);
+ #endif
+ if (ptr)
++ {
+ NV_MEMDBG_ADD(ptr, size);
++ }
+ return ptr;
+ }
+
+@@ -558,7 +560,9 @@ static inline void *nv_ioremap(NvU64 phys, NvU64 size)
+ {
+ void *ptr = ioremap(phys, size);
+ if (ptr)
++ {
+ NV_MEMDBG_ADD(ptr, size);
++ }
+ return ptr;
+ }
+
+@@ -574,7 +578,9 @@ static inline void *nv_ioremap_nocache(NvU64 phys, NvU64 size)
+ void *ptr = ioremap(phys, size);
+ #endif
+ if (ptr)
++ {
+ NV_MEMDBG_ADD(ptr, size);
++ }
+ return ptr;
+ }
+
+@@ -583,7 +589,9 @@ static inline void *nv_ioremap_cache(NvU64 phys, NvU64 size)
+ #if defined(NV_IOREMAP_CACHE_PRESENT)
+ void *ptr = ioremap_cache(phys, size);
+ if (ptr)
++ {
+ NV_MEMDBG_ADD(ptr, size);
++ }
+ return ptr;
+ #else
+ return nv_ioremap(phys, size);
+@@ -595,7 +603,9 @@ static inline void *nv_ioremap_wc(NvU64 phys, NvU64 size)
+ #if defined(NV_IOREMAP_WC_PRESENT)
+ void *ptr = ioremap_wc(phys, size);
+ if (ptr)
++ {
+ NV_MEMDBG_ADD(ptr, size);
++ }
+ return ptr;
+ #else
+ return nv_ioremap_nocache(phys, size);
+@@ -612,14 +622,18 @@ static inline void nv_iounmap(void *ptr, NvU64 size)
+ { \
+ (ptr) = kmalloc(size, NV_GFP_KERNEL); \
+ if (ptr) \
++ { \
+ NV_MEMDBG_ADD(ptr, size); \
++ } \
+ }
+
+ #define NV_KMALLOC_ATOMIC(ptr, size) \
+ { \
+ (ptr) = kmalloc(size, NV_GFP_ATOMIC); \
+ if (ptr) \
++ { \
+ NV_MEMDBG_ADD(ptr, size); \
++ } \
+ }
+
+
+@@ -655,12 +669,16 @@ static inline NvUPtr nv_vmap(struct page **pages, NvU32 page_count,
+ prot = cached ? PAGE_KERNEL : PAGE_KERNEL_NOCACHE;
+ #elif defined(NVCPU_FAMILY_ARM)
+ if (!nvos_is_chipset_io_coherent())
++ {
+ prot = cached ? PAGE_KERNEL : NV_PGPROT_UNCACHED(PAGE_KERNEL);
++ }
+ #endif
+ /* All memory cached in PPC64LE; can't honor 'cached' input. */
+ ptr = vmap(pages, page_count, VM_MAP, prot);
+ if (ptr)
++ {
+ NV_MEMDBG_ADD(ptr, page_count * PAGE_SIZE);
++ }
+ return (NvUPtr)ptr;
+ }
+
+--
+2.46.0
+
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index c93e737..b4f218e 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -103,6 +103,7 @@ Patch152: nvidia-390xx-kmod-0086-undef-NV_DRM_CONNECTOR_FUNCS_HAVE_MODE_IN_NAME-
Patch153: nvidia-390xx-kmod-0087-undef-NV_DRM_REINIT_PRIMARY_MODE_GROUP_PRESENT-in-conftest_sh.patch
Patch154: nvidia-390xx-kmod-0088-undef-NV_DRM_ATOMIC_HELPER_CONNECTOR_DPMS_PRESENT-in-conftest_sh.patch
Patch155: nvidia-390xx-kmod-0089-kernel-6.10-removed-follow_pfn-function.patch
+Patch156: nvidia-390xx-kmod-0090-fix_warning_suggested_braces_around_empty_body_in_if.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -221,6 +222,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch -P 33 -p1 -b 33 -d kernel
%patch -P 155 -p1 -b 155
+%patch -P 156 -p1 -b 156
%ifarch armv7hl
%patch -P 40 -p1 -b 40 -d kernel
1 month
[nvidia-390xx-kmod] Add patch for kernel >= 6.10 - RFBZ#7022
by Nicolas Viéville
commit bdf4c71805616749f36c521ae24e8ead3c2d8c0b
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Mon Aug 19 15:59:53 2024 +0200
Add patch for kernel >= 6.10 - RFBZ#7022
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
...9-kernel-6.10-removed-follow_pfn-function.patch | 65 ++++++++++++++++++++++
nvidia-390xx-kmod.spec | 4 ++
2 files changed, 69 insertions(+)
---
diff --git a/nvidia-390xx-kmod-0089-kernel-6.10-removed-follow_pfn-function.patch b/nvidia-390xx-kmod-0089-kernel-6.10-removed-follow_pfn-function.patch
new file mode 100644
index 0000000..2229970
--- /dev/null
+++ b/nvidia-390xx-kmod-0089-kernel-6.10-removed-follow_pfn-function.patch
@@ -0,0 +1,65 @@
+From de3bf7828321bf3a36a61d53ab658511a7e68fcb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nicolas=20Vi=C3=A9ville?= <nicolas.vieville(a)uphf.fr>
+Date: Mon, 19 Aug 2024 13:55:15 +0200
+Subject: [PATCH] Linux 6.10: follow_pfn function removed, then undef
+ NV_FOLLOW_PFN_PRESENT
+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/conftest.sh | 18 +++++++++++++-----
+ kernel/nvidia/os-mlock.c | 4 +++-
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index e20ed5f..72cf3ec 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -660,13 +660,21 @@ compile_test() {
+ # Determine if the follow_pfn() function is
+ # present.
+ #
+- CODE="
++ # follow_pfn() was added by commit 3b6748e2dd69
++ # ("mm: introduce follow_pfn()") in v2.6.31-rc1, and removed
++ # by commit 233eb0bf3b94 ("mm: remove follow_pfn")
++ # from linux-next 233eb0bf3b94.
++ #
++ # Undefined for rpmfusion for fc40
++ #
++ #CODE="
+ #include <linux/mm.h>
+- void conftest_follow_pfn(void) {
+- follow_pfn();
+- }"
++ #void conftest_follow_pfn(void) {
++ # follow_pfn();
++ #}"
+
+- compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions"
++ #compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions"
++ echo "#undef NV_FOLLOW_PFN_PRESENT" | append_conftest "functions"
+ ;;
+
+ i2c_adapter)
+diff --git a/kernel/nvidia/os-mlock.c b/kernel/nvidia/os-mlock.c
+index ad5cb9a..a59cb9f 100644
+--- a/kernel/nvidia/os-mlock.c
++++ b/kernel/nvidia/os-mlock.c
+@@ -20,8 +20,10 @@ static inline int nv_follow_pfn(struct vm_area_struct *vma,
+ {
+ #if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT)
+ return unsafe_follow_pfn(vma, address, pfn);
+-#else
++##elif defined(NV_FOLLOW_PFN_PRESENT)
+ return follow_pfn(vma, address, pfn);
++#else
++ return -1;
+ #endif
+ }
+
+--
+2.46.0
+
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 82c1ea7..c93e737 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -102,6 +102,7 @@ Patch151: nvidia-390xx-kmod-0085-undef-NV_DRM_GEM_OBJECT_PUT_UNLOCK_PRESENT-in-c
Patch152: nvidia-390xx-kmod-0086-undef-NV_DRM_CONNECTOR_FUNCS_HAVE_MODE_IN_NAME-in-conftest_sh.patch
Patch153: nvidia-390xx-kmod-0087-undef-NV_DRM_REINIT_PRIMARY_MODE_GROUP_PRESENT-in-conftest_sh.patch
Patch154: nvidia-390xx-kmod-0088-undef-NV_DRM_ATOMIC_HELPER_CONNECTOR_DPMS_PRESENT-in-conftest_sh.patch
+Patch155: nvidia-390xx-kmod-0089-kernel-6.10-removed-follow_pfn-function.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -218,6 +219,9 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch -P 31 -p1 -b 31 -d kernel
%patch -P 32 -p1 -b 32 -d kernel
%patch -P 33 -p1 -b 33 -d kernel
+
+%patch -P 155 -p1 -b 155
+
%ifarch armv7hl
%patch -P 40 -p1 -b 40 -d kernel
%patch -P 41 -p1 -b 41 -d kernel
1 month
[mesa-freeworld/f40] Update to 24.1.6
by Thorsten Leemhuis
commit 15851fe4461ab170161be0967d475375fe488a02
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Mon Aug 19 10:46:57 2024 +0200
Update to 24.1.6
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
.gitignore | 1 +
mesa-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9df343a..419cc01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
/mesa-24.1.2.tar.xz
/mesa-24.1.4.tar.xz
/mesa-24.1.5.tar.xz
+/mesa-24.1.6.tar.xz
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 4ecc629..b143bf0 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -69,7 +69,7 @@ algorithms and decoding only VC1 algorithm.
Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
-%global ver 24.1.5
+%global ver 24.1.6
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
@@ -341,6 +341,9 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Mon Aug 19 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.6-1
+- Update to 24.1.6
+
* Thu Aug 1 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.5-1
- Update to 24.1.5
- Drop upstreamed patch
diff --git a/sources b/sources
index 912fd04..edf73aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-24.1.5.tar.xz) = 5916cc38c4a17161b012310c473077177887c5fff1bc5cb1f6efdf5da44878c18c99fe0c62318d897798cd4edb0f7206a989198ba085c2d402d49cdd0ee25288
+SHA512 (mesa-24.1.6.tar.xz) = 2df0c78126f34a9ab7ce4946ed9fcd58d828717ecfd93681d9e136e605e9a8e01428dd632c0125e06d805498ffd75250f0e617f47fbb7e6368e6c8a48f4c4dfc
1 month
[mesa-freeworld] Update to 24.2.0
by Thorsten Leemhuis
commit c668640cc93005d85650f1b35982063eb30b0f53
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Mon Aug 19 10:24:03 2024 +0200
Update to 24.2.0
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
.gitignore | 1 +
mesa-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0235ad4..8e1cb9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@
/mesa-24.1.4.tar.xz
/mesa-24.2.0-rc3.tar.xz
/mesa-24.2.0-rc4.tar.xz
+/mesa-24.2.0.tar.xz
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index f8fc615..827f0be 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -69,7 +69,7 @@ algorithms and decoding only VC1 algorithm.
Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
-%global ver 24.2.0-rc4
+%global ver 24.2.0
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
@@ -345,6 +345,9 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Mon Aug 19 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.0-1
+- Update to 24.2.0
+
* Thu Aug 8 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.0~rc4-1
- Update to 24.2.0-rc4
diff --git a/sources b/sources
index 3a13128..8c32da7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-24.2.0-rc4.tar.xz) = 5a0b9043e8c3222faeaad31f435f3ea440d670ffa5497340c5809666a857fa4c77288745d52372a2267e9f9be97fc04e0d20b81bc027c1b7a33176a3bfa6b3c6
+SHA512 (mesa-24.2.0.tar.xz) = a585c788801b5a341d356e44d958b148e6e14f6b3d7224e99a92faa2f004bf0cfc90103c5fdc651afb22f805c6f9dc594f9f3f5ecebcea36f6305b3a6ccb9294
1 month
[HandBrake] drop support for building without FFmpeg
by Dominik Mierzejewski
commit 9d35c2fbb998e37f60e97ff928f28583fdbba55e
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sun Aug 18 16:24:03 2024 +0200
drop support for building without FFmpeg
HandBrake.spec | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/HandBrake.spec b/HandBrake.spec
index eb957f7..7b6ab5d 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -3,10 +3,6 @@
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global tag %{version}
-# Build with "--without ffmpeg" or enable this to use bundled libAV
-# instead of system FFMpeg libraries.
-#global _without_ffmpeg 1
-
%ifarch i686 x86_64
%global _with_asm 1
%global _with_vpl 1
@@ -31,8 +27,6 @@ Source2: gpg-keyring-1629C061B3DDE7EB4AE34B81021DB8B44E4A8645.gpg
Source0: https://github.com/%{name}/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{s...
%endif
-%{?_without_ffmpeg:Source10: https://libav.org/releases/libav-12.tar.gz}
-
# Don't link with libva unnecessarily
Patch1: %{name}-no-libva.patch
# Don't link with fdk_aac unnecessarily
@@ -53,7 +47,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gnupg2
%endif
BuildRequires: libappstream-glib
-%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel >= 3.5}
+BuildRequires: ffmpeg-devel
# Should be >= 2.6:
BuildRequires: freetype-devel >= 2.4.11
# Should be >= 0.19.7:
@@ -133,7 +127,7 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%patch -P6 -p1
# Use system libraries in place of bundled ones
-for module in fdk-aac %{!?_without_ffmpeg:ffmpeg} libdvdnav libdvdread libbluray %{?_with_vpl:libvpl} nvdec nvenc svt-av1 x265; do
+for module in fdk-aac ffmpeg libdvdnav libdvdread libbluray %{?_with_vpl:libvpl} nvdec nvenc svt-av1 x265; do
sed -i -e "/MODULES += contrib\/$module/d" make/include/main.defs
done
1 month
[HandBrake] drop unused patch
by Dominik Mierzejewski
commit b303f16a43198010ee90dc5f99e2208a76c66768
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sun Aug 18 16:23:52 2024 +0200
drop unused patch
HandBrake-fix-cflags-parsing.patch | 18 ------------------
1 file changed, 18 deletions(-)
1 month
[HandBrake/f41] Update to 1.8.2
by Dominik Mierzejewski
Summary of changes:
710861f... Update to 1.8.2 (*)
(*) This commit already existed in another branch; no separate mail sent
1 month
[HandBrake] Update to 1.8.2
by Dominik Mierzejewski
commit 710861f9951a029ed247b2b4becc1001ea535abc
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sun Aug 18 15:19:30 2024 +0200
Update to 1.8.2
HandBrake.spec | 7 +++++--
sources | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/HandBrake.spec b/HandBrake.spec
index a409600..eb957f7 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -15,8 +15,8 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.8.1
-Release: 2%{!?tag:.%{date}git%{shortcommit}}%{?dist}
+Version: 1.8.2
+Release: 1%{!?tag:.%{date}git%{shortcommit}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: https://handbrake.fr/
@@ -197,6 +197,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.
%{_bindir}/HandBrakeCLI
%changelog
+* Sun Aug 18 2024 Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> - 1.8.2-1
+- Update to 1.8.2
+
* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/sources b/sources
index cdadef3..aae15b6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (HandBrake-1.8.1-source.tar.bz2) = f4d46d760cf7755225751cf97b0708ee190a872b372e8a64c2ab8b1127ded0a28d63ea3875e629cddd352348a39010e3d58f900fd5e895788e5a4151a0288035
-SHA512 (HandBrake-1.8.1-source.tar.bz2.sig) = ca7055b0ee7d47919eedaf42d8119cfb2382978fdabca002b9c16f6d942a7aca95731b199b730120792dc188176cfb275daab8307f5529575eb219556e172491
+SHA512 (HandBrake-1.8.2-source.tar.bz2) = bc94259f199852840a9485e5ab27b81a6dec6ec8bd6839f1782cc91589551ad3e4686532f2964dca976f5401a3e72ec164ffb1be59fd1d6ef9943451b2995df4
+SHA512 (HandBrake-1.8.2-source.tar.bz2.sig) = 53a7b19214aaedf9c66d606fd95aa01e5e3204bf7425aa1f3bb3031ab022c866eebd04bc0529db1b06939c570239ba89445b8d2bbd5188a639c1b723f1e0a4a2
1 month