[nvidia-390xx-kmod] Add patch for kernel >= 6.8
by Nicolas Viéville
commit e2a7d7dd7b53a754b70375684667b8aa806402f7
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Sat Apr 6 14:55:04 2024 +0200
Add patch for kernel >= 6.8
nvidia-390xx-kmod-0031-kernel-6.8-adaptation.patch | 18 ++++++++++++++++++
nvidia-390xx-kmod.spec | 7 ++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-390xx-kmod-0031-kernel-6.8-adaptation.patch b/nvidia-390xx-kmod-0031-kernel-6.8-adaptation.patch
new file mode 100644
index 0000000..334e1dd
--- /dev/null
+++ b/nvidia-390xx-kmod-0031-kernel-6.8-adaptation.patch
@@ -0,0 +1,18 @@
+diff --git a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c
+index 132d4d4..1291893 100644
+--- a/nvidia-drm/nvidia-drm-drv.c
++++ b/nvidia-drm/nvidia-drm-drv.c
+@@ -654,6 +654,13 @@ static const struct file_operations nv_drm_fops = {
+ .llseek = noop_llseek,
+ };
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0)
++// Rel. commit. "drm: Remove locking for legacy ioctls and DRM_UNLOCKED" (Thomas Zimmermann, 22 Nov 2023)
++// Mock this flag, which was already useless on any recent kernel, since it
++// only did something if the driver set DRIVER_LEGACY in driver_features.
++static const enum drm_ioctl_flags DRM_UNLOCKED = 0;
++#endif
++
+ static const struct drm_ioctl_desc nv_drm_ioctls[] = {
+ #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
+ DRM_IOCTL_DEF_DRV(NVIDIA_GEM_IMPORT_NVKMS_MEMORY,
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 9dca389..a443a0e 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: 7%{?dist}
+Release: 8%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -44,6 +44,7 @@ Patch23: nvidia-390xx-kmod-0027-kernel-6.5-garbage-collect-all-references-to-get
Patch24: nvidia-390xx-kmod-0028-kernel-6.5-handle-get_user_pages-vmas-argument-remova.patch
Patch25: nvidia-390xx-kmod-0029-kernel-6.6-backport-drm_gem_prime_handle_to_fd-changes-from-470.patch
Patch26: nvidia-390xx-kmod-0030-kernel-6.6-refuse-to-load-legacy-module-if-IBT-is-enabled.patch
+Patch27: nvidia-390xx-kmod-0031-kernel-6.8-adaptation.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -89,6 +90,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch -P 24 -p1 -b 24 -d kernel
%patch -P 25 -p1 -b 25 -d kernel
%patch -P 26 -p1 -b 26 -d kernel
+%patch -P 27 -p1 -b 27 -d kernel
%patch -P 30 -p1 -b 30 -d kernel
%patch -P 31 -p1 -b 31 -d kernel
@@ -126,6 +128,9 @@ done
%changelog
+* Sat Apr 06 2024 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 3:390.157-8
+- Add patch for kernel >= 6.8
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3:390.157-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
7 months, 3 weeks
[ffmpeg] Fix vulkan build issue
by Leigh Scott
commit 7ef16c59c6792c2c972fafc51a860daa39d2d7ee
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 13:14:18 2024 +0100
Fix vulkan build issue
ffmpeg.spec | 1 +
vulkan_fix.patch | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 115 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 76116cd..c0f111c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -112,6 +112,7 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc
Patch0: ffmpeg-chromium.patch
Patch1: https://src.fedoraproject.org/rpms/ffmpeg/raw/774d42a0072430fdef97ce11b40...
Patch2: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/42982b5a5d46153...
+Patch3: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/fef22c87ada4517...
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
diff --git a/vulkan_fix.patch b/vulkan_fix.patch
new file mode 100644
index 0000000..65bff48
--- /dev/null
+++ b/vulkan_fix.patch
@@ -0,0 +1,114 @@
+From: Jan Ekström <jeebjp(a)gmail.com>
+Date: Wed, 14 Feb 2024 20:40:54 +0000 (+0200)
+Subject: {avcodec,tests}: rename the bundled Mesa AV1 vulkan video headers
+X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/fef22c87ada45174...
+
+{avcodec,tests}: rename the bundled Mesa AV1 vulkan video headers
+
+This together with adjusting the inclusion define allows for the
+build to not fail with latest Vulkan-Headers that contain the
+stabilized Vulkan AV1 decoding definitions.
+
+Compilation fails currently as the AV1 header is getting included
+via hwcontext_vulkan.h -> <vulkan/vulkan.h> -> vulkan_core.h, which
+finally includes vk_video/vulkan_video_codec_av1std.h and the decode
+header, leading to the bundled header to never defining anything
+due to the inclusion define being the same.
+
+This fix is imperfect, as it leads to additional re-definition
+warnings for things such as
+VK_STD_VULKAN_VIDEO_CODEC_AV1_DECODE_SPEC_VERSION. , but it is
+not clear how to otherwise have the bundled version trump the
+actually standardized one for a short-term compilation fix.
+
+(cherry picked from commit e06ce6d2b45edac4a2df04f304e18d4727417d24)
+---
+
+diff --git a/libavcodec/Makefile b/libavcodec/Makefile
+index ec57e53e30..eb25707ef5 100644
+--- a/libavcodec/Makefile
++++ b/libavcodec/Makefile
+@@ -1284,7 +1284,7 @@ SKIPHEADERS += %_tablegen.h \
+ aacenc_quantization.h \
+ aacenc_quantization_misc.h \
+ bitstream_template.h \
+- vulkan_video_codec_av1std.h \
++ vulkan_video_codec_av1std_mesa.h \
+ $(ARCH)/vpx_arith.h \
+
+ SKIPHEADERS-$(CONFIG_AMF) += amfenc.h
+@@ -1306,7 +1306,7 @@ SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h
+ SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
+ SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h
+ SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h
+-SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h
++SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h
+ SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
+ SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h
+
+diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
+index b28e3fe0bd..51f44dd543 100644
+--- a/libavcodec/vulkan_video.h
++++ b/libavcodec/vulkan_video.h
+@@ -23,8 +23,8 @@
+ #include "vulkan.h"
+
+ #include <vk_video/vulkan_video_codecs_common.h>
+-#include "vulkan_video_codec_av1std.h"
+-#include "vulkan_video_codec_av1std_decode.h"
++#include "vulkan_video_codec_av1std_mesa.h"
++#include "vulkan_video_codec_av1std_decode_mesa.h"
+
+ #define CODEC_VER_MAJ(ver) (ver >> 22)
+ #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
+diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+similarity index 89%
+rename from libavcodec/vulkan_video_codec_av1std_decode.h
+rename to libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+index a697c00593..e2f37b4e6e 100644
+--- a/libavcodec/vulkan_video_codec_av1std_decode.h
++++ b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
+@@ -14,8 +14,8 @@
+ * limitations under the License.
+ */
+
+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_
+-#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1
++#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_
++#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ 1
+
+ /*
+ ** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
+diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std_mesa.h
+similarity index 99%
+rename from libavcodec/vulkan_video_codec_av1std.h
+rename to libavcodec/vulkan_video_codec_av1std_mesa.h
+index c46236c457..c91589eee2 100644
+--- a/libavcodec/vulkan_video_codec_av1std.h
++++ b/libavcodec/vulkan_video_codec_av1std_mesa.h
+@@ -14,8 +14,8 @@
+ * limitations under the License.
+ */
+
+-#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_
+-#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1
++#ifndef VULKAN_VIDEO_CODEC_AV1STD_MESA_H_
++#define VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ 1
+
+ /*
+ ** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
+diff --git a/tests/ref/fate/source b/tests/ref/fate/source
+index c575789dd5..8bb58b61f1 100644
+--- a/tests/ref/fate/source
++++ b/tests/ref/fate/source
+@@ -23,8 +23,8 @@ compat/djgpp/math.h
+ compat/float/float.h
+ compat/float/limits.h
+ libavcodec/bitstream_template.h
+-libavcodec/vulkan_video_codec_av1std.h
+-libavcodec/vulkan_video_codec_av1std_decode.h
++libavcodec/vulkan_video_codec_av1std_decode_mesa.h
++libavcodec/vulkan_video_codec_av1std_mesa.h
+ tools/decode_simple.h
+ Use of av_clip() where av_clip_uintp2() could be used:
+ Use of av_clip() where av_clip_intp2() could be used:
7 months, 3 weeks
[ffmpeg] Rebuild for new x265 version
by Leigh Scott
commit eafbbe037ca7ab3355f8ed48633f5db97bc60cff
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 10:41:59 2024 +0100
Rebuild for new x265 version
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 9e451ee..76116cd 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,7 +98,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1.1
-Release: 7%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 8%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -530,6 +530,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-8
+- Rebuild for new x265 version
+
* Fri Mar 22 2024 Sérgio Basto <sergio(a)serjux.com> - 6.1.1-7
- Rebuild for jpegxl (libjxl) 0.10.2
7 months, 3 weeks
[x265] Update to 3.6
by Leigh Scott
commit 989d9e6dbb636bf1b2ca15d91abff4c3a10dbb84
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Apr 6 08:56:11 2024 +0100
Update to 3.6
sources | 2 +-
x265-arm-cflags.patch | 63 --------------------------------------------
x265-detect_cpu_armhfp.patch | 15 -----------
x265.spec | 21 ++++++++-------
4 files changed, 12 insertions(+), 89 deletions(-)
---
diff --git a/sources b/sources
index af884a1..2e637cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (x265_3.5.tar.gz) = 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
+SHA512 (x265_3.6.tar.gz) = 570429c3f0b560b2f946ac9baba97d66d7d6485e46eb695b17003b5913028f62d35822477633e911cd3ea60e6ce0ecc7d9d82de7d8257272f9ca7b43761438be
diff --git a/x265.spec b/x265.spec
index bc65c41..ad3020d 100644
--- a/x265.spec
+++ b/x265.spec
@@ -1,12 +1,12 @@
# Use old cmake macro
%global __cmake_in_source_build 1
-%global _so_version 199
+%global _so_version 209
Summary: H.265/HEVC encoder
Name: x265
-Version: 3.5
-Release: 7%{?dist}
+Version: 3.6
+Release: 1%{?dist}
URL: http://x265.org/
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
@@ -17,13 +17,11 @@ Source0: https://bitbucket.org/multicoreware/%{name}_git/downloads/%{name}_%{
# fix building as PIC
Patch0: x265-pic.patch
Patch1: x265-high-bit-depth-soname.patch
-Patch2: x265-detect_cpu_armhfp.patch
-Patch3: x265-arm-cflags.patch
-Patch4: x265-pkgconfig_path_fix.patch
+Patch2: x265-pkgconfig_path_fix.patch
BuildRequires: gcc-c++
BuildRequires: git
-BuildRequires: cmake3
+BuildRequires: cmake
%{?el7:BuildRequires: epel-rpm-macros}
BuildRequires: nasm
BuildRequires: ninja-build
@@ -72,7 +70,7 @@ This package contains the shared library development files.
# 10bit: libx265_main10.so
build() {
-%cmake3 -Wno-dev -G "Ninja" \
+%cmake -Wno-dev -G "Ninja" \
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=YES \
-DENABLE_PIC:BOOL=ON \
@@ -82,7 +80,7 @@ build() {
-DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy \
$* \
../source
-%cmake3_build
+%cmake_build
}
# High depth 10/12 bit libraries are supported only on 64 bit. They require
@@ -113,7 +111,7 @@ popd
for i in 8 10 12; do
if [ -d ${i}bit ]; then
pushd ${i}bit
- %cmake3_install
+ %cmake_install
# Remove unversioned library, should not be linked to
rm -f %{buildroot}%{_libdir}/libx265_main${i}.so
popd
@@ -154,6 +152,9 @@ done
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3.6-1
+- Update to 3.6
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
7 months, 3 weeks
[telegram-desktop] Update to 4.16.3.
by Vasiliy Glazov
commit 34514e1bc6fec99de00328a230381bfa4cbc75d7
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Sat Apr 6 07:00:43 2024 +0300
Update to 4.16.3.
sources | 2 +-
telegram-desktop.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index dcb5923..e7520ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-4.16.2-full.tar.gz) = 990999bef3edb09709fb2faf4b9b3c6ffb43460172f7ccaf2e30e514a0688a869bb0eb74aa671b8cb3a2c9971304371fc5c0218b3b4e5bfa8eed4414680bcf41
+SHA512 (tdesktop-4.16.3-full.tar.gz) = c7539da89ce37e87224a153a080d3cc01edf349070f0a33e19c4a29c9beedf29053f3070d73aefa993e32d3cadd381cf75309b6f43df89d3402ceb5bf8fa5849
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 05c83ae..24217b4 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -5,7 +5,7 @@
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Name: telegram-desktop
-Version: 4.16.2
+Version: 4.16.3
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -169,6 +169,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Sat Apr 06 2024 Vasiliy Glaxov <vascom2(a)gmail.com> - 4.16.3-1
+- Update to 4.16.3
+
* Fri Apr 05 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 4.16.2-1
- Update to 4.16.2
7 months, 3 weeks
[telegram-desktop] Update to 4.16.2.
by Vasiliy Glazov
commit a0c8d6652a00d03b6fb154827b4f32a7cd1d5896
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Fri Apr 5 09:14:15 2024 +0300
Update to 4.16.2.
sources | 2 +-
telegram-desktop.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index f20c8d7..dcb5923 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-4.16.1-full.tar.gz) = fb8da3e6ff6885b75e3e8f58fd080926cfbf28a7c47579197823e369d538534af6e7949b5d02905809db22b3e4595596fc32a3bcd7cef1b1cdcf327935316c8c
+SHA512 (tdesktop-4.16.2-full.tar.gz) = 990999bef3edb09709fb2faf4b9b3c6ffb43460172f7ccaf2e30e514a0688a869bb0eb74aa671b8cb3a2c9971304371fc5c0218b3b4e5bfa8eed4414680bcf41
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 58cbee9..05c83ae 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -5,7 +5,7 @@
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
Name: telegram-desktop
-Version: 4.16.1
+Version: 4.16.2
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -169,6 +169,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_metainfodir}/*.metainfo.xml
%changelog
+* Fri Apr 05 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 4.16.2-1
+- Update to 4.16.2
+
* Wed Apr 03 2024 Vasiliy Glazov <vascom2(a)gmail.com> - 4.16.1-1
- Update to 4.16.1
7 months, 3 weeks