packages/qtav
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!9 [sync] PR-7: fix build error of ffmpeg-6.1.1

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2024-04-15 06:25:43 +00:00 committed by Gitee
commit 87906b034f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 2302 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2266
0004-ffmpeg-5.0.patch Normal file
View File

File diff suppressed because it is too large Load Diff

28
QtAV-ffmpeg-6.1.patch Normal file
View File

@ -0,0 +1,28 @@
diff -up QtAV-master/src/codec/video/VideoDecoderFFmpeg.cpp.omv~ QtAV-master/src/codec/video/VideoDecoderFFmpeg.cpp
--- QtAV-master/src/codec/video/VideoDecoderFFmpeg.cpp.omv~ 2023-12-10 23:58:23.709436078 +0100
+++ QtAV-master/src/codec/video/VideoDecoderFFmpeg.cpp 2023-12-10 23:59:25.271184799 +0100
@@ -83,9 +83,9 @@ public:
// flags. visualize motion vectors (MVs)
enum MotionVectorVisFlag {
No = 0, //default
- PF = FF_DEBUG_VIS_MV_P_FOR,
- BF = FF_DEBUG_VIS_MV_B_FOR,
- BB = FF_DEBUG_VIS_MV_B_BACK
+ //PF = FF_DEBUG_VIS_MV_P_FOR,
+ //BF = FF_DEBUG_VIS_MV_B_FOR,
+ //BB = FF_DEBUG_VIS_MV_B_BACK
};
Q_DECLARE_FLAGS(MotionVectorVisFlags, MotionVectorVisFlag)
enum BugFlag {
diff -up QtAV-master/src/codec/video/VideoDecoderFFmpegHW.cpp.omv~ QtAV-master/src/codec/video/VideoDecoderFFmpegHW.cpp
--- QtAV-master/src/codec/video/VideoDecoderFFmpegHW.cpp.omv~ 2023-12-10 23:57:48.109003594 +0100
+++ QtAV-master/src/codec/video/VideoDecoderFFmpegHW.cpp 2023-12-10 23:57:53.203065458 +0100
@@ -113,7 +113,7 @@ static void ffmpeg_release_va_buffer(str
bool VideoDecoderFFmpegHWPrivate::prepare()
{
//// From vlc begin
- codec_ctx->thread_safe_callbacks = true; //?
+ //codec_ctx->thread_safe_callbacks = true; //?
codec_ctx->thread_count = threads;
#ifdef _MSC_VER
#pragma warning(disable:4065) //vc: switch has default but no case

9
qtav.spec
View File

@ -7,7 +7,7 @@
Name: qtav
Version: 1.13.0
Release: 1
Release: 2
Summary: A media playback framework based on Qt and FFmpeg
License: LGPLv2+ and GPLv3+ and BSD
URL: http://www.qtav.org/
@ -24,6 +24,8 @@ Patch2: %{name}-avoid-avresample_dependency.patch
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=6271
Patch3: %{name}-fix-avutil_test.patch
Patch4: 0004-ffmpeg-5.0.patch
Patch5: QtAV-ffmpeg-6.1.patch
BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtdeclarative-devel
@ -132,6 +134,8 @@ This package contains the QtAV based players.
%if %{with oldffmpeg}
%patch3 -p1 -b .backup
%endif
%patch4 -p1
%patch5 -p1
# E: script-without-shebang /usr/share/icons/hicolor/scalable/apps/QtAV.svg
# ignore them src/QtAV.svg: SVG Scalable Vector Graphics image
@ -235,5 +239,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/QtAV.svg
%changelog
* Wed Apr 03 2024 peijiankang <peijiankang@kylinos.cn> - 1.13.0-2
- add 0004-ffmpeg-5.0.patch
* Tue Dec 6 2022 peijiankang <peijiankang@kylinos.cn> - 1.13.0-1
- Init package for openEuler