Skip to content

Commit

Permalink
New packages: subtitlecomposer-0.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hervyqa committed Jul 31, 2022
1 parent c33f030 commit 58a612b
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 0 deletions.
@@ -0,0 +1,65 @@
From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001
From: Mladen Milinkovic <maxrd2@smoothware.net>
Date: Tue, 25 Jan 2022 14:01:56 +0100
Subject: [PATCH] Fix compilation with ffmpeg5 #63

---
src/streamprocessor/streamprocessor.cpp | 2 +-
src/videoplayer/backend/decoder.h | 1 +
src/videoplayer/backend/framequeue.h | 1 +
src/videoplayer/backend/streamdemuxer.cpp | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/streamprocessor/streamprocessor.cpp b/src/streamprocessor/streamprocessor.cpp
index b86795e..8faf8a2 100644
--- a/src/streamprocessor/streamprocessor.cpp
+++ b/src/streamprocessor/streamprocessor.cpp
@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int streamIndex, bool imageSub)
int ret;
char errorText[1024];

- AVCodec *dec = avcodec_find_decoder(m_avStream->codecpar->codec_id);
+ const AVCodec *dec = avcodec_find_decoder(m_avStream->codecpar->codec_id);
if(!dec) {
qWarning() << "Failed to find decoder for stream" << i;
return false;
diff --git a/src/videoplayer/backend/decoder.h b/src/videoplayer/backend/decoder.h
index 4ab95b2..fb6840d 100644
--- a/src/videoplayer/backend/decoder.h
+++ b/src/videoplayer/backend/decoder.h
@@ -11,6 +11,7 @@
#include <QThread>

extern "C" {
+#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
}

diff --git a/src/videoplayer/backend/framequeue.h b/src/videoplayer/backend/framequeue.h
index dc9b2fa..ece1166 100644
--- a/src/videoplayer/backend/framequeue.h
+++ b/src/videoplayer/backend/framequeue.h
@@ -9,6 +9,7 @@
#define FRAMEQUEUE_H

extern "C" {
+#include "libavcodec/avcodec.h"
#include "libavformat/avformat.h"
}

diff --git a/src/videoplayer/backend/streamdemuxer.cpp b/src/videoplayer/backend/streamdemuxer.cpp
index 1e339b3..e8320ea 100644
--- a/src/videoplayer/backend/streamdemuxer.cpp
+++ b/src/videoplayer/backend/streamdemuxer.cpp
@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex)
{
AVFormatContext *ic = m_vs->fmtContext;
AVCodecContext *avCtx;
- AVCodec *codec;
+ const AVCodec *codec;
AVDictionary *opts = nullptr;
AVDictionaryEntry *t = nullptr;
int sampleRate, nbChannels;
--
GitLab

20 changes: 20 additions & 0 deletions srcpkgs/subtitlecomposer/template
@@ -0,0 +1,20 @@
# Template file for 'subtitlecomposer'
pkgname=subtitlecomposer
version=0.7.1
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext pkg-config
pkg-config qt5-host-tools qt5-qmake kconfig xorg-server-xvfb"
makedepends="blas-devel ffmpeg-devel jack-devel ktextwidgets-devel kio-devel
ktextwidgets-devel kcodecs-devel kross-devel kxmlgui-devel ki18n-devel
libopenal-devel pocketsphinx sonnet-devel"
depends="kcoreaddons ktextwidgets kio kcodecs kross kxmlgui ki18n libopenal
ffmpeg sonnet"
checkdepends="xvfb-run"
short_desc="Open source text-based subtitle editor"
maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
license="GPL-2.0-or-later"
homepage="https://apps.kde.org/subtitlecomposer"
changelog="https://invent.kde.org/multimedia/subtitlecomposer/-/raw/master/ChangeLog"
distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=ef9cb3c0c1fe1f40cf9d8e795859b9b28adf2da3be77a076d46bc28df4cd0255

0 comments on commit 58a612b

Please sign in to comment.