Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package simplescreenrecorder for
openSUSE:Factory checked in at 2022-08-14 15:55:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/simplescreenrecorder (Old)
and /work/SRC/openSUSE:Factory/.simplescreenrecorder.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "simplescreenrecorder"
Sun Aug 14 15:55:36 2022 rev:12 rq:995024 version:0.4.4
Changes:
--------
---
/work/SRC/openSUSE:Factory/simplescreenrecorder/simplescreenrecorder.changes
2022-05-23 15:51:50.666651966 +0200
+++
/work/SRC/openSUSE:Factory/.simplescreenrecorder.new.1521/simplescreenrecorder.changes
2022-08-14 15:55:43.887780257 +0200
@@ -1,0 +2,7 @@
+Mon Aug 8 22:40:22 UTC 2022 - Atri Bhattacharya <[email protected]>
+
+- Add 768957a8de1534f0aa91bfc5d7af3c32f222beb8.patch: fix building
+ against newer ffmpeg (>= 5.0); patch taken from upstream git
+ commit.
+
+-------------------------------------------------------------------
New:
----
768957a8de1534f0aa91bfc5d7af3c32f222beb8.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ simplescreenrecorder.spec ++++++
--- /var/tmp/diff_new_pack.7z7f7u/_old 2022-08-14 15:55:44.363781269 +0200
+++ /var/tmp/diff_new_pack.7z7f7u/_new 2022-08-14 15:55:44.363781269 +0200
@@ -25,7 +25,8 @@
URL: http://www.maartenbaert.be/simplescreenrecorder
Source: https://github.com/MaartenBaert/ssr/archive/%{version}.tar.gz
Source9: baselibs.conf
-
+# PATCH-FIX-UPSTREAM [email protected] -- Compatibility for newer ffmpeg
(>=4); patch taken from upstream git commit
+Patch0:
https://github.com/MaartenBaert/ssr/commit/768957a8de1534f0aa91bfc5d7af3c32f222beb8.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
@@ -109,7 +110,7 @@
%endif
%prep
-%setup -q -n ssr-%{version}
+%autosetup -p1 -n ssr-%{version}
%build
%ifarch %{ix86} x86_64
++++++ 768957a8de1534f0aa91bfc5d7af3c32f222beb8.patch ++++++
>From 768957a8de1534f0aa91bfc5d7af3c32f222beb8 Mon Sep 17 00:00:00 2001
From: Maarten Baert <[email protected]>
Date: Sun, 20 Mar 2022 22:52:43 +0100
Subject: [PATCH] Fix for compatibility with newer FFmpeg versions
---
src/AV/Output/AudioEncoder.cpp | 3 ++-
src/AV/Output/Muxer.cpp | 6 ++++--
src/AV/Output/VideoEncoder.cpp | 3 ++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/AV/Output/AudioEncoder.cpp b/src/AV/Output/AudioEncoder.cpp
index 34d015cf..3efde703 100644
--- a/src/AV/Output/AudioEncoder.cpp
+++ b/src/AV/Output/AudioEncoder.cpp
@@ -77,7 +77,8 @@ unsigned int AudioEncoder::GetSampleRate() {
}
bool AudioEncoder::AVCodecIsSupported(const QString& codec_name) {
- AVCodec *codec =
avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+ // we have to break const correctness for compatibility with older
ffmpeg versions
+ AVCodec *codec = (AVCodec*)
avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
if(codec == NULL)
return false;
if(!av_codec_is_encoder(codec))
diff --git a/src/AV/Output/Muxer.cpp b/src/AV/Output/Muxer.cpp
index ad583803..bc6dd71c 100644
--- a/src/AV/Output/Muxer.cpp
+++ b/src/AV/Output/Muxer.cpp
@@ -194,7 +194,8 @@ unsigned int Muxer::GetQueuedPacketCount(unsigned int
stream_index) {
void Muxer::Init() {
// get the format we want (this is just a pointer, we don't have to
free this)
- AVOutputFormat *format =
av_guess_format(m_container_name.toUtf8().constData(), NULL, NULL);
+ // we have to break const correctness for compatibility with older
ffmpeg versions
+ AVOutputFormat *format = (AVOutputFormat*)
av_guess_format(m_container_name.toUtf8().constData(), NULL, NULL);
if(format == NULL) {
Logger::LogError("[Muxer::Init] " + Logger::tr("Error: Can't
find chosen output format!"));
throw LibavException();
@@ -262,7 +263,8 @@ void Muxer::Free() {
}
AVCodec* Muxer::FindCodec(const QString& codec_name) {
- AVCodec *codec =
avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+ // we have to break const correctness for compatibility with older
ffmpeg versions
+ AVCodec *codec = (AVCodec*)
avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
if(codec == NULL) {
Logger::LogError("[Muxer::FindCodec] " + Logger::tr("Error:
Can't find codec!"));
throw LibavException();
diff --git a/src/AV/Output/VideoEncoder.cpp b/src/AV/Output/VideoEncoder.cpp
index 8087e8ed..d09d7047 100644
--- a/src/AV/Output/VideoEncoder.cpp
+++ b/src/AV/Output/VideoEncoder.cpp
@@ -95,7 +95,8 @@ unsigned int VideoEncoder::GetFrameRate() {
}
bool VideoEncoder::AVCodecIsSupported(const QString& codec_name) {
- AVCodec *codec =
avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
+ // we have to break const correctness for compatibility with older
ffmpeg versions
+ AVCodec *codec = (AVCodec*)
avcodec_find_encoder_by_name(codec_name.toUtf8().constData());
if(codec == NULL)
return false;
if(!av_codec_is_encoder(codec))
