Date: Thursday, January 27, 2022 @ 18:50:32 Author: arojas Revision: 1117296
ffmpeg 5 rebuild Added: goldendict/trunk/ffmpeg5.patch Modified: goldendict/trunk/PKGBUILD ---------------+ PKGBUILD | 14 +++++++++----- ffmpeg5.patch | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-27 18:50:32 UTC (rev 1117295) +++ PKGBUILD 2022-01-27 18:50:32 UTC (rev 1117296) @@ -3,7 +3,7 @@ pkgname=goldendict pkgver=1.5.0RC2 -pkgrel=9 +pkgrel=10 pkgdesc="Feature-rich dictionary lookup program" arch=('x86_64') url="http://goldendict.org" @@ -15,11 +15,13 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/1.5.0-RC2.tar.gz goldendict-qt-5.11-1.patch::"https://github.com/goldendict/goldendict/commit/3d4a468b.patch" goldendict-qt-5.11-2.patch::"https://github.com/goldendict/goldendict/commit/a6596780.patch" - goldendict-ffmpeg4.patch::"https://github.com/goldendict/goldendict/commit/03bbe01b.patch") + goldendict-ffmpeg4.patch::"https://github.com/goldendict/goldendict/commit/03bbe01b.patch" + ffmpeg5.patch) sha256sums=('bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde' - 'dbcd8f40c8a6d35bf00fdb80cd559e22068ea4a57633d3feed711babae8af8d4' - '628eeec6b50a1f027347f799c2b06e01300412b94452bd72a611b3735e62bb98' - 'c09649081dff26b7a4eb5d6828a077089eaedf0d8cc392d5bb8232fc64e2537f') + '4606d4ce6022fc0e7b6d3dec823e1eefcd30f0760de8241a89e36dd65d47d73d' + '1ef4bf9a92ce407d50476260988253e98f0e17fa2b9acc863f8a5b536924deb2' + 'fa4d004c021c1987afb107ce3480c518b8e350630b278343a1e32dc50564b633' + '0d670656872a1558530e013f30cf88c63eb879819f5ed3b09d48e8d20b4095a7') prepare() { cd $pkgname-1.5.0-RC2 @@ -26,11 +28,13 @@ patch -p1 -i ../goldendict-qt-5.11-1.patch # Fix build with Qt 5.11 patch -p1 -i ../goldendict-qt-5.11-2.patch # Follow-up to the above patch -p1 -i ../goldendict-ffmpeg4.patch # Fix build with ffmpeg 4 + patch -p1 -i ../ffmpeg5.patch # Fix build with ffmpeg 5 } build(){ cd "${srcdir}"/$pkgname-1.5.0-RC2 + export CXXFLAGS+=" -std=c++14" # Fix build with GCC 11, fixed in master qmake-qt5 "CONFIG+=no_epwing_support" PREFIX="/usr" make } Added: ffmpeg5.patch =================================================================== --- ffmpeg5.patch (rev 0) +++ ffmpeg5.patch 2022-01-27 18:50:32 UTC (rev 1117296) @@ -0,0 +1,21 @@ +diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc +index 77585119..e3b90b5d 100644 +--- a/ffmpegaudio.cc ++++ b/ffmpegaudio.cc +@@ -51,7 +51,6 @@ AudioPlayer & AudioPlayer::instance() + + AudioPlayer::AudioPlayer() + { +- av_register_all(); + ao_initialize(); + } + +@@ -91,7 +90,7 @@ struct DecoderContext + QByteArray audioData_; + QDataStream audioDataStream_; + AVFormatContext * formatContext_; +- AVCodec * codec_; ++ const AVCodec * codec_; + AVCodecContext * codecContext_; + AVIOContext * avioContext_; + AVStream * audioStream_;