[x264] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
by Sérgio M. Basto
commit a7ed373488afa6854a4f0653d099c058224a70ef
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Feb 9 23:28:40 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Sérgio M. Basto <sergio(a)serjux.com>
x264.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/x264.spec b/x264.spec
index 068e765..3fd93de 100644
--- a/x264.spec
+++ b/x264.spec
@@ -33,7 +33,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 3%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 4%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -175,6 +175,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.163-4.20210613git5db6aa6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Tue Nov 09 2021 Leigh Scott <leigh123linux(a)gmail.com> - 0.163-3.20210613git5db6aa6
- Rebuilt for new ffmpeg snapshot
2 years, 11 months
[wxsvg] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
by Sérgio M. Basto
commit 68144949458221cd6576c11be031cdd913be0455
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Feb 9 23:27:47 2022 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Sérgio M. Basto <sergio(a)serjux.com>
wxsvg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/wxsvg.spec b/wxsvg.spec
index 6d2fe29..2b6482f 100644
--- a/wxsvg.spec
+++ b/wxsvg.spec
@@ -1,6 +1,6 @@
Name: wxsvg
Version: 1.5.23
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: C++ library to create, manipulate and render SVG files
Group: System Environment/Libraries
@@ -71,6 +71,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.5.23-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Sat Dec 04 2021 Sérgio Basto <sergio(a)serjux.com> - 1.5.23-2
- Rebuild with wxGTK-3.1.x
- Some cleanups
2 years, 11 months
[qmplay2] fix
by Leigh Scott
commit dd02476638d50208f04e842b51e5a3790d4c1b47
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 9 23:24:08 2022 +0000
fix
ffmpeg-5-compilation.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++++
qmplay2.spec | 2 +-
2 files changed, 63 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg-5-compilation.patch b/ffmpeg-5-compilation.patch
new file mode 100644
index 0000000..79e0407
--- /dev/null
+++ b/ffmpeg-5-compilation.patch
@@ -0,0 +1,62 @@
+From bb48170d01c784d3c0436e9e341e21ad08721ff6 Sun 23 1 11:55:36 2022
+From: Simon Vogl <simon.vogl(a)gmx.net>
+Date: Sun, 23 Jan 2022 11:55:36 UTC
+Subject: [PATCH] Fix FFmpeg 5 compilation
+
+This patch is required to fix a compile error when builing QMPlay2 against FFmpeg >= 5.0.0.
+
+
+diff --git src/modules/CUVID/CuvidDec.cpp src/modules/CUVID/CuvidDec.cpp
+index 64ae9386..f8288764 100644
+--- src/modules/CUVID/CuvidDec.cpp
++++ src/modules/CUVID/CuvidDec.cpp
+@@ -431,7 +431,7 @@ bool CuvidDec::open(StreamInfo &streamInfo)
+ if (streamInfo.codec_type != AVMEDIA_TYPE_VIDEO)
+ return false;
+
+- AVCodec *avCodec = avcodec_find_decoder_by_name(streamInfo.codec_name);
++ auto avCodec = const_cast<AVCodec *>(avcodec_find_decoder_by_name(streamInfo.codec_name));
+ if (!avCodec)
+ return false;
+
+diff --git src/modules/CUVID/CuvidDec.hpp src/modules/CUVID/CuvidDec.hpp
+index 0efb5bd9..cce1308d 100644
+--- src/modules/CUVID/CuvidDec.hpp
++++ src/modules/CUVID/CuvidDec.hpp
+@@ -26,6 +26,10 @@
+ #include <QCoreApplication>
+ #include <QQueue>
+
++extern "C" {
++ #include <libavcodec/bsf.h>
++}
++
+ class CuvidHWInterop;
+ class VideoWriter;
+
+diff --git src/modules/FFmpeg/FFDec.cpp src/modules/FFmpeg/FFDec.cpp
+index 592f12b7..9683bcfa 100644
+--- src/modules/FFmpeg/FFDec.cpp
++++ src/modules/FFmpeg/FFDec.cpp
+@@ -70,7 +70,7 @@ void FFDec::clearFrames()
+
+ AVCodec *FFDec::init(StreamInfo &streamInfo)
+ {
+- AVCodec *codec = avcodec_find_decoder_by_name(streamInfo.codec_name);
++ auto codec = const_cast< AVCodec *>(avcodec_find_decoder_by_name(streamInfo.codec_name));
+ if (codec)
+ {
+ codec_ctx = avcodec_alloc_context3(codec);
+diff --git src/modules/FFmpeg/FormatContext.cpp src/modules/FFmpeg/FormatContext.cpp
+index 88f8ccb8..e96758e3 100644
+--- src/modules/FFmpeg/FormatContext.cpp
++++ src/modules/FFmpeg/FormatContext.cpp
+@@ -687,7 +687,7 @@ bool FormatContext::open(const QString &_url, const QString ¶m)
+ if (scheme != "rtsp")
+ {
+ // It is needed for QMPlay2 schemes like "alsa://", "v4l2://", etc.
+- inputFmt = av_find_input_format(scheme);
++ inputFmt = const_cast<AVInputFormat *>(av_find_input_format(scheme));
+ if (inputFmt)
+ url = _url.right(_url.length() - scheme.length() - 3);
+ }
diff --git a/qmplay2.spec b/qmplay2.spec
index f85cb30..f8969fa 100644
--- a/qmplay2.spec
+++ b/qmplay2.spec
@@ -1,5 +1,4 @@
%undefine _strict_symbol_defs_build
-%undefine __cmake_in_source_build
%global pname QMPlay2
Name: qmplay2
@@ -10,6 +9,7 @@ License: LGPLv3+
URL: http://zaps166.sourceforge.net/?app=QMPlay2
Source: https://github.com/zaps166/QMPlay2/archive/%{version}.tar.gz#/%{pname}-%{...
Patch0: %{name}-numeric_limit_fix.patch
+Patch1: ffmpeg-5-compilation.patch
BuildRequires: cmake3
BuildRequires: ninja-build
2 years, 11 months
[svt-hevc] Fix build
by Leigh Scott
commit 27a949c662518b6055430568dcb92a1fee1cbfa0
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Feb 9 23:12:18 2022 +0000
Fix build
svt-hevc.spec | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/svt-hevc.spec b/svt-hevc.spec
index d57cb68..d124255 100644
--- a/svt-hevc.spec
+++ b/svt-hevc.spec
@@ -1,5 +1,3 @@
-%undefine __cmake_in_source_build
-
Name: svt-hevc
Version: 1.5.1
Release: 3%{?dist}
@@ -44,16 +42,13 @@ Include files and mandatory libraries for development svt-hevc.
%build
-%cmake -G Ninja \
-%if 0%{?rhel} && 0%{?rhel} > 7
- -B %{_target_platform} -S .
-%endif
+%cmake -G Ninja
-%ninja_build -C %{_target_platform}
+%cmake_build
%install
-%ninja_install -C %{_target_platform}
+%cmake_install
%files
%{_bindir}/SvtHevcEncApp
2 years, 11 months