[libheif-freeworld] Rebuild for x265
by Leigh Scott
commit 1b6090ef8c129f6e4cc4e37e37b85e4bd7288aad
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Sep 30 20:19:28 2024 +0100
Rebuild for x265
libheif-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libheif-freeworld.spec b/libheif-freeworld.spec
index 236486e..fda5785 100644
--- a/libheif-freeworld.spec
+++ b/libheif-freeworld.spec
@@ -2,7 +2,7 @@
Name: libheif-freeworld
Version: 1.17.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: HEVC support for HEIF and AVIF file format decoder and encoder
License: LGPL-3.0-or-later and MIT
@@ -86,6 +86,9 @@ popd
%{_libdir}/libheif/libheif-x265.so
%changelog
+* Mon Sep 30 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.17.6-3
+- Rebuild for x265
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.17.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
5 days, 15 hours
[HandBrake] Rebuild for x265
by Leigh Scott
commit 199a0b9715c000f33a2e0f90d55902341bef74fd
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Sep 30 19:59:24 2024 +0100
Rebuild for x265
HandBrake-x265-v4.patch | 70 +++++++++++++++++++++++++++++++++++++++++++++++++
HandBrake.spec | 10 ++++++-
2 files changed, 79 insertions(+), 1 deletion(-)
---
diff --git a/HandBrake-x265-v4.patch b/HandBrake-x265-v4.patch
new file mode 100644
index 0000000..1c1bcdb
--- /dev/null
+++ b/HandBrake-x265-v4.patch
@@ -0,0 +1,70 @@
+diff --git a/libhb/encx265.c b/libhb/encx265.c
+index fae6f22b4269..11c3976d5ff2 100644
+--- a/libhb/encx265.c
++++ b/libhb/encx265.c
+@@ -687,11 +687,20 @@ static hb_buffer_t* x265_encode(hb_work_object_t *w, hb_buffer_t *in)
+ {
+ hb_work_private_t *pv = w->private_data;
+ hb_job_t *job = pv->job;
+- x265_picture pic_in, pic_out;
++
++ x265_picture pic_in;
++ x265_picture pic_layers_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_lyrptr_out[MAX_SCALABLE_LAYERS];
++
+ x265_nal *nal;
+ uint32_t nnal;
+ int ret;
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ pic_lyrptr_out[i] = &pic_layers_out[i];
++ }
++
+ pv->api->picture_init(pv->param, &pic_in);
+
+ pic_in.stride[0] = in->plane[0].stride;
+@@ -777,7 +786,7 @@ static hb_buffer_t* x265_encode(hb_work_object_t *w, hb_buffer_t *in)
+ pv->last_stop = in->s.stop;
+ save_frame_info(pv, in);
+
+- ret = pv->api->encoder_encode(pv->x265, &nal, &nnal, &pic_in, &pic_out);
++ ret = pv->api->encoder_encode(pv->x265, &nal, &nnal, &pic_in, pic_lyrptr_out);
+
+ for (int i = 0; i < sei->numPayloads; i++)
+ {
+@@ -787,7 +796,7 @@ static hb_buffer_t* x265_encode(hb_work_object_t *w, hb_buffer_t *in)
+
+ if (ret > 0)
+ {
+- return nal_encode(w, &pic_out, nal, nnal);
++ return nal_encode(w, pic_lyrptr_out[0], nal, nnal);
+ }
+ return NULL;
+ }
+@@ -801,16 +810,22 @@ int encx265Work(hb_work_object_t *w, hb_buffer_t **buf_in, hb_buffer_t **buf_out
+ {
+ uint32_t nnal;
+ x265_nal *nal;
+- x265_picture pic_out;
++ x265_picture pic_layers_out[MAX_SCALABLE_LAYERS];
++ x265_picture *pic_lyrptr_out[MAX_SCALABLE_LAYERS];
+ hb_buffer_list_t list;
+
+ hb_buffer_list_clear(&list);
+
++ for (int i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ {
++ pic_lyrptr_out[i] = &pic_layers_out[i];
++ }
++
+ // flush delayed frames
+ while (pv->api->encoder_encode(pv->x265, &nal,
+- &nnal, NULL, &pic_out) > 0)
++ &nnal, NULL, pic_lyrptr_out) > 0)
+ {
+- hb_buffer_t *buf = nal_encode(w, &pic_out, nal, nnal);
++ hb_buffer_t *buf = nal_encode(w, pic_lyrptr_out[0], nal, nnal);
+ hb_buffer_list_append(&list, buf);
+ }
+ // add the EOF to the end of the chain
diff --git a/HandBrake.spec b/HandBrake.spec
index 7b6ab5d..43ce317 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -12,7 +12,7 @@
Name: HandBrake
Version: 1.8.2
-Release: 1%{!?tag:.%{date}git%{shortcommit}}%{?dist}
+Release: 2%{!?tag:.%{date}git%{shortcommit}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
URL: https://handbrake.fr/
@@ -40,6 +40,8 @@ Patch4: %{name}-syslibs-link.patch
Patch5: %{name}-no-contribs.patch
# https://salsa.debian.org/multimedia-team/handbrake/-/raw/master/debian/pa...
Patch6: %{name}-remove-ambient-viewing-support.patch
+# https://github.com/HandBrake/HandBrake/commit/65ec04667e69918401a0af77948...
+Patch7: %{name}-x265-v4.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -125,6 +127,9 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%patch -P4 -p1
%patch -P5 -p1
%patch -P6 -p1
+%if 0%{?fedora} > 41
+%patch -P7 -p1
+%endif
# Use system libraries in place of bundled ones
for module in fdk-aac ffmpeg libdvdnav libdvdread libbluray %{?_with_vpl:libvpl} nvdec nvenc svt-av1 x265; do
@@ -191,6 +196,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.
%{_bindir}/HandBrakeCLI
%changelog
+* Mon Sep 30 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.8.2-2
+- Rebuild for x265
+
* Sun Aug 18 2024 Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> - 1.8.2-1
- Update to 1.8.2
5 days, 15 hours
[ffmpeg/f40] Add build fix for new x265
by Leigh Scott
commit 86949ed2915cac00a49bff9e597b4037b3ee9d66
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Sep 30 16:08:25 2024 +0100
Add build fix for new x265
buildfix_x265.patch | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++
ffmpeg.spec | 7 ++++-
2 files changed, 84 insertions(+), 1 deletion(-)
---
diff --git a/buildfix_x265.patch b/buildfix_x265.patch
new file mode 100644
index 0000000..f671e02
--- /dev/null
+++ b/buildfix_x265.patch
@@ -0,0 +1,78 @@
+diff -uNrp a/libavcodec/libx265.c b/libavcodec/libx265.c
+--- a/libavcodec/libx265.c 2024-08-02 00:22:48.000000000 +0100
++++ b/libavcodec/libx265.c 2024-09-30 15:41:46.083523907 +0100
+@@ -581,7 +581,13 @@ static int libx265_encode_frame(AVCodecC
+ {
+ libx265Context *ctx = avctx->priv_data;
+ x265_picture x265pic;
+- x265_picture x265pic_out = { 0 };
++#if X265_BUILD >= 210
++ x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS];
++ x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
++#else
++ x265_picture x265pic_solo_out = { 0 };
++#endif
++ x265_picture* x265pic_out;
+ x265_nal *nal;
+ x265_sei *sei;
+ uint8_t *dst;
+@@ -704,8 +710,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
+ }
+ }
+
++#if X265_BUILD >= 210
++ for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
++ x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
++
++ ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
++ pic ? &x265pic : NULL, x265pic_lyrptr_out);
++#else
+ ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
+- pic ? &x265pic : NULL, &x265pic_out);
++ pic ? &x265pic : NULL, &x265pic_solo_out);
++#endif
+
+ for (i = 0; i < sei->numPayloads; i++)
+ av_free(sei->payloads[i].payload);
+@@ -735,10 +749,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
+ pkt->flags |= AV_PKT_FLAG_KEY;
+ }
+
+- pkt->pts = x265pic_out.pts;
+- pkt->dts = x265pic_out.dts;
++#if X265_BUILD >= 210
++ x265pic_out = x265pic_lyrptr_out[0];
++#else
++ x265pic_out = &x265pic_solo_out;
++#endif
++
++ pkt->pts = x265pic_out->pts;
++ pkt->dts = x265pic_out->dts;
+
+- switch (x265pic_out.sliceType) {
++ switch (x265pic_out->sliceType) {
+ case X265_TYPE_IDR:
+ case X265_TYPE_I:
+ pict_type = AV_PICTURE_TYPE_I;
+@@ -756,16 +776,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
+ }
+
+ #if X265_BUILD >= 130
+- if (x265pic_out.sliceType == X265_TYPE_B)
++ if (x265pic_out->sliceType == X265_TYPE_B)
+ #else
+- if (x265pic_out.frameData.sliceType == 'b')
++ if (x265pic_out->frameData.sliceType == 'b')
+ #endif
+ pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
+
+- ff_side_data_set_encoder_stats(pkt, x265pic_out.frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
++ ff_side_data_set_encoder_stats(pkt, x265pic_out->frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
+
+- if (x265pic_out.userData) {
+- int idx = (int)(intptr_t)x265pic_out.userData - 1;
++ if (x265pic_out->userData) {
++ int idx = (int)(intptr_t)x265pic_out->userData - 1;
+ ReorderedData *rd = &ctx->rd[idx];
+
+ #if FF_API_REORDERED_OPAQUE
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 989b2ae..00ad2c9 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.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -113,6 +113,8 @@ 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/d9f1b321cf58a85...
+# https://github.com/FFmpeg/FFmpeg/commit/1f801dfdb5066aadf0ade9cb5e94d620f...
+Patch4: buildfix_x265.patch
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -531,6 +533,9 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%changelog
+* Mon Sep 30 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.2-3
+- Add build fix for new x265
+
* Fri Aug 16 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.2-2
- Backport hevecdec fix
5 days, 19 hours
[avidemux/f41] (2 commits) ...fix patch
by Leigh Scott
Summary of changes:
9b8566f... Fix desktop file (rfbz#7068) (*)
7ed7d6d... fix patch (*)
(*) This commit already existed in another branch; no separate mail sent
6 days, 23 hours
[avidemux] fix patch
by Leigh Scott
commit 7ed7d6d3282cdee5f6349b74346b13936795a749
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 29 12:08:34 2024 +0100
fix patch
avidemux-disable_mp4v2.patch | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/avidemux-disable_mp4v2.patch b/avidemux-disable_mp4v2.patch
index f6dd9a5..a45919b 100644
--- a/avidemux-disable_mp4v2.patch
+++ b/avidemux-disable_mp4v2.patch
@@ -1,7 +1,6 @@
-Index: avidemux_2.8.0/avidemux_plugins/ADM_muxers/CMakeLists.txt
-===================================================================
---- avidemux_2.8.0.orig/avidemux_plugins/ADM_muxers/CMakeLists.txt
-+++ avidemux_2.8.0/avidemux_plugins/ADM_muxers/CMakeLists.txt
+diff -uNrp a/avidemux_plugins/ADM_muxers/CMakeLists.txt b/avidemux_plugins/ADM_muxers/CMakeLists.txt
+--- a/avidemux_plugins/ADM_muxers/CMakeLists.txt 2024-09-28 20:35:12.000000000 +0100
++++ b/avidemux_plugins/ADM_muxers/CMakeLists.txt 2024-09-29 12:05:22.954738356 +0100
@@ -16,7 +16,5 @@ IF(WIN32)
ENDIF ("${CROSS_C_COMPILER}" STREQUAL "clang")
ENDIF(MSVC)
@@ -10,10 +9,9 @@ Index: avidemux_2.8.0/avidemux_plugins/ADM_muxers/CMakeLists.txt
- ADD_SUBDIRECTORY(muxerMp4v2)
ENDIF(WIN32)
-Index: avidemux_2.8.0/avidemux_plugins/CMakeLists.txt
-===================================================================
---- avidemux_2.8.0.orig/avidemux_plugins/CMakeLists.txt
-+++ avidemux_2.8.0/avidemux_plugins/CMakeLists.txt
+diff -uNrp a/avidemux_plugins/CMakeLists.txt b/avidemux_plugins/CMakeLists.txt
+--- a/avidemux_plugins/CMakeLists.txt 2024-09-28 20:35:12.000000000 +0100
++++ b/avidemux_plugins/CMakeLists.txt 2024-09-29 12:04:21.098610942 +0100
@@ -72,7 +72,6 @@ INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_I
OPTION(USE_EXTERNAL_LIBASS "Use system installed libass library." OFF)
OPTION(USE_EXTERNAL_LIBMAD "Use system installed libmad library." OFF)
@@ -23,16 +21,16 @@ Index: avidemux_2.8.0/avidemux_plugins/CMakeLists.txt
INCLUDE(FindPkgConfig)
@@ -96,13 +95,6 @@ IF(USE_EXTERNAL_LIBA52)
- INCLUDE_DIRECTORIES(SYSTEM ${LIBA52_INCLUDE_DIR})
+ INCLUDE_DIRECTORIES(SYSTEM ${LIBA52_INCLUDE_DIR})
ENDIF()
-# libmp4v2
-IF(USE_EXTERNAL_MP4V2)
-- FIND_PATH(MP4V2_INCLUDE_DIR mp4v2/mp4v2.h)
-- FIND_LIBRARY(MP4V2_LIBRARIES mp4v2)
-- INCLUDE_DIRECTORIES(SYSTEM ${MP4V2_INCLUDE_DIR})
+- FIND_PATH(MP4V2_INCLUDE_DIR mp4v2/mp4v2.h)
+- FIND_LIBRARY(MP4V2_LIBRARIES mp4v2)
+- INCLUDE_DIRECTORIES(SYSTEM ${MP4V2_INCLUDE_DIR})
-ENDIF()
-
IF (FRESH_BUILD)
- MESSAGE("")
+ MESSAGE("")
ENDIF (FRESH_BUILD)
6 days, 23 hours
[avidemux] Fix desktop file (rfbz#7068)
by Leigh Scott
commit 9b8566f3d25c680b2e1764967176d5b6893ecafe
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 29 11:53:28 2024 +0100
Fix desktop file (rfbz#7068)
.gitignore | 2 ++
avidemux.spec | 16 +++++++++++-----
sources | 4 ++--
3 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a5b7a1..8654223 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ avidemux_2.6.10.tar.gz
/avidemux_2.8.1.tar.gz
/avidemux-601e92dabd4c1d2dcde639557d12cc1043e96669.tar.gz
/avidemux_i18n-1ac2cab673c89e18c3819cca3f8749da85550d6c.tar.gz
+/avidemux-506a9ee43ad15b452d5f232a151a795cc8503918.tar.gz
+/avidemux_i18n-b91c7f7c26577e5be005b094604f813058c31682.tar.gz
diff --git a/avidemux.spec b/avidemux.spec
index 5ffc9b3..5b00e3d 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -1,9 +1,9 @@
-%global commit 601e92dabd4c1d2dcde639557d12cc1043e96669
-%global commitdate 20240430
+%global commit 506a9ee43ad15b452d5f232a151a795cc8503918
+%global commitdate 20240928
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit0 1ac2cab673c89e18c3819cca3f8749da85550d6c
-%global commitdate0 20240316
+%global commit0 b91c7f7c26577e5be005b094604f813058c31682
+%global commitdate0 20240815
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
@@ -16,7 +16,7 @@
Name: avidemux
Version: 2.8.2
-Release: 2%{?commitdate:^git%{commitdate}.%{shortcommit}}%{?dist}
+Release: 3%{?commitdate:^git%{commitdate}.%{shortcommit}}%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -141,6 +141,8 @@ rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
avidemux_plugins/ADM_videoFilters6/ass/ADM_libass \
avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2
+sed -i -e 's@avidemux3_qt5@avidemux3_qt6@g' avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop
+
%build
export LDFLAGS="%{optflags} -lc -Wl,--as-needed"
@@ -297,6 +299,10 @@ appstream-util validate-relax --nonet \
%changelog
+* Sun Sep 29 2024 Leigh Scott <leigh123linux(a)gmail.com> - 2.8.2-3^git20240928.506a9ee
+- Fix desktop file (rfbz#7068)
+- Update git snapshot
+
* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.8.2-2^git20240430.601e92d
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/sources b/sources
index c699641..444e915 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (avidemux-601e92dabd4c1d2dcde639557d12cc1043e96669.tar.gz) = e4e0b6ab040e5c618f0447308b963823045ee2f679c87f7494769f101749fc82367e99dd833594818fa02e1261adaf8ae28dbc8777b17071bf26a68693288347
-SHA512 (avidemux_i18n-1ac2cab673c89e18c3819cca3f8749da85550d6c.tar.gz) = b7880234294baa771b637bb46bfc2886f2fad21042b34d1d618802ee93b5ca645291258bc8d0c50a9b7c56c4e5d3b8ce1bb13d68509dda16db9e124b7204511a
+SHA512 (avidemux-506a9ee43ad15b452d5f232a151a795cc8503918.tar.gz) = 7d9a8b3e0b44022662c462937a3001e3be3089d17a9078447560366dfa038bd088d1e4a0b5ad4879008a7bff1f6cabdd36d5ba5a68bd464d165225d0d9d06de5
+SHA512 (avidemux_i18n-b91c7f7c26577e5be005b094604f813058c31682.tar.gz) = e24bd99913a480be155fc551d07d97baf9edef2b44336ecfc20bd01f8d33e908d947e3c5a16cfa11de96a2d4daf4db00222789c8bca212b168bd58b341f13a59
6 days, 23 hours
[mesa-freeworld] rebuild for -Ehuman-not-enough-tee-error
by Thorsten Leemhuis
commit 16538327ebb7b1de37e6f9f29d2ad434c577e207
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Sun Sep 29 08:48:41 2024 +0200
rebuild for -Ehuman-not-enough-tee-error
rebuild for -Ehuman-not-enough-tee-error
rebuild for -Ehuman-not-enough-tee-error
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
mesa-freeworld.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 76ace15..f7a3ae8 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -73,7 +73,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 24.2.3
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 4%{?dist}
+Release: 5%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: http://www.mesa3d.org
@@ -86,7 +86,7 @@ Source2: org.mesa3d.vaapi.freeworld.metainfo.xml
Source3: org.mesa3d.vdpau.freeworld.metainfo.xml
# Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31321 for LLVM 19 compat.
-#Patch11: 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
+Patch11: 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
BuildRequires: meson >= 1.3.0
BuildRequires: gcc
@@ -356,6 +356,9 @@ rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Sun Sep 29 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.3-5
+- rebuild for -Ehuman-not-enough-tee-error
+
* Sun Sep 29 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.3-4
- add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
1 week
[mesa-freeworld] add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
by Thorsten Leemhuis
commit f65b17258fd1cce03eb9a8da0b3457df0dac320f
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Sun Sep 29 08:29:22 2024 +0200
add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
...-t-pass-avx512er-and-avx512pf-features-on.patch | 36 ++++++++++++++++++++++
mesa-freeworld.spec | 8 ++++-
2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch b/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
new file mode 100644
index 0000000..a8540c4
--- /dev/null
+++ b/0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
@@ -0,0 +1,36 @@
+From f117df06090622f7e1aad2cac818aaef6325f4d3 Mon Sep 17 00:00:00 2001
+From: Nikita Popov <npopov(a)redhat.com>
+Date: Mon, 23 Sep 2024 15:42:32 +0200
+Subject: [PATCH] gallium: Don't pass avx512er and avx512pf features on LLVM 19
+
+These target features have been remove in LLVM 19, and cause
+warnings like the following to be printed:
+
+ '-avx512er' is not a recognized feature for this target (ignoring feature)
+ '-avx512pf' is not a recognized feature for this target (ignoring feature)
+
+Do not pass these target features on LLVM 19 and newer.
+
+Fixes #11870.
+---
+ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+index e5f4dfc829f..7975fcf1ac9 100644
+--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+@@ -370,8 +370,10 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
+ /* All avx512 have avx512f */
+ MAttrs.push_back(util_get_cpu_caps()->has_avx512f ? "+avx512f" : "-avx512f");
+ MAttrs.push_back(util_get_cpu_caps()->has_avx512cd ? "+avx512cd" : "-avx512cd");
++#if LLVM_VERSION_MAJOR < 19
+ MAttrs.push_back(util_get_cpu_caps()->has_avx512er ? "+avx512er" : "-avx512er");
+ MAttrs.push_back(util_get_cpu_caps()->has_avx512pf ? "+avx512pf" : "-avx512pf");
++#endif
+ MAttrs.push_back(util_get_cpu_caps()->has_avx512bw ? "+avx512bw" : "-avx512bw");
+ MAttrs.push_back(util_get_cpu_caps()->has_avx512dq ? "+avx512dq" : "-avx512dq");
+ MAttrs.push_back(util_get_cpu_caps()->has_avx512vl ? "+avx512vl" : "-avx512vl");
+--
+2.46.0
+
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 6356d85..76ace15 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -73,7 +73,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 24.2.3
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
@@ -85,6 +85,9 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt
Source2: org.mesa3d.vaapi.freeworld.metainfo.xml
Source3: org.mesa3d.vdpau.freeworld.metainfo.xml
+# Backport of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31321 for LLVM 19 compat.
+#Patch11: 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
+
BuildRequires: meson >= 1.3.0
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -353,6 +356,9 @@ rm -fr %{buildroot}%{_libdir}{,/dri-freeworld}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Sun Sep 29 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.3-4
+- add 0001-gallium-Don-t-pass-avx512er-and-avx512pf-features-on.patch
+
* Wed Sep 25 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.2.3-3
- temporarily require llvm 19 for Fedora 41 and up
1 week
