Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package haruna for openSUSE:Factory checked in at 2022-01-31 22:57:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haruna (Old) and /work/SRC/openSUSE:Factory/.haruna.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haruna" Mon Jan 31 22:57:05 2022 rev:11 rq:950006 version:0.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/haruna/haruna.changes 2021-11-03 17:27:30.677378090 +0100 +++ /work/SRC/openSUSE:Factory/.haruna.new.1898/haruna.changes 2022-01-31 22:57:43.965415599 +0100 @@ -1,0 +2,5 @@ +Sun Jan 30 15:22:24 UTC 2022 - Luigi Baldoni <aloi...@gmx.com> + +- Add haruna-mpv_v2_fix.patch (fixes Factory build) + +------------------------------------------------------------------- New: ---- haruna-mpv_v2_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haruna.spec ++++++ --- /var/tmp/diff_new_pack.el8IMz/_old 2022-01-31 22:57:44.433412448 +0100 +++ /var/tmp/diff_new_pack.el8IMz/_new 2022-01-31 22:57:44.433412448 +0100 @@ -1,7 +1,7 @@ # # spec file for package haruna # -# 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 @@ -23,6 +23,8 @@ License: CC-BY-4.0 AND GPL-3.0-or-later AND WTFPL URL: https://invent.kde.org/multimedia/haruna Source0: https://invent.kde.org/multimedia/haruna/-/archive/v%{version}/%{name}-v%{version}.tar.gz +# PATCH-FIX-UPSTREAM haruna-mpv_v2_fix.patch +Patch0: haruna-mpv_v2_fix.patch BuildRequires: cmake >= 3.15 BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: hicolor-icon-theme @@ -58,6 +60,7 @@ %prep %setup -q -n %{name}-v%{version} +%patch0 -p1 %build %cmake ++++++ haruna-mpv_v2_fix.patch ++++++ >From 6437e9eacf6e47c1f73e7521458e5b03460d2dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20Florea=20B=C4=83nu=C8=99?= <georgefb...@gmail.com> Date: Thu, 27 Jan 2022 18:51:41 +0200 Subject: [PATCH] fix: compile with MPV_CLIENT_API_VERSION 1 and 2 --- src/mpvobject.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mpvobject.cpp b/src/mpvobject.cpp index cee6ee7..3469a58 100644 --- a/src/mpvobject.cpp +++ b/src/mpvobject.cpp @@ -79,7 +79,11 @@ QOpenGLFramebufferObject * MpvRenderer::createFramebufferObject(const QSize &siz // init mpv_gl: if (!obj->mpv_gl) { +#if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2, 0) mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr, nullptr}; +#else + mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr}; +#endif 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}, -- GitLab
