[qt5-qtwebengine-freeworld] Rebuilt
by Nicolas Chauvet
commit f0a68974491bd2b18f94944b8c99d3bfb7f5f637
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 1 22:49:05 2024 +0100
Rebuilt
qt5-qtwebengine-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index d2814f2..fa104a9 100644
--- a/qt5-qtwebengine-freeworld.spec
+++ b/qt5-qtwebengine-freeworld.spec
@@ -63,7 +63,7 @@
Summary: Qt5 - QtWebEngine components (freeworld version)
Name: qt5-qtwebengine-freeworld
Version: 5.15.12
-Release: 6%{?dist}
+Release: 7%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -481,6 +481,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Thu Feb 01 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 5.15.12-7
+- rebuilt
+
* Fri Nov 03 2023 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.12-6
- Rebuild for Qt 5.15.11 update. (#6780)
9 months, 3 weeks
[intel-media-driver] Drop Werror
by Nicolas Chauvet
commit cebe710b683cd3fd54f18a18449bf2c502a4d9e2
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 1 17:56:09 2024 +0100
Drop Werror
intel-media-driver.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index 1743499..a1d4099 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -2,7 +2,7 @@
Name: intel-media-driver
Version: 23.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Intel Media Driver for VAAPI
License: MIT and BSD
URL: https://github.com/intel/media-driver
@@ -96,6 +96,9 @@ rm -rf %{buildroot}%{_libdir}/pkgconfig
%changelog
+* Thu Feb 01 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 23.4.3-2
+- Drop Werror
+
* Tue Jan 02 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 23.4.3-1
- Update to 23.4.3
9 months, 3 weeks
[intel-media-driver] Drop old Werror
by Nicolas Chauvet
commit 7948a08ce9d8867dafd0b93ab7a936e136f8e75e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 1 17:34:26 2024 +0100
Drop old Werror
intel-media-driver.spec | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/intel-media-driver.spec b/intel-media-driver.spec
index 8ecbf22..1743499 100644
--- a/intel-media-driver.spec
+++ b/intel-media-driver.spec
@@ -51,10 +51,6 @@ chmod -x LICENSE.md README.md CMakeLists.txt
# Remove pre-built (but unused) files
rm -f Tools/MediaDriverTools/UMDPerfProfiler/MediaPerfParser
-# Remove all -Werror compile flags
-sed -e "/-Werror/d" -i media_driver/cmake/linux/media_compile_flags_linux.cmake
-sed -e "/-Werror/d" -i media_driver/media_top_cmake.cmake
-
%build
%ifarch %{ix86}
9 months, 3 weeks
[ffmpeg] fix
by Leigh Scott
commit c9cb084e6c6b8029a11966e8b2fbb0dce477859a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Feb 1 10:15:28 2024 +0000
fix
ffmpeg.spec | 1 +
rf-gcc14.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 3b345a2..1007a0c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -127,6 +127,7 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc
# We don't endorse adding this patch but fedora insists on breaking the ffmpeg ABI
Patch0: ffmpeg-chromium.patch
Patch1: https://src.fedoraproject.org/rpms/ffmpeg/raw/774d42a0072430fdef97ce11b40...
+Patch2: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/42982b5a5d46153...
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
diff --git a/rf-gcc14.patch b/rf-gcc14.patch
new file mode 100644
index 0000000..ef855c2
--- /dev/null
+++ b/rf-gcc14.patch
@@ -0,0 +1,60 @@
+From: Frank Plowman <post(a)frankplowman.com>
+Date: Fri, 22 Dec 2023 12:00:01 +0000 (+0000)
+Subject: avformat/ffrtmpcrypt: Fix int-conversion warning
+X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/42982b5a5d461530...
+
+avformat/ffrtmpcrypt: Fix int-conversion warning
+
+The gcrypt definition of `bn_new` used to use the return statement
+on errors, with an AVERROR return value, regardless of the signature
+of the function where the macro is used - it is called in
+`dh_generate_key` and `ff_dh_init` which return pointers. As a result,
+compiling with gcrypt and the ffrtmpcrypt protocol resulted in an
+int-conversion warning. GCC 14 may upgrade these to errors [1].
+
+This patch fixes the problem by changing the macro to remove `AVERROR`
+and instead set `bn` to null if the allocation fails. This is the
+behaviour of all the other `bn_new` implementations and so the result is
+already checked at all the callsites. AFAICT, this should be the only
+change needed to get ffmpeg off Fedora's naughty list of projects with
+warnings which may be upgraded to errors in GCC 14 [2].
+
+[1]: https://gcc.gnu.org/pipermail/gcc/2023-May/241264.html
+[2]: https://www.mail-archive.com/devel@lists.fedoraproject.org/msg196024.html
+
+Signed-off-by: Frank Plowman <post(a)frankplowman.com>
+Signed-off-by: Martin Storsjö <martin(a)martin.st>
+---
+
+diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c
+index 5ddae537a1..6a6c2ccd87 100644
+--- a/libavformat/rtmpdh.c
++++ b/libavformat/rtmpdh.c
+@@ -113,15 +113,18 @@ static int bn_modexp(FFBigNum bn, FFBigNum y, FFBigNum q, FFBigNum p)
+ return 0;
+ }
+ #elif CONFIG_GCRYPT
+-#define bn_new(bn) \
+- do { \
+- if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P)) { \
+- if (!gcry_check_version("1.5.4")) \
+- return AVERROR(EINVAL); \
+- gcry_control(GCRYCTL_DISABLE_SECMEM, 0); \
+- gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); \
+- } \
+- bn = gcry_mpi_new(1); \
++#define bn_new(bn) \
++ do { \
++ if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P)) { \
++ if (gcry_check_version("1.5.4")) { \
++ gcry_control(GCRYCTL_DISABLE_SECMEM, 0); \
++ gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); \
++ } \
++ } \
++ if (gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P)) \
++ bn = gcry_mpi_new(1); \
++ else \
++ bn = NULL; \
+ } while (0)
+ #define bn_free(bn) gcry_mpi_release(bn)
+ #define bn_set_word(bn, w) gcry_mpi_set_ui(bn, w)
9 months, 3 weeks
[ffmpeg] fix
by Leigh Scott
commit 2b75f34ce788defe0e222276d45de7baac4b4187
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Feb 1 10:01:31 2024 +0000
fix
ffmpeg-gcc14.patch | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg.spec | 1 +
2 files changed, 132 insertions(+)
---
diff --git a/ffmpeg-gcc14.patch b/ffmpeg-gcc14.patch
new file mode 100644
index 0000000..99dd6af
--- /dev/null
+++ b/ffmpeg-gcc14.patch
@@ -0,0 +1,131 @@
+From 68ef9a29478fad450ec29ec14120afad3938e75b Mon Sep 17 00:00:00 2001
+From: Sandro Mani <manisandro(a)gmail.com>
+Date: Tue, 30 Jan 2024 09:16:13 +0100
+Subject: [PATCH] Fix -Wint-conversion and -Wincompatible-pointer-types errors
+
+---
+ libavcodec/pcm-bluray.c | 4 ++--
+ libavcodec/pcm-dvd.c | 2 +-
+ libavcodec/vulkan_av1.c | 2 +-
+ libavcodec/vulkan_decode.c | 6 +++---
+ libavcodec/vulkan_video.c | 2 +-
+ libavfilter/vsrc_testsrc_vulkan.c | 4 ++--
+ libavutil/hwcontext_vaapi.c | 2 +-
+ 7 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c
+index f656095..56fa373 100644
+--- a/libavcodec/pcm-bluray.c
++++ b/libavcodec/pcm-bluray.c
+@@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame,
+ samples *= num_source_channels;
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, buf_size);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size);
+ #else
+ do {
+ *dst16++ = bytestream2_get_be16u(&gb);
+@@ -187,7 +187,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame,
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ do {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, avctx->ch_layout.nb_channels * 2);
+ dst16 += avctx->ch_layout.nb_channels;
+ #else
+ channel = avctx->ch_layout.nb_channels;
+diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c
+index 419b2a1..319746c 100644
+--- a/libavcodec/pcm-dvd.c
++++ b/libavcodec/pcm-dvd.c
+@@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src,
+ switch (avctx->bits_per_coded_sample) {
+ case 16: {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size);
+ dst16 += blocks * s->block_size / 2;
+ #else
+ int samples = blocks * avctx->ch_layout.nb_channels;
+diff --git a/libavcodec/vulkan_av1.c b/libavcodec/vulkan_av1.c
+index 4998bf7..9730e4b 100644
+--- a/libavcodec/vulkan_av1.c
++++ b/libavcodec/vulkan_av1.c
+@@ -180,7 +180,7 @@ static int vk_av1_create_params(AVCodecContext *avctx, AVBufferRef **buf)
+ .sType = VK_STRUCTURE_TYPE_VIDEO_SESSION_PARAMETERS_CREATE_INFO_KHR,
+ .pNext = &av1_params,
+ .videoSession = ctx->common.session,
+- .videoSessionParametersTemplate = NULL,
++ .videoSessionParametersTemplate = VK_NULL_HANDLE,
+ };
+
+ err = ff_vk_decode_create_params(buf, avctx, ctx, &session_params_create);
+diff --git a/libavcodec/vulkan_decode.c b/libavcodec/vulkan_decode.c
+index a89d84f..fdbcbb4 100644
+--- a/libavcodec/vulkan_decode.c
++++ b/libavcodec/vulkan_decode.c
+@@ -188,9 +188,9 @@ int ff_vk_decode_prepare_frame(FFVulkanDecodeContext *dec, AVFrame *pic,
+ return 0;
+
+ vkpic->dpb_frame = NULL;
+- vkpic->img_view_ref = NULL;
+- vkpic->img_view_out = NULL;
+- vkpic->img_view_dest = NULL;
++ vkpic->img_view_ref = VK_NULL_HANDLE;
++ vkpic->img_view_out = VK_NULL_HANDLE;
++ vkpic->img_view_dest = VK_NULL_HANDLE;
+
+ vkpic->destroy_image_view = vk->DestroyImageView;
+ vkpic->wait_semaphores = vk->WaitSemaphores;
+diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c
+index 236aa12..c5144bd 100644
+--- a/libavcodec/vulkan_video.c
++++ b/libavcodec/vulkan_video.c
+@@ -287,7 +287,7 @@ av_cold void ff_vk_video_common_uninit(FFVulkanContext *s,
+ if (common->session) {
+ vk->DestroyVideoSessionKHR(s->hwctx->act_dev, common->session,
+ s->hwctx->alloc);
+- common->session = NULL;
++ common->session = VK_NULL_HANDLE;
+ }
+
+ if (common->nb_mem && common->mem)
+diff --git a/libavfilter/vsrc_testsrc_vulkan.c b/libavfilter/vsrc_testsrc_vulkan.c
+index 8761c21..1720bfa 100644
+--- a/libavfilter/vsrc_testsrc_vulkan.c
++++ b/libavfilter/vsrc_testsrc_vulkan.c
+@@ -231,7 +231,7 @@ static int testsrc_vulkan_activate(AVFilterContext *ctx)
+ return AVERROR(ENOMEM);
+
+ err = ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->pl, s->picref, NULL,
+- NULL, &s->opts, sizeof(s->opts));
++ VK_NULL_HANDLE, &s->opts, sizeof(s->opts));
+ if (err < 0)
+ return err;
+ }
+@@ -250,7 +250,7 @@ static int testsrc_vulkan_activate(AVFilterContext *ctx)
+ frame->sample_aspect_ratio = s->sar;
+ if (!s->draw_once) {
+ err = ff_vk_filter_process_simple(&s->vkctx, &s->e, &s->pl, frame, NULL,
+- NULL, &s->opts, sizeof(s->opts));
++ VK_NULL_HANDLE, &s->opts, sizeof(s->opts));
+ if (err < 0) {
+ av_frame_free(&frame);
+ return err;
+diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
+index 12bc951..d326ad6 100644
+--- a/libavutil/hwcontext_vaapi.c
++++ b/libavutil/hwcontext_vaapi.c
+@@ -1203,7 +1203,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst,
+
+ if (!use_prime2 || vas != VA_STATUS_SUCCESS) {
+ int k;
+- unsigned long buffer_handle;
++ size_t buffer_handle;
+ VASurfaceAttribExternalBuffers buffer_desc;
+ VASurfaceAttrib buffer_attrs[2] = {
+ {
+--
+2.43.0
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index e99ad0b..3b345a2 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -126,6 +126,7 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc
%endif
# We don't endorse adding this patch but fedora insists on breaking the ffmpeg ABI
Patch0: ffmpeg-chromium.patch
+Patch1: https://src.fedoraproject.org/rpms/ffmpeg/raw/774d42a0072430fdef97ce11b40...
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
9 months, 3 weeks
[ffmpeg] Switch to noopenh264-devel for f39+
by Leigh Scott
commit b31d5f0b3276a64f2b594a552be16dd205828bb3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Feb 1 09:43:18 2024 +0000
Switch to noopenh264-devel for f39+
ffmpeg.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 39610d2..e99ad0b 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -114,7 +114,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1.1
-Release: 3%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 4%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -172,7 +172,11 @@ BuildRequires: libgcrypt-devel
BuildRequires: libGL-devel
BuildRequires: libmodplug-devel
BuildRequires: libmysofa-devel
+%if 0%{?fedora} && 0%{?fedora} > 39
+%{?_with_openh264:BuildRequires: noopenh264-devel}
+%else
%{?_with_openh264:BuildRequires: openh264-devel}
+%endif
BuildRequires: libopenmpt-devel
%{?_with_placebo:BuildRequires: libplacebo-devel >= 4.192.0}
BuildRequires: librsvg2-devel
@@ -538,6 +542,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Thu Feb 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-4
+- Switch to noopenh264-devel for f39+
+
* Tue Jan 16 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 6.1.1-3
- Rebuilt for libavcodec-freeworld
9 months, 3 weeks
[unifi/el9] Update to 8.0.28.
by Richard Shaw
Summary of changes:
c868a0f... Update to 8.0.28. (*)
(*) This commit already existed in another branch; no separate mail sent
9 months, 3 weeks
[unifi/f38] Update to 8.0.28.
by Richard Shaw
Summary of changes:
c868a0f... Update to 8.0.28. (*)
(*) This commit already existed in another branch; no separate mail sent
9 months, 3 weeks
[unifi/f39] Update to 8.0.28.
by Richard Shaw
Summary of changes:
c868a0f... Update to 8.0.28. (*)
(*) This commit already existed in another branch; no separate mail sent
9 months, 3 weeks
