mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
QMplay2: bump version
This commit is contained in:
@@ -839,66 +839,3 @@ index 5659018..63256fa 100644
|
|||||||
--
|
--
|
||||||
2.30.2
|
2.30.2
|
||||||
|
|
||||||
|
|
||||||
From ec53a2afe9e2e59c2322f591a65894bd2fecadd6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jerome Duval <jerome.duval@gmail.com>
|
|
||||||
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 *>(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 <QCoreApplication>
|
|
||||||
#include <QQueue>
|
|
||||||
|
|
||||||
+extern "C" {
|
|
||||||
+ #include <libavcodec/bsf.h>
|
|
||||||
+}
|
|
||||||
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*>(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<AVInputFormat*>(av_find_input_format(scheme));
|
|
||||||
if (inputFmt)
|
|
||||||
url = _url.right(_url.length() - scheme.length() - 3);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.30.2
|
|
||||||
|
|
||||||
@@ -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 \
|
Audio CD, raw files, Rayman 2 music and chiptunes. It contains YouTube and \
|
||||||
MyFreeMP3 browser."
|
MyFreeMP3 browser."
|
||||||
HOMEPAGE="http://zaps166.sourceforge.net"
|
HOMEPAGE="http://zaps166.sourceforge.net"
|
||||||
COPYRIGHT="2010-2021 Błażej Szczygieł"
|
COPYRIGHT="2010-2022 Błażej Szczygieł"
|
||||||
LICENSE="GNU GPL v3"
|
LICENSE="GNU GPL v3"
|
||||||
REVISION="3"
|
REVISION="1"
|
||||||
SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz"
|
SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="6fd7ff7eda4173f5467cc3dffbff26ce0b8a05b325db4531fd6000c9c05df958"
|
CHECKSUM_SHA256="e7a9f4076481808cd8aa2db91587ccb21e4c38c9fb970fced65de6c32fe99704"
|
||||||
SOURCE_DIR="QMPlay2-$portVersion"
|
SOURCE_DIR="QMPlay2-$portVersion"
|
||||||
PATCHES="qmplay2-$portVersion.patchset"
|
PATCHES="qmplay2-$portVersion.patchset"
|
||||||
ADDITIONAL_FILES="
|
ADDITIONAL_FILES="
|
||||||
@@ -62,7 +62,7 @@ BUILD_REQUIRES="
|
|||||||
devel:libQt5Gui$secondaryArchSuffix
|
devel:libQt5Gui$secondaryArchSuffix
|
||||||
devel:libQt5Widgets$secondaryArchSuffix
|
devel:libQt5Widgets$secondaryArchSuffix
|
||||||
devel:libsidplayfp$secondaryArchSuffix
|
devel:libsidplayfp$secondaryArchSuffix
|
||||||
devel:libswresample$secondaryArchSuffix >= 4
|
devel:libswresample$secondaryArchSuffix >= 4
|
||||||
devel:libswscale$secondaryArchSuffix >= 6
|
devel:libswscale$secondaryArchSuffix >= 6
|
||||||
devel:libtag$secondaryArchSuffix
|
devel:libtag$secondaryArchSuffix
|
||||||
devel:libz$secondaryArchSuffix
|
devel:libz$secondaryArchSuffix
|
||||||
@@ -83,6 +83,7 @@ BUILD()
|
|||||||
cmake .. \
|
cmake .. \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DCMAKE_INSTALL_PREFIX=$appsDir/QMPlay2 \
|
-DCMAKE_INSTALL_PREFIX=$appsDir/QMPlay2 \
|
||||||
|
-DUSE_CUVID=OFF \
|
||||||
-DUSE_OPENGL=OFF
|
-DUSE_OPENGL=OFF
|
||||||
make $jobArgs
|
make $jobArgs
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user