From: hervyqa <hervyqa@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: subtitlecomposer-0.7.1
Date: Tue, 27 Sep 2022 05:24:39 +0200 [thread overview]
Message-ID: <20220927032439.bITWjnuNarQWQXo1dzJiT3ejcfbiI289TLIwA2PX07I@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38384@inbox.vuxu.org>
[-- 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 782eb6592072dbdaa6e27bd98f94b5e902e42d96 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
next prev parent reply other threads:[~2022-09-27 3:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-31 3:24 [PR PATCH] New packages: subtitlecomposer-0.7.1 hervyqa
2022-07-31 3:26 ` [PR PATCH] [Updated] New package: subtitlecomposer-0.7.1 hervyqa
2022-07-31 3:36 ` hervyqa
2022-07-31 7:02 ` [PR REVIEW] " classabbyamp
2022-07-31 7:02 ` classabbyamp
2022-07-31 8:05 ` hervyqa
2022-07-31 8:06 ` [PR PATCH] [Updated] " hervyqa
2022-07-31 8:21 ` hervyqa
2022-07-31 8:22 ` [PR REVIEW] " classabbyamp
2022-07-31 8:30 ` hervyqa
2022-07-31 8:32 ` hervyqa
2022-09-25 8:03 ` [PR PATCH] [Updated] " hervyqa
2022-09-25 18:36 ` hervyqa
2022-09-27 3:24 ` hervyqa [this message]
2022-09-28 7:11 ` hervyqa
2022-12-28 1:56 ` github-actions
2023-01-11 2:30 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220927032439.bITWjnuNarQWQXo1dzJiT3ejcfbiI289TLIwA2PX07I@z \
--to=hervyqa@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).