[libheif-freeworld] backport fix for issue#590
by Dominik Mierzejewski
commit 8dfe86bb7a2b2e4211a4fc06a40434cf4bf6ab46
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Mon May 1 00:43:37 2023 +0200
backport fix for issue#590
815.patch | 133 +++++++++++++++++++++++++++++++++++++++++++++++++
libheif-freeworld.spec | 4 ++
2 files changed, 137 insertions(+)
---
diff --git a/815.patch b/815.patch
new file mode 100644
index 0000000..b39d2b7
--- /dev/null
+++ b/815.patch
@@ -0,0 +1,133 @@
+From 1e24db049f05a53ff7bd732ccde50c41bcd7d690 Mon Sep 17 00:00:00 2001
+From: fairay <ffairay(a)gmail.com>
+Date: Thu, 6 Apr 2023 15:31:20 +0300
+Subject: [PATCH 1/2] Add image reference cycle detection
+
+---
+ libheif/error.cc | 2 ++
+ libheif/heif.h | 3 +++
+ libheif/heif_file.cc | 30 ++++++++++++++++++++++++++++++
+ libheif/heif_file.h | 5 +++++
+ 4 files changed, 40 insertions(+)
+
+diff --git a/libheif/error.cc b/libheif/error.cc
+index d653cb44d7..7eef599cba 100644
+--- a/libheif/error.cc
++++ b/libheif/error.cc
+@@ -179,6 +179,8 @@ const char* heif::Error::get_error_string(heif_suberror_code err)
+ return "Unsupported parameter";
+ case heif_suberror_Invalid_parameter_value:
+ return "Invalid parameter value";
++ case heif_suberror_Item_reference_cycle:
++ return "Image reference cycle";
+
+ // --- Unsupported_feature ---
+
+diff --git a/libheif/heif.h b/libheif/heif.h
+index 793e46c871..c41955b19c 100644
+--- a/libheif/heif.h
++++ b/libheif/heif.h
+@@ -253,6 +253,9 @@ enum heif_suberror_code
+ // The value for the given parameter is not in the valid range.
+ heif_suberror_Invalid_parameter_value = 2006,
+
++ // Image reference cycle found in iref
++ heif_suberror_Item_reference_cycle = 2007,
++
+
+ // --- Unsupported_feature ---
+
+diff --git a/libheif/heif_file.cc b/libheif/heif_file.cc
+index 9b887e47b7..d1add4a3f3 100644
+--- a/libheif/heif_file.cc
++++ b/libheif/heif_file.cc
+@@ -318,6 +318,13 @@ Error HeifFile::parse_heif_file(BitstreamRange& range)
+ m_idat_box = std::dynamic_pointer_cast<Box_idat>(m_meta_box->get_child_box(fourcc("idat")));
+
+ m_iref_box = std::dynamic_pointer_cast<Box_iref>(m_meta_box->get_child_box(fourcc("iref")));
++ if (m_iref_box) {
++ std::unordered_set<heif_item_id> parent_items;
++ Error error = check_for_ref_cycle(get_primary_image_ID(), m_iref_box, parent_items);
++ if (error) {
++ return error;
++ }
++ }
+
+ m_iinf_box = std::dynamic_pointer_cast<Box_iinf>(m_meta_box->get_child_box(fourcc("iinf")));
+ if (!m_iinf_box) {
+@@ -345,6 +352,29 @@ Error HeifFile::parse_heif_file(BitstreamRange& range)
+ }
+
+
++Error HeifFile::check_for_ref_cycle(heif_item_id ID,
++ std::shared_ptr<Box_iref>& iref_box,
++ std::unordered_set<heif_item_id>& parent_items) const {
++ if (parent_items.contains(ID)) {
++ return Error(heif_error_Invalid_input,
++ heif_suberror_Item_reference_cycle,
++ "Image reference cycle");
++ }
++ parent_items.insert(ID);
++
++ std::vector<heif_item_id> image_references = iref_box->get_references(ID, fourcc("dimg"));
++ for (heif_item_id reference_idx : image_references) {
++ Error error = check_for_ref_cycle(reference_idx, iref_box, parent_items);
++ if (error) {
++ return error;
++ }
++ }
++
++ parent_items.erase(ID);
++ return Error::Ok;
++}
++
++
+ bool HeifFile::image_exists(heif_item_id ID) const
+ {
+ auto image_iter = m_infe_boxes.find(ID);
+diff --git a/libheif/heif_file.h b/libheif/heif_file.h
+index bdc0a10993..4c95227396 100644
+--- a/libheif/heif_file.h
++++ b/libheif/heif_file.h
+@@ -32,6 +32,7 @@
+ #include <string>
+ #include <map>
+ #include <vector>
++#include <unordered_set>
+
+ #if ENABLE_PARALLEL_TILE_DECODING
+ #include <mutex>
+@@ -199,6 +200,10 @@ namespace heif {
+
+ Error parse_heif_file(BitstreamRange& bitstream);
+
++ Error check_for_ref_cycle(heif_item_id ID,
++ std::shared_ptr<Box_iref>& iref_box,
++ std::unordered_set<heif_item_id>& parent_items) const;
++
+ std::shared_ptr<Box_infe> get_infe(heif_item_id ID) const;
+ };
+
+
+From 5170f7c0ed068b3c9eb91e257d9d496b4c611151 Mon Sep 17 00:00:00 2001
+From: fairay <ffairay(a)gmail.com>
+Date: Thu, 6 Apr 2023 17:01:35 +0300
+Subject: [PATCH 2/2] fix contains method usage
+
+---
+ libheif/heif_file.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libheif/heif_file.cc b/libheif/heif_file.cc
+index d1add4a3f3..df35011164 100644
+--- a/libheif/heif_file.cc
++++ b/libheif/heif_file.cc
+@@ -355,7 +355,7 @@ Error HeifFile::parse_heif_file(BitstreamRange& range)
+ Error HeifFile::check_for_ref_cycle(heif_item_id ID,
+ std::shared_ptr<Box_iref>& iref_box,
+ std::unordered_set<heif_item_id>& parent_items) const {
+- if (parent_items.contains(ID)) {
++ if (parent_items.find(ID) != parent_items.end()) {
+ return Error(heif_error_Invalid_input,
+ heif_suberror_Item_reference_cycle,
+ "Image reference cycle");
diff --git a/libheif-freeworld.spec b/libheif-freeworld.spec
index d4b62da..150fd8e 100644
--- a/libheif-freeworld.spec
+++ b/libheif-freeworld.spec
@@ -6,6 +6,7 @@ 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
+Patch0: https://patch-diff.githubusercontent.com/raw/strukturag/libheif/pull/815....
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -59,6 +60,9 @@ popd
%{_libdir}/libheif/libheif-x265.so
%changelog
+* Sun Apr 30 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.15.2-2
+- backport fix for issue#590
+
* Fri Apr 21 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.15.2-1
- update to 1.15.2
- drop obsolete patch
12 months
[ppsspp] Release 1.15
by sagitter
commit 397e4f5d7f77a6f73adf3ae222c8469d1ec9d0c8
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sun Apr 30 16:07:52 2023 +0200
Release 1.15
.gitignore | 1 +
ppsspp.spec | 17 ++++++++++-------
sources | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6fef239..4b6f760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/ppsspp-ffmpeg-1.14.tar.gz
/ppsspp-ffmpeg-1.14.2.tar.gz
/ppsspp-ffmpeg-1.14.4.tar.gz
+/ppsspp-ffmpeg-1.15.tar.gz
diff --git a/ppsspp.spec b/ppsspp.spec
index 72c8c44..176a63c 100644
--- a/ppsspp.spec
+++ b/ppsspp.spec
@@ -73,7 +73,7 @@ ExcludeArch: %{power64}
Name: ppsspp
-Version: 1.14.4
+Version: 1.15
Release: 1%{?dist}
Summary: A PSP emulator
License: BSD and GPLv2+
@@ -83,8 +83,8 @@ URL: https://www.ppsspp.org/
## We need to checkout it, then download relative submodules
## which are not included in the source code:
##
-# git clone -b v1.14.4 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git
-# cd ppsspp/ffmpeg && git checkout 98973e62e0653fcac12f277838ff3d76e786722b
+# git clone -b v1.15 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git
+# cd ppsspp/ffmpeg
# rm -rf ios Windows* windows* macosx blackberry* gas-preprocessor symbian* wiiu
# cd ..
# rm -rf ios Windows* windows* macosx blackberry* symbian*
@@ -193,12 +193,12 @@ PPSSPP with Qt5 frontend wrapper.
%prep
%autosetup -n %{name} -N
-%patch0 -p1 -b .backup
+%patch 0 -p1 -b .backup
%if %{with ffmpeg}
-%patch2 -p1 -b .backup
-%patch3 -p1 -b .backup
-%patch4 -p1 -b .backup
+%patch 2 -p1 -b .backup
+%patch 3 -p1 -b .backup
+%patch 4 -p1 -b .backup
%endif
# Remove bundled libraries
@@ -420,6 +420,9 @@ fi
%{_datadir}/icons/%{name}/
%changelog
+* Sun Apr 30 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 1.15-1
+- Release 1.15
+
* Fri Jan 06 2023 Antonio Trande <sagitter(a)fedoraproject.org> - 1.14.4-1
- Release 1.14.4
diff --git a/sources b/sources
index 8a842f2..7efa428 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ppsspp-ffmpeg-1.14.4.tar.gz) = 0e5d40a219f0a46fcac690358971b4012d628439f7a70d4b0a1dda241f72c8f8dab6efb4314f9c71d0bf6db2e2b4f1eb00bfbd048ac22018818d3c4e86f7b395
+SHA512 (ppsspp-ffmpeg-1.15.tar.gz) = 18dd8a10b10fa2715a7664a591203bbe2f7584e0089c85550025f110c18934fe930d5aec853e6460a075ba0ef8b0d06c9f95c8d7e96ebbaa546a531de16ee86b
12 months
[vdr-markad/f36] Update to 3.2.4
by Martin Gansser
Summary of changes:
adce639... Update to 3.2.4 (*)
(*) This commit already existed in another branch; no separate mail sent
12 months
[vdr-markad] Update to 3.2.4
by Martin Gansser
commit adce639d2c486875b2f65320b7eb08b7d8b1d2e9
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Apr 30 14:22:11 2023 +0200
Update to 3.2.4
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e30218f..12bd5d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.2.0.tar.gz
/vdr-markad-3.2.1.tar.gz
/vdr-markad-3.2.3.tar.gz
+/vdr-markad-3.2.4.tar.gz
diff --git a/sources b/sources
index 53aa8b3..f8e29cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.2.3.tar.gz) = 993f4d332774fb015fa84ac90e20c207903025c4e0eff91f2b4f6ea7f99c6c81bec2619aeb289548be1e0c6db8e7698300111ead8535496749d8b040c6dd7f99
+SHA512 (vdr-markad-3.2.4.tar.gz) = 8ad06f2b65e68b2a65a46c62e9bbcf0956e08d34127b70a62d5f9684e7ce7c2dbf6f38fae4b73741d2a6f46fe1611050553bc72366eb54c9a8495a196b1ff314
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 786302b..9824e41 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-markad
-Version: 3.2.3
+Version: 3.2.4
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -71,6 +71,9 @@ fi
%doc html
%changelog
+* Sun Apr 30 2023 Martin Gansser <martinkg(a)fedoraproject.org> - 3.2.4-1
+- Update to 3.2.4
+
* Tue Apr 18 2023 Martin Gansser <martinkg(a)fedoraproject.org> - 3.2.3-1
- Update to 3.2.3
12 months
[audacity-freeworld/f38] 3.3.1
by Leigh Scott
Summary of changes:
cced12f... 3.3.1 (*)
(*) This commit already existed in another branch; no separate mail sent
12 months
[audacity-freeworld] 3.3.1
by Leigh Scott
commit cced12f5715bf08e8056344c9041febcc98811a2
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Apr 28 16:44:41 2023 +0100
3.3.1
.gitignore | 1 +
audacity-freeworld.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f63abd..ae22c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
/Audacity-3.2.2.tar.gz
/Audacity-3.2.5.tar.gz
/Audacity-3.3.0.tar.gz
+/Audacity-3.3.1.tar.gz
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index dd17484..22e2699 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -4,7 +4,7 @@
#global toolchain clang
Name: audacity-freeworld
-Version: 3.3.0
+Version: 3.3.1
Release: 1%{?dist}
Summary: Multitrack audio editor
License: GPLv2
@@ -157,6 +157,9 @@ rm -f %{buildroot}%{_prefix}/%{realname}
%license LICENSE.txt
%changelog
+* Fri Apr 28 2023 Leigh Scott <leigh123linux(a)gmail.com> - 3.3.1-1
+- 3.3.1
+
* Mon Apr 24 2023 Leigh Scott <leigh123linux(a)gmail.com> - 3.3.0-1
- 3.3.0
diff --git a/sources b/sources
index 0b7a90b..ff7a9a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Audacity-3.3.0.tar.gz) = f987271f608ead83fde7026bd4fcba7612c5df49a2d87cebd998742ba2587aaa0419392945afc491ad61b06563ff529d11080cc57cb0c1387fd62a361b753fb4
+SHA512 (Audacity-3.3.1.tar.gz) = 741b74799652cc3ad915eec3d8189cd7c2f52838a4927be1fe3303b8984f7a2975e1b39f2b753b7417a56cd0899213de1a13327ed5fbdc57589516daebe0c6e9
12 months
[qt5-qtwebengine-freeworld/f38] Rebuild for Qt 5.15.9 update in Fedora 38. (#6658)
by Kevin Kofler
commit aeaf3287a19df4e0c010dcb10d39788426886e3f
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Fri Apr 28 03:03:17 2023 +0200
Rebuild for Qt 5.15.9 update in Fedora 38. (#6658)
* Fri Apr 28 2023 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.12-3.fc38.1
- Rebuild for Qt 5.15.9 update in Fedora 38. (#6658)
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 956400d..d422d19 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: 3%{?dist}
+Release: 3%{?dist}.1
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -481,6 +481,9 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Fri Apr 28 2023 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.12-3.fc38.1
+- Rebuild for Qt 5.15.9 update in Fedora 38. (#6658)
+
* Tue Apr 18 2023 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 5.15.12-3
- Port bundled libsync to C99
- https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/628adfbb0613c892b916...
12 months