From 105ca1476da455563a92348116196eba1f31a669 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 20 Mar 2022 18:44:30 +1000 Subject: [PATCH] QMplay2: bump version --- ....24.patchset => qmplay2-22.03.19.patchset} | 63 ------------------- ...1.12.24.recipe => qmplay2-22.03.19.recipe} | 9 +-- 2 files changed, 5 insertions(+), 67 deletions(-) rename media-video/qmplay2/patches/{qmplay2-21.12.24.patchset => qmplay2-22.03.19.patchset} (89%) rename media-video/qmplay2/{qmplay2-21.12.24.recipe => qmplay2-22.03.19.recipe} (94%) diff --git a/media-video/qmplay2/patches/qmplay2-21.12.24.patchset b/media-video/qmplay2/patches/qmplay2-22.03.19.patchset similarity index 89% rename from media-video/qmplay2/patches/qmplay2-21.12.24.patchset rename to media-video/qmplay2/patches/qmplay2-22.03.19.patchset index 1c983a459..bcb2e54c6 100644 --- a/media-video/qmplay2/patches/qmplay2-21.12.24.patchset +++ b/media-video/qmplay2/patches/qmplay2-22.03.19.patchset @@ -839,66 +839,3 @@ index 5659018..63256fa 100644 -- 2.30.2 - -From ec53a2afe9e2e59c2322f591a65894bd2fecadd6 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 22 Feb 2022 16:52:40 +0100 -Subject: ffmpeg5 build fix - - -diff --git a/src/modules/CUVID/CuvidDec.cpp b/src/modules/CUVID/CuvidDec.cpp -index 65a7b8d..b503ffb 100644 ---- a/src/modules/CUVID/CuvidDec.cpp -+++ b/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_find_decoder_by_name(streamInfo.codec_name)); - if (!avCodec) - return false; - -diff --git a/src/modules/CUVID/CuvidDec.hpp b/src/modules/CUVID/CuvidDec.hpp -index 972cbb5..6f7dc68 100644 ---- a/src/modules/CUVID/CuvidDec.hpp -+++ b/src/modules/CUVID/CuvidDec.hpp -@@ -26,6 +26,9 @@ - #include - #include - -+extern "C" { -+ #include -+} - class CuvidHWInterop; - class VideoWriter; - -diff --git a/src/modules/FFmpeg/FFDec.cpp b/src/modules/FFmpeg/FFDec.cpp -index 0b2dae2..571465a 100644 ---- a/src/modules/FFmpeg/FFDec.cpp -+++ b/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_find_decoder_by_name(streamInfo.codec_name)); - if (codec) - { - codec_ctx = avcodec_alloc_context3(codec); -diff --git a/src/modules/FFmpeg/FormatContext.cpp b/src/modules/FFmpeg/FormatContext.cpp -index 0996f9a..c241e7b 100644 ---- a/src/modules/FFmpeg/FormatContext.cpp -+++ b/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(av_find_input_format(scheme)); - if (inputFmt) - url = _url.right(_url.length() - scheme.length() - 3); - } --- -2.30.2 - diff --git a/media-video/qmplay2/qmplay2-21.12.24.recipe b/media-video/qmplay2/qmplay2-22.03.19.recipe similarity index 94% rename from media-video/qmplay2/qmplay2-21.12.24.recipe rename to media-video/qmplay2/qmplay2-22.03.19.recipe index 969e90371..ff2e6fd4c 100644 --- a/media-video/qmplay2/qmplay2-21.12.24.recipe +++ b/media-video/qmplay2/qmplay2-22.03.19.recipe @@ -4,11 +4,11 @@ supported by FFmpeg, libmodplug (including J2B and SFX). It also supports \ Audio CD, raw files, Rayman 2 music and chiptunes. It contains YouTube and \ MyFreeMP3 browser." HOMEPAGE="http://zaps166.sourceforge.net" -COPYRIGHT="2010-2021 Błażej Szczygieł" +COPYRIGHT="2010-2022 Błażej Szczygieł" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="6fd7ff7eda4173f5467cc3dffbff26ce0b8a05b325db4531fd6000c9c05df958" +CHECKSUM_SHA256="e7a9f4076481808cd8aa2db91587ccb21e4c38c9fb970fced65de6c32fe99704" SOURCE_DIR="QMPlay2-$portVersion" PATCHES="qmplay2-$portVersion.patchset" ADDITIONAL_FILES=" @@ -62,7 +62,7 @@ BUILD_REQUIRES=" devel:libQt5Gui$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix devel:libsidplayfp$secondaryArchSuffix - devel:libswresample$secondaryArchSuffix >= 4 + devel:libswresample$secondaryArchSuffix >= 4 devel:libswscale$secondaryArchSuffix >= 6 devel:libtag$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -83,6 +83,7 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$appsDir/QMPlay2 \ + -DUSE_CUVID=OFF \ -DUSE_OPENGL=OFF make $jobArgs }