pool/qimgv
2
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 978018 from home:sbradnick

Browse Source 
- Removing patch files which aren't needed since items were fixed upstream:
  * qimgv-mpv_v2_fix.patch
  * qimgv-no_return_in_nonvoid.patch

OBS-URL: https://build.opensuse.org/request/show/978018
OBS-URL: https://build.opensuse.org/package/show/graphics/qimgv?expand=0&rev=45
This commit is contained in:
Scott Bradnick 2022-05-18 23:40:02 +00:00 committed by Git OBS Bridge
parent 040ae1d5e8
commit a7c0337fb2
3 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qimgv-mpv_v2_fix.patch
View File

@ -1,22 +0,0 @@
From 8b01170753fcadc86770dd650c3d38a76e88963d Mon Sep 17 00:00:00 2001
From: easymodo <easymodofrf@gmail.com>
Date: Sat, 18 Dec 2021 10:32:05 +0200
Subject: [PATCH] fix mpv_opengl_init_params
---
plugins/player_mpv/src/mpvwidget.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/player_mpv/src/mpvwidget.cpp b/plugins/player_mpv/src/mpvwidget.cpp
index 16c4b168..2f8a39a5 100644
--- a/plugins/player_mpv/src/mpvwidget.cpp
+++ b/plugins/player_mpv/src/mpvwidget.cpp
@@ -69,7 +69,7 @@ void MpvWidget::setOption(const QString& name, const QVariant& value) {
}
void MpvWidget::initializeGL() {
- mpv_opengl_init_params gl_init_params{get_proc_address, nullptr, nullptr};
+ mpv_opengl_init_params gl_init_params{get_proc_address, nullptr};
mpv_render_param params[]{
{MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
{MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},

12
qimgv-no_return_in_nonvoid.patch
View File

@ -1,12 +0,0 @@
Index: qimgv-1.0.0/qimgv/utils/fileoperations.cpp
===================================================================
--- qimgv-1.0.0.orig/qimgv/utils/fileoperations.cpp
+++ qimgv-1.0.0/qimgv/utils/fileoperations.cpp
@@ -60,6 +60,7 @@ QString FileOperations::decodeResult(con
case FileOpResult::OTHER_ERROR:
return "Other error.";
}
+ return NULL;
}
void FileOperations::copyFileTo(const QString &srcFilePath, const QString &destDirPath, bool force, FileOpResult &result) {

7
qimgv.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 18 23:25:22 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- Removing patch files which aren't needed since items were fixed upstream:
* qimgv-mpv_v2_fix.patch
* qimgv-no_return_in_nonvoid.patch
-------------------------------------------------------------------
Wed May 11 18:15:36 UTC 2022 - scott.bradnick@suse.com