Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-movie for openSUSE:Factory checked in at 2022-04-16 00:14:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-movie (Old) and /work/SRC/openSUSE:Factory/.deepin-movie.new.1941 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-movie" Sat Apr 16 00:14:23 2022 rev:9 rq:970217 version:5.7.11 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie.changes 2021-06-07 22:44:01.772538734 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-movie.new.1941/deepin-movie.changes 2022-04-16 00:14:43.949687815 +0200 @@ -1,0 +2,6 @@ +Thu Apr 14 14:52:23 UTC 2022 - Hillwood Yang <hillw...@opensuse.org> + +- Add drop-MPV_EVENT_TRACKS_CHANGED.patch, drop the api +- Add fix-mpv_opengl_init_params.patch???Upstream of MPV changed this api + +------------------------------------------------------------------- New: ---- drop-MPV_EVENT_TRACKS_CHANGED.patch fix-mpv_opengl_init_params.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-movie.spec ++++++ --- /var/tmp/diff_new_pack.R2d4Z5/_old 2022-04-16 00:14:44.665688771 +0200 +++ /var/tmp/diff_new_pack.R2d4Z5/_new 2022-04-16 00:14:44.669688776 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-movie # -# Copyright (c) 2020 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %if 0%{?is_opensuse} %define distribution openSUSE-Edition %else @@ -38,6 +39,12 @@ # PATCH-FIX-UPSTEAM fix-build-on-ARM.patch hillw...@opensuse.org Patch1: fix-build-on-ARM.patch %endif +# PATCH-FIX-UPSTEAM drop-MPV_EVENT_TRACKS_CHANGED.patch hillw...@opensuse.org +# MPV_EVENT_TRACKS_CHANGED have been dropped by upstream +Patch2: drop-MPV_EVENT_TRACKS_CHANGED.patch +# PATCH-FIX-UPSTEAM fix-mpv_opengl_init_params.patch hillw...@opensuse.org +# Upstream of MPV changed this api +Patch3: fix-mpv_opengl_init_params.patch BuildRequires: dtkcore >= 5.0.0 BuildRequires: fdupes %ifarch ppc ppc64 ppc64le s390 s390x @@ -54,6 +61,7 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(dbusextended-qt5) BuildRequires: pkgconfig(dtkcore) >= 5.0.0 BuildRequires: pkgconfig(dtkgui) >= 5.0.0 BuildRequires: pkgconfig(dtkwidget) >= 5.0.0 @@ -67,6 +75,7 @@ BuildRequires: pkgconfig(libffmpegthumbnailer) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) +BuildRequires: pkgconfig(mpris-qt5) BuildRequires: pkgconfig(mpv) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(xcb-aux) @@ -75,8 +84,6 @@ BuildRequires: pkgconfig(xcb-shape) BuildRequires: pkgconfig(xcb-util) BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(mpris-qt5) -BuildRequires: pkgconfig(dbusextended-qt5) %if 0%{?suse_version} <= 1500 BuildRequires: qtdbusextended-devel < 3.1.2 BuildRequires: qtmpris-devel < 3.1.2 ++++++ drop-MPV_EVENT_TRACKS_CHANGED.patch ++++++ diff -Nur deepin-movie-reborn-5.7.11/src/backends/mpv/mpv_proxy.cpp deepin-movie-reborn-5.7.11-new/src/backends/mpv/mpv_proxy.cpp --- deepin-movie-reborn-5.7.11/src/backends/mpv/mpv_proxy.cpp 2021-03-22 12:01:47.000000000 +0800 +++ deepin-movie-reborn-5.7.11-new/src/backends/mpv/mpv_proxy.cpp 2022-04-14 23:07:19.551364419 +0800 @@ -582,11 +582,13 @@ // caused by seek or just playing break; +#if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) case MPV_EVENT_TRACKS_CHANGED: qInfo() << m_eventName(pEvent->event_id); updatePlayingMovieInfo(); emit tracksChanged(); break; +#endif case MPV_EVENT_FILE_LOADED: { qInfo() << m_eventName(pEvent->event_id); ++++++ fix-mpv_opengl_init_params.patch ++++++ diff -Nur deepin-movie-reborn-5.7.11/src/backends/mpv/mpv_glwidget.cpp deepin-movie-reborn-5.7.11-new/src/backends/mpv/mpv_glwidget.cpp --- deepin-movie-reborn-5.7.11/src/backends/mpv/mpv_glwidget.cpp 2021-03-22 12:01:47.000000000 +0800 +++ deepin-movie-reborn-5.7.11-new/src/backends/mpv/mpv_glwidget.cpp 2022-04-14 22:41:25.276505872 +0800 @@ -491,7 +491,11 @@ #endif #endif +#if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0) mpv_opengl_init_params gl_init_params = { get_proc_address, nullptr, nullptr }; +#else + mpv_opengl_init_params gl_init_params = { get_proc_address, nullptr }; +#endif //int adv_control = 1; mpv_render_param params[] = { {MPV_RENDER_PARAM_API_TYPE, const_cast<char*>(MPV_RENDER_API_TYPE_OPENGL)},
