Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package subtitlecomposer for
openSUSE:Factory checked in at 2022-07-13 13:45:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/subtitlecomposer (Old)
and /work/SRC/openSUSE:Factory/.subtitlecomposer.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subtitlecomposer"
Wed Jul 13 13:45:40 2022 rev:11 rq:988947 version:0.7.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/subtitlecomposer/subtitlecomposer.changes
2021-11-05 22:58:52.476291121 +0100
+++
/work/SRC/openSUSE:Factory/.subtitlecomposer.new.1523/subtitlecomposer.changes
2022-07-13 13:46:04.630090481 +0200
@@ -1,0 +2,6 @@
+Tue Jul 12 20:38:48 UTC 2022 - Bj??rn Lie <[email protected]>
+
+- Add 4f4f560e40ba0b760cf688eb024be3cc734ca347.patch: Fix build
+ with ffmpeg 5, patch from upstream git.
+
+-------------------------------------------------------------------
New:
----
4f4f560e40ba0b760cf688eb024be3cc734ca347.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ subtitlecomposer.spec ++++++
--- /var/tmp/diff_new_pack.ciAe2E/_old 2022-07-13 13:46:05.150091219 +0200
+++ /var/tmp/diff_new_pack.ciAe2E/_new 2022-07-13 13:46:05.154091225 +0200
@@ -1,7 +1,7 @@
#
# spec file for package subtitlecomposer
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,6 +30,8 @@
Patch0: subtitlecomposer-ARM_GLES.patch
# PATCH-FIX-UPSTREAM subtitlecomposer-fix_empty_lines_crash.patch
Patch1: subtitlecomposer-fix_empty_lines_crash.patch
+# PATCH-FIX-UPSTREAM 4f4f560e40ba0b760cf688eb024be3cc734ca347.patch - Fix
build with ffmpeg 5
+Patch2:
https://invent.kde.org/multimedia/subtitlecomposer/-/commit/4f4f560e40ba0b760cf688eb024be3cc734ca347.patch
BuildRequires: cmake >= 3.10
BuildRequires: extra-cmake-modules
BuildRequires: libQt5Widgets-private-headers-devel
@@ -63,7 +65,6 @@
BuildRequires: pkgconfig(pocketsphinx) >= 5
%endif
%endif
-Recommends: %{name}-lang = %{version}
%description
A text-based subtitles editor that supports basic operations. It supports
++++++ 4f4f560e40ba0b760cf688eb024be3cc734ca347.patch ++++++
>From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001
From: Mladen Milinkovic <[email protected]>
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
