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-22 21:53:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-movie (Old) and /work/SRC/openSUSE:Factory/.deepin-movie.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-movie" Fri Apr 22 21:53:48 2022 rev:10 rq:971787 version:5.9.8 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie.changes 2022-04-16 00:14:43.949687815 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-movie.new.1538/deepin-movie.changes 2022-04-22 21:54:40.758835057 +0200 @@ -7,0 +8,17 @@ +Thu Apr 14 09:09:08 UTC 2022 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 5.9.8 + * Fix bugs + * Add English document + * Optimize hard decoding +- Add fix-build-on-mpv-0_34_1.patch + +------------------------------------------------------------------- +Sat Jan 15 07:39:13 UTC 2022 - Hillwood Yang <hillw...@opensuse.org> + +- Update version to 5.9.1 + * Fix bugs + * Update manual documents +- Add drop-setCanShowInUI.patch + +------------------------------------------------------------------- Old: ---- deepin-movie-reborn-5.7.11.tar.gz New: ---- deepin-movie-reborn-5.9.8.tar.gz drop-setCanShowInUI.patch fix-build-on-mpv-0_34_1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-movie.spec ++++++ --- /var/tmp/diff_new_pack.fxn6PE/_old 2022-04-22 21:54:41.626836046 +0200 +++ /var/tmp/diff_new_pack.fxn6PE/_new 2022-04-22 21:54:41.630836051 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-movie # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - %if 0%{?is_opensuse} %define distribution openSUSE-Edition %else @@ -25,7 +24,7 @@ %define sover 0_1 Name: deepin-movie -Version: 5.7.11 +Version: 5.9.8 Release: 0 Summary: Deepin Video Players License: GPL-3.0-or-later AND OpenSSL @@ -41,10 +40,18 @@ %endif # PATCH-FIX-UPSTEAM drop-MPV_EVENT_TRACKS_CHANGED.patch hillw...@opensuse.org # MPV_EVENT_TRACKS_CHANGED have been dropped by upstream +# https://github.com/linuxdeepin/deepin-movie-reborn/pull/83 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 +# https://github.com/linuxdeepin/deepin-movie-reborn/pull/83 Patch3: fix-mpv_opengl_init_params.patch +# PATCH-FIX-UPSTEAM drop-setCanShowInUI.patch +# https://github.com/linuxdeepin/deepin-movie-reborn/pull/80/files +Patch4: drop-setCanShowInUI.patch +# # PATCH-FIX-UPSTEAM fix-build-on-mpv-0_34_1.patch +# https://github.com/linuxdeepin/developer-center/issues/2233 +Patch5: fix-build-on-mpv-0_34_1.patch BuildRequires: dtkcore >= 5.0.0 BuildRequires: fdupes %ifarch ppc ppc64 ppc64le s390 s390x @@ -61,7 +68,6 @@ 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 @@ -75,7 +81,7 @@ BuildRequires: pkgconfig(libffmpegthumbnailer) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse-simple) -BuildRequires: pkgconfig(mpris-qt5) +BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(mpv) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(xcb-aux) @@ -84,6 +90,8 @@ 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 ++++++ deepin-movie-reborn-5.7.11.tar.gz -> deepin-movie-reborn-5.9.8.tar.gz ++++++ /work/SRC/openSUSE:Factory/deepin-movie/deepin-movie-reborn-5.7.11.tar.gz /work/SRC/openSUSE:Factory/.deepin-movie.new.1538/deepin-movie-reborn-5.9.8.tar.gz differ: char 14, line 1 ++++++ drop-MPV_EVENT_TRACKS_CHANGED.patch ++++++ --- /var/tmp/diff_new_pack.fxn6PE/_old 2022-04-22 21:54:41.694836124 +0200 +++ /var/tmp/diff_new_pack.fxn6PE/_new 2022-04-22 21:54:41.702836132 +0200 @@ -1,18 +1,17 @@ -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 @@ +diff -Nur deepin-movie-reborn-5.9.14/src/backends/mpv/mpv_proxy.cpp deepin-movie-reborn-5.9.14-new/src/backends/mpv/mpv_proxy.cpp +--- deepin-movie-reborn-5.9.14/src/backends/mpv/mpv_proxy.cpp 2022-03-15 14:10:26.000000000 +0800 ++++ deepin-movie-reborn-5.9.14-new/src/backends/mpv/mpv_proxy.cpp 2022-04-14 16:55:15.895534382 +0800 +@@ -661,12 +661,6 @@ // 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_TRACKS_CHANGED: +- qInfo() << m_eventName(pEvent->event_id); +- updatePlayingMovieInfo(); +- emit tracksChanged(); +- break; +- case MPV_EVENT_FILE_LOADED: { qInfo() << m_eventName(pEvent->event_id); + ++++++ drop-setCanShowInUI.patch ++++++ diff -Nur deepin-movie-reborn-5.9.8/src/vendor/presenter.cpp deepin-movie-reborn-5.9.8-new/src/vendor/presenter.cpp --- deepin-movie-reborn-5.9.8/src/vendor/presenter.cpp 2022-01-11 13:11:54.000000000 +0800 +++ deepin-movie-reborn-5.9.8-new/src/vendor/presenter.cpp 2022-02-11 10:02:19.109078420 +0800 @@ -55,9 +55,6 @@ mprisPlayer->setCanGoPrevious(true); mprisPlayer->setCanPause(true); mprisPlayer->setCanSeek(true); -#ifndef _LIBMPR_ - mprisPlayer->setCanShowInUI(false); -#endif initMpris(mprisPlayer); } ++++++ fix-build-on-mpv-0_34_1.patch ++++++ diff -Nur deepin-movie-reborn-5.9.8/CMakeLists.txt deepin-movie-reborn-5.9.8-new/CMakeLists.txt --- deepin-movie-reborn-5.9.8/CMakeLists.txt 2022-01-11 13:11:54.000000000 +0800 +++ deepin-movie-reborn-5.9.8-new/CMakeLists.txt 2022-03-04 11:33:25.176476555 +0800 @@ -20,6 +20,11 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS on) +#??????mpris?????? +if(NOT DEFINED _LIBMPR_) + add_definitions(-D_LIBMPR_) +endif() + find_package(PkgConfig REQUIRED) # Find includes in corresponding build directories diff -Nur deepin-movie-reborn-5.9.8/src/CMakeLists.txt deepin-movie-reborn-5.9.8-new/src/CMakeLists.txt --- deepin-movie-reborn-5.9.8/src/CMakeLists.txt 2022-03-04 11:32:27.515344141 +0800 +++ deepin-movie-reborn-5.9.8-new/src/CMakeLists.txt 2022-03-04 11:33:48.871345113 +0800 @@ -86,13 +86,6 @@ RENAME deepin-movie.svg) install(DIRECTORY ${CMAKE_SOURCE_DIR}/assets/deepin-movie DESTINATION /usr/share/deepin-manual/manual-assets/application/) -#??????mpris?????? -execute_process(COMMAND dpkg -s libmpris-qt5-1 COMMAND grep -i version COMMAND cut -d\ -f2 OUTPUT_VARIABLE libmprisVersion) -message(${libmprisVersion}) -if( ${libmprisVersion} MATCHES "0.1.0-" ) - add_definitions(-D_LIBMPR_) -endif() - # ???????????????????????? if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64") SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O3 -ftree-vectorize -march=loongson3a -mhard-float -mno-micromips -mno-mips16 -flax-vector-conversions -mloongson-ext2 -mloongson-mmi -Wl,--as-need -fPIE -z noexecstack") diff -Nur deepin-movie-reborn-5.9.8/src/libdmr/CMakeLists.txt deepin-movie-reborn-5.9.8-new/src/libdmr/CMakeLists.txt --- deepin-movie-reborn-5.9.8/src/libdmr/CMakeLists.txt 2022-03-04 11:32:27.515344141 +0800 +++ deepin-movie-reborn-5.9.8-new/src/libdmr/CMakeLists.txt 2022-03-04 11:35:03.588084743 +0800 @@ -3,17 +3,15 @@ set(CMAKE_AUTOMOC ON) set(CMD_NAME dmr) -add_definitions(-D_LIBDMR_) - pkg_check_modules(FFTHUMB REQUIRED libffmpegthumbnailer) pkg_check_modules(AV REQUIRED IMPORTED_TARGET libavformat libavutil libavcodec) -include_directories(${CMAKE_INCLUDE_CURRENT_DIR}) - file(GLOB_RECURSE SRCS LIST_DIRECTORIES false *.cpp) file(GLOB_RECURSE MPV_SRCS LIST_DIRECTORIES false ../backends/mpv/*.cpp) file(GLOB_RECURSE HWDEC_SRCS ../common/hwdec_probe.cpp) -list(APPEND SRCS player_widget.cpp ${MPV_SRCS} ${HWDEC_SRCS}) +file(GLOB_RECURSE SETTINGS_SRCS ../common/dmr_settings.cpp) +file(GLOB_RECURSE OPTIONS_SRCS ../common/options.cpp) +list(APPEND SRCS player_widget.cpp ${MPV_SRCS} ${HWDEC_SRCS} ${SETTINGS_SRCS} ${OPTIONS_SRCS}) add_library(${CMD_NAME} SHARED ${SRCS}) set_target_properties(${CMD_NAME} PROPERTIES VERSION 0.1.0 SOVERSION 0.1) diff -Nur deepin-movie-reborn-5.9.8/src/libdmr/filefilter.cpp deepin-movie-reborn-5.9.8-new/src/libdmr/filefilter.cpp --- deepin-movie-reborn-5.9.8/src/libdmr/filefilter.cpp 2022-01-11 13:11:54.000000000 +0800 +++ deepin-movie-reborn-5.9.8-new/src/libdmr/filefilter.cpp 2022-03-04 11:35:36.754714760 +0800 @@ -175,7 +175,7 @@ { AVStream *in_stream = av_ctx->streams[0]; - if (in_stream->codec->codec_type == AVMEDIA_TYPE_AUDIO) + if (in_stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { bAudio = true; } @@ -247,10 +247,10 @@ { AVStream *in_stream = av_ctx->streams[i]; - if (in_stream->codec->codec_type == AVMEDIA_TYPE_VIDEO) + if (in_stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { - nWidth = in_stream->codec->width; - nHeight = in_stream->codec->height; + nWidth = in_stream->codecpar->width; + nHeight = in_stream->codecpar->height; } } diff -Nur deepin-movie-reborn-5.9.8/src/libdmr/playlist_model.cpp deepin-movie-reborn-5.9.8-new/src/libdmr/playlist_model.cpp --- deepin-movie-reborn-5.9.8/src/libdmr/playlist_model.cpp 2022-01-11 13:11:54.000000000 +0800 +++ deepin-movie-reborn-5.9.8-new/src/libdmr/playlist_model.cpp 2022-03-04 11:35:36.754714760 +0800 @@ -1576,7 +1576,7 @@ st = fmt_ctx->streams[stream_index]; #if LIBAVFORMAT_VERSION_MAJOR >= 57 *dec_ctx = st->codecpar; - dec = avcodec_find_decoder((*dec_ctx)->codec_id); + dec = avcodec_find_decoder(const_cast<AVCodec*>((*dec_ctx))->codec_id); #else /* find decoder for the stream */ dec = avcodec_find_decoder(st->codecpar->codec_id); diff -Nur deepin-movie-reborn-5.9.8/tests/deepin-movie/stub/stub.h deepin-movie-reborn-5.9.8-new/tests/deepin-movie/stub/stub.h --- deepin-movie-reborn-5.9.8/tests/deepin-movie/stub/stub.h 2022-01-11 13:11:54.000000000 +0800 +++ deepin-movie-reborn-5.9.8-new/tests/deepin-movie/stub/stub.h 2022-03-04 11:35:36.754714760 +0800 @@ -38,7 +38,7 @@ #include <cstring> //c++ #include <map> - +#include <cstdint> #define ADDR(CLASS_NAME,MEMBER_NAME) (&CLASS_NAME::MEMBER_NAME)
