Re: [PR PATCH] [Updated] New package: subtitlecomposer-0.7.1

[hervyqa <hervyqa@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 873 bytes --]

There is an updated pull request by hervyqa against master on the void-packages repository

https://github.com/hervyqa/void-packages subtitlecomposer
https://github.com/void-linux/void-packages/pull/38384

New package: subtitlecomposer-0.7.1
Fix: https://github.com/void-linux/void-packages/issues/38023

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

![Screenshot_20220731_113250](https://user-images.githubusercontent.com/45872139/182010211-6d2e9493-8176-4db0-b802-acfe55885757.png)


A patch file from https://github.com/void-linux/void-packages/pull/38384.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-subtitlecomposer-38384.patch --]
[-- Type: text/x-diff, Size: 4222 bytes --]

From 7a2429a508e469715b3c75e8076d15ea6f0b2952 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>
Date: Sun, 31 Jul 2022 10:17:44 +0700
Subject: [PATCH] New package: subtitlecomposer-0.7.1

---
 .../fix-compilation-with-ffmpeg5.patch        | 65 +++++++++++++++++++
 srcpkgs/subtitlecomposer/template             | 19 ++++++
 2 files changed, 84 insertions(+)
 create mode 100644 srcpkgs/subtitlecomposer/patches/fix-compilation-with-ffmpeg5.patch
 create mode 100644 srcpkgs/subtitlecomposer/template

diff --git a/srcpkgs/subtitlecomposer/patches/fix-compilation-with-ffmpeg5.patch b/srcpkgs/subtitlecomposer/patches/fix-compilation-with-ffmpeg5.patch
new file mode 100644
index 000000000000..a0314fb06820
--- /dev/null
+++ b/srcpkgs/subtitlecomposer/patches/fix-compilation-with-ffmpeg5.patch
@@ -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
+
diff --git a/srcpkgs/subtitlecomposer/template b/srcpkgs/subtitlecomposer/template
new file mode 100644
index 000000000000..39f54154befa
--- /dev/null
+++ b/srcpkgs/subtitlecomposer/template
@@ -0,0 +1,19 @@
+# Template file for 'subtitlecomposer'
+pkgname=subtitlecomposer
+version=0.7.1
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools gettext
+ pkg-config qt5-host-tools qt5-qmake"
+makedepends="blas-devel ffmpeg-devel jack-devel ktextwidgets-devel kio-devel
+ ktextwidgets-devel kcodecs-devel kross-devel kxmlgui-devel ki18n-devel
+ libopenal-devel libpocketsphinx-devel sonnet-devel"
+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
+python_version=3