Hello community, here is the log from the commit of package deepin-movie for openSUSE:Factory checked in at 2019-07-11 13:17:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-movie (Old) and /work/SRC/openSUSE:Factory/.deepin-movie.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-movie" Thu Jul 11 13:17:51 2019 rev:2 rq:714327 version:3.2.24 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie.changes 2019-03-26 15:43:39.996201230 +0100 +++ /work/SRC/openSUSE:Factory/.deepin-movie.new.4615/deepin-movie.changes 2019-07-11 13:18:16.174769733 +0200 @@ -1,0 +2,18 @@ +Tue Jul 9 14:10:21 UTC 2019 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 3.2.24 + * Fix card0 may not enabled/usable + * Should free xcb_query_pointer_reply return pointer + * workaround for QTBUG-76114. + * Missing settings item added. Fix crash on file open. + * Thumbnail previewer caused dock show up + * Remember last opened path + * Drag and drop to load subtitle + * Fix buttons not shwon in mini mode on arm64 platform + * Fix can not toggle mini mode when window maximized + * Fix don't sleep while playing + * New subtitle font style +- Fix fix build on Qt 5.13.0, add Fix-build-on-Qt-5_13_0.patch +- Add OpenSSL license + +------------------------------------------------------------------- Old: ---- deepin-movie-reborn-3.2.17.tar.gz New: ---- Fix-build-on-Qt-5_13_0.patch deepin-movie-reborn-3.2.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-movie.spec ++++++ --- /var/tmp/diff_new_pack.QqWVCx/_old 2019-07-11 13:18:17.750769237 +0200 +++ /var/tmp/diff_new_pack.QqWVCx/_new 2019-07-11 13:18:17.754769235 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-movie # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,28 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define sover 0_1 Name: deepin-movie -Version: 3.2.17 +Version: 3.2.24 Release: 0 -License: GPL-3.0+ Summary: Deepin Video Players +License: GPL-3.0-or-later AND OpenSSL +Group: Productivity/Multimedia/Video/Players Url: https://github.com/linuxdeepin/deepin-movie-reborn -Group: Productivity/Multimedia/Players Source: https://github.com/linuxdeepin/deepin-movie-reborn/archive/%{version}/%{name}-reborn-%{version}.tar.gz # PATCH-FIX-UPSTEAM deepin-movie-reborn-add-pkgconfig-check.patch hillw...@opensuse.org - fix lost pkgconfig check Patch0: deepin-movie-reborn-add-pkgconfig-check.patch -# PATCH-FIX-UPSTEAM no-return-in-nonvoid-function.patch hillw...@opensuse.org -fix lost return function +# PATCH-FIX-UPSTEAM no-return-in-nonvoid-function.patch hillw...@opensuse.org - fix lost return function Patch1: no-return-in-nonvoid-function.patch -BuildRequires: fdupes +# PATCH-FIX-UPSTEAM no-return-in-nonvoid-function.patch hillw...@opensuse.org - fix build on Qt 5.13.0 +Patch2: Fix-build-on-Qt-5_13_0.patch BuildRequires: dtkcore +BuildRequires: fdupes BuildRequires: cmake(Qt5LinguistTools) BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5DBus) @@ -38,26 +41,25 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(dtkwidget) BuildRequires: pkgconfig(dtkcore) +BuildRequires: pkgconfig(dtkwidget) +BuildRequires: pkgconfig(dvdnav) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(libffmpegthumbnailer) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavresample) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libffmpegthumbnailer) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) BuildRequires: pkgconfig(mpv) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xcb-aux) BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(xcb-proto) BuildRequires: pkgconfig(xcb-shape) BuildRequires: pkgconfig(xcb-util) -BuildRequires: pkgconfig(dvdnav) -Requires: libdmr%{sover} +BuildRequires: pkgconfig(xtst) Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,8 +68,8 @@ graphical interface, combined with QtAV as its multimedia backend. %package -n libdmr%{sover} -Group: System/Libraries Summary: Deepin Video Players +Group: System/Libraries %description -n libdmr%{sover} libdmr is a library for accessing the Direct Rendering Manager on Linux, BSD and @@ -91,6 +93,7 @@ %setup -q -n %{name}-reborn-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i 's,/usr/lib/dtk2/dtk-settings-tool,/usr/bin/dtk-settings-tool,g' src/CMakeLists.txt %build @@ -108,7 +111,8 @@ %files %defattr(-,root,root,-) -%doc README.md LICENSE +%doc README.md HACKING.md CHANGELOG.md +%license LICENSE LICENSE.OpenSSL %{_bindir}/%{name} %{_datadir}/%{name} %exclude %{_datadir}/%{name}/translations ++++++ Fix-build-on-Qt-5_13_0.patch ++++++ diff -Nur deepin-movie-reborn-3.2.24/src/common/event_monitor.cpp deepin-movie-reborn-3.2.24-new/src/common/event_monitor.cpp --- deepin-movie-reborn-3.2.24/src/common/event_monitor.cpp 2019-06-20 16:43:45.000000000 +0800 +++ deepin-movie-reborn-3.2.24-new/src/common/event_monitor.cpp 2019-07-09 21:54:17.331888895 +0800 @@ -32,8 +32,15 @@ #include "event_monitor.h" #define Bool int +#include <X11/Xlib.h> #include <X11/Xlibint.h> #include <X11/extensions/record.h> +#undef Bool + +void callback(XPointer ptr, XRecordInterceptData* data) +{ + ((dmr::EventMonitor *) ptr)->handleRecordEvent(data); +} namespace dmr { @@ -85,13 +92,10 @@ } } -void EventMonitor::callback(XPointer ptr, XRecordInterceptData* data) -{ - ((EventMonitor *) ptr)->handleRecordEvent(data); -} +void EventMonitor::handleRecordEvent(void* dat) -void EventMonitor::handleRecordEvent(XRecordInterceptData* data) { + XRecordInterceptData* data = (XRecordInterceptData*)dat; if (!_recording) { XRecordFreeData(data); return; diff -Nur deepin-movie-reborn-3.2.24/src/common/event_monitor.h deepin-movie-reborn-3.2.24-new/src/common/event_monitor.h --- deepin-movie-reborn-3.2.24/src/common/event_monitor.h 2019-06-20 16:43:45.000000000 +0800 +++ deepin-movie-reborn-3.2.24-new/src/common/event_monitor.h 2019-07-09 21:56:06.480170669 +0800 @@ -31,10 +31,6 @@ #define EVENTMONITOR_H #include <QThread> -#define Bool int -#include <X11/Xlib.h> -#include <X11/extensions/record.h> -#undef Bool namespace dmr { @@ -56,8 +52,7 @@ public: EventMonitor(QObject *parent = 0); - static void callback(XPointer trash, XRecordInterceptData* data); - void handleRecordEvent(XRecordInterceptData *); + void handleRecordEvent(void *); void resumeRecording(); void suspendRecording(); diff -Nur deepin-movie-reborn-3.2.24/src/libdmr/online_sub.h deepin-movie-reborn-3.2.24-new/src/libdmr/online_sub.h --- deepin-movie-reborn-3.2.24/src/libdmr/online_sub.h 2019-06-20 16:43:45.000000000 +0800 +++ deepin-movie-reborn-3.2.24-new/src/libdmr/online_sub.h 2019-07-09 21:57:32.608219960 +0800 @@ -30,8 +30,10 @@ #ifndef _DMR_ONLINE_SUB_H #define _DMR_ONLINE_SUB_H -#include <QtWidgets> -#include <QtNetwork> +#include <QFileInfo> +#include <QNetworkAccessManager> +#include <QNetworkRequest> +#include <QNetworkReply> namespace dmr { ++++++ deepin-movie-reborn-3.2.17.tar.gz -> deepin-movie-reborn-3.2.24.tar.gz ++++++ ++++ 21374 lines of diff (skipped)
