[ffmpeg/f40] Rebuild for svt-av1 2.1.0
by Leigh Scott
commit 9b5f5e826ebd13e89cfdda85f6fd4472c80affb6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri May 31 20:52:50 2024 +0100
Rebuild for svt-av1 2.1.0
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 2a393d6..157340e 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: 10%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 11%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -531,6 +531,9 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%changelog
+* Fri May 31 2024 Robert-André Mauchin <zebob.m(a)gmail.com> - 6.1.1-11
+- Rebuild for svt-av1 2.1.0
+
* Wed May 29 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-10
- Add buildrequires lcms2-devel and fix rfbz#6947
8 months
[ffmpeg] Rebuild for svt-av1 2.1.0
by Robert-André Mauchin
commit 4c45ab3033096fd1049475e21e3f8f67e96b5c68
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Fri May 31 20:49:23 2024 +0200
Rebuild for svt-av1 2.1.0
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index bb821e9..082ac64 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,7 +98,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 7.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -533,6 +533,9 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%changelog
+* Fri May 31 2024 Robert-André Mauchin <zebob.m(a)gmail.com> - 7.0.1-2
+- Rebuild for svt-av1 2.1.0
+
* Sun May 26 2024 Leigh Scott <leigh123linux(a)gmail.com> - 7.0.1-1
- Update to 7.0.1
8 months
[jellyfin] Drop libexec dir that held restart script that was dropped
by Michael Cronenworth
commit 1954a466cef01e678860e805e3840b75aa8887bf
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Fri May 31 09:59:38 2024 -0500
Drop libexec dir that held restart script that was dropped
jellyfin.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/jellyfin.spec b/jellyfin.spec
index 0075366..4f88d6c 100644
--- a/jellyfin.spec
+++ b/jellyfin.spec
@@ -205,7 +205,6 @@ done
%{_bindir}/jellyfin
# Needs 755 else only root can run it since binary build by dotnet is 722
%{_libdir}/jellyfin/
-%{_libexecdir}/jellyfin/
# Jellyfin config
%config(noreplace) %attr(644,jellyfin,jellyfin) %{_sysconfdir}/jellyfin/logging.json
8 months
[vdr-markad/f39] Update to 3.6.5
by Martin Gansser
Summary of changes:
1c82590... Update to 3.6.5 (*)
(*) This commit already existed in another branch; no separate mail sent
8 months
[vdr-markad/f40] Update to 3.6.5
by Martin Gansser
Summary of changes:
1c82590... Update to 3.6.5 (*)
(*) This commit already existed in another branch; no separate mail sent
8 months
[vdr-markad] Update to 3.6.5
by Martin Gansser
commit 1c825907dd8c5db7d3abb3e65aac538dcadf229a
Author: Martin Gansser <mgansser(a)online.de>
Date: Fri May 31 08:27:24 2024 +0200
Update to 3.6.5
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f4d1ab..8eac4f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.6.1.tar.gz
/vdr-markad-3.6.3.tar.gz
/vdr-markad-3.6.4.tar.gz
+/vdr-markad-3.6.5.tar.gz
diff --git a/sources b/sources
index 7469904..64a9a4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.6.4.tar.gz) = dde16a556a1bffda33712dcaa98f5f4b0e73ca726f35660eab4c081c4a5d9efef3478ec4f62194762f9e6eacbb98855fdb0711893fedc212a9e451e4ba5e9485
+SHA512 (vdr-markad-3.6.5.tar.gz) = 1d55374a94924eece1dbd971a7aba8bc116c006993933ed9ba355dcd39a7ddf7062a5602fc29838ea0d6b2ab02179871f2d10b2fa91710cad8ce67bf3a4bba31
diff --git a/vdr-markad.spec b/vdr-markad.spec
index a347cb9..ee95379 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-markad
-Version: 3.6.4
+Version: 3.6.5
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -72,6 +72,9 @@ fi
%doc html
%changelog
+* Fri May 31 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 3.6.5-1
+- Update to 3.6.5
+
* Tue May 21 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 3.6.4-1
- Update to 3.6.4
8 months
[vcmi] Move the .qm files to the expected directories
by Leigh Scott
commit b733d4a08f56b975cc13b9e18c250b8247907dd8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu May 30 13:57:23 2024 +0100
Move the .qm files to the expected directories
vcmi.spec | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/vcmi.spec b/vcmi.spec
index 4a68d1d..58da9d6 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -42,14 +42,9 @@ BuildRequires: minizip-ng-devel
BuildRequires: tbb-devel
BuildRequires: zlib-devel
BuildRequires: ffmpeg-devel
-%if 0%{?fedora} >= 39
BuildRequires: qt6-qtbase-devel
BuildRequires: qt6-qttools-devel
BuildRequires: qt6-linguist
-%else
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-linguist
-%endif
Requires: innoextract
Requires: hicolor-icon-theme
@@ -100,6 +95,10 @@ sed -i 's/GITDIR-NOTFOUND/%{version}/' cmake_modules/*
%global _smp_mflags -j1
%endif
%cmake_build
+# Move the .qm files to the expected directories
+mkdir %{_vpath_builddir}/{launcher,mapeditor}/translation/
+mv %{_vpath_builddir}/launcher/*.qm %{_vpath_builddir}/launcher/translation/
+mv %{_vpath_builddir}/mapeditor/*.qm %{_vpath_builddir}/mapeditor/translation/
%install
8 months
[libheif-freeworld] Update to 1.17.6
by Robert-André Mauchin
commit 254c68df576729af285d82e427d6e3215d604766
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Sun May 26 19:57:21 2024 +0200
Update to 1.17.6
Fix CVE-2024-25269
26ec3953d46bb5756b97955661565bcbc6647abf.patch | 25 ---
50aa08176e44178eeffcb7a66f37d7cad074f51b.patch | 23 +++
56ef61d8daa55b56d782e5d8ab6f0ed31b98b494.patch | 24 ---
730a9d80bea3434f75c79e721878cc67f3889969.patch | 208 -------------------------
877de6b398198bca387df791b9232922c5721c80.patch | 42 +++++
90955e3118d687fa8c36747a7b349caebc82707d.patch | 21 +++
9598ddeb3dff4e51a9989067e912baf502410cee.patch | 141 +++++++++++++++++
a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch | 22 +++
bef5f0f49f9024957189b5b465cd4d07078cd06f.patch | 36 +++++
dfd88deb1d80b4195ef16cddad256f33b46fbe29.patch | 22 +++
fd5b02aca3e29088bf0a1fc400bd661be4a6ed76.patch | 28 ----
libheif-freeworld.spec | 26 ++--
sources | 2 +-
13 files changed, 324 insertions(+), 296 deletions(-)
---
diff --git a/50aa08176e44178eeffcb7a66f37d7cad074f51b.patch b/50aa08176e44178eeffcb7a66f37d7cad074f51b.patch
new file mode 100644
index 0000000..e3ef6b9
--- /dev/null
+++ b/50aa08176e44178eeffcb7a66f37d7cad074f51b.patch
@@ -0,0 +1,23 @@
+From 50aa08176e44178eeffcb7a66f37d7cad074f51b Mon Sep 17 00:00:00 2001
+From: zhubo <zhubo.z(a)bytedance.com>
+Date: Fri, 29 Dec 2023 23:16:57 +0800
+Subject: [PATCH] Add kvazaar to REQUIRES_PRIVATE
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d996845e39..3a3f51d86f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,6 +234,9 @@ endif()
+ if (X265_FOUND AND NOT (PLUGIN_LOADING_SUPPORTED_AND_ENABLED AND WITH_X265_PLUGIN))
+ list(APPEND REQUIRES_PRIVATE "x265")
+ endif()
++if (KVAZAAR_FOUND AND NOT (PLUGIN_LOADING_SUPPORTED_AND_ENABLED AND WITH_KVAZAAR_PLUGIN))
++ list(APPEND REQUIRES_PRIVATE "kvazaar")
++endif()
+ if ((AOM_DECODER_FOUND AND NOT (PLUGIN_LOADING_SUPPORTED_AND_ENABLED AND WITH_AOM_DECODER_PLUGIN))
+ OR (AOM_ENCODER_FOUND AND NOT (PLUGIN_LOADING_SUPPORTED_AND_ENABLED AND WITH_AOM_ENCODER_PLUGIN)))
+ list(APPEND REQUIRES_PRIVATE "aom")
diff --git a/877de6b398198bca387df791b9232922c5721c80.patch b/877de6b398198bca387df791b9232922c5721c80.patch
new file mode 100644
index 0000000..852ca50
--- /dev/null
+++ b/877de6b398198bca387df791b9232922c5721c80.patch
@@ -0,0 +1,42 @@
+From 877de6b398198bca387df791b9232922c5721c80 Mon Sep 17 00:00:00 2001
+From: zhailiangliang <zhailiangliang(a)loongson.cn>
+Date: Thu, 21 Dec 2023 15:45:29 +0800
+Subject: [PATCH] fix memory leaks in function JpegEncoder::Encode
+
+---
+ examples/encoder_jpeg.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/examples/encoder_jpeg.cc b/examples/encoder_jpeg.cc
+index 6a8bae163a..b82f8aa39b 100644
+--- a/examples/encoder_jpeg.cc
++++ b/examples/encoder_jpeg.cc
+@@ -179,6 +179,9 @@ bool JpegEncoder::Encode(const struct heif_image_handle* handle,
+ uint32_t skip = (exifdata[0]<<24) | (exifdata[1]<<16) | (exifdata[2]<<8) | exifdata[3];
+ if (skip > (exifsize - 4)) {
+ fprintf(stderr, "Invalid EXIF data (offset too large)\n");
++ free(exifdata);
++ jpeg_destroy_compress(&cinfo);
++ fclose(fp);
+ return false;
+ }
+ skip += 4;
+@@ -188,6 +191,9 @@ bool JpegEncoder::Encode(const struct heif_image_handle* handle,
+
+ if (size > std::numeric_limits<uint32_t>::max()) {
+ fprintf(stderr, "EXIF larger than 4GB is not supported");
++ free(exifdata);
++ jpeg_destroy_compress(&cinfo);
++ fclose(fp);
+ return false;
+ }
+
+@@ -258,6 +264,8 @@ bool JpegEncoder::Encode(const struct heif_image_handle* handle,
+
+ if (heif_image_get_bits_per_pixel(image, heif_channel_Y) != 8) {
+ fprintf(stderr, "JPEG writer cannot handle image with >8 bpp.\n");
++ jpeg_destroy_compress(&cinfo);
++ fclose(fp);
+ return false;
+ }
+
diff --git a/90955e3118d687fa8c36747a7b349caebc82707d.patch b/90955e3118d687fa8c36747a7b349caebc82707d.patch
new file mode 100644
index 0000000..b967bd2
--- /dev/null
+++ b/90955e3118d687fa8c36747a7b349caebc82707d.patch
@@ -0,0 +1,21 @@
+From 90955e3118d687fa8c36747a7b349caebc82707d Mon Sep 17 00:00:00 2001
+From: zhailiangliang <zhailiangliang(a)loongson.cn>
+Date: Thu, 11 Jan 2024 17:48:52 +0800
+Subject: [PATCH] Fix potential memory leak in file heif_convert.cc
+
+---
+ examples/heif_convert.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/examples/heif_convert.cc b/examples/heif_convert.cc
+index 0e3cb4d2de..e57573235c 100644
+--- a/examples/heif_convert.cc
++++ b/examples/heif_convert.cc
+@@ -609,6 +609,7 @@ int main(int argc, char** argv)
+ const char* auxTypeC = nullptr;
+ err = heif_image_handle_get_auxiliary_type(aux_handle, &auxTypeC);
+ if (err.code) {
++ heif_image_release(aux_image);
+ heif_image_handle_release(aux_handle);
+ heif_image_handle_release(handle);
+ std::cerr << "Could not get type of auxiliary image: " << err.message << "\n";
diff --git a/9598ddeb3dff4e51a9989067e912baf502410cee.patch b/9598ddeb3dff4e51a9989067e912baf502410cee.patch
new file mode 100644
index 0000000..7674268
--- /dev/null
+++ b/9598ddeb3dff4e51a9989067e912baf502410cee.patch
@@ -0,0 +1,141 @@
+From 9598ddeb3dff4e51a9989067e912baf502410cee Mon Sep 17 00:00:00 2001
+From: Heiko Lewin <hlewin(a)worldiety.de>
+Date: Sun, 10 Mar 2024 13:32:18 +0100
+Subject: [PATCH] encoder_kvazaar.cc: Fix some memory leaks
+
+---
+ libheif/plugins/encoder_kvazaar.cc | 50 +++++++++++++-----------------
+ 1 file changed, 22 insertions(+), 28 deletions(-)
+
+diff --git a/libheif/plugins/encoder_kvazaar.cc b/libheif/plugins/encoder_kvazaar.cc
+index eada77f9fe..158f174b04 100644
+--- a/libheif/plugins/encoder_kvazaar.cc
++++ b/libheif/plugins/encoder_kvazaar.cc
+@@ -361,6 +361,11 @@ static void copy_plane(kvz_pixel* out_p,
+ }
+
+
++template<typename T, typename D>
++std::unique_ptr<T, D> make_guard(T* ptr, D&& deleter) {
++ return std::unique_ptr<T, D>(ptr, deleter);
++}
++
+ static struct heif_error kvazaar_encode_image(void* encoder_raw, const struct heif_image* image,
+ heif_image_input_class input_class)
+ {
+@@ -380,7 +385,8 @@ static struct heif_error kvazaar_encode_
+ return err;
+ }
+
+- kvz_config* config = api->config_alloc();
++ auto uconfig = make_guard(api->config_alloc(), [api](kvz_config* cfg) { api->config_destroy(cfg); });
++ kvz_config* config = uconfig.get();
+ api->config_init(config); // param, encoder->preset.c_str(), encoder->tune.c_str());
+ #if HAVE_KVAZAAR_ENABLE_LOGGING
+ config->enable_logging_output = 0;
+@@ -541,9 +547,9 @@ static struct heif_error kvazaar_encode_
+ }
+ */
+
+- kvz_picture* pic = api->picture_alloc_csp(kvzChroma, encoded_width, encoded_height);
++ auto upic = make_guard(api->picture_alloc_csp(kvzChroma, encoded_width, encoded_height), [api](kvz_picture* pic) { api->picture_free(pic); });
++ kvz_picture* pic = upic.get();
+ if (!pic) {
+- api->config_destroy(config);
+ return heif_error{
+ heif_error_Encoder_plugin_error,
+ heif_suberror_Encoder_encoding,
+@@ -573,11 +579,9 @@ static struct heif_error kvazaar_encode_
+ encoded_width >> chroma_stride_shift, encoded_height >> chroma_height_shift);
+ }
+
+- kvz_encoder* kvzencoder = api->encoder_open(config);
++ auto uencoder = make_guard(api->encoder_open(config), [api](kvz_encoder* e) { api->encoder_close(e); });
++ kvz_encoder* kvzencoder = uencoder.get();
+ if (!kvzencoder) {
+- api->picture_free(pic);
+- api->config_destroy(config);
+-
+ return heif_error{
+ heif_error_Encoder_plugin_error,
+ heif_suberror_Encoder_encoding,
+@@ -586,14 +590,18 @@ static struct heif_error kvazaar_encode_
+ }
+
+ kvz_data_chunk* data = nullptr;
++ auto free_data = [api](kvz_data_chunk** data){
++ if(*data) {
++ api->chunk_free(*data);
++ *data = nullptr;
++ }
++ };
++ auto data_deleter = std::unique_ptr<kvz_data_chunk*, decltype(free_data)>(&data, free_data);
++
+ uint32_t data_len;
+ int success;
+ success = api->encoder_headers(kvzencoder, &data, &data_len);
+ if (!success) {
+- api->picture_free(pic);
+- api->config_destroy(config);
+- api->encoder_close(kvzencoder);
+-
+ return heif_error{
+ heif_error_Encoder_plugin_error,
+ heif_suberror_Encoder_encoding,
+@@ -602,17 +610,13 @@ static struct heif_error kvazaar_encode_
+ }
+
+ append_chunk_data(data, encoder->output_data);
++ free_data(&data);
+
+ success = api->encoder_encode(kvzencoder,
+ pic,
+ &data, &data_len,
+ nullptr, nullptr, nullptr);
+ if (!success) {
+- api->chunk_free(data);
+- api->picture_free(pic);
+- api->config_destroy(config);
+- api->encoder_close(kvzencoder);
+-
+ return heif_error{
+ heif_error_Encoder_plugin_error,
+ heif_suberror_Encoder_encoding,
+@@ -621,6 +625,7 @@ static struct heif_error kvazaar_encode_
+ }
+
+ append_chunk_data(data, encoder->output_data);
++ free_data(&data);
+
+ for (;;) {
+ success = api->encoder_encode(kvzencoder,
+@@ -628,11 +633,6 @@ static struct heif_error kvazaar_encode_
+ &data, &data_len,
+ nullptr, nullptr, nullptr);
+ if (!success) {
+- api->chunk_free(data);
+- api->picture_free(pic);
+- api->config_destroy(config);
+- api->encoder_close(kvzencoder);
+-
+ return heif_error{
+ heif_error_Encoder_plugin_error,
+ heif_suberror_Encoder_encoding,
+@@ -645,16 +645,10 @@ static struct heif_error kvazaar_encode_
+ }
+
+ append_chunk_data(data, encoder->output_data);
++ free_data(&data);
+ }
+
+ (void) success;
+-
+- api->chunk_free(data);
+-
+- api->encoder_close(kvzencoder);
+- api->picture_free(pic);
+- api->config_destroy(config);
+-
+ return heif_error_ok;
+ }
+
diff --git a/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch b/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch
new file mode 100644
index 0000000..e3f3374
--- /dev/null
+++ b/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch
@@ -0,0 +1,22 @@
+From a911b26a902c5f89fee2dc20ac4dfaafcb8144ec Mon Sep 17 00:00:00 2001
+From: Andrey Semashev <Lastique(a)users.noreply.github.com>
+Date: Fri, 15 Mar 2024 17:46:48 +0300
+Subject: [PATCH] Fix compilation with libsvtav1 2.0.0.
+
+---
+ libheif/plugins/encoder_svt.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libheif/plugins/encoder_svt.cc b/libheif/plugins/encoder_svt.cc
+index 4597d7b8fc..1ff3bce2d5 100644
+--- a/libheif/plugins/encoder_svt.cc
++++ b/libheif/plugins/encoder_svt.cc
+@@ -646,7 +646,7 @@ struct heif_error svt_encode_image(void* encoder_raw, const struct heif_image* i
+
+ if (nclx) {
+ svt_config.color_description_present_flag = true;
+-#if SVT_AV1_VERSION_MAJOR == 1
++#if SVT_AV1_VERSION_MAJOR >= 1
+ svt_config.color_primaries = static_cast<EbColorPrimaries>(nclx->color_primaries);
+ svt_config.transfer_characteristics = static_cast<EbTransferCharacteristics>(nclx->transfer_characteristics);
+ svt_config.matrix_coefficients = static_cast<EbMatrixCoefficients>(nclx->matrix_coefficients);
diff --git a/bef5f0f49f9024957189b5b465cd4d07078cd06f.patch b/bef5f0f49f9024957189b5b465cd4d07078cd06f.patch
new file mode 100644
index 0000000..256c6e4
--- /dev/null
+++ b/bef5f0f49f9024957189b5b465cd4d07078cd06f.patch
@@ -0,0 +1,36 @@
+From bef5f0f49f9024957189b5b465cd4d07078cd06f Mon Sep 17 00:00:00 2001
+From: Brad Hards <bradh(a)frogmouth.net>
+Date: Sat, 6 Jan 2024 13:59:21 +1100
+Subject: [PATCH] kvazaar: protect against unexpected chroma values
+
+Resolves #1089
+---
+ libheif/plugins/encoder_kvazaar.cc | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libheif/plugins/encoder_kvazaar.cc b/libheif/plugins/encoder_kvazaar.cc
+index 408f1bf84d..eada77f9fe 100644
+--- a/libheif/plugins/encoder_kvazaar.cc
++++ b/libheif/plugins/encoder_kvazaar.cc
+@@ -35,6 +35,7 @@ extern "C" {
+
+ static const char* kError_unspecified_error = "Unspecified encoder error";
+ static const char* kError_unsupported_bit_depth = "Bit depth not supported by kvazaar";
++static const char* kError_unsupported_chroma = "Unsupported chroma type";
+ //static const char* kError_unsupported_image_size = "Images smaller than 16 pixels are not supported";
+
+
+@@ -492,6 +493,13 @@ static struct heif_error kvazaar_encode_image(void* encoder_raw, const struct he
+ input_chroma_width = input_width;
+ input_chroma_height = input_height;
+ }
++ else {
++ return heif_error{
++ heif_error_Encoder_plugin_error,
++ heif_suberror_Unsupported_image_type,
++ kError_unsupported_chroma
++ };
++ }
+
+ if (chroma != heif_chroma_monochrome) {
+ int w = heif_image_get_width(image, heif_channel_Y);
diff --git a/dfd88deb1d80b4195ef16cddad256f33b46fbe29.patch b/dfd88deb1d80b4195ef16cddad256f33b46fbe29.patch
new file mode 100644
index 0000000..12fcb45
--- /dev/null
+++ b/dfd88deb1d80b4195ef16cddad256f33b46fbe29.patch
@@ -0,0 +1,22 @@
+From dfd88deb1d80b4195ef16cddad256f33b46fbe29 Mon Sep 17 00:00:00 2001
+From: Brad Hards <bradh(a)frogmouth.net>
+Date: Wed, 17 Jan 2024 11:47:15 +1100
+Subject: [PATCH] examples: fix leak in PNG decoder
+
+This shows up with heif-enc (e.g. with --avif) under valgrind
+---
+ examples/decoder_png.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/examples/decoder_png.cc b/examples/decoder_png.cc
+index 5742f02653..c3eeed88a8 100644
+--- a/examples/decoder_png.cc
++++ b/examples/decoder_png.cc
+@@ -419,6 +419,7 @@ InputImage loadPNG(const char* filename, int output_bit_depth)
+ } // for
+
+ delete[] row_pointers;
++ fclose(fh);
+
+ input_image.image = std::shared_ptr<heif_image>(image,
+ [](heif_image* img) { heif_image_release(img); });
diff --git a/libheif-freeworld.spec b/libheif-freeworld.spec
index ccf0cfd..6e124fe 100644
--- a/libheif-freeworld.spec
+++ b/libheif-freeworld.spec
@@ -1,21 +1,23 @@
%bcond_with check
Name: libheif-freeworld
-Version: 1.17.5
-Release: 3%{?dist}
+Version: 1.17.6
+Release: 1%{?dist}
Summary: HEVC support for HEIF and AVIF file format decoder and encoder
License: LGPL-3.0-or-later and MIT
URL: https://github.com/strukturag/libheif
Source0: %{url}/archive/v%{version}/libheif-%{version}.tar.gz
-# fix for CVE-2023-49460 (https://github.com/strukturag/libheif/issues/1046)
-Patch10: https://github.com/strukturag/libheif/commit/fd5b02aca3e29088bf0a1fc400bd...
-# fix for CVE-2023-49462 (https://github.com/strukturag/libheif/issues/1043)
-Patch11: https://github.com/strukturag/libheif/commit/730a9d80bea3434f75c79e721878...
-# fix for CVE-2023-49463 (https://github.com/strukturag/libheif/issues/1042)
-Patch12: https://github.com/strukturag/libheif/commit/26ec3953d46bb5756b9795566156...
-# fix for CVE-2023-49464 (https://github.com/strukturag/libheif/issues/1044)
-Patch13: https://github.com/strukturag/libheif/commit/56ef61d8daa55b56d782e5d8ab6f...
+# Fix for CVE-2024-25269 (https://github.com/strukturag/libheif/issues/1073)
+Patch1: 877de6b398198bca387df791b9232922c5721c80.patch
+# Fix compilation with libsvtav1 2.0.0.
+Patch2: a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch
+# Backport memory leaks fix from master
+Patch3: 9598ddeb3dff4e51a9989067e912baf502410cee.patch
+Patch4: dfd88deb1d80b4195ef16cddad256f33b46fbe29.patch
+Patch5: 90955e3118d687fa8c36747a7b349caebc82707d.patch
+Patch6: bef5f0f49f9024957189b5b465cd4d07078cd06f.patch
+Patch7: 50aa08176e44178eeffcb7a66f37d7cad074f51b.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -84,6 +86,10 @@ popd
%{_libdir}/libheif/libheif-x265.so
%changelog
+* Sun May 26 2024 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.17.6-1
+- Update to 1.17.6
+- Fix CVE-2024-25269
+
* Sat Apr 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.17.5-3
- Rebuild for new x265 version
diff --git a/sources b/sources
index 7a5642d..f75b96a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libheif-1.17.5.tar.gz) = e17f990fcb4b3ebfec19cbf304ae8f9b00a3d33aaf46802eff8b3c21c614ccd02cb0a92960324b4c579e579021615c88d16efe6df84a171ddbc05313d2c73931
+SHA512 (libheif-1.17.6.tar.gz) = e8f7a9d8d7af1947e9ca43e8387fc082551c884bb66fef7484c82748f3b81524efa7a2988f31d059a85a10539ff42bd3125b0f066f7b8b652bd9450737b2bc89
8 months
[mixxx] Add updated sources and correct release tag
by Leigh Scott
commit 39c29c97674bdcf5a5de46361b528c34a28ff7d0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed May 29 22:19:03 2024 +0100
Add updated sources and correct release tag
mixxx.spec | 8 ++++----
sources | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 2410965..ae1e0a7 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -12,10 +12,10 @@
#global gitcommitdate 20240214
# Additional sources
-%global libkeyfinder_version 2.2.6
+%global libkeyfinder_version 2.2.8
# Additional sources
-%global libdjinterop_version 0.20.1
+%global libdjinterop_version 0.20.2
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -28,7 +28,7 @@
Name: mixxx
Version: 2.4.1
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -222,7 +222,7 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
-* Wed May 29 2024 Luis Correia <luis.f.correia(a)gmail.com> - 2.4.1-3
+* Wed May 29 2024 Luis Correia <luis.f.correia(a)gmail.com> - 2.4.1-1
- New upstream release 2.4.1
* Fri Feb 16 2024 Luis Correia <luis.f.correia(a)gmail.com> - 2.4.0-2
diff --git a/sources b/sources
index 9904203..e0046be 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (libdjinterop-0.20.1.tar.gz) = 2f75a57326cc958bce6634aba407707313cec646d1713c80d9286d9d2448a68dd304eacd02b38c237a6bb869f07b9b3d3b1cc7fcb7c3a9cdf6ba7515166be6cf
-SHA512 (libkeyfinder-2.2.6.zip) = 23ffcc4da59019349824b60dd1b125d559f39d7731fe7f00cdc8f4a97a342fa59ef5183c4e272ff4c5fd06eaa89c581e07fdb26bcfd3c98cc42d2dcc29e13e1e
+SHA512 (libdjinterop-0.20.2.tar.gz) = 591cbf8102e16b11337ec25ad90ef035bf65dbbd18591802d959044874f36bb61bce3d5db974b00ecee14b45c7ea2488542b226d823d9087c92a0b452d804ff3
+SHA512 (libkeyfinder-2.2.8.zip) = 0fd5c566430f5ffeca4e8a01e925c384ee8206d12b90eeb21c479baf822e741f2d1ac583a0355c380817994232deca314a40c0f65acb3cea84b173627948f3e3
SHA512 (mixxx-2.4.1.tar.gz) = f62e0ce3bd016d411eda544a621e33b791517931c268391089cfe3101cd1e123eeb0b80bc8c138e7c67bb41cf378c6973f5c9284d5c720c693fd632f62372569
8 months
