[vdr-softhddevice] Update to 2.0.1
by Martin Gansser
commit a75df566c8ac036fa669efebbf6c3f673c5a7440
Author: Martin Gansser <mgansser(a)online.de>
Date: Mon Oct 9 14:59:15 2023 +0200
Update to 2.0.1
.gitignore | 1 +
sources | 2 +-
vdr-softhddevice.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dee3224..02f91c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
/vdr-softhddevice-1.12.2.tar.gz
/vdr-softhddevice-1.12.3.tar.gz
/vdr-softhddevice-2.0.0.tar.gz
+/vdr-softhddevice-2.0.1.tar.gz
diff --git a/sources b/sources
index 3ca3d9f..953f617 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-softhddevice-2.0.0.tar.gz) = 71152c398a6c87e256ab57f7b56b8fd09cde1e9b3c7c2b0bbae117ba88a7faa6984743f9a7171fe897ec6799ffe387e7b284c11fd1b3eb0071a830ee1ccf7cf8
+SHA512 (vdr-softhddevice-2.0.1.tar.gz) = ff6e715a7462f4a1a88545fe3b23d9dd7942c0e465039df13dd85e9e65e3b523522407ccc230eaa69bc8bd21501591867a24b66f0f726862bf9aed8b1ba8ec11
diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec
index 56a2bc9..b0c711d 100644
--- a/vdr-softhddevice.spec
+++ b/vdr-softhddevice.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-softhddevice
-Version: 2.0.0
+Version: 2.0.1
Release: 1%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
@@ -86,6 +86,9 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Mon Oct 09 2023 Martin Gansser <martinkg(a)fedoraproject.org> - 2.0.1-1
+- Update to 2.0.1
+
* Sun Oct 08 2023 Martin Gansser <martinkg(a)fedoraproject.org> - 2.0.0-1
- Update to 2.0.0
1 year, 1 month
[ffmpeg] Backport upstream patch to fix segfault when passing non-existent filter option (rfbz#6773)
by Dominik Mierzejewski
commit 82dc37749568b6112ef1f52d2dfa420f61b702e9
Author: Dominik Mierzejewski <dominik(a)greysector.net>
Date: Mon Oct 9 14:07:38 2023 +0200
Backport upstream patch to fix segfault when passing non-existent filter option (rfbz#6773)
...peg_filter-initialize-the-o-to-silence-th.patch | 30 ++++++++++++++++++++++
ffmpeg.spec | 9 ++++++-
2 files changed, 38 insertions(+), 1 deletion(-)
---
diff --git a/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch b/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
new file mode 100644
index 0000000..85b43a4
--- /dev/null
+++ b/0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
@@ -0,0 +1,30 @@
+From a0a0a804998da8d1a397479c9bafeb000e6be088 Mon Sep 17 00:00:00 2001
+From: Jun Zhao <barryjzhao(a)tencent.com>
+Date: Sat, 25 Feb 2023 21:54:00 +0800
+Subject: [PATCH] fftools/ffmpeg_filter: initialize the 'o' to silence the
+ warning
+
+silence the warning: variable 'o' is used uninitialized whenever
+'&&' condition is false
+
+Signed-off-by: Jun Zhao <barryjzhao(a)tencent.com>
+---
+ fftools/ffmpeg_filter.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
+index 1f5bbf6c4d..3504a3cc0a 100644
+--- a/fftools/ffmpeg_filter.c
++++ b/fftools/ffmpeg_filter.c
+@@ -362,7 +362,7 @@ fail:
+
+ static int filter_opt_apply(AVFilterContext *f, const char *key, const char *val)
+ {
+- const AVOption *o;
++ const AVOption *o = NULL;
+ int ret;
+
+ ret = av_opt_set(f, key, val, AV_OPT_SEARCH_CHILDREN);
+--
+2.41.0
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b5f46af..b5cbfdd 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -112,7 +112,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.0
-Release: 17%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 18%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -125,6 +125,9 @@ Source2: https://ffmpeg.org/ffmpeg-devel.asc
Patch0: 0001-avfilter-vf_libplacebo-wrap-deprecated-opts-in-FF_AP.patch
Patch1: 0001-avfilter-vf_libplacebo-remove-deprecated-field.patch
Patch2: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
+# Backport fix for segfault when passing non-existent filter option
+# See: https://bugzilla.rpmfusion.org/show_bug.cgi?id=6773
+Patch3: 0001-fftools-ffmpeg_filter-initialize-the-o-to-silence-th.patch
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -533,6 +536,10 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
%changelog
+* Sun Oct 08 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 6.0-18
+- Backport upstream patch to fix segfault when passing non-existent filter
+ option (rfbz#6773)
+
* Fri Sep 29 2023 Nicolas Chauvet <nchauvet(a)linagora.com> - 6.0-17
- Rebuild for libplacebo
- Backport upstream patch to fix assembly with binutils 2.41 - rathann
1 year, 1 month
[qt-heif-image-plugin/f37] Revert "Revert "version 0.3.4""
by Yaroslav Sidlovsky
commit 59131afaf1a8f72780c2ff0e739384fe0f326e53
Author: Yaroslav Sidlovsky <zawertun(a)gmail.com>
Date: Mon Oct 9 14:09:43 2023 +0300
Revert "Revert "version 0.3.4""
This reverts commit 8775f8a728c54df9bc97fbbd62a0e11177ff3cdb.
.gitignore | 2 +-
qt-heif-image-plugin-fix-libheif-1.7.0.patch | 49 ----------------------------
qt-heif-image-plugin.spec | 10 +++---
sources | 2 +-
4 files changed, 7 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f859ff..2609919 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/qt-heif-image-plugin-0.3.3.tar.gz
+qt-heif-image-plugin-*.tar.gz
diff --git a/qt-heif-image-plugin.spec b/qt-heif-image-plugin.spec
index fa6ca09..43164b5 100644
--- a/qt-heif-image-plugin.spec
+++ b/qt-heif-image-plugin.spec
@@ -1,17 +1,14 @@
%undefine __cmake_in_source_build
Name: qt-heif-image-plugin
-Version: 0.3.3
-Release: 8%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
Summary: Qt plugin for HEIF images
License: LGPLv3
URL: https://github.com/jakar/qt-heif-image-plugin
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-# https://github.com/jakar/qt-heif-image-plugin/issues/17
-Patch0: qt-heif-image-plugin-fix-libheif-1.7.0.patch
-
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: cmake(Qt5)
@@ -42,6 +39,9 @@ BuildRequires: qt5-rpm-macros
%changelog
+* Mon Oct 09 2023 Yaroslav Sidlovsky <zawertun(a)gmail.com> - 0.3.4-1
+- version 0.3.4
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.3.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index a9e1061..c771f5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt-heif-image-plugin-0.3.3.tar.gz) = ba617d11e73d73dee5220b668918e313b6d856cabc1567b9221ddb2b3d35c4bfefadcd9e4485bdc7c280be104d09c3580e245d9a8f72c9fac397ebe84fe55e2f
+SHA512 (qt-heif-image-plugin-0.3.4.tar.gz) = bdb2cf797d897408c31ffb4b84cd29ce5755a633ec38bbf8ce307f1ed0cc274203d11f3450450536ddc7f4ff4621f73d2c84fd7133dd00c16775f538133c03f5
1 year, 1 month
[qt-heif-image-plugin/f37] Revert "version 0.3.4"
by Yaroslav Sidlovsky
commit 8775f8a728c54df9bc97fbbd62a0e11177ff3cdb
Author: Yaroslav Sidlovsky <zawertun(a)gmail.com>
Date: Mon Oct 9 11:36:02 2023 +0300
Revert "version 0.3.4"
This reverts commit 5c4d4cda4966e7dee11b61787cbcb19b860153c5.
.gitignore | 2 +-
qt-heif-image-plugin-fix-libheif-1.7.0.patch | 49 ++++++++++++++++++++++++++++
qt-heif-image-plugin.spec | 10 +++---
sources | 2 +-
4 files changed, 56 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2609919..7f859ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-qt-heif-image-plugin-*.tar.gz
+/qt-heif-image-plugin-0.3.3.tar.gz
diff --git a/qt-heif-image-plugin-fix-libheif-1.7.0.patch b/qt-heif-image-plugin-fix-libheif-1.7.0.patch
new file mode 100644
index 0000000..03ae7ee
--- /dev/null
+++ b/qt-heif-image-plugin-fix-libheif-1.7.0.patch
@@ -0,0 +1,49 @@
+From 3288ae60b96efa404fbeb40598a8567bc8c75761 Mon Sep 17 00:00:00 2001
+From: Markus Diem <diemmarkus(a)gmail.com>
+Date: Mon, 22 Jun 2020 11:12:12 +0200
+Subject: [PATCH] maps color format from HEIF to Qt (i.e. RGB88)
+
+- this patch is needed to load RGB888 heif images with libheif 1.7.0
+- maps heif_chroma_interleaved_RGB to QImage::Format_RGB888
+- other conversions are not added because I don't have test images
+---
+ src/qheifhandler.cpp | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/src/qheifhandler.cpp b/src/qheifhandler.cpp
+index e1b9933..822c45d 100644
+--- a/src/qheifhandler.cpp
++++ b/src/qheifhandler.cpp
+@@ -288,13 +288,31 @@ bool QHeifHandler::read(QImage* destImage)
+ qWarning("QHeifHandler::read() invalid stride: %d", stride);
+ return false;
+ }
++
++ // map image format
++ heif_chroma heifFormat = heif_image_get_chroma_format(srcImage.get());
++ QImage::Format qtFormat;
+
++ switch (heifFormat) {
++ case heif_chroma_interleaved_RGB: {
++ qtFormat = QImage::Format_RGB888;
++ break;
++ }
++ case heif_chroma_interleaved_RGBA: {
++ qtFormat = QImage::Format_RGBA8888;
++ break;
++ }
++ // TODO: add other formats i.e. heif_chroma_monochrome here
++ default:
++ qtFormat = QImage::Format_RGBA8888;
++ }
++
+ // move data ownership to QImage
+ heif_image* dataImage = srcImage.release();
+
+ *destImage = QImage(
+ data, imgSize.width(), imgSize.height(),
+- stride, QImage::Format_RGBA8888,
++ stride, qtFormat,
+ [](void* img) { heif_image_release(static_cast<heif_image*>(img)); },
+ dataImage
+ );
diff --git a/qt-heif-image-plugin.spec b/qt-heif-image-plugin.spec
index 43164b5..fa6ca09 100644
--- a/qt-heif-image-plugin.spec
+++ b/qt-heif-image-plugin.spec
@@ -1,14 +1,17 @@
%undefine __cmake_in_source_build
Name: qt-heif-image-plugin
-Version: 0.3.4
-Release: 1%{?dist}
+Version: 0.3.3
+Release: 8%{?dist}
Summary: Qt plugin for HEIF images
License: LGPLv3
URL: https://github.com/jakar/qt-heif-image-plugin
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+# https://github.com/jakar/qt-heif-image-plugin/issues/17
+Patch0: qt-heif-image-plugin-fix-libheif-1.7.0.patch
+
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: cmake(Qt5)
@@ -39,9 +42,6 @@ BuildRequires: qt5-rpm-macros
%changelog
-* Mon Oct 09 2023 Yaroslav Sidlovsky <zawertun(a)gmail.com> - 0.3.4-1
-- version 0.3.4
-
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.3.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
diff --git a/sources b/sources
index c771f5f..a9e1061 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qt-heif-image-plugin-0.3.4.tar.gz) = bdb2cf797d897408c31ffb4b84cd29ce5755a633ec38bbf8ce307f1ed0cc274203d11f3450450536ddc7f4ff4621f73d2c84fd7133dd00c16775f538133c03f5
+SHA512 (qt-heif-image-plugin-0.3.3.tar.gz) = ba617d11e73d73dee5220b668918e313b6d856cabc1567b9221ddb2b3d35c4bfefadcd9e4485bdc7c280be104d09c3580e245d9a8f72c9fac397ebe84fe55e2f
1 year, 1 month
